From f018cd7d90243ab29c3cad25caf6932d1f1b83ea Mon Sep 17 00:00:00 2001 From: Marc Schink Date: Wed, 6 Dec 2023 18:08:50 +0100 Subject: [PATCH] jtag: Rename 'hasidcode' to 'has_idcode' While at it, fix some coding style issues. Change-Id: I8196045f46ce043ed0d28cb95470132b3a7de1bb Signed-off-by: Marc Schink Reviewed-on: https://review.openocd.org/c/openocd/+/8039 Tested-by: jenkins Reviewed-by: Antonio Borneo --- src/flash/nor/xcf.c | 2 +- src/jtag/core.c | 6 +++--- src/jtag/hla/hla_interface.c | 2 +- src/jtag/jtag.h | 2 +- src/pld/intel.c | 2 +- src/pld/lattice.c | 4 ++-- src/target/dsp563xx.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/flash/nor/xcf.c b/src/flash/nor/xcf.c index 287072551..c253b2264 100644 --- a/src/flash/nor/xcf.c +++ b/src/flash/nor/xcf.c @@ -597,7 +597,7 @@ static int xcf_probe(struct flash_bank *bank) } /* check idcode and alloc memory for sector table */ - if (!bank->target->tap->hasidcode) + if (!bank->target->tap->has_idcode) return ERROR_FLASH_OPERATION_FAILED; /* guess number of blocks using chip ID */ diff --git a/src/jtag/core.c b/src/jtag/core.c index 574801187..665a93219 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -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) { - if (tap->expected_ids_cnt == 0 || !tap->hasidcode) + if (tap->expected_ids_cnt == 0 || !tap->has_idcode) return true; /* 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 */ LOG_INFO("TAP %s does not have valid IDCODE (idcode=0x%" PRIx32 ")", tap->dotted_name, idcode); - tap->hasidcode = false; + tap->has_idcode = false; tap->idcode = 0; bit_count += 1; } else { /* Friendly devices support IDCODE */ - tap->hasidcode = true; + tap->has_idcode = true; tap->idcode = idcode; jtag_examine_chain_display(LOG_LVL_INFO, "tap/device found", tap->dotted_name, idcode); diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c index f4bfeb1a1..9c8d0fade 100644 --- a/src/jtag/hla/hla_interface.c +++ b/src/jtag/hla/hla_interface.c @@ -100,7 +100,7 @@ int hl_interface_init_target(struct target *t) } t->tap->priv = &hl_if; - t->tap->hasidcode = 1; + t->tap->has_idcode = true; return ERROR_OK; } diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index 04d1b4a2b..7353104f0 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -115,7 +115,7 @@ struct jtag_tap { uint32_t idcode; /**< device identification code */ /** not all devices have idcode, * we'll discover this during chain examination */ - bool hasidcode; + bool has_idcode; /** Array of expected identification codes */ uint32_t *expected_ids; diff --git a/src/pld/intel.c b/src/pld/intel.c index 8422c94c4..a39e16c21 100644 --- a/src/pld/intel.c +++ b/src/pld/intel.c @@ -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) { - if (!intel_info->tap->hasidcode) { + if (!intel_info->tap->has_idcode) { LOG_ERROR("no IDCODE"); return ERROR_FAIL; } diff --git a/src/pld/lattice.c b/src/pld/lattice.c index cd72d3cb5..2997cdc39 100644 --- a/src/pld/lattice.c +++ b/src/pld/lattice.c @@ -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) return ERROR_OK; - if (!lattice_device->tap || !lattice_device->tap->hasidcode) + if (!lattice_device->tap || !lattice_device->tap->has_idcode) return ERROR_FAIL; 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; struct jtag_tap *tap = lattice_device->tap; - if (!tap || !tap->hasidcode) + if (!tap || !tap->has_idcode) return ERROR_FAIL; int retval = lattice_check_device_family(lattice_device); diff --git a/src/target/dsp563xx.c b/src/target/dsp563xx.c index 578920154..80cca1ed5 100644 --- a/src/target/dsp563xx.c +++ b/src/target/dsp563xx.c @@ -912,7 +912,7 @@ static int dsp563xx_examine(struct target *target) { uint32_t chip; - if (target->tap->hasidcode == false) { + if (!target->tap->has_idcode) { LOG_ERROR("no IDCODE present on device"); return ERROR_COMMAND_SYNTAX_ERROR; } -- 2.11.4.GIT