#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>
typedef uint16_t avr_page_addr_t;
-/**
- * Temporary buffer cointaing data block to
- * write on flash.
- */
-static uint8_t page_buf[SPM_PAGESIZE];
-
-
-
-/*
+/**
* 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)
+static void flash_avr_flush(FlashAvr *fd)
{
- if (fd->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));
/* 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));
*/
ATOMIC(boot_rww_enable());
- fd->page_modified = false;
- kprintf("Done.\n");
+ fd->page_dirty = false;
+ LOG_INFO("Done.\n");
}
}
*/
static int flash_avr_kfileFlush(struct KFile *_fd)
{
- KFileFlashAvr *fd = KFILEFLASHAVR(_fd);
+ FlashAvr *fd = FLASHAVR_CAST(_fd);
flash_avr_flush(fd);
return 0;
}
* Check current page and if \a page is different, load it in
* temporary buffer.
*/
-static void flash_avr_loadPage(KFileFlashAvr *fd, avr_page_t page)
+static void flash_avr_loadPage(FlashAvr *fd, avr_page_t page)
{
if (page != fd->curr_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);
}
}
*/
static size_t flash_avr_write(struct KFile *_fd, const void *_buf, size_t size)
{
- KFileFlashAvr *fd = KFILEFLASHAVR(_fd);
+ FlashAvr *fd = FLASHAVR_CAST(_fd);
const uint8_t *buf =(const uint8_t *)_buf;
avr_page_t page;
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;
flash_avr_loadPage(fd, page);
size_t wr_len = MIN(size, SPM_PAGESIZE - page_addr);
- memcpy(page_buf + page_addr, buf, wr_len);
- fd->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;
}
* \a name and \a mode are unused, cause flash memory is
* threated like one file.
*/
-static void flash_avr_open(struct KFileFlashAvr *fd)
+static void flash_avr_open(struct FlashAvr *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);
- fd->page_modified = false;
+ fd->page_dirty = false;
- kprintf("Flash file opened\n");
+ LOG_INFO("Flash file opened\n");
}
/**
*/
static int flash_avr_close(struct KFile *_fd)
{
- KFileFlashAvr *fd = KFILEFLASHAVR(_fd);
+ FlashAvr *fd = FLASHAVR_CAST(_fd);
flash_avr_flush(fd);
- kprintf("Flash file closed\n");
+ LOG_INFO("Flash file closed\n");
return 0;
}
*/
static struct KFile *flash_avr_reopen(struct KFile *fd)
{
- KFileFlashAvr *_fd = KFILEFLASHAVR(fd);
+ FlashAvr *_fd = FLASHAVR_CAST(fd);
flash_avr_close(fd);
flash_avr_open(_fd);
return fd;
*/
static size_t flash_avr_read(struct KFile *_fd, void *buf, size_t size)
{
- KFileFlashAvr *fd = KFILEFLASHAVR(_fd);
+ FlashAvr *fd = FLASHAVR_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);
- 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);
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;
}
/**
* Init AVR flash read/write file.
*/
-void flash_avr_init(struct KFileFlashAvr *fd)
+void flash_avr_init(struct FlashAvr *fd)
{
memset(fd, 0, sizeof(*fd));
DB(fd->fd._type = KFT_FLASHAVR);