X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Ftosboot%2Favr%2FProgFlashM.nc;h=898ebc64888daa24ba9f8a0a65d5d5c411781638;hb=adf1de6c009d13b7b52e68535c63b28f59c97400;hp=8bada2d6757a84d3150623489f7706865537389d;hpb=ff6f444a38d8901cbf9fd5f844639f3a5c5be597;p=tinyos-2.x.git

diff --git a/tos/lib/tosboot/avr/ProgFlashM.nc b/tos/lib/tosboot/avr/ProgFlashM.nc
index 8bada2d6..898ebc64 100644
--- a/tos/lib/tosboot/avr/ProgFlashM.nc
+++ b/tos/lib/tosboot/avr/ProgFlashM.nc
@@ -1,6 +1,6 @@
 // $Id$
 
-/*									tab:2
+/*
  *
  *
  * "Copyright (c) 2000-2005 The Regents of the University  of California.  
@@ -36,7 +36,7 @@ module ProgFlashM {
 
 implementation {
 
-#include <boot.h>
+#include <avr/boot.h>
 
   command error_t ProgFlash.write(in_flash_addr_t addr, uint8_t* buf, in_flash_addr_t len) {
 
@@ -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;