diff options
| author | Marc Schink <dev@zapb.de> | 2020-02-20 21:55:53 +0100 |
|---|---|---|
| committer | Tomas Vanek <vanekt@fbl.cz> | 2020-05-12 06:03:49 +0100 |
| commit | b604bc6c4ccaf81d61cd1c8a5e5c9f1b722e252e (patch) | |
| tree | 83c2d288bea3bc37431c52f02876b8637f873b39 /src/flash | |
| parent | 59cc1f6629a8d8008cd5af69792e63adecd56b7c (diff) | |
| download | riscv-openocd-b604bc6c4ccaf81d61cd1c8a5e5c9f1b722e252e.zip riscv-openocd-b604bc6c4ccaf81d61cd1c8a5e5c9f1b722e252e.tar.gz riscv-openocd-b604bc6c4ccaf81d61cd1c8a5e5c9f1b722e252e.tar.bz2 | |
flash/nor/bluenrg-x: Minor code cleanups
Change-Id: I7844eb30d58b0a23ca5bcc94181066cca6fa0861
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/5462
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Diffstat (limited to 'src/flash')
| -rw-r--r-- | src/flash/nor/bluenrg-x.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/flash/nor/bluenrg-x.c b/src/flash/nor/bluenrg-x.c index f7f5e63..fbce20d 100644 --- a/src/flash/nor/bluenrg-x.c +++ b/src/flash/nor/bluenrg-x.c @@ -74,7 +74,7 @@ const struct flash_ctrl_priv_data flash_priv_data_lp = { }; struct bluenrgx_flash_bank { - int probed; + bool probed; uint32_t die_id; const struct flash_ctrl_priv_data *flash_ptr; }; @@ -99,7 +99,7 @@ FLASH_BANK_COMMAND_HANDLER(bluenrgx_flash_bank_command) bank->driver_priv = bluenrgx_info; - bluenrgx_info->probed = 0; + bluenrgx_info->probed = false; if (CMD_ARGC < 6) return ERROR_COMMAND_SYNTAX_ERROR; @@ -133,7 +133,7 @@ static int bluenrgx_erase(struct flash_bank *bank, int first, int last) uint32_t address, command; /* check preconditions */ - if (bluenrgx_info->probed == 0) + if (!bluenrgx_info->probed) return ERROR_FLASH_BANK_NOT_PROBED; if (bank->target->state != TARGET_HALTED) { @@ -165,7 +165,7 @@ static int bluenrgx_erase(struct flash_bank *bank, int first, int last) return ERROR_FAIL; } - for (int i = 0; i < 100; i++) { + for (unsigned int i = 0; i < 100; i++) { uint32_t value; if (bluenrgx_read_flash_reg(bank, FLASH_REG_IRQRAW, &value)) { LOG_ERROR("Register write failed"); @@ -201,7 +201,7 @@ static int bluenrgx_erase(struct flash_bank *bank, int first, int last) return ERROR_FAIL; } - for (int j = 0; j < 100; j++) { + for (unsigned int j = 0; j < 100; j++) { uint32_t value; if (bluenrgx_read_flash_reg(bank, FLASH_REG_IRQRAW, &value)) { LOG_ERROR("Register write failed"); @@ -244,7 +244,7 @@ static int bluenrgx_write(struct flash_bank *bank, const uint8_t *buffer, }; /* check preconditions */ - if (bluenrgx_info->probed == 0) + if (!bluenrgx_info->probed) return ERROR_FLASH_BANK_NOT_PROBED; if ((offset + count) > bank->size) { @@ -365,7 +365,6 @@ static int bluenrgx_probe(struct flash_bank *bank) { struct bluenrgx_flash_bank *bluenrgx_info = bank->driver_priv; uint32_t idcode, size_info, die_id; - int i; int retval = target_read_u32(bank->target, BLUENRGLP_JTAG_REG, &idcode); if (retval != ERROR_OK) @@ -381,7 +380,7 @@ static int bluenrgx_probe(struct flash_bank *bank) bluenrgx_info->flash_ptr = &flash_priv_data_1; bank->base = flash_priv_data_1.flash_base; - for (i = 0; i < (int)(sizeof(flash_ctrl)/sizeof(*flash_ctrl)); i++) { + for (size_t i = 0; i < ARRAY_SIZE(flash_ctrl); i++) { if (idcode == (*flash_ctrl[i]).jtag_idcode) { bluenrgx_info->flash_ptr = flash_ctrl[i]; bank->base = (*flash_ctrl[i]).flash_base; @@ -400,14 +399,14 @@ static int bluenrgx_probe(struct flash_bank *bank) bank->num_sectors = bank->size/FLASH_PAGE_SIZE(bluenrgx_info); bank->sectors = realloc(bank->sectors, sizeof(struct flash_sector) * bank->num_sectors); - for (i = 0; i < bank->num_sectors; i++) { + for (int i = 0; i < bank->num_sectors; i++) { bank->sectors[i].offset = i * FLASH_PAGE_SIZE(bluenrgx_info); bank->sectors[i].size = FLASH_PAGE_SIZE(bluenrgx_info); bank->sectors[i].is_erased = -1; bank->sectors[i].is_protected = 0; } - bluenrgx_info->probed = 1; + bluenrgx_info->probed = true; bluenrgx_info->die_id = die_id; return ERROR_OK; |