[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge DelugeM.nc, 1.12, 1.13 DelugeMetadata.nc, 1.3, 1.4 DelugeMetadataM.nc, 1.10, 1.11

[Jonathan Hui]

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

Modified Files:
	DelugeM.nc DelugeMetadata.nc DelugeMetadataM.nc 
Log Message:
- Fixed a bug where Deluge doesn't startup in GoldenImage.



Index: DelugeM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeM.nc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DelugeM.nc	15 Mar 2005 19:56:07 -0000	1.12
--- DelugeM.nc	15 Mar 2005 21:49:59 -0000	1.13
***************
*** 161,165 ****
  
      state = S_INITIALIZING;
!     call MetadataControl.start();
  
      return result;
--- 161,168 ----
  
      state = S_INITIALIZING;
!     if (!call Metadata.started())
!       call MetadataControl.start();
!     else
!       realStart();
  
      return result;

Index: DelugeMetadata.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeMetadata.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DelugeMetadata.nc	11 Mar 2005 21:46:37 -0000	1.3
--- DelugeMetadata.nc	15 Mar 2005 21:49:59 -0000	1.4
***************
*** 31,34 ****
--- 31,36 ----
  interface DelugeMetadata {
  
+   command bool started();
+ 
    command bool isComplete(imgnum_t imgNum);
    command bool isImgDescValid(DelugeImgDesc* tmpImgDesc);

Index: DelugeMetadataM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeMetadataM.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DelugeMetadataM.nc	15 Mar 2005 07:20:52 -0000	1.10
--- DelugeMetadataM.nc	15 Mar 2005 21:49:59 -0000	1.11
***************
*** 130,133 ****
--- 130,138 ----
        realStart();
  
+     if (state != S_RADIO_STARTING
+ 	&& state != S_WAITING_FOR_RADIO
+ 	&& state != S_INIT)
+       return FAIL;
+ 	
      return SUCCESS;
    }
***************
*** 153,156 ****
--- 158,165 ----
  #endif
  
+   command bool Metadata.started[uint8_t id]() {
+     return (state >= S_IDLE);
+   }
+ 
    command bool Metadata.isImgDescValid[uint8_t id](DelugeImgDesc* tmpImgDesc) {