Move flash related flags to the flash driver; refactor accordingly.

[bertos.git] / bertos / cpu / cortex-m3 / drv / flash_stm32.c

diff --git a/bertos/cpu/cortex-m3/drv/flash_stm32.c b/bertos/cpu/cortex-m3/drv/flash_stm32.c
index 68b3cdaff630e58af8906c8ea8b023e8f34e362d..816cdd58f94096f459a240f6a18f386cdc665328 100644 (file)
--- a/bertos/cpu/cortex-m3/drv/flash_stm32.c
+++ b/bertos/cpu/cortex-m3/drv/flash_stm32.c
@@ -112,6 +112,8 @@ static bool stm32_erasePage(struct KBlock *blk, uint32_t page_add)
        return true;
 }
 
+#if 0
+// not used for now
 static bool stm32_eraseAll(struct KBlock *blk)
 {
        EMB_FLASH->CR |= CR_MER_SET;
@@ -124,6 +126,7 @@ static bool stm32_eraseAll(struct KBlock *blk)
 
        return true;
 }
+#endif
 
 static int stm32_flash_error(struct KBlock *blk)
 {
@@ -139,10 +142,7 @@ static void stm32_flash_clearerror(struct KBlock *blk)
 
 static size_t stm32_flash_readDirect(struct KBlock *blk, block_idx_t idx, void *buf, size_t offset, size_t size)
 {
-       ASSERT(offset == 0);
-       ASSERT(size == blk->blk_size);
-
-       memcpy(buf, (void *)(idx * blk->blk_size), size);
+       memcpy(buf, (void *)(idx * blk->blk_size + offset), size);
        return size;
 }
 
@@ -165,6 +165,9 @@ INLINE bool stm32_writeWord(struct KBlock *blk, uint32_t addr, uint16_t data)
 
 static size_t stm32_flash_writeDirect(struct KBlock *blk, block_idx_t idx, const void *_buf, size_t offset, size_t size)
 {
+       ASSERT(offset == 0);
+       ASSERT(size == blk->blk_size);
+
        if (!stm32_erasePage(blk, (idx * blk->blk_size)))
                return 0;
 
@@ -173,7 +176,7 @@ static size_t stm32_flash_writeDirect(struct KBlock *blk, block_idx_t idx, const
 
        while (size)
        {
-               uint16_t data = ((*buf + 1) << 8) | *buf;
+               uint16_t data = (*(buf + 1) << 8) | *buf;
                if (!stm32_writeWord(blk, addr, data))
                        return 0;
 
@@ -195,6 +198,8 @@ static const KBlockVTable flash_stm32_buffered_vt =
        .load = kblock_swLoad,
        .store = kblock_swStore,
 
+       .close = kblock_swClose,
+
        .error = stm32_flash_error,
        .clearerr = stm32_flash_clearerror,
 };
@@ -204,6 +209,8 @@ static const KBlockVTable flash_stm32_unbuffered_vt =
        .readDirect = stm32_flash_readDirect,
        .writeDirect = stm32_flash_writeDirect,
 
+       .close = kblock_swClose,
+
        .error = stm32_flash_error,
        .clearerr = stm32_flash_clearerror,
 };
@@ -227,15 +234,19 @@ static void common_init(Flash *fls)
 }
 
 
-void flash_hw_init(Flash *fls)
+void flash_hw_init(Flash *fls, UNUSED_ARG(int, flags))
 {
        common_init(fls);
        fls->blk.priv.vt = &flash_stm32_buffered_vt;
        fls->blk.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE;
        fls->blk.priv.buf = flash_buf;
+
+       /* Load the first block in the cache */
+       void *flash_start = 0x0;
+       memcpy(fls->blk.priv.buf, flash_start, fls->blk.blk_size);
 }
 
-void flash_hw_initUnbuffered(Flash *fls)
+void flash_hw_initUnbuffered(Flash *fls, UNUSED_ARG(int, flags))
 {
        common_init(fls);
        fls->blk.priv.vt = &flash_stm32_unbuffered_vt;