diff options
| author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2014-03-10 22:23:07 +0100 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2014-03-17 12:47:18 +0000 |
| commit | 565f8481c7b71614a05d79ab79af8610d2535a81 (patch) | |
| tree | e37bd29bd71c8c83046a4b91536405542e722d84 /src/flash/nor/lpc2000.c | |
| parent | cd091c36305d9d2de838c7ba145ee7547e4e1640 (diff) | |
flash: Constify write buffer
Change-Id: Ic812098d3ed5a2992c26bb57d08ae350e2c5d5d8
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/2040
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/flash/nor/lpc2000.c')
| -rw-r--r-- | src/flash/nor/lpc2000.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c index 259b42f1..69c8b034 100644 --- a/src/flash/nor/lpc2000.c +++ b/src/flash/nor/lpc2000.c @@ -711,7 +711,7 @@ static int lpc2000_protect(struct flash_bank *bank, int set, int first, int last return ERROR_OK; } -static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count) +static int lpc2000_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count) { struct target *target = bank->target; @@ -746,6 +746,7 @@ static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs /* check if exception vectors should be flashed */ if ((offset == 0) && (count >= 0x20) && lpc2000_info->calc_checksum) { + assert(lpc2000_info->checksum_vector < 8); uint32_t checksum = 0; for (int i = 0; i < 8; i++) { LOG_DEBUG("Vector 0x%2.2x: 0x%8.8" PRIx32, i * 4, buf_get_u32(buffer + (i * 4), 0, 32)); @@ -763,7 +764,8 @@ static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs "checksum."); } - buf_set_u32(buffer + (lpc2000_info->checksum_vector * 4), 0, 32, checksum); + /* FIXME: WARNING! This code is broken because it modifies the callers buffer in place. */ + buf_set_u32((uint8_t *)buffer + (lpc2000_info->checksum_vector * 4), 0, 32, checksum); } struct working_area *iap_working_area; |