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

flash/nor/stm32f1x: Some small code cleanups 

Change-Id: I1fc08b96b179a1376af233b713ae50d6ad7867a0
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/5404
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
This commit is contained in:
Marc Schink 2020-01-19 16:56:16 +01:00 committed by Tomas Vanek
parent a08d7b7093
commit 2a60ae7fee
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/stm32f1x.c
View File

@ -116,7 +116,7 @@ struct stm32x_options {
struct stm32x_flash_bank { struct stm32x_flash_bank {
struct stm32x_options option_bytes; struct stm32x_options option_bytes;
int ppage_size; int ppage_size;
int probed; bool probed;
bool has_dual_banks; bool has_dual_banks;
/* used to access dual flash bank stm32xl */ /* used to access dual flash bank stm32xl */
@ -145,7 +145,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
stm32x_info = malloc(sizeof(struct stm32x_flash_bank)); stm32x_info = malloc(sizeof(struct stm32x_flash_bank));
bank->driver_priv = stm32x_info; bank->driver_priv = stm32x_info;
stm32x_info->probed = 0; stm32x_info->probed = false;
stm32x_info->has_dual_banks = false; stm32x_info->has_dual_banks = false;
stm32x_info->can_load_options = false; stm32x_info->can_load_options = false;
stm32x_info->register_base = FLASH_REG_BASE_B0; stm32x_info->register_base = FLASH_REG_BASE_B0;
@ -368,7 +368,6 @@ static int stm32x_protect_check(struct flash_bank *bank)
static int stm32x_erase(struct flash_bank *bank, int first, int last) static int stm32x_erase(struct flash_bank *bank, int first, int last)
{ {
struct target *target = bank->target; struct target *target = bank->target;
int i;
if (bank->target->state != TARGET_HALTED) { if (bank->target->state != TARGET_HALTED) {
LOG_ERROR("Target not halted"); LOG_ERROR("Target not halted");
@ -386,7 +385,7 @@ static int stm32x_erase(struct flash_bank *bank, int first, int last)
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
for (i = first; i <= last; i++) { for (int i = first; i <= last; i++) {
retval = target_write_u32(target, stm32x_get_flash_reg(bank, STM32_FLASH_CR), FLASH_PER); retval = target_write_u32(target, stm32x_get_flash_reg(bank, STM32_FLASH_CR), FLASH_PER);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -697,7 +696,7 @@ static int stm32x_probe(struct flash_bank *bank)
int page_size; int page_size;
uint32_t base_address = 0x08000000; uint32_t base_address = 0x08000000;
stm32x_info->probed = 0; stm32x_info->probed = false;
stm32x_info->register_base = FLASH_REG_BASE_B0; stm32x_info->register_base = FLASH_REG_BASE_B0;
stm32x_info->user_data_offset = 10; stm32x_info->user_data_offset = 10;
stm32x_info->option_offset = 0; stm32x_info->option_offset = 0;
@ -886,7 +885,7 @@ static int stm32x_probe(struct flash_bank *bank)
if (num_prot_blocks == 32) if (num_prot_blocks == 32)
bank->prot_blocks[31].size = (num_pages - (31 * stm32x_info->ppage_size)) * page_size; bank->prot_blocks[31].size = (num_pages - (31 * stm32x_info->ppage_size)) * page_size;
stm32x_info->probed = 1; stm32x_info->probed = true;
return ERROR_OK; return ERROR_OK;
} }
@ -1474,8 +1473,6 @@ static int stm32x_mass_erase(struct flash_bank *bank)
COMMAND_HANDLER(stm32x_handle_mass_erase_command) COMMAND_HANDLER(stm32x_handle_mass_erase_command)
{ {
int i;
if (CMD_ARGC < 1) if (CMD_ARGC < 1)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
@ -1487,7 +1484,7 @@ COMMAND_HANDLER(stm32x_handle_mass_erase_command)
retval = stm32x_mass_erase(bank); retval = stm32x_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, "stm32x mass erase complete"); command_print(CMD, "stm32x mass erase complete");