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

[Jonathan Hui]

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

Modified Files:
	NetProgM.nc 
Log Message:
- Changes in NetProg to match new cleaned up bootloader.



Index: NetProgM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/NetProgM.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NetProgM.nc	15 Mar 2005 19:54:11 -0000	1.5
--- NetProgM.nc	21 Apr 2005 17:33:04 -0000	1.6
***************
*** 114,118 ****
  #ifndef PLATFORM_PC
        uint32_t imageAddr;
!       uint8_t  tmp = 0;
        
        atomic {
--- 114,118 ----
  #ifndef PLATFORM_PC
        uint32_t imageAddr;
!       uint8_t  flags;
        
        atomic {
***************
*** 122,126 ****
  	imageAddr = call Storage.imgNum2Addr(newImgNum) + DELUGE_IDENT_SIZE;
  	call IFlash.write((uint16_t*)TOSBOOT_NEW_IMG_START_ADDR, &imageAddr, sizeof(imageAddr));
! 	call IFlash.write((uint8_t*)TOSBOOT_LOAD_IMG_ADDR, &tmp, sizeof(tmp));
  	
  	// reboot
--- 122,128 ----
  	imageAddr = call Storage.imgNum2Addr(newImgNum) + DELUGE_IDENT_SIZE;
  	call IFlash.write((uint16_t*)TOSBOOT_NEW_IMG_START_ADDR, &imageAddr, sizeof(imageAddr));
! 	call IFlash.read((uint8_t*)TOSBOOT_FLAGS_ADDR, &flags, sizeof(flags));
! 	flags &= ~TOSBOOT_REPROGRAM;
! 	call IFlash.write((uint8_t*)TOSBOOT_FLAGS_ADDR, &flags, sizeof(flags));
  	
  	// reboot