A small fix for mulle and some cleanup.

diff --git a/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerP.nc b/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerP.nc
index 95340106bd825d706a4d0eaca8b3340c19277517..22d8fcd228600ce3fa402ecac454bd5102ff9058 100644 (file)
--- a/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerP.nc
+++ b/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerP.nc
@@ -180,7 +180,7 @@ implementation
     storage_addr_t p_addr = 0xFFFFFFFF;
 #if defined(PLATFORM_TELOSB)
     p_addr = call SubStorageMap.getPhysicalAddress[volume_id](addr);
-#elif defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_EPIC)
+#elif defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_EPIC) || defined(PLATFORM_MULLE)
     at45page_t page = call At45dbVolume.remap[volume_id]((addr >> AT45_PAGE_SIZE_LOG2));
     at45pageoffset_t offset = addr & ((1 << AT45_PAGE_SIZE_LOG2) - 1);
     p_addr = page;

diff --git a/tos/lib/net/Deluge/extra/NetProgC.nc b/tos/lib/net/Deluge/extra/NetProgC.nc
index 36fabc7d00dd05b94c65462e9649c0b8985143ab..da2b50e646a6535d5c584355f9c6d0b20f880f1f 100644 (file)
--- a/tos/lib/net/Deluge/extra/NetProgC.nc
+++ b/tos/lib/net/Deluge/extra/NetProgC.nc
@@ -56,8 +56,6 @@ implementation {
   components ActiveMessageAddressC;
   NetProgM.setAmAddress -> ActiveMessageAddressC;
 
-#if !defined(PLATFORM_MULLE)
   components CC2420ControlP;
   NetProgM.CC2420Config -> CC2420ControlP;
-#endif
 }

diff --git a/tos/lib/net/Deluge/extra/NetProgM.nc b/tos/lib/net/Deluge/extra/NetProgM.nc
index 95f4d30bf35670344ef39ef5260a3a3bc116716e..e77ebeedeb4b09780359cfa6b8eb8cc0dbe91055 100644 (file)
--- a/tos/lib/net/Deluge/extra/NetProgM.nc
+++ b/tos/lib/net/Deluge/extra/NetProgM.nc
@@ -40,9 +40,7 @@ module NetProgM {
     interface InternalFlash as IFlash;
     interface Crc;
     interface Leds;
-#if !defined(PLATFORM_MULLE)
     interface CC2420Config;
-#endif
     async command void setAmAddress(am_addr_t a);
     interface ReprogramGuard;
   }