[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge Deluge.h, 1.9, 1.10 DelugeStorageC.nc, 1.9, 1.10

[Jonathan Hui]

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

Modified Files:
	Deluge.h DelugeStorageC.nc 
Log Message:
Added ability to easily change number of supported Deluge images using
DELUGE_NUM_IMAGES. No recompilation of Deluge tools is necessary since
number of images is queried during a ping.



Index: Deluge.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/Deluge.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Deluge.h	17 May 2005 20:55:47 -0000	1.9
--- Deluge.h	23 Jun 2005 19:30:20 -0000	1.10
***************
*** 34,40 ****
  #include "DelugeMetadata.h"
  
  enum {
    DELUGE_VERSION                    = 2,
-   DELUGE_NUM_IMAGES                 = 3,
    DELUGE_MIN_ADV_PERIOD_LOG2        = 8,
    DELUGE_MAX_ADV_PERIOD_LOG2        = 20,
--- 34,43 ----
  #include "DelugeMetadata.h"
  
+ #ifndef DELUGE_NUM_IMAGES
+ #define DELUGE_NUM_IMAGES 3
+ #endif
+ 
  enum {
    DELUGE_VERSION                    = 2,
    DELUGE_MIN_ADV_PERIOD_LOG2        = 8,
    DELUGE_MAX_ADV_PERIOD_LOG2        = 20,
***************
*** 65,74 ****
  };
  
- enum {
-   DELUGE_VOLUME_ID_0 = unique("StorageManager"),
-   DELUGE_VOLUME_ID_1 = unique("StorageManager"),
-   DELUGE_VOLUME_ID_2 = unique("StorageManager"),
- };
- 
  #include "Storage.h"
  
--- 68,71 ----
***************
*** 78,87 ****
  };
  
- static const struct deluge_image_t DELUGE_IMAGES[DELUGE_NUM_IMAGES] = {
-   { DELUGE_VOLUME_ID_0, 0xDF },
-   { DELUGE_VOLUME_ID_1, 0xD0 },
-   { DELUGE_VOLUME_ID_2, 0xD1 },
- };
- 
  typedef struct DelugeAdvTimer {
    uint32_t timer      : 32;
--- 75,78 ----
***************
*** 98,100 ****
--- 89,141 ----
  } DelugeNodeDesc;
  
+ enum {
+   DELUGE_VOLUME_ID_0 = unique("StorageManager"),
+ #if DELUGE_NUM_IMAGES >= 2
+   DELUGE_VOLUME_ID_1 = unique("StorageManager"),
+ #if DELUGE_NUM_IMAGES >= 3
+   DELUGE_VOLUME_ID_2 = unique("StorageManager"),
+ #if DELUGE_NUM_IMAGES >= 4
+   DELUGE_VOLUME_ID_3 = unique("StorageManager"),
+ #if DELUGE_NUM_IMAGES >= 5
+   DELUGE_VOLUME_ID_4 = unique("StorageManager"),
+ #if DELUGE_NUM_IMAGES >= 6
+   DELUGE_VOLUME_ID_5 = unique("StorageManager"),
+ #if DELUGE_NUM_IMAGES >= 7
+   DELUGE_VOLUME_ID_6 = unique("StorageManager"),
+ #if DELUGE_NUM_IMAGES >= 8
+   DELUGE_VOLUME_ID_7 = unique("StorageManager"),
+ #endif
+ #endif
+ #endif
+ #endif
+ #endif
+ #endif
+ #endif
+ };
+ 
+ static const struct deluge_image_t DELUGE_IMAGES[DELUGE_NUM_IMAGES] = {
+   { DELUGE_VOLUME_ID_0, 0xDF },
+ #if DELUGE_NUM_IMAGES >= 2
+   { DELUGE_VOLUME_ID_1, 0xD0 },
+ #if DELUGE_NUM_IMAGES >= 3
+   { DELUGE_VOLUME_ID_2, 0xD1 },
+ #if DELUGE_NUM_IMAGES >= 4
+   { DELUGE_VOLUME_ID_3, 0xD2 },
+ #if DELUGE_NUM_IMAGES >= 5
+   { DELUGE_VOLUME_ID_4, 0xD3 },
+ #if DELUGE_NUM_IMAGES >= 6
+   { DELUGE_VOLUME_ID_5, 0xD4 },
+ #if DELUGE_NUM_IMAGES >= 7
+   { DELUGE_VOLUME_ID_6, 0xD5 },
+ #if DELUGE_NUM_IMAGES >= 8
+   { DELUGE_VOLUME_ID_7, 0xD6 },
+ #endif
+ #endif
+ #endif
+ #endif
+ #endif
+ #endif
+ #endif
+ };
+ 
  #endif

Index: DelugeStorageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeStorageC.nc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DelugeStorageC.nc	18 Mar 2005 01:13:28 -0000	1.9
--- DelugeStorageC.nc	23 Jun 2005 19:30:20 -0000	1.10
***************
*** 56,69 ****
    Storage.Mount[DELUGE_VOLUME_ID_0] -> BlockStorageC.Mount[DELUGE_VOLUME_ID_0];
    Storage.StorageRemap[DELUGE_VOLUME_ID_0] -> BlockStorageC.StorageRemap[DELUGE_VOLUME_ID_0];
! 
    Storage.BlockRead[DELUGE_VOLUME_ID_1] -> BlockStorageC.BlockRead[DELUGE_VOLUME_ID_1];
    Storage.BlockWrite[DELUGE_VOLUME_ID_1] -> BlockStorageC.BlockWrite[DELUGE_VOLUME_ID_1];
    Storage.Mount[DELUGE_VOLUME_ID_1] -> BlockStorageC.Mount[DELUGE_VOLUME_ID_1];
    Storage.StorageRemap[DELUGE_VOLUME_ID_1] -> BlockStorageC.StorageRemap[DELUGE_VOLUME_ID_1];
! 
    Storage.BlockRead[DELUGE_VOLUME_ID_2] -> BlockStorageC.BlockRead[DELUGE_VOLUME_ID_2];
    Storage.BlockWrite[DELUGE_VOLUME_ID_2] -> BlockStorageC.BlockWrite[DELUGE_VOLUME_ID_2];
    Storage.Mount[DELUGE_VOLUME_ID_2] -> BlockStorageC.Mount[DELUGE_VOLUME_ID_2];
    Storage.StorageRemap[DELUGE_VOLUME_ID_2] -> BlockStorageC.StorageRemap[DELUGE_VOLUME_ID_2];
  
  }
