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

Merge branch 'lpc11xx-flash' of https://github.com/John-Titor/blackmagic into John-Titor-lpc11xx-flash 

Conflicts:
	src/lpc11xx.c
This commit is contained in:
Gareth McMullin 2014-07-30 16:45:55 +12:00
parent 5d61575ce6 3543e560af
commit 3daf5d7e11
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lpc11xx.c
View File

@ -260,26 +260,26 @@ lpc11xx_flash_write(struct target_s *target, uint32_t dest, const uint8_t *src,
copylen = len; copylen = len;
memcpy(&flash_pgm.data[chunk_offset], src, copylen); memcpy(&flash_pgm.data[chunk_offset], src, copylen);
/* if we are programming the vectors, calculate the magic number */
if ((chunk == 0) && (chunk_offset == 0)) {
if (copylen < 32) {
/* we have to be programming at least the first 8 vectors... */
return -1;
}
uint32_t *w = (uint32_t *)(&flash_pgm.data[0]);
uint32_t sum = 0;
for (unsigned i = 0; i < 7; i++)
sum += w[i];
w[7] = ~sum + 1;
}
/* update to suit */ /* update to suit */
len -= copylen; len -= copylen;
src += copylen; src += copylen;
chunk_offset = 0; chunk_offset = 0;
/* if we are programming the vectors, calculate the magic number */
if (chunk == 0) {
uint32_t *w = (uint32_t *)(&flash_pgm.data[0]);
uint32_t sum = 0;
if (copylen >= 7) {
for (unsigned i = 0; i < 7; i++)
sum += w[i];
w[7] = 0 - sum;
} else {
/* We can't possibly calculate the magic number */
return -1;
}
}
} else { } else {
/* interior chunk, must be aligned and full-sized */ /* interior chunk, must be aligned and full-sized */