sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nrf51: braces cleanup in nrf51_flash_erase

This commit is contained in:
dragonmux 2022-07-11 20:41:16 -04:00 committed by Piotr Esden-Tempski
parent ee694fcb75
commit 57d8e8f5d9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/target/nrf51.c
View File

@ -166,19 +166,18 @@ static int nrf51_flash_erase(struct target_flash *f, target_addr addr, size_t le
return -1; return -1;
while (len) { while (len) {
if (addr == NRF51_UICR) { // Special Case if (addr == NRF51_UICR) // Special Case
/* Write to the ERASE_UICR register to erase */ /* Write to the ERASE_UICR register to erase */
target_mem_write32(t, NRF51_NVMC_ERASEUICR, 0x1); target_mem_write32(t, NRF51_NVMC_ERASEUICR, 0x1);
else // Standard Flash Page
} else { // Standard Flash Page
/* Write address of first word in page to erase it */ /* Write address of first word in page to erase it */
target_mem_write32(t, NRF51_NVMC_ERASEPAGE, addr); target_mem_write32(t, NRF51_NVMC_ERASEPAGE, addr);
}
/* Poll for NVMC_READY */ /* Poll for NVMC_READY */
while (target_mem_read32(t, NRF51_NVMC_READY) == 0) while (target_mem_read32(t, NRF51_NVMC_READY) == 0) {
if(target_check_error(t)) if (target_check_error(t))
return -1; return -1;
}
addr += f->blocksize; addr += f->blocksize;
if (len > f->blocksize) if (len > f->blocksize)
@ -191,9 +190,10 @@ static int nrf51_flash_erase(struct target_flash *f, target_addr addr, size_t le
target_mem_write32(t, NRF51_NVMC_CONFIG, NRF51_NVMC_CONFIG_REN); target_mem_write32(t, NRF51_NVMC_CONFIG, NRF51_NVMC_CONFIG_REN);
/* Poll for NVMC_READY */ /* Poll for NVMC_READY */
while (target_mem_read32(t, NRF51_NVMC_READY) == 0) while (target_mem_read32(t, NRF51_NVMC_READY) == 0) {
if(target_check_error(t)) if (target_check_error(t))
return -1; return -1;
}
return 0; return 0;
} }