[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/Deluge/FlashVolumeManager FlashVolumeManagerC.nc, 1.4, 1.5 FlashVolumeManagerP.nc, 1.7, 1.8

[Razvan Musaloiu-E.]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/FlashVolumeManager
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1433/tos/lib/net/Deluge/FlashVolumeManager

Modified Files:
	FlashVolumeManagerC.nc FlashVolumeManagerP.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: FlashVolumeManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FlashVolumeManagerC.nc	10 Jul 2007 01:17:40 -0000	1.4
--- FlashVolumeManagerC.nc	20 Dec 2007 02:31:40 -0000	1.5
***************
*** 50,57 ****
               NoLedsC, LedsC;
    
!   FlashVolumeManagerP.BlockRead[VOLUME_DELUGE0] = BlockRead[VOLUME_DELUGE0];
!   FlashVolumeManagerP.BlockWrite[VOLUME_DELUGE0] = BlockWrite[VOLUME_DELUGE0];
    FlashVolumeManagerP.BlockRead[VOLUME_DELUGE1] = BlockRead[VOLUME_DELUGE1];
    FlashVolumeManagerP.BlockWrite[VOLUME_DELUGE1] = BlockWrite[VOLUME_DELUGE1];
    FlashVolumeManagerP.SerialAMSender -> SerialAMSenderC;
    FlashVolumeManagerP.SerialAMReceiver -> SerialAMReceiverC;
--- 50,62 ----
               NoLedsC, LedsC;
    
!   FlashVolumeManagerP.BlockRead[VOLUME_GOLDENIMAGE] = BlockRead[VOLUME_GOLDENIMAGE];
!   FlashVolumeManagerP.BlockWrite[VOLUME_GOLDENIMAGE] = BlockWrite[VOLUME_GOLDENIMAGE];
    FlashVolumeManagerP.BlockRead[VOLUME_DELUGE1] = BlockRead[VOLUME_DELUGE1];
    FlashVolumeManagerP.BlockWrite[VOLUME_DELUGE1] = BlockWrite[VOLUME_DELUGE1];
+   FlashVolumeManagerP.BlockRead[VOLUME_DELUGE2] = BlockRead[VOLUME_DELUGE2];
+   FlashVolumeManagerP.BlockWrite[VOLUME_DELUGE2] = BlockWrite[VOLUME_DELUGE2];
+   FlashVolumeManagerP.BlockRead[VOLUME_DELUGE3] = BlockRead[VOLUME_DELUGE3];
+   FlashVolumeManagerP.BlockWrite[VOLUME_DELUGE3] = BlockWrite[VOLUME_DELUGE3];
+  
    FlashVolumeManagerP.SerialAMSender -> SerialAMSenderC;
    FlashVolumeManagerP.SerialAMReceiver -> SerialAMReceiverC;
***************
*** 63,68 ****
    FlashVolumeManagerP.NetProg -> NetProgC;
    FlashVolumeManagerP.Timer -> TimerMilliC;
!   FlashVolumeManagerP.DelugeStorage[VOLUME_DELUGE0] = DelugeStorage[VOLUME_DELUGE0];
    FlashVolumeManagerP.DelugeStorage[VOLUME_DELUGE1] = DelugeStorage[VOLUME_DELUGE1];
    DissNotify = FlashVolumeManagerP.DissNotify;
    ReprogNotify = FlashVolumeManagerP.ReprogNotify;
--- 68,75 ----
    FlashVolumeManagerP.NetProg -> NetProgC;
    FlashVolumeManagerP.Timer -> TimerMilliC;
!   FlashVolumeManagerP.DelugeStorage[VOLUME_GOLDENIMAGE] = DelugeStorage[VOLUME_GOLDENIMAGE];
    FlashVolumeManagerP.DelugeStorage[VOLUME_DELUGE1] = DelugeStorage[VOLUME_DELUGE1];
+   FlashVolumeManagerP.DelugeStorage[VOLUME_DELUGE2] = DelugeStorage[VOLUME_DELUGE2];
+   FlashVolumeManagerP.DelugeStorage[VOLUME_DELUGE3] = DelugeStorage[VOLUME_DELUGE3];
    DissNotify = FlashVolumeManagerP.DissNotify;
    ReprogNotify = FlashVolumeManagerP.ReprogNotify;

Index: FlashVolumeManagerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerP.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FlashVolumeManagerP.nc	13 Sep 2007 23:10:18 -0000	1.7
--- FlashVolumeManagerP.nc	20 Dec 2007 02:31:40 -0000	1.8
***************
*** 163,171 ****
      switch (srpkt->img_num) {
        case 0:
!         img_num = VOLUME_DELUGE0;
          break;
        case 1:
          img_num = VOLUME_DELUGE1;
          break;
      }
      
--- 163,177 ----
      switch (srpkt->img_num) {
        case 0:
!         img_num = VOLUME_GOLDENIMAGE;
          break;
        case 1:
          img_num = VOLUME_DELUGE1;
          break;
+       case 2:
+         img_num = VOLUME_DELUGE2;
+         break;
+       case 3:
+         img_num = VOLUME_DELUGE3;
+         break;
      }