From: razvanm <razvanm>
Date: Tue, 15 Jul 2008 23:36:36 +0000 (+0000)
Subject: Switch boot_* calls to boot_*_safe. This restores the exact functionality of the... 
X-Git-Tag: release_tinyos_2_1_0_0~71
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=d8a901c927fb28a5a7f92f1ce99868fe5e89de60

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.
---

diff --git a/tos/lib/tosboot/avr/ProgFlashM.nc b/tos/lib/tosboot/avr/ProgFlashM.nc
index 24644933..898ebc64 100644
--- a/tos/lib/tosboot/avr/ProgFlashM.nc
+++ b/tos/lib/tosboot/avr/ProgFlashM.nc
@@ -46,17 +46,17 @@ implementation {
     if ( addr + len > TOSBOOT_START )
       return FAIL;    
 
-    boot_page_erase( addr );
+    boot_page_erase_safe( addr );
     while( boot_rww_busy() )
-      boot_rww_enable();
+      boot_rww_enable_safe();
     
     for ( i = 0; i < len; i += 2 )
-      boot_page_fill( addr + i, *wordBuf++ );
+      boot_page_fill_safe( addr + i, *wordBuf++ );
 
-    boot_page_write( addr );
+    boot_page_write_safe( addr );
     
     while ( boot_rww_busy() )
-      boot_rww_enable();
+      boot_rww_enable_safe();
     
     return SUCCESS;