STM32: USB: device, interface and endpoint status is always uint16_t

[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 013642affe03031cc5733d11a495eed7512b4124..62e448f3ab35dd9d201ba78756c89b3655247d9f 100644 (file)
--- a/bertos/cpu/cortex-m3/drv/flash_stm32.c
+++ b/bertos/cpu/cortex-m3/drv/flash_stm32.c
@@ -139,10 +139,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;
 }
 
@@ -234,11 +231,11 @@ static void common_init(Flash *fls)
 }
 
 
-void flash_hw_init(Flash *fls)
+void flash_hw_init(Flash *fls, 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.flags |= KB_BUFFERED | KB_PARTIAL_WRITE | flags;
        fls->blk.priv.buf = flash_buf;
 
        /* Load the first block in the cache */
@@ -246,8 +243,9 @@ 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, int flags)
 {
        common_init(fls);
        fls->blk.priv.vt = &flash_stm32_unbuffered_vt;
+       fls->blk.priv.flags |= flags;
 }