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

jtag: Rename 'hasidcode' to 'has_idcode' 

While at it, fix some coding style issues.

Change-Id: I8196045f46ce043ed0d28cb95470132b3a7de1bb
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: https://review.openocd.org/c/openocd/+/8039
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Marc Schink 2023-12-06 18:08:50 +01:00 committed by Antonio Borneo
parent d3d287bf67
commit f018cd7d90
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/flash/nor/xcf.c
View File

@ -597,7 +597,7 @@ static int xcf_probe(struct flash_bank *bank)
} }
/* check idcode and alloc memory for sector table */ /* check idcode and alloc memory for sector table */
if (!bank->target->tap->hasidcode) if (!bank->target->tap->has_idcode)
return ERROR_FLASH_OPERATION_FAILED; return ERROR_FLASH_OPERATION_FAILED;
/* guess number of blocks using chip ID */ /* guess number of blocks using chip ID */

6
src/jtag/core.c
View File

@ -1177,7 +1177,7 @@ static bool jtag_examine_chain_end(uint8_t *idcodes, unsigned count, unsigned ma
static bool jtag_examine_chain_match_tap(const struct jtag_tap *tap) static bool jtag_examine_chain_match_tap(const struct jtag_tap *tap)
{ {
if (tap->expected_ids_cnt == 0 || !tap->hasidcode) if (tap->expected_ids_cnt == 0 || !tap->has_idcode)
return true; return true;
/* optionally ignore the JTAG version field - bits 28-31 of IDCODE */ /* optionally ignore the JTAG version field - bits 28-31 of IDCODE */
@ -1283,13 +1283,13 @@ static int jtag_examine_chain(void)
/* Zero for LSB indicates a device in bypass */ /* Zero for LSB indicates a device in bypass */
LOG_INFO("TAP %s does not have valid IDCODE (idcode=0x%" PRIx32 ")", LOG_INFO("TAP %s does not have valid IDCODE (idcode=0x%" PRIx32 ")",
tap->dotted_name, idcode); tap->dotted_name, idcode);
tap->hasidcode = false; tap->has_idcode = false;
tap->idcode = 0; tap->idcode = 0;
bit_count += 1; bit_count += 1;
} else { } else {
/* Friendly devices support IDCODE */ /* Friendly devices support IDCODE */
tap->hasidcode = true; tap->has_idcode = true;
tap->idcode = idcode; tap->idcode = idcode;
jtag_examine_chain_display(LOG_LVL_INFO, "tap/device found", tap->dotted_name, idcode); jtag_examine_chain_display(LOG_LVL_INFO, "tap/device found", tap->dotted_name, idcode);

2
src/jtag/hla/hla_interface.c
View File

@ -100,7 +100,7 @@ int hl_interface_init_target(struct target *t)
} }
t->tap->priv = &hl_if; t->tap->priv = &hl_if;
t->tap->hasidcode = 1; t->tap->has_idcode = true;
return ERROR_OK; return ERROR_OK;
} }

2
src/jtag/jtag.h
View File

@ -115,7 +115,7 @@ struct jtag_tap {
uint32_t idcode; /**< device identification code */ uint32_t idcode; /**< device identification code */
/** not all devices have idcode, /** not all devices have idcode,
* we'll discover this during chain examination */ * we'll discover this during chain examination */
bool hasidcode; bool has_idcode;
/** Array of expected identification codes */ /** Array of expected identification codes */
uint32_t *expected_ids; uint32_t *expected_ids;

2
src/pld/intel.c
View File

@ -157,7 +157,7 @@ static int intel_check_for_unique_id(struct intel_pld_device *intel_info)
static int intel_check_config(struct intel_pld_device *intel_info) static int intel_check_config(struct intel_pld_device *intel_info)
{ {
if (!intel_info->tap->hasidcode) { if (!intel_info->tap->has_idcode) {
LOG_ERROR("no IDCODE"); LOG_ERROR("no IDCODE");
return ERROR_FAIL; return ERROR_FAIL;
} }

4
src/pld/lattice.c
View File

@ -81,7 +81,7 @@ static int lattice_check_device_family(struct lattice_pld_device *lattice_device
if (lattice_device->family != LATTICE_UNKNOWN && lattice_device->preload_length != 0) if (lattice_device->family != LATTICE_UNKNOWN && lattice_device->preload_length != 0)
return ERROR_OK; return ERROR_OK;
if (!lattice_device->tap || !lattice_device->tap->hasidcode) if (!lattice_device->tap || !lattice_device->tap->has_idcode)
return ERROR_FAIL; return ERROR_FAIL;
for (size_t i = 0; i < ARRAY_SIZE(lattice_devices); ++i) { for (size_t i = 0; i < ARRAY_SIZE(lattice_devices); ++i) {
@ -280,7 +280,7 @@ static int lattice_load_command(struct pld_device *pld_device, const char *filen
return ERROR_FAIL; return ERROR_FAIL;
struct jtag_tap *tap = lattice_device->tap; struct jtag_tap *tap = lattice_device->tap;
if (!tap || !tap->hasidcode) if (!tap || !tap->has_idcode)
return ERROR_FAIL; return ERROR_FAIL;
int retval = lattice_check_device_family(lattice_device); int retval = lattice_check_device_family(lattice_device);

2
src/target/dsp563xx.c
View File

@ -912,7 +912,7 @@ static int dsp563xx_examine(struct target *target)
{ {
uint32_t chip; uint32_t chip;
if (target->tap->hasidcode == false) { if (!target->tap->has_idcode) {
LOG_ERROR("no IDCODE present on device"); LOG_ERROR("no IDCODE present on device");
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
} }