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

Merge pull request #293 from UweBonnes/write_size 

target: Fix wrong size calculation for write.
This commit is contained in:
Gareth McMullin 2017-10-05 09:07:18 +13:00 committed by GitHub
parent ed8366813d a7815fff3d
commit 5950d8f56c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/target/target.c
View File

@ -213,16 +213,18 @@ int target_flash_write(target *t,
int ret = 0; int ret = 0;
while (len) { while (len) {
struct target_flash *f = flash_for_addr(t, dest); struct target_flash *f = flash_for_addr(t, dest);
size_t tmplen = MIN(len, f->length - (dest % f->length)); size_t tmptarget = MIN(dest + len, f->start + f->length);
size_t tmplen = tmptarget - dest;
if (f->align > 1) { if (f->align > 1) {
uint32_t offset = dest % f->align; uint32_t offset = dest % f->align;
uint8_t data[ALIGN(offset + len, f->align)]; uint8_t data[ALIGN(offset + tmplen, f->align)];
memset(data, f->erased, sizeof(data)); memset(data, f->erased, sizeof(data));
memcpy((uint8_t *)data + offset, src, len); memcpy((uint8_t *)data + offset, src, tmplen);
ret |= f->write(f, dest - offset, data, sizeof(data)); ret |= f->write(f, dest - offset, data, sizeof(data));
} else { } else {
ret |= f->write(f, dest, src, tmplen); ret |= f->write(f, dest, src, tmplen);
} }
dest += tmplen;
src += tmplen; src += tmplen;
len -= tmplen; len -= tmplen;
} }