[Tinyos-commits] CVS: tinyos-1.x/tos/platform/telosb TOSBoot.h, 1.4, 1.5

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/tos/platform/telosb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4537

Modified Files:
	TOSBoot.h 
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: TOSBoot.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/platform/telosb/TOSBoot.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TOSBoot.h	17 May 2005 20:49:28 -0000	1.4
--- TOSBoot.h	12 Jul 2005 20:09:29 -0000	1.5
***************
*** 30,52 ****
  #define __MSP_BOOTLOADER_H__
  
- // size of each internal program flash page
- #define TOSBOOT_INT_PAGE_SIZE  ((uint32_t)512)
- 
- // address of the golden image in external flash
- #define TOSBOOT_GOLDEN_IMG_ADDR  ((uint32_t)0xf0000)
- 
- // number of resets to force golden image
- #define TOSBOOT_GESTURE_MAX_COUNT   3
- 
  enum {
!   TOSBOOT_GOLDEN_IMG_LOADED = 1 << 0,
!   TOSBOOT_REPROGRAM = 1 << 1,
  };
  
! // bootloader state stored in the information section
! #define TOSBOOT_GESTURE_COUNT_ADDR    0x70 // 1 byte
! #define TOSBOOT_NEW_IMG_START_ADDR    0x71 // 4 bytes
! 
! #define TOSBOOT_FLAGS_ADDR            0x7e // 1 byte
  
  #endif
--- 30,49 ----
  #define __MSP_BOOTLOADER_H__
  
  enum {
!   // address of TOSBoot args in internal flash
!   TOSBOOT_ARGS_ADDR = 0x70,
!   // number of resets to force golden image
!   TOSBOOT_GESTURE_MAX_COUNT = 3,
!   // address of the golden image in external flash
!   TOSBOOT_GOLDEN_IMG_ADDR = 0xf0000L,
!   // size of each internal program flash page
!   TOSBOOT_INT_PAGE_SIZE = 512L,
  };
  
! typedef struct tosboot_args_t {
!   uint32_t imageAddr;
!   uint8_t  gestureCount;
!   bool     noReprogram;
! } tosboot_args_t;
  
  #endif