X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fcortex-m3%2Fdrv%2Fflash_stm32.c;h=d92e91420cbb67bd5ce3171e76679c03d11ac305;hb=f1fab319eb3fe91c157b3a9564841aef62a03554;hp=d3e82b28b5f379d0a1058f7eb152e26e1c84af91;hpb=49f91f6a14dbe4cee94d5c16621774b5992d93cf;p=bertos.git

diff --git a/bertos/cpu/cortex-m3/drv/flash_stm32.c b/bertos/cpu/cortex-m3/drv/flash_stm32.c
index d3e82b28..d92e9142 100644
--- a/bertos/cpu/cortex-m3/drv/flash_stm32.c
+++ b/bertos/cpu/cortex-m3/drv/flash_stm32.c
@@ -56,13 +56,6 @@
 
 #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;
@@ -74,6 +67,7 @@ static bool flash_wait(struct KBlock *blk)
 	ticks_t start = timer_clock();
 	while (true)
 	{
+		cpu_relax();
 		if (!(EMB_FLASH->SR & FLASH_FLAG_BSY))
 			break;
 
@@ -97,8 +91,6 @@ static bool flash_wait(struct KBlock *blk)
 			LOG_ERR("Timeout..\n");
 			return false;
 		}
-
-		cpu_relax();
 	}
 
 	return true;
@@ -119,6 +111,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;
@@ -131,6 +125,7 @@ static bool stm32_eraseAll(struct KBlock *blk)
 
 	return true;
 }
+#endif
 
 static int stm32_flash_error(struct KBlock *blk)
 {
@@ -146,10 +141,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;
 }
 
@@ -172,6 +164,9 @@ INLINE bool stm32_writeWord(struct KBlock *blk, uint32_t addr, uint16_t data)
 
 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;
 
@@ -180,7 +175,7 @@ static size_t stm32_flash_writeDirect(struct KBlock *blk, block_idx_t idx, const
 
 	while (size)
 	{
-		uint16_t data = ((*buf + 1) << 8) | *buf;
+		uint16_t data = (*(buf + 1) << 8) | *buf;
 		if (!stm32_writeWord(blk, addr, data))
 			return 0;
 
@@ -202,6 +197,8 @@ static const KBlockVTable flash_stm32_buffered_vt =
 	.load = kblock_swLoad,
 	.store = kblock_swStore,
 
+	.close = kblock_swClose,
+
 	.error = stm32_flash_error,
 	.clearerr = stm32_flash_clearerror,
 };
@@ -211,24 +208,24 @@ static const KBlockVTable flash_stm32_unbuffered_vt =
 	.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;
@@ -236,15 +233,19 @@ 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;
 	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;