[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tosboot/avr ProgFlashM.nc, 1.3, 1.4

[Razvan Musaloiu-E.]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/tosboot/avr
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2430

Modified Files:
	ProgFlashM.nc 
Log Message:
Switch boot_* calls to boot_*_safe. This restores the exact functionality of the boot.h that was used some time ago. Thanks to Aurelien Francillon for finding this.


Index: ProgFlashM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosboot/avr/ProgFlashM.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ProgFlashM.nc	11 Jun 2008 00:46:25 -0000	1.3
--- ProgFlashM.nc	15 Jul 2008 23:36:36 -0000	1.4
***************
*** 47,61 ****
        return FAIL;    
  
!     boot_page_erase( addr );
      while( boot_rww_busy() )
!       boot_rww_enable();
      
      for ( i = 0; i < len; i += 2 )
!       boot_page_fill( addr + i, *wordBuf++ );
  
!     boot_page_write( addr );
      
      while ( boot_rww_busy() )
!       boot_rww_enable();
      
      return SUCCESS;
--- 47,61 ----
        return FAIL;    
  
!     boot_page_erase_safe( addr );
      while( boot_rww_busy() )
!       boot_rww_enable_safe();
      
      for ( i = 0; i < len; i += 2 )
!       boot_page_fill_safe( addr + i, *wordBuf++ );
  
!     boot_page_write_safe( addr );
      
      while ( boot_rww_busy() )
!       boot_rww_enable_safe();
      
      return SUCCESS;