Merge of the latest Deluge T2.

[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 255d2c9b7d72592f2db4f8892c78fee3a34d98f4..462ff7da4883f412557da2857805b3ff19a52304 100644 (file)
--- a/tos/lib/net/Deluge/extra/NetProgC.nc
+++ b/tos/lib/net/Deluge/extra/NetProgC.nc
@@ -40,18 +40,20 @@ configuration NetProgC {
 
 implementation {
 
-  components MainC, InternalFlashC as IFlash, CrcP, 
-    DelugeStorageC, NetProgM;
+  components MainC, InternalFlashC as IFlash, CrcP;
+  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.ReprogramGuard -> ReprogramGuardC;
+
   components LedsC;
   NetProgM.Leds -> LedsC;
+  
+  components CC2420ControlP, ActiveMessageAddressC;
+  NetProgM.CC2420Config -> CC2420ControlP;
+  NetProgM.setAmAddress -> ActiveMessageAddressC;
 }