interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flash/nor/fm4,tms470: fix clang static analyzer warnings 

Change-Id: I18c1501918d40453fea6aeeb6f035e46d41fc524
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/5366
Tested-by: jenkins
Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
This commit is contained in:
Tomas Vanek 2019-12-20 23:23:26 +01:00
parent b852429500
commit e1051e1090
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/flash/nor/fm4.c
View File

@ -207,7 +207,7 @@ static int fm4_flash_write(struct flash_bank *bank, const uint8_t *buffer,
uint32_t halfword_count = DIV_ROUND_UP(byte_count, 2); uint32_t halfword_count = DIV_ROUND_UP(byte_count, 2);
uint32_t result; uint32_t result;
unsigned i; unsigned i;
int retval; int retval, retval2 = ERROR_OK;
const uint8_t write_block_code[] = { const uint8_t write_block_code[] = {
#include "../../../contrib/loaders/flash/fm4/write.inc" #include "../../../contrib/loaders/flash/fm4/write.inc"
}; };
@ -327,7 +327,7 @@ static int fm4_flash_write(struct flash_bank *bank, const uint8_t *buffer,
err_run_ret: err_run_ret:
err_run: err_run:
err_write_data: err_write_data:
retval = fm4_enter_flash_cpu_rom_mode(target); retval2 = fm4_enter_flash_cpu_rom_mode(target);
err_flash_mode: err_flash_mode:
for (i = 0; i < ARRAY_SIZE(reg_params); i++) for (i = 0; i < ARRAY_SIZE(reg_params); i++)
@ -338,7 +338,9 @@ err_alloc_data:
err_write_code: err_write_code:
target_free_working_area(target, code_workarea); target_free_working_area(target, code_workarea);
return retval; if (retval != ERROR_OK)
return retval;
return retval2;
} }
static int mb9bf_probe(struct flash_bank *bank) static int mb9bf_probe(struct flash_bank *bank)

1
src/flash/nor/tms470.c
View File

@ -709,6 +709,7 @@ static int tms470_erase_sector(struct flash_bank *bank, int sector)
* Select one or more bits in FMBSEA or FMBSEB to disable Level 1 * Select one or more bits in FMBSEA or FMBSEB to disable Level 1
* protection for the particular sector to be erased/written. * protection for the particular sector to be erased/written.
*/ */
assert(sector >= 0);
if (sector < 16) { if (sector < 16) {
target_read_u32(target, 0xFFE88008, &fmbsea); target_read_u32(target, 0xFFE88008, &fmbsea);
target_write_u32(target, 0xFFE88008, fmbsea | (1 << sector)); target_write_u32(target, 0xFFE88008, fmbsea | (1 << sector));