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

[Razvan Musaloiu-E.]

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

Modified Files:
	BlockStorageManagerC.nc BlockStorageManagerP.nc 
Log Message:
Deluge T2 support for Epic. This includes support for at45db161d and some refactoring and cleaning.


Index: BlockStorageManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BlockStorageManagerC.nc	24 Jan 2008 20:43:55 -0000	1.3
--- BlockStorageManagerC.nc	25 Aug 2008 16:48:47 -0000	1.4
***************
*** 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;
--- 70,74 ----
    BlockStorageManagerP.SubStorageMap[VOLUME_DELUGE2]     -> BlockStorageC_2;
    BlockStorageManagerP.SubStorageMap[VOLUME_DELUGE3]     -> BlockStorageC_3;
! #elif defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_EPIC)
    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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BlockStorageManagerP.nc	24 Jan 2008 20:43:55 -0000	1.3
--- BlockStorageManagerP.nc	25 Aug 2008 16:48:47 -0000	1.4
***************
*** 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
--- 38,42 ----
  #if defined(PLATFORM_TELOSB)
      interface StorageMap as SubStorageMap[volume_id_t volume_id];
! #elif defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_EPIC)
      interface At45dbVolume[volume_id_t volume_id];
  #endif
***************
*** 181,191 ****
  #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)
      at45page_t page = call At45dbVolume.remap[volume_id]((addr >> AT45_PAGE_SIZE_LOG2));
      at45pageoffset_t offset = addr & ((1 << AT45_PAGE_SIZE_LOG2) - 1);
--- 181,185 ----
  #if defined(PLATFORM_TELOSB)
      p_addr = call SubStorageMap.getPhysicalAddress[volume_id](addr);
! #elif defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_EPIC)
      at45page_t page = call At45dbVolume.remap[volume_id]((addr >> AT45_PAGE_SIZE_LOG2));
      at45pageoffset_t offset = addr & ((1 << AT45_PAGE_SIZE_LOG2) - 1);