Add missing assert. Clean up.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4163 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cpu/cortex-m3/drv/flash_lm3s.c b/bertos/cpu/cortex-m3/drv/flash_lm3s.c
index dbabc08ae7185b2979794de9b800fb22dff1eb06..563b222906fad1c4b745aa9160cc130d247fcc5d 100644 (file)
--- a/bertos/cpu/cortex-m3/drv/flash_lm3s.c
+++ b/bertos/cpu/cortex-m3/drv/flash_lm3s.c
@@ -107,7 +107,10 @@ static int lm3s_writeWord(struct KBlock *blk, uint32_t addr, uint32_t data)
 
 static size_t lm3s_flash_readDirect(struct KBlock *blk, block_idx_t idx, void *buf, size_t offset, size_t size)
 {
-       memcpy(buf, (void *)(idx * blk->blk_size + offset), size);
+       ASSERT(offest == 0);
+       ASSERT(size == blk->blk_size);
+
+       memcpy(buf, (void *)(idx * blk->blk_size), size);
        return size;
 }
 

diff --git a/bertos/cpu/cortex-m3/drv/flash_stm32.c b/bertos/cpu/cortex-m3/drv/flash_stm32.c
index fc1805e283fb885c8a178dd6f3f4d20bf0158c3f..a90bc95cc1f66eacffced954b4c489cc43d96984 100644 (file)
--- a/bertos/cpu/cortex-m3/drv/flash_stm32.c
+++ b/bertos/cpu/cortex-m3/drv/flash_stm32.c
@@ -146,8 +146,10 @@ 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)
 {
-       memcpy(buf, (void *)(idx * blk->blk_size + offset), size);
+       ASSERT(offest == 0);
+       ASSERT(size == blk->blk_size);
 
+       memcpy(buf, (void *)(idx * blk->blk_size), size);
        return size;
 }
 
@@ -173,7 +175,7 @@ static size_t stm32_flash_writeDirect(struct KBlock *blk, block_idx_t idx, const
        if (!stm32_erasePage(blk, (idx * blk->blk_size)))
                return 0;
 
-       uint32_t addr = idx * blk->blk_size + offset;
+       uint32_t addr = idx * blk->blk_size;
        const uint8_t *buf = (const uint8_t *)_buf;
 
        while (size)