X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Favr%2Fdrv%2Fflash_avr.c;h=cc5780a6d47583e1dead50854b5510d6c3b3cca5;hb=abce9f855444c620d52b4f5fdd25c3260de5bb15;hp=a0792e3cf3ddb592e517b0a6025b0af7eff46796;hpb=e2f204cc87c855c1bca96b96b9ebb71397a818b9;p=bertos.git

diff --git a/bertos/cpu/avr/drv/flash_avr.c b/bertos/cpu/avr/drv/flash_avr.c
index a0792e3c..cc5780a6 100644
--- a/bertos/cpu/avr/drv/flash_avr.c
+++ b/bertos/cpu/avr/drv/flash_avr.c
@@ -50,6 +50,11 @@
 #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
+#include <cfg/log.h>
+
 #include <drv/wdt.h>
 
 #include <kern/kfile.h>
@@ -68,50 +73,40 @@
 typedef uint16_t avr_page_addr_t;
 
 
-/**
- * Temporary buffer cointaing data block to
- * write on flash.
- */
-static uint8_t page_buf[SPM_PAGESIZE];
 
-/**
- * Flag for checking if current page is modified.
- */
-bool page_modified;
 
-
-
-/*
+/**
  * Private avr flush funtion.
  *
  * Write current buffered page in flash memory (if modified).
  * This function erase flash memory page before writing.
  *
- * This function is only use internaly in this module.
+ * This function is only use internally in this module.
  */
 static void flash_avr_flush(KFileFlashAvr *fd)
 {
-	if (page_modified)
+	if (fd->page_dirty)
 	{
-		kprintf("Flushing page %d\n", fd->curr_page);
+
+		LOG_INFO("Flushing page %d\n", fd->curr_page);
 
 		// Wait while the SPM instruction is busy.
 		boot_spm_busy_wait();
 
-		kprintf("Filling temparary page buffer...");
+		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)
 		{
-			uint16_t word = ((uint16_t)page_buf[page_addr + 1] << 8) | page_buf[page_addr];
+			uint16_t word = ((uint16_t)fd->page_buf[page_addr + 1] << 8) | fd->page_buf[page_addr];
 
 			ATOMIC(boot_page_fill(page_addr, word));
 		}
-		kprintf("Done.\n");
+		LOG_INFO("Done.\n");
 
 		wdt_reset();
 
-		kprintf("Erasing page, addr %u...", fd->curr_page * SPM_PAGESIZE);
+		LOG_INFO("Erasing page, addr %u...", fd->curr_page * SPM_PAGESIZE);
 
 		/* Page erase */
 		ATOMIC(boot_page_erase(fd->curr_page * SPM_PAGESIZE));
@@ -119,8 +114,8 @@ static void flash_avr_flush(KFileFlashAvr *fd)
 		/* Wait until the memory is erased. */
 		boot_spm_busy_wait();
 
-		kprintf("Done.\n");
-		kprintf("Writing page, addr %u...", fd->curr_page * SPM_PAGESIZE);
+		LOG_INFO("Done.\n");
+		LOG_INFO("Writing page, addr %u...", fd->curr_page * SPM_PAGESIZE);
 
 		/* Store buffer in flash page. */
 		ATOMIC(boot_page_write(fd->curr_page * SPM_PAGESIZE));
@@ -132,8 +127,8 @@ static void flash_avr_flush(KFileFlashAvr *fd)
 		*/
 		ATOMIC(boot_rww_enable());
 
-		page_modified = false;
-		kprintf("Done.\n");
+		fd->page_dirty = false;
+		LOG_INFO("Done.\n");
 	}
 }
 
@@ -162,9 +157,9 @@ static void flash_avr_loadPage(KFileFlashAvr *fd, avr_page_t page)
 	{
 		flash_avr_flush(fd);
 		// Load page
-		memcpy_P(page_buf, (const char *)(page * SPM_PAGESIZE), SPM_PAGESIZE);
+		memcpy_P(fd->page_buf, (const char *)(page * SPM_PAGESIZE), SPM_PAGESIZE);
 		fd->curr_page = page;
-		kprintf("Loaded page %d\n", fd->curr_page);
+		LOG_INFO("Loaded page %d\n", fd->curr_page);
 	}
 }
 
@@ -186,7 +181,7 @@ static size_t flash_avr_write(struct KFile *_fd, const void *_buf, size_t size)
 	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);
 
-	kprintf("Writing at pos[%u]\n", fd->fd.seek_pos);
+	LOG_INFO("Writing at pos[%u]\n", fd->fd.seek_pos);
 	while (size)
 	{
 		page = fd->fd.seek_pos / SPM_PAGESIZE;
@@ -195,15 +190,15 @@ static size_t flash_avr_write(struct KFile *_fd, const void *_buf, size_t size)
 		flash_avr_loadPage(fd, page);
 
 		size_t wr_len = MIN(size, SPM_PAGESIZE - page_addr);
-		memcpy(page_buf + page_addr, buf, wr_len);
-		page_modified = true;
+		memcpy(fd->page_buf + page_addr, buf, wr_len);
+		fd->page_dirty = true;
 
 		buf += wr_len;
 		fd->fd.seek_pos += wr_len;
 		size -= wr_len;
 		total_write += wr_len;
 	}
-	kprintf("written %u bytes\n", total_write);
+	LOG_INFO("written %u bytes\n", total_write);
 	return total_write;
 }
 
@@ -215,13 +210,13 @@ static size_t flash_avr_write(struct KFile *_fd, const void *_buf, size_t size)
 static void flash_avr_open(struct KFileFlashAvr *fd)
 {
 	fd->curr_page = 0;
-	memcpy_P(page_buf, (const char *)(fd->curr_page * SPM_PAGESIZE), SPM_PAGESIZE);
+	memcpy_P(fd->page_buf, (const char *)(fd->curr_page * SPM_PAGESIZE), SPM_PAGESIZE);
 
 	fd->fd.seek_pos = 0;
 	fd->fd.size = (uint16_t)(FLASHEND - CONFIG_FLASH_AVR_BOOTSIZE + 1);
-	page_modified = false;
+	fd->page_dirty = false;
 
-	kprintf("Flash file opened\n");
+	LOG_INFO("Flash file opened\n");
 }
 
 /**
@@ -231,7 +226,7 @@ static int flash_avr_close(struct KFile *_fd)
 {
 	KFileFlashAvr *fd = KFILEFLASHAVR(_fd);
 	flash_avr_flush(fd);
-	kprintf("Flash file closed\n");
+	LOG_INFO("Flash file closed\n");
 	return 0;
 }
 
@@ -257,7 +252,7 @@ static size_t flash_avr_read(struct KFile *_fd, void *buf, size_t size)
 	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);
 
-	kprintf("Reading at pos[%u]\n", fd->fd.seek_pos);
+	LOG_INFO("Reading at pos[%u]\n", fd->fd.seek_pos);
 	// Flush current buffered page (if modified).
 	flash_avr_flush(fd);
 
@@ -270,7 +265,7 @@ static size_t flash_avr_read(struct KFile *_fd, void *buf, size_t size)
 
 	memcpy_P(buf, pgm_addr, size);
 	fd->fd.seek_pos += size;
-	kprintf("Read %u bytes\n", size);
+	LOG_INFO("Read %u bytes\n", size);
 	return size;
 }