X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Favr%2Fdrv%2Fflash_avr.c;h=af1d6de89c2a7aaa6897b6b5403ef23c8c01d505;hb=911d2706a86d326786bfe721dcc3d63aeade7f28;hp=ad350b299a9d52ff93bcb76b971ba614e7bc8619;hpb=2b1ef1c4e079e86db8512cec4dac031a0d19cb2f;p=bertos.git diff --git a/bertos/cpu/avr/drv/flash_avr.c b/bertos/cpu/avr/drv/flash_avr.c index ad350b29..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 * \author Daniele Basile * @@ -50,9 +49,15 @@ #include #include +// Define log settings for cfg/log.h +#define LOG_LEVEL CONFIG_FLASH_AVR_LOG_LEVEL +#define LOG_FORMAT CONFIG_FLASH_AVR_LOG_FORMAT +#include + #include +#include -#include +#include #include #include @@ -61,74 +66,56 @@ #include -#if 1 - - /** * Definition of type for avr flash module. */ -typedef uint16_t avr_page_addr_t; -typedef uint16_t avr_page_t; +typedef uint16_t 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; /** - * Current buffered page. - */ -static avr_page_t curr_page = 0; - -/* * 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(void) +static void flash_avr_flush(Flash *fd) { - if (page_modified) + if (fd->page_dirty) { - kprintf("Flushing page %d\n", 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) + for (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...", curr_page * SPM_PAGESIZE); + LOG_INFO("Erasing page, addr %u...", fd->curr_page * SPM_PAGESIZE); /* Page erase */ - ATOMIC(boot_page_erase(curr_page * SPM_PAGESIZE)); + 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...", 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(curr_page * SPM_PAGESIZE)); + ATOMIC(boot_page_write(fd->curr_page * SPM_PAGESIZE)); boot_spm_busy_wait(); // Wait while the SPM instruction is busy. /* @@ -137,8 +124,8 @@ static void flash_avr_flush(void) */ ATOMIC(boot_rww_enable()); - page_modified = false; - kprintf("Done.\n"); + fd->page_dirty = false; + LOG_INFO("Done.\n"); } } @@ -149,12 +136,10 @@ static void flash_avr_flush(void) * Write current buffered page in flash memory (if modified). * This function erase flash memory page before writing. */ -static int flash_avr_kfileFlush(struct KFile * fd) +static int flash_avr_kfileFlush(struct KFile *_fd) { - - KFILEFLASHAVR(fd); - (void)fd; - flash_avr_flush(); + Flash *fd = FLASH_CAST(_fd); + flash_avr_flush(fd); return 0; } @@ -163,15 +148,15 @@ 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(avr_page_t page) +static void flash_avr_loadPage(Flash *fd, page_t page) { - if (page != curr_page) + if (page != fd->curr_page) { - flash_avr_flush(); + flash_avr_flush(fd); // Load page - memcpy_P(page_buf, (const char *)(page * SPM_PAGESIZE), SPM_PAGESIZE); - curr_page = page; - kprintf("Loaded page %d\n", curr_page); + memcpy_P(fd->page_buf, (const char *)(page * SPM_PAGESIZE), SPM_PAGESIZE); + fd->curr_page = page; + LOG_INFO("Loaded page %d\n", fd->curr_page); } } @@ -180,37 +165,37 @@ static void flash_avr_loadPage(avr_page_t page) * Write \a size bytes from buffer \a _buf to file \a fd * \note Write operations are buffered. */ -static size_t flash_avr_write(struct KFile *fd, const void *_buf, size_t size) +static size_t flash_avr_write(struct KFile *_fd, const void *_buf, size_t size) { - KFILEFLASHAVR(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->seek_pos + size <= fd->size); - size = MIN((uint32_t)size, fd->size - fd->seek_pos); + ASSERT(fd->fd.seek_pos + (kfile_off_t)size <= (kfile_off_t)fd->fd.size); + size = MIN((kfile_off_t)size, fd->fd.size - fd->fd.seek_pos); - kprintf("Writing at pos[%u]\n", fd->seek_pos); + LOG_INFO("Writing at pos[%u]\n", fd->fd.seek_pos); while (size) { - page = fd->seek_pos / SPM_PAGESIZE; - page_addr = fd->seek_pos % SPM_PAGESIZE; + page = fd->fd.seek_pos / SPM_PAGESIZE; + page_addr = fd->fd.seek_pos % SPM_PAGESIZE; - flash_avr_loadPage(page); + 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->seek_pos += 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; } @@ -219,27 +204,26 @@ 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 KFile *fd) +static void flash_avr_open(struct Flash *fd) { - KFILEFLASHAVR(fd); - curr_page = 0; - memcpy_P(page_buf, (const char *)(curr_page * SPM_PAGESIZE), SPM_PAGESIZE); + fd->curr_page = 0; + memcpy_P(fd->page_buf, (const char *)(fd->curr_page * SPM_PAGESIZE), SPM_PAGESIZE); - fd->seek_pos = 0; - fd->size = (uint16_t)(FLASHEND - CONFIG_FLASH_AVR_BOOTSIZE + 1); - page_modified = false; + fd->fd.seek_pos = 0; + fd->fd.size = (uint16_t)(FLASHEND - CONFIG_FLASH_AVR_BOOTSIZE + 1); + fd->page_dirty = false; - kprintf("Flash file opened\n"); + LOG_INFO("Flash file opened\n"); } /** * Close file \a fd */ -static int flash_avr_close(UNUSED_ARG(struct KFile *,fd)) +static int flash_avr_close(struct KFile *_fd) { - KFILEFLASHAVR(fd); - flash_avr_flush(); - kprintf("Flash file closed\n"); + Flash *fd = FLASH_CAST(_fd); + flash_avr_flush(fd); + LOG_INFO("Flash file closed\n"); return 0; } @@ -248,9 +232,9 @@ static int flash_avr_close(UNUSED_ARG(struct KFile *,fd)) */ static struct KFile *flash_avr_reopen(struct KFile *fd) { - KFILEFLASHAVR(fd); + Flash *_fd = FLASH_CAST(fd); flash_avr_close(fd); - flash_avr_open(fd); + flash_avr_open((struct Flash *)_fd); return fd; } @@ -259,46 +243,47 @@ static struct KFile *flash_avr_reopen(struct KFile *fd) * Read from file \a fd \a size bytes and put it in buffer \a buf * \return the number of bytes read. */ -static size_t flash_avr_read(struct KFile *fd, void *buf, size_t size) +static size_t flash_avr_read(struct KFile *_fd, void *buf, size_t size) { - KFILEFLASHAVR(fd); - ASSERT(fd->seek_pos + size <= fd->size); - size = MIN((uint32_t)size, fd->size - fd->seek_pos); + Flash *fd = FLASH_CAST(_fd); + ASSERT(fd->fd.seek_pos + (kfile_off_t)size <= (kfile_off_t)fd->fd.size); + size = MIN((kfile_off_t)size, fd->fd.size - fd->fd.seek_pos); - kprintf("Reading at pos[%u]\n", fd->seek_pos); + LOG_INFO("Reading at pos[%u]\n", fd->fd.seek_pos); // Flush current buffered page (if modified). - flash_avr_flush(); + flash_avr_flush(fd); /* * AVR pointers are 16 bits wide, this hack is needed to avoid * compiler warning, cause fd->seek_pos is a 32bit offset. */ const uint8_t *pgm_addr = (const uint8_t *)0; - pgm_addr += fd->seek_pos; + pgm_addr += fd->fd.seek_pos; memcpy_P(buf, pgm_addr, size); - fd->seek_pos += size; - kprintf("Read %u bytes\n", size); + fd->fd.seek_pos += size; + LOG_INFO("Read %u bytes\n", size); return size; } /** * Init AVR flash read/write file. */ -void flash_avr_init(struct KFile *fd) +void flash_hw_init(struct Flash *fd) { memset(fd, 0, sizeof(*fd)); - DB(fd->_type = KFT_FLASHAVR); + DB(fd->fd._type = KFT_FLASH); // Set up flash programming functions. - fd->reopen = flash_avr_reopen; - fd->close = flash_avr_close; - fd->read = flash_avr_read; - fd->write = flash_avr_write; - fd->seek = kfile_genericSeek; - fd->flush = flash_avr_kfileFlush; + fd->fd.reopen = flash_avr_reopen; + fd->fd.close = flash_avr_close; + fd->fd.read = flash_avr_read; + fd->fd.write = flash_avr_write; + fd->fd.seek = kfile_genericSeek; + fd->fd.flush = flash_avr_kfileFlush; + fd->curr_page = 0; flash_avr_open(fd); } -#endif +