--- 56,101 ----
    Storage.Mount[DELUGE_VOLUME_ID_0] -> BlockStorageC.Mount[DELUGE_VOLUME_ID_0];
    Storage.StorageRemap[DELUGE_VOLUME_ID_0] -> BlockStorageC.StorageRemap[DELUGE_VOLUME_ID_0];
! #if DELUGE_NUM_IMAGES >= 2
    Storage.BlockRead[DELUGE_VOLUME_ID_1] -> BlockStorageC.BlockRead[DELUGE_VOLUME_ID_1];
    Storage.BlockWrite[DELUGE_VOLUME_ID_1] -> BlockStorageC.BlockWrite[DELUGE_VOLUME_ID_1];
    Storage.Mount[DELUGE_VOLUME_ID_1] -> BlockStorageC.Mount[DELUGE_VOLUME_ID_1];
    Storage.StorageRemap[DELUGE_VOLUME_ID_1] -> BlockStorageC.StorageRemap[DELUGE_VOLUME_ID_1];
! #if DELUGE_NUM_IMAGES >= 3
    Storage.BlockRead[DELUGE_VOLUME_ID_2] -> BlockStorageC.BlockRead[DELUGE_VOLUME_ID_2];
    Storage.BlockWrite[DELUGE_VOLUME_ID_2] -> BlockStorageC.BlockWrite[DELUGE_VOLUME_ID_2];
    Storage.Mount[DELUGE_VOLUME_ID_2] -> BlockStorageC.Mount[DELUGE_VOLUME_ID_2];
    Storage.StorageRemap[DELUGE_VOLUME_ID_2] -> BlockStorageC.StorageRemap[DELUGE_VOLUME_ID_2];
