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

stm32g0: Refactored out the busy wait code into a small function, 

This netted a 36 byte code size reduction
This commit is contained in:
dragonmux 2022-08-09 19:04:17 +01:00 committed by Piotr Esden-Tempski
parent 60af35b06c
commit f4d8022437
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/target/stm32g0.c
View File

@ -320,6 +320,15 @@ static void stm32g0_flash_lock(target *t)
target_mem_write32(t, FLASH_CR, flash_cr); target_mem_write32(t, FLASH_CR, flash_cr);
} }
static bool stm32g0_wait_busy(target *const t)
{
while (target_mem_read32(t, FLASH_SR) & FLASH_SR_BSY_MASK) {
if (target_check_error(t))
return false;
}
return true;
}
/* /*
* Flash erasure function. * Flash erasure function.
* OTP case: this function clears any previous error and returns. * OTP case: this function clears any previous error and returns.
@ -336,10 +345,8 @@ static int stm32g0_flash_erase(target_flash_s *f, target_addr addr, size_t len)
goto exit_cleanup; goto exit_cleanup;
/* Wait for Flash ready */ /* Wait for Flash ready */
while (target_mem_read32(t, FLASH_SR) & FLASH_SR_BSY_MASK) { if (!stm32g0_wait_busy(t))
if (target_check_error(t)) goto exit_error;
goto exit_error;
}
/* Clear any previous programming error */ /* Clear any previous programming error */
target_mem_write32(t, FLASH_SR, target_mem_read32(t, FLASH_SR)); target_mem_write32(t, FLASH_SR, target_mem_read32(t, FLASH_SR));
@ -372,10 +379,8 @@ static int stm32g0_flash_erase(target_flash_s *f, target_addr addr, size_t len)
flash_cr |= (uint32_t)FLASH_CR_STRT; flash_cr |= (uint32_t)FLASH_CR_STRT;
target_mem_write32(t, FLASH_CR, flash_cr); target_mem_write32(t, FLASH_CR, flash_cr);
while (target_mem_read32(t, FLASH_SR) & FLASH_SR_BSY_MASK) { if (!stm32g0_wait_busy(t))
if (target_check_error(t)) goto exit_error;
goto exit_error;
}
page_nb++; page_nb++;
nb_pages_to_erase--; nb_pages_to_erase--;
@ -505,20 +510,16 @@ static bool stm32g0_cmd_erase_bank(target *t, int argc, const char **argv)
stm32g0_flash_unlock(t); stm32g0_flash_unlock(t);
target_mem_write32(t, FLASH_CR, flash_cr); target_mem_write32(t, FLASH_CR, flash_cr);
bool error = true;
/* Read FLASH_SR to poll for BSY bits */ /* Read FLASH_SR to poll for BSY bits */
while (target_mem_read32(t, FLASH_SR) & FLASH_SR_BSY_MASK) { if (!stm32g0_wait_busy(t)) {
if ((error = target_check_error(t))) stm32g0_flash_lock(t);
goto exit_cleanup; return false;
} }
/* Check for error */ /* Check for error */
uint16_t flash_sr = target_mem_read32(t, FLASH_SR); const uint16_t flash_sr = target_mem_read32(t, FLASH_SR);
error = flash_sr & FLASH_SR_ERROR_MASK;
exit_cleanup:
stm32g0_flash_lock(t); stm32g0_flash_lock(t);
return !error; return !(flash_sr & FLASH_SR_ERROR_MASK);
} }
static void stm32g0_flash_option_unlock(target *t) static void stm32g0_flash_option_unlock(target *t)
@ -594,18 +595,14 @@ static bool stm32g0_option_write(target *const t, const registers_s *const optio
stm32g0_flash_option_unlock(t); stm32g0_flash_option_unlock(t);
/* Wait for Flash ready */ /* Wait for Flash ready */
while (target_mem_read32(t, FLASH_SR) & FLASH_SR_BSY_MASK) { if (!stm32g0_wait_busy(t))
if (target_check_error(t)) goto exit_error;
goto exit_error;
}
write_registers(t, options_req, NB_REG_OPT); write_registers(t, options_req, NB_REG_OPT);
target_mem_write32(t, FLASH_CR, FLASH_CR_OPTSTRT); target_mem_write32(t, FLASH_CR, FLASH_CR_OPTSTRT);
while (target_mem_read32(t, FLASH_SR) & FLASH_SR_BSY_MASK) { if (!stm32g0_wait_busy(t))
if (target_check_error(t)) goto exit_error;
goto exit_error;
}
/* Option bytes loading generates a system reset */ /* Option bytes loading generates a system reset */
target_mem_write32(t, FLASH_CR, FLASH_CR_OBL_LAUNCH); target_mem_write32(t, FLASH_CR, FLASH_CR_OBL_LAUNCH);