[Tinyos-beta-commits] CVS: tinyos-1.x/beta/STM25P BlockStorageC.nc, 1.2, 1.3 StorageManagerM.nc, 1.1, 1.2

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/beta/STM25P
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14174

Modified Files:
	BlockStorageC.nc StorageManagerM.nc 
Log Message:
- Move away from generic components for 1.x tree.



Index: BlockStorageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/STM25P/BlockStorageC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BlockStorageC.nc	9 Feb 2005 00:46:09 -0000	1.2
--- BlockStorageC.nc	9 Feb 2005 02:53:45 -0000	1.3
***************
*** 27,37 ****
  
  includes BlockStorage;
! 
! generic configuration BlockStorageC() {
    provides {
!     interface Mount;
!     interface BlockRead;
!     interface BlockWrite;
!     interface StorageRemap;
    }
  }
--- 27,36 ----
  
  includes BlockStorage;
! configuration BlockStorageC {
    provides {
!     interface Mount[blockstorage_t blockId];
!     interface BlockRead[blockstorage_t blockId];
!     interface BlockWrite[blockstorage_t blockId];
!     interface StorageRemap[blockstorage_t blockId];
    }
  }
***************
*** 39,58 ****
  implementation {
  
-   enum {
-     BLOCK_ID = unique("BlockStorage"),
-     VOLUME_ID = unique("StorageManager"),
-   };
- 
    components BlockStorageM, Main, StorageManagerC;
  
!   Mount = BlockStorageM.Mount[BLOCK_ID];
!   BlockRead = BlockStorageM.BlockRead[BLOCK_ID];
!   BlockWrite = BlockStorageM.BlockWrite[BLOCK_ID];
!   StorageRemap = StorageManagerC.StorageRemap[VOLUME_ID];
  
    Main.StdControl -> StorageManagerC;
  
!   BlockStorageM.HALSTM25P[BLOCK_ID] -> StorageManagerC.HALSTM25P[VOLUME_ID];
!   BlockStorageM.ActualMount[BLOCK_ID] -> StorageManagerC.Mount[VOLUME_ID];
  
  }
--- 38,52 ----
  implementation {
  
    components BlockStorageM, Main, StorageManagerC;
  
!   Mount = BlockStorageM.Mount;
!   BlockRead = BlockStorageM.BlockRead;
!   BlockWrite = BlockStorageM.BlockWrite;
!   StorageRemap = StorageManagerC.StorageRemap;
  
    Main.StdControl -> StorageManagerC;
  
!   BlockStorageM.HALSTM25P -> StorageManagerC.HALSTM25P;
!   BlockStorageM.ActualMount -> StorageManagerC.Mount;
  
  }

Index: StorageManagerM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/STM25P/StorageManagerM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StorageManagerM.nc	9 Feb 2005 00:46:09 -0000	1.1
--- StorageManagerM.nc	9 Feb 2005 02:53:45 -0000	1.2
***************
*** 37,41 ****
  
    enum {
!     NUM_VOLUMES = uniqueCount("StorageManager"),
    };
  
--- 37,41 ----
  
    enum {
!     NUM_VOLUMES = uniqueCount("BlockStorage"),
    };