X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Favr%2Fdrv%2Fflash_avr.c;h=2c0baa1b52924bdab9bc0c51f6cff08285a93d20;hb=540b160dbedfdb12ce29f9b107be860ba22cd6cb;hp=231e01ebb941d77f19e0197b64eaa09d09bc6822;hpb=af6f92fdde767ddb88623acead8a59a468c1ae15;p=bertos.git

diff --git a/bertos/cpu/avr/drv/flash_avr.c b/bertos/cpu/avr/drv/flash_avr.c
index 231e01eb..2c0baa1b 100644
--- a/bertos/cpu/avr/drv/flash_avr.c
+++ b/bertos/cpu/avr/drv/flash_avr.c
@@ -71,7 +71,7 @@ struct FlashHardware;
 
 static size_t avr_flash_readDirect(struct KBlock *blk, block_idx_t idx, void *buf, size_t offset, size_t size)
 {
-	memcpy_P(buf, (const void *)(uint16_t)(idx * blk->blk_size), size);
+	memcpy_P(buf, (const void *)(uint16_t)(idx * blk->blk_size + offset), size);
 	return blk->blk_size;
 }
 
@@ -161,19 +161,18 @@ static void common_init(Flash *fls)
 }
 
 
-void flash_hw_init(Flash *fls, int flags)
+void flash_hw_init(Flash *fls, UNUSED_ARG(int, flags))
 {
 	common_init(fls);
 	fls->blk.priv.vt = &flash_avr_buffered_vt;
-	fls->blk.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE | flags;
+	fls->blk.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE;
 	fls->blk.priv.buf = flash_buf;
 }
 
-void flash_hw_initUnbuffered(Flash *fls, int flags)
+void flash_hw_initUnbuffered(Flash *fls, UNUSED_ARG(int, flags))
 {
 	common_init(fls);
 	fls->blk.priv.vt = &flash_avr_unbuffered_vt;
-	fls->blk.priv.flags |= flags;
 }