X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Favr%2Fdrv%2Fflash_avr.c;h=af1d6de89c2a7aaa6897b6b5403ef23c8c01d505;hb=911d2706a86d326786bfe721dcc3d63aeade7f28;hp=c64f935b8a7ff76ab5e818d901c9a5dcc92c7eec;hpb=b59de1faa4a3d4656d9ffe3e2cc513abc55fb6b3;p=bertos.git

diff --git a/bertos/cpu/avr/drv/flash_avr.c b/bertos/cpu/avr/drv/flash_avr.c
index c64f935b..af1d6de8 100644
--- a/bertos/cpu/avr/drv/flash_avr.c
+++ b/bertos/cpu/avr/drv/flash_avr.c
@@ -32,7 +32,6 @@
  *
  * \brief Self programming routines.
  *
- * \version $Id$
  * \author Francesco Sacchi <batt@develer.com>
  * \author Daniele Basile <asterix@develer.com>
  *
@@ -50,14 +49,15 @@
 #include <cfg/debug.h>
 #include <cpu/irq.h>
 
- 	// Define logging setting (for cfg/log.h module).
-#define LOG_LEVEL         CONFIG_FLASH_AVR_LOG_LEVEL
-#define LOG_VERBOSITY     CONFIG_FLASH_AVR_LOG_VERBOSITY
+// Define log settings for cfg/log.h
+#define LOG_LEVEL    CONFIG_FLASH_AVR_LOG_LEVEL
+#define LOG_FORMAT   CONFIG_FLASH_AVR_LOG_FORMAT
 #include <cfg/log.h>
 
 #include <drv/wdt.h>
+#include <drv/flash.h>
 
-#include <kern/kfile.h>
+#include <io/kfile.h>
 
 #include <avr/io.h>
 #include <avr/boot.h>
@@ -66,13 +66,10 @@
 #include <string.h>
 
 
-
 /**
  * Definition of type for avr flash module.
  */
-typedef uint16_t avr_page_addr_t;
-
-
+typedef uint16_t page_addr_t;
 
 
 /**
@@ -83,7 +80,7 @@ typedef uint16_t avr_page_addr_t;
  *
  * This function is only use internally in this module.
  */
-static void flash_avr_flush(FlashAvrKFile *fd)
+static void flash_avr_flush(Flash *fd)
 {
 	if (fd->page_dirty)
 	{
@@ -96,7 +93,7 @@ static void flash_avr_flush(FlashAvrKFile *fd)
 		LOG_INFO("Filling temparary page buffer...");
 
 		// Fill the temporary buffer of the AVR
-		for (avr_page_addr_t page_addr = 0; page_addr < SPM_PAGESIZE; page_addr += 2)
+		for (page_addr_t page_addr = 0; page_addr < SPM_PAGESIZE; page_addr += 2)
 		{
 			uint16_t word = ((uint16_t)fd->page_buf[page_addr + 1] << 8) | fd->page_buf[page_addr];
 
@@ -141,7 +138,7 @@ static void flash_avr_flush(FlashAvrKFile *fd)
  */
 static int flash_avr_kfileFlush(struct KFile *_fd)
 {
-	FlashAvrKFile *fd = FLASHAVRKFILE(_fd);
+	Flash *fd = FLASH_CAST(_fd);
 	flash_avr_flush(fd);
 	return 0;
 }
@@ -151,7 +148,7 @@ static int flash_avr_kfileFlush(struct KFile *_fd)
  * Check current page and if \a page is different, load it in
  * temporary buffer.
  */
-static void flash_avr_loadPage(FlashAvrKFile *fd, avr_page_t page)
+static void flash_avr_loadPage(Flash *fd, page_t page)
 {
 	if (page != fd->curr_page)
 	{
@@ -170,16 +167,16 @@ static void flash_avr_loadPage(FlashAvrKFile *fd, avr_page_t page)
  */
 static size_t flash_avr_write(struct KFile *_fd, const void *_buf, size_t size)
 {
-	FlashAvrKFile *fd = FLASHAVRKFILE(_fd);
+	Flash *fd = FLASH_CAST(_fd);
 	const uint8_t *buf =(const uint8_t *)_buf;
 
-	avr_page_t page;
-	avr_page_addr_t page_addr;
+	page_t page;
+	page_addr_t page_addr;
 	size_t total_write = 0;
 
 
 	ASSERT(fd->fd.seek_pos + (kfile_off_t)size <= (kfile_off_t)fd->fd.size);
-	size = MIN((uint32_t)size, fd->fd.size - fd->fd.seek_pos);
+	size = MIN((kfile_off_t)size, fd->fd.size - fd->fd.seek_pos);
 
 	LOG_INFO("Writing at pos[%u]\n", fd->fd.seek_pos);
 	while (size)
@@ -207,7 +204,7 @@ static size_t flash_avr_write(struct KFile *_fd, const void *_buf, size_t size)
  * \a name and \a mode are unused, cause flash memory is
  * threated like one file.
  */
-static void flash_avr_open(struct FlashAvrKFile *fd)
+static void flash_avr_open(struct Flash *fd)
 {
 	fd->curr_page = 0;
 	memcpy_P(fd->page_buf, (const char *)(fd->curr_page * SPM_PAGESIZE), SPM_PAGESIZE);
@@ -224,7 +221,7 @@ static void flash_avr_open(struct FlashAvrKFile *fd)
  */
 static int flash_avr_close(struct KFile *_fd)
 {
-	FlashAvrKFile *fd = FLASHAVRKFILE(_fd);
+	Flash *fd = FLASH_CAST(_fd);
 	flash_avr_flush(fd);
 	LOG_INFO("Flash file closed\n");
 	return 0;
@@ -235,9 +232,9 @@ static int flash_avr_close(struct KFile *_fd)
  */
 static struct KFile *flash_avr_reopen(struct KFile *fd)
 {
-	FlashAvrKFile *_fd = FLASHAVRKFILE(fd);
+	Flash *_fd = FLASH_CAST(fd);
 	flash_avr_close(fd);
-	flash_avr_open(_fd);
+	flash_avr_open((struct Flash *)_fd);
 	return fd;
 }
 
@@ -248,9 +245,9 @@ static struct KFile *flash_avr_reopen(struct KFile *fd)
  */
 static size_t flash_avr_read(struct KFile *_fd, void *buf, size_t size)
 {
-	FlashAvrKFile *fd = FLASHAVRKFILE(_fd);
+	Flash *fd = FLASH_CAST(_fd);
 	ASSERT(fd->fd.seek_pos + (kfile_off_t)size <= (kfile_off_t)fd->fd.size);
-	size = MIN((uint32_t)size, fd->fd.size - fd->fd.seek_pos);
+	size = MIN((kfile_off_t)size, fd->fd.size - fd->fd.seek_pos);
 
 	LOG_INFO("Reading at pos[%u]\n", fd->fd.seek_pos);
 	// Flush current buffered page (if modified).
@@ -272,10 +269,10 @@ static size_t flash_avr_read(struct KFile *_fd, void *buf, size_t size)
 /**
  * Init AVR flash read/write file.
  */
-void flash_avr_init(struct FlashAvrKFile *fd)
+void flash_hw_init(struct Flash *fd)
 {
 	memset(fd, 0, sizeof(*fd));
-	DB(fd->fd._type = KFT_FLASHAVR);
+	DB(fd->fd._type = KFT_FLASH);
 
 	// Set up flash programming functions.
 	fd->fd.reopen = flash_avr_reopen;