[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tosboot TOSBootM.nc, 1.5, 1.6

[Razvan Musaloiu-E.]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/tosboot
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9494/tos/lib/tosboot

Modified Files:
	TOSBootM.nc 
Log Message:
Fix for Deluge T2 to properly deal with images bigger than 64K.


Index: TOSBootM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosboot/TOSBootM.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TOSBootM.nc	25 Aug 2008 16:48:47 -0000	1.5
--- TOSBootM.nc	23 Apr 2009 00:45:00 -0000	1.6
***************
*** 97,104 ****
  
    bool verifyImage(ex_flash_addr_t startAddr) {
!     uint16_t addr;
      uint8_t  numPgs;
      uint8_t  i;
  
      if (!verifyBlock(startAddr + offsetof(DelugeIdent,crc),
  		     startAddr, offsetof(DelugeIdent,crc)))
--- 97,105 ----
  
    bool verifyImage(ex_flash_addr_t startAddr) {
!     uint32_t addr;
      uint8_t  numPgs;
      uint8_t  i;
  
+ 
      if (!verifyBlock(startAddr + offsetof(DelugeIdent,crc),
  		     startAddr, offsetof(DelugeIdent,crc)))
***************
*** 119,125 ****
        if (!verifyBlock(startAddr + i*sizeof(uint16_t),
  		       startAddr + addr, DELUGE_BYTES_PER_PAGE)) {
- 	if (i == 0)
- 	  while (1)
- 	    call Leds.flash(2);
  	return FALSE;
        }
--- 120,123 ----
***************
*** 132,136 ****
    error_t programImage(ex_flash_addr_t startAddr) {
      uint8_t  buf[TOSBOOT_INT_PAGE_SIZE];
!     uint16_t pageAddr, newPageAddr;
      in_flash_addr_t intAddr;
      in_flash_addr_t secLength;
--- 130,134 ----
    error_t programImage(ex_flash_addr_t startAddr) {
      uint8_t  buf[TOSBOOT_INT_PAGE_SIZE];
!     uint32_t pageAddr, newPageAddr;
      in_flash_addr_t intAddr;
      in_flash_addr_t secLength;