Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / net / Deluge / BlockStorageManager / BlockStorageManagerP.nc

diff --git a/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerP.nc b/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerP.nc
index 9fbd9e40ae52c64df0f989726206d6ecd594c887..3c0e34e85041e0e9017833adbae1de2eea754cd7 100644 (file)
--- a/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerP.nc
+++ b/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerP.nc
@@ -37,7 +37,7 @@ generic module BlockStorageManagerP(uint8_t clients)
     interface VolumeId[uint8_t client];
 #if defined(PLATFORM_TELOSB)
     interface StorageMap as SubStorageMap[volume_id_t volume_id];
-#elif defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+#elif defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_EPIC) || defined(PLATFORM_MULLE) || defined(PLATFORM_TINYNODE)
     interface At45dbVolume[volume_id_t volume_id];
 #endif
   }
@@ -180,13 +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)
-    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;
-    p_addr = p_addr << AT45_PAGE_SIZE_LOG2;
-    p_addr += offset;
-#elif defined(PLATFORM_IRIS)
+#elif defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_EPIC) || defined(PLATFORM_MULLE) || defined(PLATFORM_TINYNODE)
     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;