[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge DelugeMetadataM.nc, 1.20, 1.21

[Jonathan Hui]

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

Modified Files:
	DelugeMetadataM.nc 
Log Message:
- Reset image if image num doesn't match with what is expected.



Index: DelugeMetadataM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeMetadataM.nc,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** DelugeMetadataM.nc	29 Jun 2005 21:08:14 -0000	1.20
--- DelugeMetadataM.nc	12 Jul 2005 18:16:09 -0000	1.21
***************
*** 1,8 ****
  // $Id$
  
! /*									tab:4
   *
   *
!  * "Copyright (c) 2000-2004 The Regents of the University  of California.  
   * All rights reserved.
   *
--- 1,8 ----
  // $Id$
  
! /*									tab:2
   *
   *
!  * "Copyright (c) 2000-2005 The Regents of the University  of California.  
   * All rights reserved.
   *
***************
*** 174,178 ****
  
        // check if metadata is corrupt
!       if (!call Metadata.isImgDescValid[client](&imgDesc[curImage])) {
  	imgDesc[curImage].vNum = DELUGE_INVALID_VNUM;
  	imgDesc[curImage].imgNum = curImage;
--- 174,179 ----
  
        // check if metadata is corrupt
!       if ( !call Metadata.isImgDescValid[client](&imgDesc[curImage])
! 	   || imgDesc[curImage].imgNum != curImage ) {
  	imgDesc[curImage].vNum = DELUGE_INVALID_VNUM;
  	imgDesc[curImage].imgNum = curImage;