rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed erase in hal_efl_lld

This commit is contained in:
andru 2021-07-10 20:58:37 +03:00
parent 2fab47aa3b
commit 4ace726d62
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
os/hal/ports/NRF5/NRF52832/hal_efl_lld.c
View File

@ -66,12 +66,18 @@ static void nrf52_flash_lock(void *instance) {
devp->flash->CONFIG = (NVMC_CONFIG_WEN_Ren << NVMC_CONFIG_WEN_Pos) & NVMC_CONFIG_WEN_Msk;
}
static void nrf52_flash_unlock(void *instance) {
static void nrf52_flash_write_unlock(void *instance) {
EFlashDriver *devp = (EFlashDriver *)instance;
devp->flash->CONFIG = (NVMC_CONFIG_WEN_Wen << NVMC_CONFIG_WEN_Pos) & NVMC_CONFIG_WEN_Msk;
}
static void nrf52_flash_erase_unlock(void *instance) {
EFlashDriver *devp = (EFlashDriver *)instance;
devp->flash->CONFIG = (NVMC_CONFIG_WEN_Een << NVMC_CONFIG_WEN_Pos) & NVMC_CONFIG_WEN_Msk;
}
static flash_error_t nrf52_flash_wait_busy(EFlashDriver *devp) {
uint32_t READY;
@ -87,16 +93,10 @@ static flash_error_t nrf52_flash_program_word(EFlashDriver *devp,
uint32_t wdata) {
nrf52_flash_wait_busy(devp);
nrf52_flash_unlock(devp);
nrf52_flash_wait_busy(devp);
*(volatile uint32_t*)address = wdata;
nrf52_flash_wait_busy(devp);
nrf52_flash_lock(devp);
if( *(volatile uint32_t*)address != wdata ) {
return FLASH_ERROR_PROGRAM;
}
@ -250,7 +250,7 @@ flash_error_t efl_lld_program(void *instance, flash_offset_t offset,
devp->state = FLASH_PGM;
nrf52_flash_unlock(devp);
nrf52_flash_write_unlock(devp);
while(n > 3) {
wdata = (*(uint32_t*)pp);
@ -316,7 +316,8 @@ flash_error_t efl_lld_start_erase_all(void *instance) {
devp->state = FLASH_ERASE;
nrf52_flash_wait_busy(devp);
nrf52_flash_unlock(devp);
nrf52_flash_erase_unlock(devp);
nrf52_flash_wait_busy(devp);
@ -361,7 +362,8 @@ flash_error_t efl_lld_start_erase_sector(void *instance,
devp->state = FLASH_ERASE;
nrf52_flash_wait_busy(devp);
nrf52_flash_unlock(devp);
nrf52_flash_erase_unlock(devp);
nrf52_flash_wait_busy(devp);