[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge Deluge.h, 1.5, 1.6 DelugeStorageC.nc, 1.6, 1.7

[Jonathan Hui]

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

Modified Files:
	Deluge.h DelugeStorageC.nc 
Log Message:
- No longer using generic component for storage stack.



Index: Deluge.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/Deluge.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Deluge.h	9 Feb 2005 00:48:27 -0000	1.5
--- Deluge.h	9 Feb 2005 02:54:30 -0000	1.6
***************
*** 67,70 ****
--- 67,76 ----
  
  enum {
+   DELUGE_VOLUME_ID_0 = unique("BlockStorage"),
+   DELUGE_VOLUME_ID_1 = unique("BlockStorage"),
+   DELUGE_VOLUME_ID_2 = unique("BlockStorage"),
+ };
+ 
+ enum {
    DELUGE_IMAGE_0 = 0,
    DELUGE_IMAGE_1 = 1,

Index: DelugeStorageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeStorageC.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DelugeStorageC.nc	9 Feb 2005 00:48:33 -0000	1.6
--- DelugeStorageC.nc	9 Feb 2005 02:54:30 -0000	1.7
***************
*** 46,53 ****
      Main,
      DelugeStorageM as Storage,
!     new BlockStorageC() as BlockStorage0,
!     new BlockStorageC() as BlockStorage1,
!     new BlockStorageC() as BlockStorage2;
!     
    StdControl = Storage;
    DataRead = Storage;
--- 46,51 ----
      Main,
      DelugeStorageM as Storage,
!     BlockStorageC;
! 
    StdControl = Storage;
    DataRead = Storage;
***************
*** 57,74 ****
    MetadataWrite = Storage;
  
!   Storage.ImageRead[DELUGE_IMAGE_0] -> BlockStorage0;
!   Storage.ImageWrite[DELUGE_IMAGE_0] -> BlockStorage0;
!   Storage.Mount[DELUGE_IMAGE_0] -> BlockStorage0;
!   Storage.StorageRemap[DELUGE_IMAGE_0] -> BlockStorage0;
  
!   Storage.ImageRead[DELUGE_IMAGE_1] -> BlockStorage1;
!   Storage.ImageWrite[DELUGE_IMAGE_1] -> BlockStorage1;
!   Storage.Mount[DELUGE_IMAGE_1] -> BlockStorage1;
!   Storage.StorageRemap[DELUGE_IMAGE_1] -> BlockStorage1;
  
!   Storage.ImageRead[DELUGE_IMAGE_2] -> BlockStorage2;
!   Storage.ImageWrite[DELUGE_IMAGE_2] -> BlockStorage2;
!   Storage.Mount[DELUGE_IMAGE_2] -> BlockStorage2;
!   Storage.StorageRemap[DELUGE_IMAGE_2] -> BlockStorage2;
  
  }
--- 55,72 ----
    MetadataWrite = Storage;
  
!   Storage.ImageRead[DELUGE_IMAGE_0] -> BlockStorageC.BlockRead[DELUGE_VOLUME_ID_0];
!   Storage.ImageWrite[DELUGE_IMAGE_0] -> BlockStorageC.BlockWrite[DELUGE_VOLUME_ID_0];
!   Storage.Mount[DELUGE_IMAGE_0] -> BlockStorageC.Mount[DELUGE_VOLUME_ID_0];
!   Storage.StorageRemap[DELUGE_IMAGE_0] -> BlockStorageC.StorageRemap[DELUGE_VOLUME_ID_0];
  
!   Storage.ImageRead[DELUGE_IMAGE_1] -> BlockStorageC.BlockRead[DELUGE_VOLUME_ID_1];
!   Storage.ImageWrite[DELUGE_IMAGE_1] -> BlockStorageC.BlockWrite[DELUGE_VOLUME_ID_1];
!   Storage.Mount[DELUGE_IMAGE_1] -> BlockStorageC.Mount[DELUGE_VOLUME_ID_1];
!   Storage.StorageRemap[DELUGE_IMAGE_1] -> BlockStorageC.StorageRemap[DELUGE_VOLUME_ID_1];
  
!   Storage.ImageRead[DELUGE_IMAGE_2] -> BlockStorageC.BlockRead[DELUGE_VOLUME_ID_2];
!   Storage.ImageWrite[DELUGE_IMAGE_2] -> BlockStorageC.BlockWrite[DELUGE_VOLUME_ID_2];
!   Storage.Mount[DELUGE_IMAGE_2] -> BlockStorageC.Mount[DELUGE_VOLUME_ID_2];
!   Storage.StorageRemap[DELUGE_IMAGE_2] -> BlockStorageC.StorageRemap[DELUGE_VOLUME_ID_2];
  
  }