djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disable interrupts inside of write_page and erase_write_sector

Browse Source
This commit is contained in:
foamyguy 2021-12-04 12:21:51 -06:00
parent f49271b472
commit 5e7c1328b0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/raspberrypi/common-hal/nvm/ByteArray.c
View File

@ -43,6 +43,9 @@ uint32_t common_hal_nvm_bytearray_get_length(const nvm_bytearray_obj_t *self) {
} }
static void write_page(uint32_t page_addr, uint32_t offset, uint32_t len, uint8_t *bytes) { static void write_page(uint32_t page_addr, uint32_t offset, uint32_t len, uint8_t *bytes) {
// disable interrupts to prevent core hang on rp2040
common_hal_mcu_disable_interrupts();
// Write a whole page to flash, buffering it first and then erasing and rewriting it // Write a whole page to flash, buffering it first and then erasing and rewriting it
// since we can only write a whole page at a time. // since we can only write a whole page at a time.
if (offset == 0 && len == FLASH_PAGE_SIZE) { if (offset == 0 && len == FLASH_PAGE_SIZE) {
@ -53,9 +56,13 @@ static void write_page(uint32_t page_addr, uint32_t offset, uint32_t len, uint8_
memcpy(buffer + offset, bytes, len); memcpy(buffer + offset, bytes, len);
flash_range_program(RMV_OFFSET(page_addr), buffer, FLASH_PAGE_SIZE); flash_range_program(RMV_OFFSET(page_addr), buffer, FLASH_PAGE_SIZE);
} }
common_hal_mcu_enable_interrupts();
} }
static void erase_and_write_sector(uint32_t address, uint32_t len, uint8_t *bytes) { static void erase_and_write_sector(uint32_t address, uint32_t len, uint8_t *bytes) {
// disable interrupts to prevent core hang on rp2040
common_hal_mcu_disable_interrupts();
// Write a whole sector to flash, buffering it first and then erasing and rewriting it // Write a whole sector to flash, buffering it first and then erasing and rewriting it
// since we can only erase a whole sector at a time. // since we can only erase a whole sector at a time.
uint8_t buffer[FLASH_SECTOR_SIZE]; uint8_t buffer[FLASH_SECTOR_SIZE];
@ -63,6 +70,7 @@ static void erase_and_write_sector(uint32_t address, uint32_t len, uint8_t *byte
memcpy(buffer + address, bytes, len); memcpy(buffer + address, bytes, len);
flash_range_erase(RMV_OFFSET(CIRCUITPY_INTERNAL_NVM_START_ADDR), FLASH_SECTOR_SIZE); flash_range_erase(RMV_OFFSET(CIRCUITPY_INTERNAL_NVM_START_ADDR), FLASH_SECTOR_SIZE);
flash_range_program(RMV_OFFSET(CIRCUITPY_INTERNAL_NVM_START_ADDR), buffer, FLASH_SECTOR_SIZE); flash_range_program(RMV_OFFSET(CIRCUITPY_INTERNAL_NVM_START_ADDR), buffer, FLASH_SECTOR_SIZE);
common_hal_mcu_enable_interrupts();
} }
void common_hal_nvm_bytearray_get_bytes(const nvm_bytearray_obj_t *self, void common_hal_nvm_bytearray_get_bytes(const nvm_bytearray_obj_t *self,
@ -72,8 +80,6 @@ void common_hal_nvm_bytearray_get_bytes(const nvm_bytearray_obj_t *self,
bool common_hal_nvm_bytearray_set_bytes(const nvm_bytearray_obj_t *self, bool common_hal_nvm_bytearray_set_bytes(const nvm_bytearray_obj_t *self,
uint32_t start_index, uint8_t *values, uint32_t len) { uint32_t start_index, uint8_t *values, uint32_t len) {
// disable interrupts to prevent core hang on rp2040
common_hal_mcu_disable_interrupts();
uint8_t values_in[len]; uint8_t values_in[len];
common_hal_nvm_bytearray_get_bytes(self, start_index, len, values_in); common_hal_nvm_bytearray_get_bytes(self, start_index, len, values_in);
@ -102,6 +108,5 @@ bool common_hal_nvm_bytearray_set_bytes(const nvm_bytearray_obj_t *self,
erase_and_write_sector(start_index, len, values); erase_and_write_sector(start_index, len, values);
} }
common_hal_mcu_enable_interrupts();
return true; return true;
} }