X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fcortex-m3%2Fdrv%2Fflash_lm3s.c;h=ffec0db7c0c20e94b310668aa84ae5a6e72ccd11;hb=b13dbf31d82c002be6169e7cba5923c9970f5267;hp=f2887571949e0ccb03a53a6590991bb6921ba948;hpb=7052462ee4127b539fb1d7816720767ac9904a9a;p=bertos.git diff --git a/bertos/cpu/cortex-m3/drv/flash_lm3s.c b/bertos/cpu/cortex-m3/drv/flash_lm3s.c index f2887571..ffec0db7 100644 --- a/bertos/cpu/cortex-m3/drv/flash_lm3s.c +++ b/bertos/cpu/cortex-m3/drv/flash_lm3s.c @@ -111,15 +111,13 @@ 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) { - 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; } static size_t lm3s_flash_writeDirect(struct KBlock *blk, block_idx_t idx, const void *_buf, size_t offset, size_t size) { + (void)offset; ASSERT(offset == 0); ASSERT(size == blk->blk_size); @@ -203,7 +201,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_lm3s_buffered_vt; @@ -215,7 +213,7 @@ void flash_hw_init(Flash *fls) 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_lm3s_unbuffered_vt;