From e968fc956c0a512253f4b24a8ce5ccef035392fa Mon Sep 17 00:00:00 2001 From: Rafael Silva Date: Wed, 24 Aug 2022 12:39:23 +0100 Subject: [PATCH] target_flash: flash read write return bool --- src/target/target.c | 2 +- src/target/target_flash.c | 4 ++-- src/target/target_internal.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/target/target.c b/src/target/target.c index 3112941..d61456f 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -440,7 +440,7 @@ static bool target_cmd_range_erase(target *const t, const int argc, const char * const uint32_t addr = strtoul(argv[1], NULL, 0); const uint32_t length = strtoul(argv[2], NULL, 0); - return target_flash_erase(t, addr, length) == 0; + return target_flash_erase(t, addr, length); } /* Accessor functions */ diff --git a/src/target/target_flash.c b/src/target/target_flash.c index 0367ccd..e6f4805 100644 --- a/src/target/target_flash.c +++ b/src/target/target_flash.c @@ -143,7 +143,7 @@ bool target_flash_erase(target *t, target_addr_t addr, size_t len) if (!flash_prepare(f)) return false; - ret &= f->erase(f, local_start_addr, f->blocksize) == 0; + ret &= f->erase(f, local_start_addr, f->blocksize); len -= MIN(local_end_addr - addr, len); addr = local_end_addr; @@ -267,7 +267,7 @@ static bool flash_buffered_flush(target_flash_s *f) uint32_t len = f->buf_addr_high - aligned_addr; for (size_t offset = 0; offset < len; offset += f->writesize) - ret &= f->write(f, aligned_addr + offset, src + offset, f->writesize) == 0; + ret &= f->write(f, aligned_addr + offset, src + offset, f->writesize); f->buf_addr_base = UINT32_MAX; f->buf_addr_low = UINT32_MAX; diff --git a/src/target/target_internal.h b/src/target/target_internal.h index 17cbc55..a50e430 100644 --- a/src/target/target_internal.h +++ b/src/target/target_internal.h @@ -35,8 +35,8 @@ struct target_ram { typedef struct target_flash target_flash_s; typedef bool (*flash_prepare_func)(target_flash_s *f); -typedef int (*flash_erase_func)(target_flash_s *f, target_addr_t addr, size_t len); -typedef int (*flash_write_func)(target_flash_s *f, target_addr_t dest, const void *src, size_t len); +typedef bool (*flash_erase_func)(target_flash_s *f, target_addr_t addr, size_t len); +typedef bool (*flash_write_func)(target_flash_s *f, target_addr_t dest, const void *src, size_t len); typedef bool (*flash_done_func)(target_flash_s *f); struct target_flash {