From d4d6218234cdf2839bc22bf0dd194288429e0c42 Mon Sep 17 00:00:00 2001 From: dragonmux Date: Tue, 9 Aug 2022 22:22:14 +0100 Subject: [PATCH] stm32g0: Refactored the wait code in the flash write routine --- src/target/stm32g0.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/target/stm32g0.c b/src/target/stm32g0.c index c1aafb7..9d3e855 100644 --- a/src/target/stm32g0.c +++ b/src/target/stm32g0.c @@ -418,16 +418,13 @@ static int stm32g0_flash_write(target_flash_s *f, target_addr dest, const void * target_mem_write32(t, FLASH_CR, FLASH_CR_PG); target_mem_write(t, dest, src, len); /* Wait for completion or an error */ - uint32_t status = FLASH_SR_BSY_MASK; - while (status & FLASH_SR_BSY_MASK) { - status = target_mem_read32(t, FLASH_SR); - if (target_check_error(t)) { - DEBUG_WARN("stm32g0 flash write: comm error\n"); - stm32g0_flash_op_finish(t); - return -1; - } + if (!stm32g0_wait_busy(t)) { + DEBUG_WARN("stm32g0 flash write: comm error\n"); + stm32g0_flash_op_finish(t); + return -1; } + const uint32_t status = target_mem_read32(t, FLASH_SR); if (status & FLASH_SR_ERROR_MASK) { DEBUG_WARN("stm32g0 flash write error: sr 0x%" PRIx32 "\n", status); stm32g0_flash_op_finish(t);