From 220293abc6c32da4098dcf06aef661cbde68c71f Mon Sep 17 00:00:00 2001 From: Rafael Silva Date: Wed, 24 Aug 2022 12:38:07 +0100 Subject: [PATCH] target/nrf51: flash read write return bool --- src/target/nrf51.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/target/nrf51.c b/src/target/nrf51.c index 5eb891a..53c9259 100644 --- a/src/target/nrf51.c +++ b/src/target/nrf51.c @@ -27,8 +27,8 @@ #include "cortexm.h" #include "adiv5.h" -static int nrf51_flash_erase(target_flash_s *f, target_addr_t addr, size_t len); -static int nrf51_flash_write(target_flash_s *f, target_addr_t dest, const void *src, size_t len); +static bool nrf51_flash_erase(target_flash_s *f, target_addr_t addr, size_t len); +static bool nrf51_flash_write(target_flash_s *f, target_addr_t dest, const void *src, size_t len); static bool nrf51_mass_erase(target *t); static bool nrf51_cmd_erase_uicr(target *t, int argc, const char **argv); @@ -159,7 +159,7 @@ bool nrf51_probe(target *t) return true; } -static int nrf51_flash_erase(target_flash_s *f, target_addr_t addr, size_t len) +static bool nrf51_flash_erase(target_flash_s *f, target_addr_t addr, size_t len) { target *t = f->t; /* Enable erase */ @@ -168,7 +168,7 @@ static int nrf51_flash_erase(target_flash_s *f, target_addr_t addr, size_t len) /* Poll for NVMC_READY */ while (target_mem_read32(t, NRF51_NVMC_READY) == 0) if(target_check_error(t)) - return -1; + return false; while (len) { if (addr == NRF51_UICR) // Special Case @@ -181,7 +181,7 @@ static int nrf51_flash_erase(target_flash_s *f, target_addr_t addr, size_t len) /* Poll for NVMC_READY */ while (target_mem_read32(t, NRF51_NVMC_READY) == 0) { if (target_check_error(t)) - return -1; + return false; } addr += f->blocksize; @@ -197,13 +197,13 @@ static int nrf51_flash_erase(target_flash_s *f, target_addr_t addr, size_t len) /* Poll for NVMC_READY */ while (target_mem_read32(t, NRF51_NVMC_READY) == 0) { if (target_check_error(t)) - return -1; + return false; } - return 0; + return true; } -static int nrf51_flash_write(target_flash_s *f, target_addr_t dest, const void *src, size_t len) +static bool nrf51_flash_write(target_flash_s *f, target_addr_t dest, const void *src, size_t len) { target *t = f->t; @@ -212,15 +212,15 @@ static int nrf51_flash_write(target_flash_s *f, target_addr_t dest, const void * /* Poll for NVMC_READY */ while (target_mem_read32(t, NRF51_NVMC_READY) == 0) if(target_check_error(t)) - return -1; + return false; target_mem_write(t, dest, src, len); /* Poll for NVMC_READY */ while (target_mem_read32(t, NRF51_NVMC_READY) == 0) if(target_check_error(t)) - return -1; + return false; /* Return to read-only */ target_mem_write32(t, NRF51_NVMC_CONFIG, NRF51_NVMC_CONFIG_REN); - return 0; + return true; } static bool nrf51_mass_erase(target *t)