From: razvanm <razvanm>
Date: Fri, 6 Nov 2009 05:38:50 +0000 (+0000)
Subject: A small fix for mulle and some cleanup.
X-Git-Tag: rc_6_tinyos_2_1_1~145
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=4dc55c65a61de96156679ff8486b58dd5c4fc786

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 95340106..22d8fcd2 100644
--- 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 36fabc7d..da2b50e6 100644
--- 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 95f4d30b..e77ebeed 100644
--- 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;
   }