projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stm32f103-nucleo: Use more bits
[fw/altos]
/
src
/
samd21
/
ao_flash_samd21.c
diff --git
a/src/samd21/ao_flash_samd21.c
b/src/samd21/ao_flash_samd21.c
index c1cee3f876e75e95b493e24866cd41e48a8cfee9..502ff35e07710b680972f075f6254709c71975d8 100644
(file)
--- a/
src/samd21/ao_flash_samd21.c
+++ b/
src/samd21/ao_flash_samd21.c
@@
-38,7
+38,15
@@
samd21_nvmctrl_lock_region(void)
static uint8_t
ao_flash_lock_region_bit(void *addr)
{
static uint8_t
ao_flash_lock_region_bit(void *addr)
{
- return (uint8_t) (((uintptr_t) addr) / samd21_nvmctrl_lock_region());
+ uint32_t lock_region = samd21_nvmctrl_lock_region();
+ uintptr_t a = (uintptr_t) addr;
+
+ while (lock_region) {
+ a >>= 1;
+ lock_region >>= 1;
+ }
+
+ return (uint8_t) a;
}
static uint8_t
}
static uint8_t
@@
-101,6
+109,9
@@
ao_flash_erase_page(uint32_t *page)
uint32_t row_size = samd21_nvmctrl_row_size();
uint32_t rows = (row_size + 255) / 256;
uint32_t row_size = samd21_nvmctrl_row_size();
uint32_t rows = (row_size + 255) / 256;
+ if ((uintptr_t) page & (row_size - 1))
+ return;
+
ao_arch_block_interrupts();
if (((uintptr_t) row & (row_size - 1)) == 0) {
ao_arch_block_interrupts();
if (((uintptr_t) row & (row_size - 1)) == 0) {
@@
-116,10
+127,12
@@
ao_flash_erase_page(uint32_t *page)
void
ao_flash_page(uint32_t *page, uint32_t *src)
{
void
ao_flash_page(uint32_t *page, uint32_t *src)
{
- uint32_t page_s
ize = samd21_nvmctrl_page_size
();
- uint32_t pages = 256
/ page_size
;
+ uint32_t page_s
hift = samd21_nvmctrl_page_shift
();
+ uint32_t pages = 256
>> page_shift
;
uint32_t i;
uint32_t i;
- uint32_t per_page = page_size / sizeof(uint32_t);
+ uint32_t per_page = 1 << (page_shift - 2);
+
+ ao_flash_erase_page(page);
ao_arch_block_interrupts();
ao_arch_block_interrupts();