[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge DelugeM.nc, 1.6, 1.7

[Jonathan Hui]

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

Modified Files:
	DelugeM.nc 
Log Message:
- Should check image specified in node descriptor, not image
descriptor when deciding whether or not to reboot.



Index: DelugeM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeM.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DelugeM.nc	20 Jan 2005 01:36:43 -0000	1.6
--- DelugeM.nc	20 Jan 2005 21:32:27 -0000	1.7
***************
*** 317,321 ****
      if ((rxAdvMsg->nodeDesc.vNum - nodeDesc.vNum) > 0
  	&& rxAdvMsg->nodeDesc.vNum != DELUGE_INVALID_VNUM
! 	&& call Metadata.isComplete(imgNum)) {
        imgnum_t tmpImgNum = (imgNum > 0) ? imgNum : 1;
        call Leds.yellowOn();
--- 317,321 ----
      if ((rxAdvMsg->nodeDesc.vNum - nodeDesc.vNum) > 0
  	&& rxAdvMsg->nodeDesc.vNum != DELUGE_INVALID_VNUM
! 	&& call Metadata.isComplete(rxAdvMsg->nodeDesc.imgNum)) {
        imgnum_t tmpImgNum = (imgNum > 0) ? imgNum : 1;
        call Leds.yellowOn();
***************
*** 356,361 ****
      imgnum_t imgNum;
  
-     call Leds.yellowOn();
- 
      setNextPage();
  
--- 356,359 ----