X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fcortex-m3%2Fdrv%2Fflash_stm32.c;h=62e448f3ab35dd9d201ba78756c89b3655247d9f;hb=854199db6c8a6aee9b131095a8c3d7934ebcc1ae;hp=9d7e5974703d2682ca75acf183551a1781adad53;hpb=ec3166808afafa4cdae2f542253cd0a530e6ee79;p=bertos.git

diff --git a/bertos/cpu/cortex-m3/drv/flash_stm32.c b/bertos/cpu/cortex-m3/drv/flash_stm32.c
index 9d7e5974..62e448f3 100644
--- a/bertos/cpu/cortex-m3/drv/flash_stm32.c
+++ b/bertos/cpu/cortex-m3/drv/flash_stm32.c
@@ -56,19 +56,12 @@
 
 #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;
 };
 
-INLINE bool flash_wait(struct KBlock *blk)
+static bool flash_wait(struct KBlock *blk)
 {
 	Flash *fls = FLASH_CAST(blk);
 	ticks_t start = timer_clock();
@@ -147,7 +140,6 @@ 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);
-
 	return size;
 }
 
@@ -170,49 +162,27 @@ 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;
 
-	uint32_t addr = idx * blk->blk_size + offset;
+	uint32_t addr = idx * blk->blk_size;
 	const uint8_t *buf = (const uint8_t *)_buf;
-	size_t count = 0;
-
-	if (addr % 2)
-	{
-		if (!stm32_writeWord(blk, addr - 1, (buf[0] << 8) | 0xFF))
-			return count;
 
-		buf++;
-		size--;
-		count++;
-		addr++;
-	}
-
-	ASSERT(!(addr % 2));
 	while (size)
 	{
-		uint16_t data;
-		size_t len;
-		if (size == 1)
-		{
-			data = 0xFF00 | *buf;
-			len = 1;
-		}
-		else
-		{
-			data = ((*buf + 1) << 8) | *buf;
-			len = 2;
-		}
-
+		uint16_t data = (*(buf + 1) << 8) | *buf;
 		if (!stm32_writeWord(blk, addr, data))
-			return count;
+			return 0;
 
-		buf += len;
-		size -= len;
-		count += len;
-		addr += len;
+		buf += 2;
+		size -= 2;
+		addr += 2;
 	}
-	return count;
+
+	return blk->blk_size;
 }
 
 static const KBlockVTable flash_stm32_buffered_vt =
@@ -225,35 +195,35 @@ static const KBlockVTable flash_stm32_buffered_vt =
 	.load = kblock_swLoad,
 	.store = kblock_swStore,
 
+	.close = kblock_swClose,
+
 	.error = stm32_flash_error,
 	.clearerr = stm32_flash_clearerror,
 };
 
-
-
 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;
@@ -261,16 +231,21 @@ 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 */
+	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, int flags)
 {
 	common_init(fls);
 	fls->blk.priv.vt = &flash_stm32_unbuffered_vt;
+	fls->blk.priv.flags |= flags;
 }