[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge DelugeM.nc, 1.10, 1.11 DelugeMetadataM.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-serv2377/Deluge

Modified Files:
	DelugeM.nc DelugeMetadataM.nc 
Log Message:
- Fixed a minor bug that prevented resuming of images after the node
is rebooted.



Index: DelugeM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeM.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DelugeM.nc	15 Mar 2005 06:24:32 -0000	1.10
--- DelugeM.nc	15 Mar 2005 07:20:52 -0000	1.11
***************
*** 161,166 ****
  
      state = S_INITIALIZING;
!     if (call MetadataControl.start() == FAIL)
!       realStart();
  
      return result;
--- 161,165 ----
  
      state = S_INITIALIZING;
!     call MetadataControl.start();
  
      return result;

Index: DelugeMetadataM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeMetadataM.nc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DelugeMetadataM.nc	11 Mar 2005 21:46:38 -0000	1.9
--- DelugeMetadataM.nc	15 Mar 2005 07:20:52 -0000	1.10
***************
*** 113,118 ****
    }
  
!   result_t realStart() {
!     return call DelugeStorage.loadImages();
    }
  
--- 113,118 ----
    }
  
!   void realStart() {
!     call DelugeStorage.loadImages();
    }
  
***************
*** 125,136 ****
  
    command result_t SplitControl.start() {
!     if (state == S_RADIO_STARTING) {
        state = S_WAITING_FOR_RADIO;
-       return SUCCESS;
-     }
      else if (state == S_INIT)
!       return realStart();
  
!     return FAIL;
    }
  
--- 125,134 ----
  
    command result_t SplitControl.start() {
!     if (state == S_RADIO_STARTING)
        state = S_WAITING_FOR_RADIO;
      else if (state == S_INIT)
!       realStart();
  
!     return SUCCESS;
    }
  
***************
*** 147,151 ****
      else if (state == S_WAITING_FOR_RADIO) {
        state = S_INIT;
!       return realStart();
      }
  
--- 145,149 ----
      else if (state == S_WAITING_FOR_RADIO) {
        state = S_INIT;
!       realStart();
      }