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 39f16182b2c15dea44ae2b4af572175227746727..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;
 }
 
@@ -174,7 +174,6 @@ static size_t stm32_flash_writeDirect(struct KBlock *blk, block_idx_t idx, const
        uint32_t addr = idx * blk->blk_size;
        const uint8_t *buf = (const uint8_t *)_buf;
 
-       kprintf("idx[%ld],size[%u]\n", idx, size);
        while (size)
        {
                uint16_t data = (*(buf + 1) << 8) | *buf;
@@ -235,7 +234,7 @@ 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;
@@ -243,11 +242,11 @@ void flash_hw_init(Flash *fls)
        fls->blk.priv.buf = flash_buf;
 
        /* Load the first block in the cache */
-       void *a = 0;
-       memcpy(fls->blk.priv.buf, a, fls->blk.blk_size);
+       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;