summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
5e2546b)
#include <cfg/debug.h>
#include <cpu/irq.h>
#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>
#include <drv/wdt.h>
#include <kern/kfile.h>
- 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();
// 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)
// Fill the temporary buffer of the AVR
for (avr_page_addr_t page_addr = 0; page_addr < SPM_PAGESIZE; page_addr += 2)
ATOMIC(boot_page_fill(page_addr, word));
}
ATOMIC(boot_page_fill(page_addr, word));
}
- 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));
/* Page erase */
ATOMIC(boot_page_erase(fd->curr_page * SPM_PAGESIZE));
/* Wait until the memory is erased. */
boot_spm_busy_wait();
/* 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));
/* Store buffer in flash page. */
ATOMIC(boot_page_write(fd->curr_page * SPM_PAGESIZE));
ATOMIC(boot_rww_enable());
fd->page_dirty = false;
ATOMIC(boot_rww_enable());
fd->page_dirty = false;
// Load page
memcpy_P(fd->page_buf, (const char *)(page * SPM_PAGESIZE), SPM_PAGESIZE);
fd->curr_page = page;
// Load page
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);
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);
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;
while (size)
{
page = fd->fd.seek_pos / SPM_PAGESIZE;
size -= wr_len;
total_write += wr_len;
}
size -= wr_len;
total_write += wr_len;
}
- kprintf("written %u bytes\n", total_write);
+ LOG_INFO("written %u bytes\n", total_write);
fd->fd.size = (uint16_t)(FLASHEND - CONFIG_FLASH_AVR_BOOTSIZE + 1);
fd->page_dirty = false;
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");
{
KFileFlashAvr *fd = KFILEFLASHAVR(_fd);
flash_avr_flush(fd);
{
KFileFlashAvr *fd = KFILEFLASHAVR(_fd);
flash_avr_flush(fd);
- kprintf("Flash file closed\n");
+ LOG_INFO("Flash file closed\n");
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);
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);
// Flush current buffered page (if modified).
flash_avr_flush(fd);
memcpy_P(buf, pgm_addr, size);
fd->fd.seek_pos += 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);