A fix to allow Deluge T2 to compile for micaz.

diff --git a/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerC.nc b/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerC.nc
index 49c4093d02003c89b932fcb098259e5aee90425a..68714cfd68ff9b08ead6429e55da2850a97d3fbd 100644 (file)
--- a/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerC.nc
+++ b/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerC.nc
@@ -70,7 +70,7 @@ implementation
   BlockStorageManagerP.SubStorageMap[VOLUME_DELUGE2]     -> BlockStorageC_2;
   BlockStorageManagerP.SubStorageMap[VOLUME_DELUGE3]     -> BlockStorageC_3;
 #elif defined(PLATFORM_MICAZ)
-  components StorageMapperAt45dbC;
-  BlockStorageManagerP.At45dbVolume = At45dbStorageManagerC;
+  components At45dbStorageManagerC;
+  BlockStorageManagerP.At45dbVolume -> At45dbStorageManagerC;
 #endif
 }

diff --git a/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerP.nc b/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerP.nc
index 7a7cefb7e62e9c587613cc45cb1b8ace210c31bb..c171a25c85fa1a4b04092d3cd522186320dfd730 100644 (file)
--- a/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerP.nc
+++ b/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerP.nc
@@ -181,7 +181,7 @@ implementation
 #if defined(PLATFORM_TELOSB)
     p_addr = call SubStorageMap.getPhysicalAddress[volume_id](addr);
 #elif defined(PLATFORM_MICAZ)
-    at45page_t page = call At45dbVolume.remap[img_num]((addr >> AT45_PAGE_SIZE_LOG2));
+    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;