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

flash/nor/stm32h7x: Minor code cleanups 

Change-Id: Ia212b1877abeda27f507de29a3aee2b171c1b8c6
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/5448
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-by: Christopher Head <chead@zaber.com>
This commit is contained in:
Marc Schink 2020-02-10 15:39:19 +01:00 committed by Antonio Borneo
parent 608105dff8
commit 98e9d96239
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/stm32h7x.c
View File

@ -123,7 +123,7 @@ struct stm32h7x_part_info {
}; };
struct stm32h7x_flash_bank { struct stm32h7x_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_regs_base; /* Address of flash reg controller */ uint32_t flash_regs_base; /* Address of flash reg controller */
@ -167,7 +167,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
stm32x_info = malloc(sizeof(struct stm32h7x_flash_bank)); stm32x_info = malloc(sizeof(struct stm32h7x_flash_bank));
bank->driver_priv = stm32x_info; bank->driver_priv = stm32x_info;
stm32x_info->probed = 0; stm32x_info->probed = false;
stm32x_info->user_bank_size = bank->size; stm32x_info->user_bank_size = bank->size;
bank->write_start_alignment = FLASH_BLOCK_SIZE; bank->write_start_alignment = FLASH_BLOCK_SIZE;
@ -701,13 +701,12 @@ static int stm32x_probe(struct flash_bank *bank)
{ {
struct target *target = bank->target; struct target *target = bank->target;
struct stm32h7x_flash_bank *stm32x_info = bank->driver_priv; struct stm32h7x_flash_bank *stm32x_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;
stm32x_info->probed = 0; stm32x_info->probed = false;
stm32x_info->part_info = NULL; stm32x_info->part_info = NULL;
int retval = stm32x_read_id_code(bank, &stm32x_info->idcode); int retval = stm32x_read_id_code(bank, &stm32x_info->idcode);
@ -803,12 +802,12 @@ static int stm32x_probe(struct flash_bank *bank)
/* fixed memory */ /* fixed memory */
setup_sector(bank, 0, num_pages, stm32x_info->part_info->page_size * 1024); setup_sector(bank, 0, num_pages, stm32x_info->part_info->page_size * 1024);
for (i = 0; i < num_pages; i++) { for (int i = 0; i < num_pages; i++) {
bank->sectors[i].is_erased = -1; bank->sectors[i].is_erased = -1;
bank->sectors[i].is_protected = 0; bank->sectors[i].is_protected = 0;
} }
stm32x_info->probed = 1; stm32x_info->probed = true;
return ERROR_OK; return ERROR_OK;
} }
@ -980,8 +979,6 @@ flash_lock:
COMMAND_HANDLER(stm32x_handle_mass_erase_command) COMMAND_HANDLER(stm32x_handle_mass_erase_command)
{ {
int i;
if (CMD_ARGC < 1) { if (CMD_ARGC < 1) {
command_print(CMD, "stm32h7x mass_erase <bank>"); command_print(CMD, "stm32h7x mass_erase <bank>");
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
@ -995,7 +992,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, "stm32h7x mass erase complete"); command_print(CMD, "stm32h7x mass erase complete");