+ #if DELUGE_NUM_IMAGES >= 4
+   Storage.BlockRead[DELUGE_VOLUME_ID_3] -> BlockStorageC.BlockRead[DELUGE_VOLUME_ID_3];
+   Storage.BlockWrite[DELUGE_VOLUME_ID_3] -> BlockStorageC.BlockWrite[DELUGE_VOLUME_ID_3];
+   Storage.Mount[DELUGE_VOLUME_ID_3] -> BlockStorageC.Mount[DELUGE_VOLUME_ID_3];
+   Storage.StorageRemap[DELUGE_VOLUME_ID_3] -> BlockStorageC.StorageRemap[DELUGE_VOLUME_ID_3];
+ #if DELUGE_NUM_IMAGES >= 5
+   Storage.BlockRead[DELUGE_VOLUME_ID_4] -> BlockStorageC.BlockRead[DELUGE_VOLUME_ID_4];
+   Storage.BlockWrite[DELUGE_VOLUME_ID_4] -> BlockStorageC.BlockWrite[DELUGE_VOLUME_ID_4];
+   Storage.Mount[DELUGE_VOLUME_ID_4] -> BlockStorageC.Mount[DELUGE_VOLUME_ID_4];
+   Storage.StorageRemap[DELUGE_VOLUME_ID_4] -> BlockStorageC.StorageRemap[DELUGE_VOLUME_ID_4];
+ #if DELUGE_NUM_IMAGES >= 6
+   Storage.BlockRead[DELUGE_VOLUME_ID_5] -> BlockStorageC.BlockRead[DELUGE_VOLUME_ID_5];
+   Storage.BlockWrite[DELUGE_VOLUME_ID_5] -> BlockStorageC.BlockWrite[DELUGE_VOLUME_ID_5];
+   Storage.Mount[DELUGE_VOLUME_ID_5] -> BlockStorageC.Mount[DELUGE_VOLUME_ID_5];
+   Storage.StorageRemap[DELUGE_VOLUME_ID_5] -> BlockStorageC.StorageRemap[DELUGE_VOLUME_ID_5];
+ #if DELUGE_NUM_IMAGES >= 7
+   Storage.BlockRead[DELUGE_VOLUME_ID_6] -> BlockStorageC.BlockRead[DELUGE_VOLUME_ID_6];
+   Storage.BlockWrite[DELUGE_VOLUME_ID_6] -> BlockStorageC.BlockWrite[DELUGE_VOLUME_ID_6];
+   Storage.Mount[DELUGE_VOLUME_ID_6] -> BlockStorageC.Mount[DELUGE_VOLUME_ID_6];
+   Storage.StorageRemap[DELUGE_VOLUME_ID_6] -> BlockStorageC.StorageRemap[DELUGE_VOLUME_ID_6];
+ #if DELUGE_NUM_IMAGES >= 8
+   Storage.BlockRead[DELUGE_VOLUME_ID_7] -> BlockStorageC.BlockRead[DELUGE_VOLUME_ID_7];
+   Storage.BlockWrite[DELUGE_VOLUME_ID_7] -> BlockStorageC.BlockWrite[DELUGE_VOLUME_ID_7];
+   Storage.Mount[DELUGE_VOLUME_ID_7] -> BlockStorageC.Mount[DELUGE_VOLUME_ID_7];
+   Storage.StorageRemap[DELUGE_VOLUME_ID_7] -> BlockStorageC.StorageRemap[DELUGE_VOLUME_ID_7];
+ #endif
+ #endif
+ #endif
+ #endif
+ #endif
+ #endif
+ #endif
  
  }