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

target_flash: add prepare routine and extra return checks

This commit is contained in:
Rafael Silva 2022-08-22 11:49:59 +01:00 committed by Rachel Mant
parent e72edc0579
commit 44a028344a
2 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/target/target_flash.c
View File

@ -85,10 +85,44 @@ static int target_exit_flash_mode(target *t)
return ret; return ret;
} }
static int flash_prepare(target_flash_s *f)
{
if (f->ready)
return 0;
int ret = 0;
if (f->prepare)
ret = f->prepare(f);
if (ret == 0)
f->ready = true;
return ret;
}
static int flash_done(target_flash_s *f)
{
if (!f->ready)
return 0;
int ret = 0;
if (f->done)
ret = f->done(f);
if (f->buf) {
free(f->buf);
f->buf = NULL;
}
f->ready = false;
return ret;
}
int target_flash_erase(target *t, target_addr_t addr, size_t len) int target_flash_erase(target *t, target_addr_t addr, size_t len)
{ {
if (!t->flash_mode) if (target_enter_flash_mode(t) != 0)
target_enter_flash_mode(t); return 1;
int ret = 0; int ret = 0;
while (len) { while (len) {
@ -101,7 +135,9 @@ int target_flash_erase(target *t, target_addr_t addr, size_t len)
const target_addr_t local_start_addr = addr & ~(f->blocksize - 1U); const target_addr_t local_start_addr = addr & ~(f->blocksize - 1U);
const target_addr_t local_end_addr = local_start_addr + f->blocksize; const target_addr_t local_end_addr = local_start_addr + f->blocksize;
if (flash_prepare(f) == 0)
ret |= f->erase(f, local_start_addr, f->blocksize); ret |= f->erase(f, local_start_addr, f->blocksize);
flash_done(f);
len -= MIN(local_end_addr - addr, len); len -= MIN(local_end_addr - addr, len);
addr = local_end_addr; addr = local_end_addr;
@ -111,14 +147,17 @@ int target_flash_erase(target *t, target_addr_t addr, size_t len)
int target_flash_write(target *t, target_addr_t dest, const void *src, size_t len) int target_flash_write(target *t, target_addr_t dest, const void *src, size_t len)
{ {
if (!t->flash_mode) if (target_enter_flash_mode(t) != 0)
target_enter_flash_mode(t); return 1;
int ret = 0; int ret = 0;
while (len) { while (len) {
target_flash_s *f = target_flash_for_addr(t, dest); target_flash_s *f = target_flash_for_addr(t, dest);
if (!f) if (!f)
return 1; return 1;
flash_prepare(f)
size_t tmptarget = MIN(dest + len, f->start + f->length); size_t tmptarget = MIN(dest + len, f->start + f->length);
size_t tmplen = tmptarget - dest; size_t tmplen = tmptarget - dest;
ret |= target_flash_write_buffered(f, dest, src, tmplen); ret |= target_flash_write_buffered(f, dest, src, tmplen);
@ -142,8 +181,7 @@ int target_flash_complete(target *t)
int ret = 0; int ret = 0;
for (target_flash_s *f = t->flash; f; f = f->next) { for (target_flash_s *f = t->flash; f; f = f->next) {
ret |= target_flash_done_buffered(f); ret |= target_flash_done_buffered(f);
if (f->done) ret |= flash_done(f);
ret |= f->done(f);
} }
target_exit_flash_mode(t); target_exit_flash_mode(t);
return ret; return ret;

1
src/target/target_internal.h
View File

@ -46,6 +46,7 @@ struct target_flash {
size_t blocksize; /* erase block size */ size_t blocksize; /* erase block size */
size_t writesize; /* write operation size, must be <= blocksize */ size_t writesize; /* write operation size, must be <= blocksize */
uint8_t erased; /* byte erased state */ uint8_t erased; /* byte erased state */
bool ready; /* true if flash is in flash mode/prepared */
flash_prepare_func prepare; /* prepare for flash operations */ flash_prepare_func prepare; /* prepare for flash operations */
flash_erase_func erase; /* erase a range of flash */ flash_erase_func erase; /* erase a range of flash */
flash_write_func write; /* write to flash */ flash_write_func write; /* write to flash */