X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Fnet%2FDeluge%2Fextra%2FNetProgC.nc;h=79bad7651dd654b4bde4b9323cf9de1b9687ada2;hb=e9bfab607e051bae6afb47b44892ce37541d1b44;hp=255d2c9b7d72592f2db4f8892c78fee3a34d98f4;hpb=1275ad8c5c9368b541e7eeccfeb6bf20352e6330;p=tinyos-2.x.git

diff --git a/tos/lib/net/Deluge/extra/NetProgC.nc b/tos/lib/net/Deluge/extra/NetProgC.nc
index 255d2c9b..79bad765 100644
--- a/tos/lib/net/Deluge/extra/NetProgC.nc
+++ b/tos/lib/net/Deluge/extra/NetProgC.nc
@@ -40,18 +40,24 @@ configuration NetProgC {
 
 implementation {
 
-  components MainC, InternalFlashC as IFlash, CrcP, 
-    DelugeStorageC, NetProgM;
+  components MainC, InternalFlashC as IFlash, CrcC;
+  components NetProgM, ReprogramGuardC;
 
   NetProg = NetProgM;
 
   MainC.SoftwareInit -> NetProgM.Init;
-  NetProgM.DelugeStorage[VOLUME_DELUGE0] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE0];
-  NetProgM.DelugeStorage[VOLUME_DELUGE1] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE1];
-  NetProgM.DelugeMetadata -> DelugeStorageC;
   NetProgM.IFlash -> IFlash;
-  NetProgM.Crc -> CrcP;
-  
+  NetProgM.Crc -> CrcC;
+  NetProgM.ReprogramGuard -> ReprogramGuardC;
+
   components LedsC;
   NetProgM.Leds -> LedsC;
+  
+  components ActiveMessageAddressC;
+  NetProgM.setAmAddress -> ActiveMessageAddressC;
+
+#if !defined(PLATFORM_TINYNODE)
+  components CC2420ControlP;
+  NetProgM.CC2420Config -> CC2420ControlP;
+#endif
 }