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

[Razvan Musaloiu-E.]

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

Modified Files:
	BlockStorageManagerC.nc BlockStorageManagerP.nc 
Log Message:
A fix to allow Deluge T2 to compile for micaz.


Index: BlockStorageManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BlockStorageManagerC.nc	14 Jan 2008 04:22:01 -0000	1.1
--- BlockStorageManagerC.nc	14 Jan 2008 20:34:29 -0000	1.2
***************
*** 71,76 ****
    BlockStorageManagerP.SubStorageMap[VOLUME_DELUGE3]     -> BlockStorageC_3;
  #elif defined(PLATFORM_MICAZ)
!   components StorageMapperAt45dbC;
!   BlockStorageManagerP.At45dbVolume = At45dbStorageManagerC;
  #endif
  }
--- 71,76 ----
    BlockStorageManagerP.SubStorageMap[VOLUME_DELUGE3]     -> BlockStorageC_3;
  #elif defined(PLATFORM_MICAZ)
!   components At45dbStorageManagerC;
!   BlockStorageManagerP.At45dbVolume -> At45dbStorageManagerC;
  #endif
  }

Index: BlockStorageManagerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/BlockStorageManager/BlockStorageManagerP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BlockStorageManagerP.nc	14 Jan 2008 04:22:01 -0000	1.1
--- BlockStorageManagerP.nc	14 Jan 2008 20:34:29 -0000	1.2
***************
*** 182,186 ****
      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));
      at45pageoffset_t offset = addr & ((1 << AT45_PAGE_SIZE_LOG2) - 1);
      p_addr = page;
--- 182,186 ----
      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;