Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / net / Deluge / extra / NetProgC.nc

diff --git a/tos/lib/net/Deluge/extra/NetProgC.nc b/tos/lib/net/Deluge/extra/NetProgC.nc
index aeef0279559c661f87ee64a4a8210ac1f1ede017..79bad7651dd654b4bde4b9323cf9de1b9687ada2 100644 (file)
--- a/tos/lib/net/Deluge/extra/NetProgC.nc
+++ b/tos/lib/net/Deluge/extra/NetProgC.nc
@@ -40,24 +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_GOLDENIMAGE] -> DelugeStorageC.DelugeStorage[VOLUME_GOLDENIMAGE];
-  NetProgM.DelugeStorage[VOLUME_DELUGE1] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE1];
-  NetProgM.DelugeStorage[VOLUME_DELUGE2] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE2];
-  NetProgM.DelugeStorage[VOLUME_DELUGE3] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE3];
-  NetProgM.DelugeMetadata -> DelugeStorageC;
   NetProgM.IFlash -> IFlash;
-  NetProgM.Crc -> CrcP;
-  
+  NetProgM.Crc -> CrcC;
+  NetProgM.ReprogramGuard -> ReprogramGuardC;
+
   components LedsC;
   NetProgM.Leds -> LedsC;
   
-  components CC2420ControlP, ActiveMessageAddressC;
-  NetProgM.CC2420Config -> CC2420ControlP;
+  components ActiveMessageAddressC;
   NetProgM.setAmAddress -> ActiveMessageAddressC;
+
+#if !defined(PLATFORM_TINYNODE)
+  components CC2420ControlP;
+  NetProgM.CC2420Config -> CC2420ControlP;
+#endif
 }