[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/Deluge/BlockStorageManager BlockStorageManagerC.nc, 1.2, 1.3 BlockStorageManagerP.nc, 1.2, 1.3

[Janos Sallai]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/BlockStorageManager
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19436/BlockStorageManager

Modified Files:
	BlockStorageManagerC.nc BlockStorageManagerP.nc 
Log Message:
added iris support for deluge

Index: BlockStorageManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BlockStorageManagerC.nc	14 Jan 2008 20:34:29 -0000	1.2
--- BlockStorageManagerC.nc	24 Jan 2008 20:43:55 -0000	1.3
***************
*** 42,48 ****
      NUM_CLIENTS = uniqueCount(UQ_BSTORAGEM_CLIENT)
    };
!   
    components new BlockStorageManagerP(NUM_CLIENTS);
!   
    BlockRead  = BlockStorageManagerP;
    BlockWrite = BlockStorageManagerP;
--- 42,48 ----
      NUM_CLIENTS = uniqueCount(UQ_BSTORAGEM_CLIENT)
    };
! 
    components new BlockStorageManagerP(NUM_CLIENTS);
! 
    BlockRead  = BlockStorageManagerP;
    BlockWrite = BlockStorageManagerP;
***************
*** 70,74 ****
    BlockStorageManagerP.SubStorageMap[VOLUME_DELUGE2]     -> BlockStorageC_2;
    BlockStorageManagerP.SubStorageMap[VOLUME_DELUGE3]     -> BlockStorageC_3;
! #elif defined(PLATFORM_MICAZ)
    components At45dbStorageManagerC;
    BlockStorageManagerP.At45dbVolume -> At45dbStorageManagerC;
--- 70,74 ----
    BlockStorageManagerP.SubStorageMap[VOLUME_DELUGE2]     -> BlockStorageC_2;
    BlockStorageManagerP.SubStorageMap[VOLUME_DELUGE3]     -> BlockStorageC_3;
! #elif defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
    components At45dbStorageManagerC;
    BlockStorageManagerP.At45dbVolume -> At45dbStorageManagerC;

Index: BlockStorageManagerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BlockStorageManagerP.nc	14 Jan 2008 20:34:29 -0000	1.2
--- BlockStorageManagerP.nc	24 Jan 2008 20:43:55 -0000	1.3
***************
*** 38,42 ****
  #if defined(PLATFORM_TELOSB)
      interface StorageMap as SubStorageMap[volume_id_t volume_id];
! #elif defined(PLATFORM_MICAZ)
      interface At45dbVolume[volume_id_t volume_id];
  #endif
--- 38,42 ----
  #if defined(PLATFORM_TELOSB)
      interface StorageMap as SubStorageMap[volume_id_t volume_id];
! #elif defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
      interface At45dbVolume[volume_id_t volume_id];
  #endif
***************
*** 187,190 ****
--- 187,196 ----
      p_addr = p_addr << AT45_PAGE_SIZE_LOG2;
      p_addr += offset;
+ #elif defined(PLATFORM_IRIS)
+     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;
  #endif
      return p_addr;