projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up. Reformat.
[bertos.git]
/
bertos
/
cpu
/
arm
/
drv
/
flash_at91.c
diff --git
a/bertos/cpu/arm/drv/flash_at91.c
b/bertos/cpu/arm/drv/flash_at91.c
index c63dd70702d384ab4ed7745ecfba39860aa56012..514d54e4326811042b4ea7dcafcf0e1f5e815857 100644
(file)
--- 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)
{
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;
}
return size;
}
@@
-225,7
+222,7
@@
static void common_init(Flash *fls)
fls->blk.blk_cnt = FLASH_MEM_SIZE / FLASH_PAGE_SIZE_BYTES;
}
fls->blk.blk_cnt = FLASH_MEM_SIZE / FLASH_PAGE_SIZE_BYTES;
}
-void flash_hw_init(Flash *fls)
+void flash_hw_init(Flash *fls
, UNUSED_ARG(int, flags)
)
{
common_init(fls);
fls->blk.priv.vt = &flash_at91_buffered_vt;
{
common_init(fls);
fls->blk.priv.vt = &flash_at91_buffered_vt;
@@
-236,7
+233,7
@@
void flash_hw_init(Flash *fls)
memcpy(fls->blk.priv.buf, (void *)(FLASH_BASE), fls->blk.blk_size);
}
memcpy(fls->blk.priv.buf, (void *)(FLASH_BASE), 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_at91_unbuffered_vt;
{
common_init(fls);
fls->blk.priv.vt = &flash_at91_unbuffered_vt;