X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Favr%2Fdrv%2Fflash_avr.h;h=0897132c358809eb3c024c0c9779a739479a7345;hb=4ceddcf7d53f4ddf8c4bfa78a6183ed256a1d0a5;hp=bb7698aba42bb9072f9b1457d332edb7c5d60519;hpb=5853468b688f4ef103db8977ea633c596a64b8b1;p=bertos.git

diff --git a/bertos/cpu/avr/drv/flash_avr.h b/bertos/cpu/avr/drv/flash_avr.h
index bb7698ab..0897132c 100644
--- a/bertos/cpu/avr/drv/flash_avr.h
+++ b/bertos/cpu/avr/drv/flash_avr.h
@@ -42,6 +42,7 @@
 
 #include <cfg/compiler.h>
 #include <kern/kfile.h>
+#include <avr/io.h>
 
 
 /**
@@ -53,24 +54,31 @@ typedef uint16_t avr_page_t;
 /**
  * FlashAvr KFile context structure.
  */
-typedef struct KFileFlashAvr
+typedef struct FlashAvr
 {
 	/**
-	* File descriptor.
-	*/
+	 * File descriptor.
+	 */
 	KFile fd;
 
 	/**
-	* Current buffered page.
-	*/
+	 * Current buffered page.
+	 */
 	avr_page_t curr_page;
 
 	/**
-	* Flag for checking if current page is modified.
-	*/
-	bool page_modified;
+	 * Flag for checking if current page is modified.
+	 */
+	bool page_dirty;
 
-} KFileFlashAvr;
+	/**
+	 * Temporary buffer cointaing data block to
+	 * write on flash.
+	 */
+	uint8_t page_buf[SPM_PAGESIZE];
+
+
+} FlashAvr;
 
 
 
@@ -80,16 +88,16 @@ typedef struct KFileFlashAvr
 #define KFT_FLASHAVR MAKE_ID('F', 'L', 'A', 'V')
 
 /**
- * Convert + ASSERT from generic KFile to KFileFlashAvr.
+ * Convert + ASSERT from generic KFile to FlashAvr.
  */
-INLINE KFileFlashAvr * KFILEFLASHAVR(KFile *fd)
+INLINE FlashAvr * FLASHAVR_CAST(KFile *fd)
 {
 	ASSERT(fd->_type == KFT_FLASHAVR);
-	return (KFileFlashAvr *)fd;
+	return (FlashAvr *)fd;
 }
 
 
-void flash_avr_init(struct KFileFlashAvr *fd);
+void flash_avr_init(struct FlashAvr *fd);