[Tinyos-commits] CVS: tinyos-1.x/tos/lib/Flash/AT45DB BlockStorageC.nc, 1.1, 1.2 StorageManagerC.nc, 1.1, 1.2 StorageManagerM.nc, 1.1, 1.2

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/tos/lib/Flash/AT45DB
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25445

Modified Files:
	BlockStorageC.nc StorageManagerC.nc StorageManagerM.nc 
Log Message:
- Added StorageRemap command. Needed by Deluge to tell bootloader the
physical address of an image in external flash.



Index: BlockStorageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/Flash/AT45DB/BlockStorageC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BlockStorageC.nc	11 Jul 2005 23:36:08 -0000	1.1
--- BlockStorageC.nc	13 Jul 2005 08:05:58 -0000	1.2
***************
*** 9,12 ****
--- 9,13 ----
      interface BlockRead[blockstorage_t blockId];
      interface BlockWrite[blockstorage_t blockId];
+     interface StorageRemap[blockstorage_t blockId];
    }
  }
***************
*** 17,21 ****
    BlockWrite = BlockStorageM.BlockWrite;
    BlockRead = BlockStorageM.BlockRead;
! 
    Main.StdControl -> StorageManagerC;
    BlockStorageM.HALAT45DB -> StorageManagerC.HALAT45DB;
--- 18,23 ----
    BlockWrite = BlockStorageM.BlockWrite;
    BlockRead = BlockStorageM.BlockRead;
!   StorageRemap = StorageManagerC.StorageRemap;
!   
    Main.StdControl -> StorageManagerC;
    BlockStorageM.HALAT45DB -> StorageManagerC.HALAT45DB;

Index: StorageManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/Flash/AT45DB/StorageManagerC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StorageManagerC.nc	11 Jul 2005 23:36:08 -0000	1.1
--- StorageManagerC.nc	13 Jul 2005 08:05:58 -0000	1.2
***************
*** 8,11 ****
--- 8,12 ----
      interface Mount[volume_t volume];
      interface HALAT45DB[volume_t volume];
+     interface StorageRemap[volume_t volume];
      interface AT45Remap;
    }
***************
*** 19,22 ****
--- 20,24 ----
    HALAT45DB = HALAT45DBShare;
    AT45Remap = StorageManagerM;
+   StorageRemap = StorageManagerM;
  
    StorageManagerM.HALAT45DB -> HALAT45DBShare.HALAT45DB[uniqueCount("StorageManager")];

Index: StorageManagerM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/Flash/AT45DB/StorageManagerM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StorageManagerM.nc	11 Jul 2005 23:36:08 -0000	1.1
--- StorageManagerM.nc	13 Jul 2005 08:05:59 -0000	1.2
***************
*** 6,9 ****
--- 6,10 ----
      interface StdControl;
      interface Mount[volume_t volume];
+     interface StorageRemap[volume_t volume];
      interface AT45Remap;
    }
***************
*** 92,95 ****
--- 93,100 ----
    }
  
+   command uint32_t StorageRemap.physicalAddr[volume_t v](uint32_t volumeAddr) {
+     return ((uint32_t)volumes[v].start << AT45_PAGE_SIZE_LOG2) + volumeAddr;
+   }
+ 
    command at45page_t AT45Remap.remap(volume_t volume, at45page_t volumePage) {
      if (volume == NVOLUMES) // special internal-use case