[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge NetProgM.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-serv3138

Modified Files:
	NetProgM.nc 
Log Message:
- Reduced code size of TOSBoot yet again by reducing number of
internal flash command calls. TOSBoot is currently at 2002 bytes. The
starting address for the app is now moved to 0x4800 leaving 46KB for
the application.



Index: NetProgM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/NetProgM.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** NetProgM.nc	12 Jul 2005 02:59:32 -0000	1.10
--- NetProgM.nc	12 Jul 2005 20:09:06 -0000	1.11
***************
*** 111,116 ****
  
  #ifndef PLATFORM_PC
!     uint32_t imageAddr;
!     uint8_t  flags;
      
      atomic {
--- 111,115 ----
  
  #ifndef PLATFORM_PC
!     tosboot_args_t args;
      
      atomic {
***************
*** 118,126 ****
        writeTOSinfo();
        
!       imageAddr = call Storage.imgNum2Addr(newImgNum);
!       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
--- 117,124 ----
        writeTOSinfo();
        
!       args.imageAddr = call Storage.imgNum2Addr(newImgNum);
!       args.gestureCount = 0xff;
!       args.noReprogram = FALSE;
!       call IFlash.write((uint8_t*)TOSBOOT_ARGS_ADDR, &args, sizeof(args));
        
        // reboot