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

flash/nor/stm32lx: Minor code cleanups 

Change-Id: I6440a4eb1f65a2f8ae2914b38f21a59955e85e0d
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/5438
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Marc Schink 2020-02-06 11:02:25 +01:00 committed by Antonio Borneo
parent 4882acef80
commit 9cf7dff974
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/flash/nor/stm32lx.c
View File

@ -128,7 +128,7 @@ struct stm32lx_part_info {
}; };
struct stm32lx_flash_bank { struct stm32lx_flash_bank {
int probed; bool probed;
uint32_t idcode; uint32_t idcode;
uint32_t user_bank_size; uint32_t user_bank_size;
uint32_t flash_base; uint32_t flash_base;
@ -297,7 +297,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32lx_flash_bank_command)
bank->driver_priv = stm32lx_info; bank->driver_priv = stm32lx_info;
stm32lx_info->probed = 0; stm32lx_info->probed = false;
stm32lx_info->user_bank_size = bank->size; stm32lx_info->user_bank_size = bank->size;
/* the stm32l erased value is 0x00 */ /* the stm32l erased value is 0x00 */
@ -308,8 +308,6 @@ FLASH_BANK_COMMAND_HANDLER(stm32lx_flash_bank_command)
COMMAND_HANDLER(stm32lx_handle_mass_erase_command) COMMAND_HANDLER(stm32lx_handle_mass_erase_command)
{ {
int i;
if (CMD_ARGC < 1) if (CMD_ARGC < 1)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
@ -321,7 +319,7 @@ COMMAND_HANDLER(stm32lx_handle_mass_erase_command)
retval = stm32lx_mass_erase(bank); retval = stm32lx_mass_erase(bank);
if (retval == ERROR_OK) { if (retval == ERROR_OK) {
/* set all sectors as erased */ /* set all sectors as erased */
for (i = 0; i < bank->num_sectors; i++) for (int i = 0; i < bank->num_sectors; i++)
bank->sectors[i].is_erased = 1; bank->sectors[i].is_erased = 1;
command_print(CMD, "stm32lx mass erase complete"); command_print(CMD, "stm32lx mass erase complete");
@ -731,14 +729,13 @@ static int stm32lx_probe(struct flash_bank *bank)
{ {
struct target *target = bank->target; struct target *target = bank->target;
struct stm32lx_flash_bank *stm32lx_info = bank->driver_priv; struct stm32lx_flash_bank *stm32lx_info = bank->driver_priv;
int i;
uint16_t flash_size_in_kb; uint16_t flash_size_in_kb;
uint32_t device_id; uint32_t device_id;
uint32_t base_address = FLASH_BANK0_ADDRESS; uint32_t base_address = FLASH_BANK0_ADDRESS;
uint32_t second_bank_base; uint32_t second_bank_base;
unsigned int n; unsigned int n;
stm32lx_info->probed = 0; stm32lx_info->probed = false;
int retval = stm32lx_read_id_code(bank->target, &device_id); int retval = stm32lx_read_id_code(bank->target, &device_id);
if (retval != ERROR_OK) if (retval != ERROR_OK)
@ -852,14 +849,14 @@ static int stm32lx_probe(struct flash_bank *bank)
return ERROR_FAIL; return ERROR_FAIL;
} }
for (i = 0; i < num_sectors; i++) { for (int i = 0; i < num_sectors; i++) {
bank->sectors[i].offset = i * FLASH_SECTOR_SIZE; bank->sectors[i].offset = i * FLASH_SECTOR_SIZE;
bank->sectors[i].size = FLASH_SECTOR_SIZE; bank->sectors[i].size = FLASH_SECTOR_SIZE;
bank->sectors[i].is_erased = -1; bank->sectors[i].is_erased = -1;
bank->sectors[i].is_protected = -1; bank->sectors[i].is_protected = -1;
} }
stm32lx_info->probed = 1; stm32lx_info->probed = true;
return ERROR_OK; return ERROR_OK;
} }