[Tinyos-2-commits]
CVS: tinyos-2.x/tos/lib/net/Deluge Deluge.h, 1.2,
1.3 DelugeC.nc, 1.5, 1.6 DelugeStorageC.nc, 1.2,
1.3 ObjectTransferC.nc, 1.3, 1.4
Razvan Musaloiu-E.
razvanm at users.sourceforge.net
Wed Dec 19 18:31:42 PST 2007
Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1433/tos/lib/net/Deluge
Modified Files:
Deluge.h DelugeC.nc DelugeStorageC.nc ObjectTransferC.nc
Log Message:
Fix the Deluge rollback gesture and increase the total number of Deluge images to 4. The first one is considered to be the Golden Image.
Index: Deluge.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/Deluge.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Deluge.h 10 Jul 2007 01:17:40 -0000 1.2
--- Deluge.h 20 Dec 2007 02:31:40 -0000 1.3
***************
*** 35,39 ****
enum {
DELUGE_INVALID_UID = 0xffffffff,
! DELUGE_NUM_VOLUMES = 2,
};
--- 35,39 ----
enum {
DELUGE_INVALID_UID = 0xffffffff,
! DELUGE_NUM_VOLUMES = 4,
};
Index: DelugeC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/DelugeC.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DelugeC.nc 19 Jul 2007 02:19:38 -0000 1.5
--- DelugeC.nc 20 Dec 2007 02:31:40 -0000 1.6
***************
*** 43,59 ****
DelugeP.DissNotify -> FlashVolumeManagerC.DissNotify;
DelugeP.ReprogNotify -> FlashVolumeManagerC.ReprogNotify;
! FlashVolumeManagerC.BlockRead[VOLUME_DELUGE0] -> DelugeStorageC.BlockRead[VOLUME_DELUGE0];
! FlashVolumeManagerC.BlockWrite[VOLUME_DELUGE0] -> DelugeStorageC.BlockWrite[VOLUME_DELUGE0];
! FlashVolumeManagerC.DelugeStorage[VOLUME_DELUGE0] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE0];
FlashVolumeManagerC.BlockRead[VOLUME_DELUGE1] -> DelugeStorageC.BlockRead[VOLUME_DELUGE1];
FlashVolumeManagerC.BlockWrite[VOLUME_DELUGE1] -> DelugeStorageC.BlockWrite[VOLUME_DELUGE1];
FlashVolumeManagerC.DelugeStorage[VOLUME_DELUGE1] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE1];
#endif
components ObjectTransferC;
- ObjectTransferC.BlockRead[VOLUME_DELUGE0] -> DelugeStorageC.BlockRead[VOLUME_DELUGE0];
- ObjectTransferC.BlockWrite[VOLUME_DELUGE0] -> DelugeStorageC.BlockWrite[VOLUME_DELUGE0];
ObjectTransferC.BlockRead[VOLUME_DELUGE1] -> DelugeStorageC.BlockRead[VOLUME_DELUGE1];
ObjectTransferC.BlockWrite[VOLUME_DELUGE1] -> DelugeStorageC.BlockWrite[VOLUME_DELUGE1];
ObjectTransferC.Leds = Leds;
--- 43,71 ----
DelugeP.DissNotify -> FlashVolumeManagerC.DissNotify;
DelugeP.ReprogNotify -> FlashVolumeManagerC.ReprogNotify;
!
! FlashVolumeManagerC.BlockRead[VOLUME_GOLDENIMAGE] -> DelugeStorageC.BlockRead[VOLUME_GOLDENIMAGE];
! FlashVolumeManagerC.BlockWrite[VOLUME_GOLDENIMAGE] -> DelugeStorageC.BlockWrite[VOLUME_GOLDENIMAGE];
! FlashVolumeManagerC.DelugeStorage[VOLUME_GOLDENIMAGE] -> DelugeStorageC.DelugeStorage[VOLUME_GOLDENIMAGE];
!
FlashVolumeManagerC.BlockRead[VOLUME_DELUGE1] -> DelugeStorageC.BlockRead[VOLUME_DELUGE1];
FlashVolumeManagerC.BlockWrite[VOLUME_DELUGE1] -> DelugeStorageC.BlockWrite[VOLUME_DELUGE1];
FlashVolumeManagerC.DelugeStorage[VOLUME_DELUGE1] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE1];
+
+ FlashVolumeManagerC.BlockRead[VOLUME_DELUGE2] -> DelugeStorageC.BlockRead[VOLUME_DELUGE2];
+ FlashVolumeManagerC.BlockWrite[VOLUME_DELUGE2] -> DelugeStorageC.BlockWrite[VOLUME_DELUGE2];
+ FlashVolumeManagerC.DelugeStorage[VOLUME_DELUGE2] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE2];
+
+ FlashVolumeManagerC.BlockRead[VOLUME_DELUGE3] -> DelugeStorageC.BlockRead[VOLUME_DELUGE3];
+ FlashVolumeManagerC.BlockWrite[VOLUME_DELUGE3] -> DelugeStorageC.BlockWrite[VOLUME_DELUGE3];
+ FlashVolumeManagerC.DelugeStorage[VOLUME_DELUGE3] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE3];
#endif
components ObjectTransferC;
ObjectTransferC.BlockRead[VOLUME_DELUGE1] -> DelugeStorageC.BlockRead[VOLUME_DELUGE1];
ObjectTransferC.BlockWrite[VOLUME_DELUGE1] -> DelugeStorageC.BlockWrite[VOLUME_DELUGE1];
+ ObjectTransferC.BlockRead[VOLUME_DELUGE2] -> DelugeStorageC.BlockRead[VOLUME_DELUGE2];
+ ObjectTransferC.BlockWrite[VOLUME_DELUGE2] -> DelugeStorageC.BlockWrite[VOLUME_DELUGE2];
+ ObjectTransferC.BlockRead[VOLUME_DELUGE3] -> DelugeStorageC.BlockRead[VOLUME_DELUGE3];
+ ObjectTransferC.BlockWrite[VOLUME_DELUGE3] -> DelugeStorageC.BlockWrite[VOLUME_DELUGE3];
ObjectTransferC.Leds = Leds;
Index: DelugeStorageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/DelugeStorageC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DelugeStorageC.nc 2 Jun 2007 00:09:14 -0000 1.2
--- DelugeStorageC.nc 20 Dec 2007 02:31:40 -0000 1.3
***************
*** 43,72 ****
components DelugeStorageP;
! BlockRead[VOLUME_DELUGE0] = DelugeStorageP.BlockRead[VOLUME_DELUGE0];
! BlockWrite[VOLUME_DELUGE0] = DelugeStorageP.BlockWrite[VOLUME_DELUGE0];
BlockRead[VOLUME_DELUGE1] = DelugeStorageP.BlockRead[VOLUME_DELUGE1];
BlockWrite[VOLUME_DELUGE1] = DelugeStorageP.BlockWrite[VOLUME_DELUGE1];
DelugeMetadata = DelugeStorageP.DelugeMetadata;
- components new BlockStorageC(VOLUME_DELUGE0) as BlockStorageC_0;
components new BlockStorageC(VOLUME_DELUGE1) as BlockStorageC_1;
- DelugeStorageP.SubBlockRead[VOLUME_DELUGE0] -> BlockStorageC_0;
- DelugeStorageP.SubBlockWrite[VOLUME_DELUGE0] -> BlockStorageC_0;
DelugeStorageP.SubBlockRead[VOLUME_DELUGE1] -> BlockStorageC_1;
DelugeStorageP.SubBlockWrite[VOLUME_DELUGE1] -> BlockStorageC_1;
#if defined(PLATFORM_TELOSB)
! DelugeStorageP.StorageMap[VOLUME_DELUGE0] -> BlockStorageC_0;
DelugeStorageP.StorageMap[VOLUME_DELUGE1] -> BlockStorageC_1;
#elif defined(PLATFORM_MICAZ)
components At45dbStorageManagerC;
! DelugeStorageP.At45dbVolume[VOLUME_DELUGE0] -> At45dbStorageManagerC.At45dbVolume[VOLUME_DELUGE0];
DelugeStorageP.At45dbVolume[VOLUME_DELUGE1] -> At45dbStorageManagerC.At45dbVolume[VOLUME_DELUGE1];
#else
#error "Target platform is not currently supported by Deluge T2"
#endif
! DelugeStorage[VOLUME_DELUGE0] = DelugeStorageP.DelugeStorage[VOLUME_DELUGE0];
DelugeStorage[VOLUME_DELUGE1] = DelugeStorageP.DelugeStorage[VOLUME_DELUGE1];
components LedsC, MainC;
--- 43,91 ----
components DelugeStorageP;
! BlockRead[VOLUME_GOLDENIMAGE] = DelugeStorageP.BlockRead[VOLUME_GOLDENIMAGE];
! BlockWrite[VOLUME_GOLDENIMAGE] = DelugeStorageP.BlockWrite[VOLUME_GOLDENIMAGE];
BlockRead[VOLUME_DELUGE1] = DelugeStorageP.BlockRead[VOLUME_DELUGE1];
BlockWrite[VOLUME_DELUGE1] = DelugeStorageP.BlockWrite[VOLUME_DELUGE1];
+ BlockRead[VOLUME_DELUGE2] = DelugeStorageP.BlockRead[VOLUME_DELUGE2];
+ BlockWrite[VOLUME_DELUGE2] = DelugeStorageP.BlockWrite[VOLUME_DELUGE2];
+ BlockRead[VOLUME_DELUGE3] = DelugeStorageP.BlockRead[VOLUME_DELUGE3];
+ BlockWrite[VOLUME_DELUGE3] = DelugeStorageP.BlockWrite[VOLUME_DELUGE3];
DelugeMetadata = DelugeStorageP.DelugeMetadata;
+
+ components new BlockStorageC(VOLUME_GOLDENIMAGE) as BlockStorageC_Golden;
+ DelugeStorageP.SubBlockRead[VOLUME_GOLDENIMAGE] -> BlockStorageC_Golden;
+ DelugeStorageP.SubBlockWrite[VOLUME_GOLDENIMAGE] -> BlockStorageC_Golden;
components new BlockStorageC(VOLUME_DELUGE1) as BlockStorageC_1;
DelugeStorageP.SubBlockRead[VOLUME_DELUGE1] -> BlockStorageC_1;
DelugeStorageP.SubBlockWrite[VOLUME_DELUGE1] -> BlockStorageC_1;
+
+ components new BlockStorageC(VOLUME_DELUGE2) as BlockStorageC_2;
+ DelugeStorageP.SubBlockRead[VOLUME_DELUGE2] -> BlockStorageC_2;
+ DelugeStorageP.SubBlockWrite[VOLUME_DELUGE2] -> BlockStorageC_2;
+
+ components new BlockStorageC(VOLUME_DELUGE3) as BlockStorageC_3;
+ DelugeStorageP.SubBlockRead[VOLUME_DELUGE3] -> BlockStorageC_3;
+ DelugeStorageP.SubBlockWrite[VOLUME_DELUGE3] -> BlockStorageC_3;
#if defined(PLATFORM_TELOSB)
! DelugeStorageP.StorageMap[VOLUME_GOLDENIMAGE] -> BlockStorageC_Golden;
DelugeStorageP.StorageMap[VOLUME_DELUGE1] -> BlockStorageC_1;
+ DelugeStorageP.StorageMap[VOLUME_DELUGE2] -> BlockStorageC_2;
+ DelugeStorageP.StorageMap[VOLUME_DELUGE3] -> BlockStorageC_3;
#elif defined(PLATFORM_MICAZ)
components At45dbStorageManagerC;
! DelugeStorageP.At45dbVolume[VOLUME_GOLDENIMAGE] -> At45dbStorageManagerC.At45dbVolume[VOLUME_GOLDENIMAGE];
DelugeStorageP.At45dbVolume[VOLUME_DELUGE1] -> At45dbStorageManagerC.At45dbVolume[VOLUME_DELUGE1];
+ DelugeStorageP.At45dbVolume[VOLUME_DELUGE2] -> At45dbStorageManagerC.At45dbVolume[VOLUME_DELUGE2];
+ DelugeStorageP.At45dbVolume[VOLUME_DELUGE3] -> At45dbStorageManagerC.At45dbVolume[VOLUME_DELUGE3];
#else
#error "Target platform is not currently supported by Deluge T2"
#endif
! DelugeStorage[VOLUME_GOLDENIMAGE] = DelugeStorageP.DelugeStorage[VOLUME_GOLDENIMAGE];
DelugeStorage[VOLUME_DELUGE1] = DelugeStorageP.DelugeStorage[VOLUME_DELUGE1];
+ DelugeStorage[VOLUME_DELUGE2] = DelugeStorageP.DelugeStorage[VOLUME_DELUGE2];
+ DelugeStorage[VOLUME_DELUGE3] = DelugeStorageP.DelugeStorage[VOLUME_DELUGE3];
components LedsC, MainC;
Index: ObjectTransferC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/ObjectTransferC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ObjectTransferC.nc 19 Jul 2007 02:19:38 -0000 1.3
--- ObjectTransferC.nc 20 Dec 2007 02:31:40 -0000 1.4
***************
*** 43,50 ****
ObjectTransfer = ObjectTransferP;
- BlockRead[VOLUME_DELUGE0] = DelugePageTransferC.BlockRead[VOLUME_DELUGE0];
- BlockWrite[VOLUME_DELUGE0] = DelugePageTransferC.BlockWrite[VOLUME_DELUGE0];
BlockRead[VOLUME_DELUGE1] = DelugePageTransferC.BlockRead[VOLUME_DELUGE1];
BlockWrite[VOLUME_DELUGE1] = DelugePageTransferC.BlockWrite[VOLUME_DELUGE1];
ObjectTransferP.DelugePageTransfer -> DelugePageTransferC.DelugePageTransfer;
--- 43,52 ----
ObjectTransfer = ObjectTransferP;
BlockRead[VOLUME_DELUGE1] = DelugePageTransferC.BlockRead[VOLUME_DELUGE1];
BlockWrite[VOLUME_DELUGE1] = DelugePageTransferC.BlockWrite[VOLUME_DELUGE1];
+ BlockRead[VOLUME_DELUGE2] = DelugePageTransferC.BlockRead[VOLUME_DELUGE2];
+ BlockWrite[VOLUME_DELUGE2] = DelugePageTransferC.BlockWrite[VOLUME_DELUGE2];
+ BlockRead[VOLUME_DELUGE3] = DelugePageTransferC.BlockRead[VOLUME_DELUGE3];
+ BlockWrite[VOLUME_DELUGE3] = DelugePageTransferC.BlockWrite[VOLUME_DELUGE3];
ObjectTransferP.DelugePageTransfer -> DelugePageTransferC.DelugePageTransfer;
***************
*** 68,73 ****
DelugePageTransferC.Leds = Leds;
- ObjectTransferP.BlockWrite[VOLUME_DELUGE0] = BlockWrite[VOLUME_DELUGE0];
ObjectTransferP.BlockWrite[VOLUME_DELUGE1] = BlockWrite[VOLUME_DELUGE1];
components RandomC, new TimerMilliC() as Timer;
--- 70,76 ----
DelugePageTransferC.Leds = Leds;
ObjectTransferP.BlockWrite[VOLUME_DELUGE1] = BlockWrite[VOLUME_DELUGE1];
+ ObjectTransferP.BlockWrite[VOLUME_DELUGE2] = BlockWrite[VOLUME_DELUGE2];
+ ObjectTransferP.BlockWrite[VOLUME_DELUGE3] = BlockWrite[VOLUME_DELUGE3];
components RandomC, new TimerMilliC() as Timer;
More information about the Tinyos-2-commits
mailing list