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

target/ch32f1: flash read write return bool

This commit is contained in:
Rafael Silva 2022-08-24 12:36:38 +01:00 committed by Rachel Mant
parent e968fc956c
commit cf28b352a7
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/target/ch32f1.c
View File

@ -34,8 +34,8 @@
extern const struct command_s stm32f1_cmd_list[]; // Reuse stm32f1 stuff extern const struct command_s stm32f1_cmd_list[]; // Reuse stm32f1 stuff
static int ch32f1_flash_erase(target_flash_s *f, target_addr_t addr, size_t len); static bool ch32f1_flash_erase(target_flash_s *f, target_addr_t addr, size_t len);
static int ch32f1_flash_write(target_flash_s *f, target_addr_t dest, const void *src, size_t len); static bool ch32f1_flash_write(target_flash_s *f, target_addr_t dest, const void *src, size_t len);
// these are common with stm32f1/gd32f1/... // these are common with stm32f1/gd32f1/...
#define FPEC_BASE 0x40022000 #define FPEC_BASE 0x40022000
@ -200,7 +200,7 @@ bool ch32f1_probe(target *t)
\fn ch32f1_flash_erase \fn ch32f1_flash_erase
\brief fast erase of CH32 \brief fast erase of CH32
*/ */
int ch32f1_flash_erase(target_flash_s *f, target_addr_t addr, size_t len) bool ch32f1_flash_erase(target_flash_s *f, target_addr_t addr, size_t len)
{ {
volatile uint32_t sr, magic; volatile uint32_t sr, magic;
target *t = f->t; target *t = f->t;
@ -208,7 +208,7 @@ int ch32f1_flash_erase(target_flash_s *f, target_addr_t addr, size_t len)
if (ch32f1_flash_unlock(t)) { if (ch32f1_flash_unlock(t)) {
DEBUG_WARN("CH32: Unlock failed\n"); DEBUG_WARN("CH32: Unlock failed\n");
return -1; return false;
} }
// Fast Erase 128 bytes pages (ch32 mode) // Fast Erase 128 bytes pages (ch32 mode)
while (len) { while (len) {
@ -232,9 +232,9 @@ int ch32f1_flash_erase(target_flash_s *f, target_addr_t addr, size_t len)
ch32f1_flash_lock(t); ch32f1_flash_lock(t);
if (sr & SR_ERROR_MASK) { if (sr & SR_ERROR_MASK) {
DEBUG_WARN("ch32f1 flash erase error 0x%" PRIx32 "\n", sr); DEBUG_WARN("ch32f1 flash erase error 0x%" PRIx32 "\n", sr);
return -1; return false;
} }
return 0; return true;
} }
/** /**
@ -297,7 +297,7 @@ static int ch32f1_buffer_clear(target *t)
/** /**
*/ */
static int ch32f1_flash_write(target_flash_s *f, target_addr_t dest, const void *src, size_t len) static bool ch32f1_flash_write(target_flash_s *f, target_addr_t dest, const void *src, size_t len)
{ {
volatile uint32_t sr, magic; volatile uint32_t sr, magic;
target *t = f->t; target *t = f->t;
@ -312,7 +312,7 @@ static int ch32f1_flash_write(target_flash_s *f, target_addr_t dest, const void
{ {
if (ch32f1_flash_unlock(t)) { if (ch32f1_flash_unlock(t)) {
DEBUG_WARN("ch32f1 cannot fast unlock\n"); DEBUG_WARN("ch32f1 cannot fast unlock\n");
return -1; return false;
} }
WAIT_BUSY(); WAIT_BUSY();
@ -320,12 +320,12 @@ static int ch32f1_flash_write(target_flash_s *f, target_addr_t dest, const void
ch32f1_buffer_clear(t); ch32f1_buffer_clear(t);
// Load 128 bytes to buffer // Load 128 bytes to buffer
if (!ch32f1_wait_flash_ready(t,dest)) if (!ch32f1_wait_flash_ready(t,dest))
return -1; return false;
for (size_t i = 0; i < 8; i++) { for (size_t i = 0; i < 8; i++) {
if (ch32f1_upload(t, dest, src, i * 16U)) { if (ch32f1_upload(t, dest, src, i * 16U)) {
DEBUG_WARN("Cannot upload to buffer\n"); DEBUG_WARN("Cannot upload to buffer\n");
return -1; return false;
} }
} }
// write buffer // write buffer
@ -350,7 +350,7 @@ static int ch32f1_flash_write(target_flash_s *f, target_addr_t dest, const void
ch32f1_flash_lock(t); ch32f1_flash_lock(t);
if (sr & SR_ERROR_MASK) { if (sr & SR_ERROR_MASK) {
DEBUG_WARN("ch32f1 flash write error 0x%" PRIx32 "\n", sr); DEBUG_WARN("ch32f1 flash write error 0x%" PRIx32 "\n", sr);
return -1; return false;
} }
} }
@ -365,10 +365,10 @@ static int ch32f1_flash_write(target_flash_s *f, target_addr_t dest, const void
DEBUG_WARN(">>>>write mistmatch at address 0x%" PRIx32 "\n", org_dest + i); DEBUG_WARN(">>>>write mistmatch at address 0x%" PRIx32 "\n", org_dest + i);
DEBUG_WARN(">>>>expected: 0x%" PRIx32 "\n", expected); DEBUG_WARN(">>>>expected: 0x%" PRIx32 "\n", expected);
DEBUG_WARN(">>>> actual: 0x%" PRIx32 "\n", actual); DEBUG_WARN(">>>> actual: 0x%" PRIx32 "\n", actual);
return -1; return false;
} }
} }
#endif #endif
return 0; return true;
} }