#define EMB_FLASH ((struct stm32_flash*)FLASH_R_BASE)
-#if CPU_CM3_STM32F103RB
- #define EMB_FLASH_PAGE_SIZE 1024
-#else
- #error Unknown CPU
-#endif
-
-
struct FlashHardware
{
uint8_t status;
ticks_t start = timer_clock();
while (true)
{
+ cpu_relax();
if (!(EMB_FLASH->SR & FLASH_FLAG_BSY))
break;
LOG_ERR("Timeout..\n");
return false;
}
-
- cpu_relax();
}
return true;
return true;
}
+#if 0
+// not used for now
static bool stm32_eraseAll(struct KBlock *blk)
{
EMB_FLASH->CR |= CR_MER_SET;
return true;
}
+#endif
static int stm32_flash_error(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;
}
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;
while (size)
{
- uint16_t data = ((*buf + 1) << 8) | *buf;
+ uint16_t data = (*(buf + 1) << 8) | *buf;
if (!stm32_writeWord(blk, addr, data))
return 0;
.load = kblock_swLoad,
.store = kblock_swStore,
+ .close = kblock_swClose,
+
.error = stm32_flash_error,
.clearerr = stm32_flash_clearerror,
};
.readDirect = stm32_flash_readDirect,
.writeDirect = stm32_flash_writeDirect,
+ .close = kblock_swClose,
+
.error = stm32_flash_error,
.clearerr = stm32_flash_clearerror,
};
static struct FlashHardware flash_stm32_hw;
-static uint8_t flash_buf[EMB_FLASH_PAGE_SIZE];
+static uint8_t flash_buf[FLASH_PAGE_SIZE];
static void common_init(Flash *fls)
{
memset(fls, 0, sizeof(*fls));
DB(fls->blk.priv.type = KBT_FLASH);
- EMB_FLASH->CR = 0;
-
fls->hw = &flash_stm32_hw;
- fls->blk.blk_size = EMB_FLASH_PAGE_SIZE;
- fls->blk.blk_cnt = (F_SIZE * 1024) / EMB_FLASH_PAGE_SIZE;
+ fls->blk.blk_size = FLASH_PAGE_SIZE;
+ fls->blk.blk_cnt = (F_SIZE * 1024) / FLASH_PAGE_SIZE;
/* Unlock flash memory for the FPEC Access */
EMB_FLASH->KEYR = FLASH_KEY1;
}
-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;