Modified flash_avr module to work with new kfile interface. Addedd a new tipe of...

[bertos.git] / bertos / cpu / avr / drv / flash_avr.c

diff --git a/bertos/cpu/avr/drv/flash_avr.c b/bertos/cpu/avr/drv/flash_avr.c
index b461d95dd8e2335d15746dc7f09a1b4b7654dda0..ad350b299a9d52ff93bcb76b971ba614e7bc8619 100644 (file)
--- a/bertos/cpu/avr/drv/flash_avr.c
+++ b/bertos/cpu/avr/drv/flash_avr.c
@@ -44,10 +44,7 @@
 
 #include "flash_avr.h"
 
-#include <avr/io.h>
-#include <avr/boot.h>
-#include <avr/pgmspace.h>
-
+#include "cfg/cfg_flash_avr.h"
 #include <cfg/macros.h> // MIN()
 #include <cfg/compiler.h>
 #include <cfg/debug.h>
@@ -57,8 +54,16 @@
 
 #include <kern/kfile.h>
 
+#include <avr/io.h>
+#include <avr/boot.h>
+#include <avr/pgmspace.h>
+
 #include <string.h>
 
+
+#if 1
+
+
 /**
  * Definition of type for avr flash module.
  */
@@ -146,7 +151,8 @@ static void flash_avr_flush(void)
  */
 static int flash_avr_kfileFlush(struct KFile * fd)
 {
-       KFILE_ASSERT_GENERIC(fd);
+
+       KFILEFLASHAVR(fd);
        (void)fd;
        flash_avr_flush();
        return 0;
@@ -176,13 +182,14 @@ static void flash_avr_loadPage(avr_page_t page)
  */
 static size_t flash_avr_write(struct KFile *fd, const void *_buf, size_t size)
 {
-       KFILE_ASSERT_GENERIC(fd);
+       KFILEFLASHAVR(fd);
        const uint8_t *buf =(const uint8_t *)_buf;
 
        avr_page_t page;
        avr_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);
 
@@ -214,12 +221,12 @@ static size_t flash_avr_write(struct KFile *fd, const void *_buf, size_t size)
  */
 static void flash_avr_open(struct KFile *fd)
 {
-       KFILE_ASSERT_GENERIC(fd);
+       KFILEFLASHAVR(fd);
        curr_page = 0;
        memcpy_P(page_buf, (const char *)(curr_page * SPM_PAGESIZE), SPM_PAGESIZE);
 
        fd->seek_pos = 0;
-       fd->size = (uint16_t)(FLASHEND - CONFIG_BOOT_SIZE + 1);
+       fd->size = (uint16_t)(FLASHEND - CONFIG_FLASH_AVR_BOOTSIZE + 1);
        page_modified = false;
 
        kprintf("Flash file opened\n");
@@ -230,7 +237,7 @@ static void flash_avr_open(struct KFile *fd)
  */
 static int flash_avr_close(UNUSED_ARG(struct KFile *,fd))
 {
-       KFILE_ASSERT_GENERIC(fd);
+       KFILEFLASHAVR(fd);
        flash_avr_flush();
        kprintf("Flash file closed\n");
        return 0;
@@ -241,7 +248,7 @@ static int flash_avr_close(UNUSED_ARG(struct KFile *,fd))
  */
 static struct KFile *flash_avr_reopen(struct KFile *fd)
 {
-       KFILE_ASSERT_GENERIC(fd);
+       KFILEFLASHAVR(fd);
        flash_avr_close(fd);
        flash_avr_open(fd);
        return fd;
@@ -254,7 +261,7 @@ static struct KFile *flash_avr_reopen(struct KFile *fd)
  */
 static size_t flash_avr_read(struct KFile *fd, void *buf, size_t size)
 {
-       KFILE_ASSERT_GENERIC(fd);
+       KFILEFLASHAVR(fd);
        ASSERT(fd->seek_pos + size <= fd->size);
        size = MIN((uint32_t)size, fd->size - fd->seek_pos);
 
@@ -281,7 +288,7 @@ static size_t flash_avr_read(struct KFile *fd, void *buf, size_t size)
 void flash_avr_init(struct KFile *fd)
 {
        memset(fd, 0, sizeof(*fd));
-       DB(fd->_type = KFT_GENERIC);
+       DB(fd->_type = KFT_FLASHAVR);
 
        // Set up flash programming functions.
        fd->reopen = flash_avr_reopen;
@@ -293,4 +300,5 @@ void flash_avr_init(struct KFile *fd)
 
        flash_avr_open(fd);
 }
+#endif