X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Farm%2Fdrv%2Fflash_at91.c;h=1cdf6b788e0e8678ea6a7a5fc6609aa640a6c72e;hb=7713a5e329a770f53d53e39e9b3b8dae55c71614;hp=c63dd70702d384ab4ed7745ecfba39860aa56012;hpb=b2f2f597867bc837cfc6269c8d67276996d7f5e1;p=bertos.git

diff --git a/bertos/cpu/arm/drv/flash_at91.c b/bertos/cpu/arm/drv/flash_at91.c
index c63dd707..1cdf6b78 100644
--- a/bertos/cpu/arm/drv/flash_at91.c
+++ b/bertos/cpu/arm/drv/flash_at91.c
@@ -139,10 +139,7 @@ static bool flash_getStatus(struct KBlock *blk)
 
 static size_t at91_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 +  FLASH_BASE), size);
+	memcpy(buf, (void *)(idx * blk->blk_size +  FLASH_BASE + offset), size);
 	return size;
 }
 
@@ -225,20 +222,21 @@ static void common_init(Flash *fls)
 	fls->blk.blk_cnt = FLASH_MEM_SIZE / FLASH_PAGE_SIZE_BYTES;
 }
 
-void flash_hw_init(Flash *fls)
+void flash_hw_init(Flash *fls, int flags)
 {
 	common_init(fls);
 	fls->blk.priv.vt = &flash_at91_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 */
 	memcpy(fls->blk.priv.buf, (void *)(FLASH_BASE), 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_at91_unbuffered_vt;
+	fls->blk.priv.flags |= flags;
 }