diff options
author | Marc Schink <dev@zapb.de> | 2020-06-07 17:00:13 +0200 |
---|---|---|
committer | Tomas Vanek <vanekt@fbl.cz> | 2020-07-07 05:23:54 +0100 |
commit | ef14384b681af4f731f768bb866457832af6925f (patch) | |
tree | a8cb953d765484d4cd627eaa7ea71d9be6699866 /src/flash/nor/em357.c | |
parent | a2e6982a1816a0229bd5644156f3025a0e8cb6ce (diff) | |
download | riscv-openocd-ef14384b681af4f731f768bb866457832af6925f.zip riscv-openocd-ef14384b681af4f731f768bb866457832af6925f.tar.gz riscv-openocd-ef14384b681af4f731f768bb866457832af6925f.tar.bz2 |
flash/nor: Use proper data types in driver API
Use 'unsigned int' and 'bool' instead of 'int' where appropriate.
While at it, fix some coding style issues.
No new Clang analyzer warnings.
Change-Id: I700802c9ee81c3c7ae73108f0f8f06b15a4345f8
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/4929
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Diffstat (limited to 'src/flash/nor/em357.c')
-rw-r--r-- | src/flash/nor/em357.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/flash/nor/em357.c b/src/flash/nor/em357.c index 38fb731..a93c81e 100644 --- a/src/flash/nor/em357.c +++ b/src/flash/nor/em357.c @@ -343,10 +343,10 @@ static int em357_protect_check(struct flash_bank *bank) return ERROR_OK; } -static int em357_erase(struct flash_bank *bank, int first, int last) +static int em357_erase(struct flash_bank *bank, unsigned int first, + unsigned int last) { struct target *target = bank->target; - int i; if (bank->target->state != TARGET_HALTED) { LOG_ERROR("Target not halted"); @@ -367,7 +367,7 @@ static int em357_erase(struct flash_bank *bank, int first, int last) if (retval != ERROR_OK) return retval; - for (i = first; i <= last; i++) { + for (unsigned int i = first; i <= last; i++) { retval = target_write_u32(target, EM357_FLASH_CR, FLASH_PER); if (retval != ERROR_OK) return retval; @@ -393,12 +393,13 @@ static int em357_erase(struct flash_bank *bank, int first, int last) return ERROR_OK; } -static int em357_protect(struct flash_bank *bank, int set, int first, int last) +static int em357_protect(struct flash_bank *bank, int set, unsigned int first, + unsigned int last) { struct em357_flash_bank *em357_info = NULL; struct target *target = bank->target; uint16_t prot_reg[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}; - int i, reg, bit; + int reg, bit; int status; uint32_t protection; @@ -431,7 +432,7 @@ static int em357_protect(struct flash_bank *bank, int set, int first, int last) prot_reg[1] = (uint16_t)(protection >> 8); prot_reg[2] = (uint16_t)(protection >> 16); - for (i = first; i <= last; i++) { + for (unsigned int i = first; i <= last; i++) { reg = (i / em357_info->ppage_size) / 8; bit = (i / em357_info->ppage_size) - (reg * 8); @@ -870,8 +871,6 @@ static int em357_mass_erase(struct flash_bank *bank) COMMAND_HANDLER(em357_handle_mass_erase_command) { - int i; - if (CMD_ARGC < 1) return ERROR_COMMAND_SYNTAX_ERROR; @@ -883,7 +882,7 @@ COMMAND_HANDLER(em357_handle_mass_erase_command) retval = em357_mass_erase(bank); if (retval == ERROR_OK) { /* set all sectors as erased */ - for (i = 0; i < bank->num_sectors; i++) + for (unsigned int i = 0; i < bank->num_sectors; i++) bank->sectors[i].is_erased = 1; command_print(CMD, "em357 mass erase complete"); |