[Tinyos-commits] CVS: tinyos-1.x/tos/lib/Deluge/TOSBoot TOSBootM.nc, 1.2, 1.3

[Joe Polastre]

Update of /cvsroot/tinyos/tinyos-1.x/tos/lib/Deluge/TOSBoot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11959

Modified Files:
	TOSBootM.nc 
Log Message:
fail if the program image starts at the wrong address
(program too small or compiled for a different bootloader/revision)


Index: TOSBootM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/Deluge/TOSBoot/TOSBootM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TOSBootM.nc	19 Sep 2005 21:58:03 -0000	1.2
--- TOSBootM.nc	19 Sep 2005 22:33:59 -0000	1.3
***************
*** 134,137 ****
--- 134,143 ----
      curAddr = curAddr + 8;
  
+     // check that the image starts on the correct boundary
+     if (intAddr != TOSBOOT_END) {
+       call ExtFlash.stopRead();
+       return R_INVALID_IMAGE_ERROR;
+     }
+ 
      while ( secLength ) {