From b550f70100794d8dfa91d2760324041828836f82 Mon Sep 17 00:00:00 2001 From: zwelch Date: Sun, 7 Jun 2009 05:24:20 +0000 Subject: [PATCH] Factoring of jtag_examine_chain for maintainability: - Limit scope: move tap and bit_count variables to point of first use. git-svn-id: svn://svn.berlios.de/openocd/trunk@2090 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/jtag.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index d94bebe13e..96565d949e 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -1064,9 +1064,7 @@ static bool jtag_examine_chain_match_tap(const struct jtag_tap_s *tap) */ static int jtag_examine_chain(void) { - jtag_tap_t *tap; u8 idcode_buffer[JTAG_MAX_CHAIN_SIZE * 4]; - int bit_count; int device_count = 0; jtag_examine_chain_execute(idcode_buffer, JTAG_MAX_CHAIN_SIZE); @@ -1075,14 +1073,14 @@ static int jtag_examine_chain(void) return ERROR_JTAG_INIT_FAILED; /* point at the 1st tap */ - tap = jtag_tap_next_enabled(NULL); + jtag_tap_t *tap = jtag_tap_next_enabled(NULL); if (tap == NULL) { LOG_ERROR("JTAG: No taps enabled?"); return ERROR_JTAG_INIT_FAILED; } - for (bit_count = 0; bit_count < (JTAG_MAX_CHAIN_SIZE * 32) - 31;) + for (unsigned bit_count = 0; bit_count < (JTAG_MAX_CHAIN_SIZE * 32) - 31;) { u32 idcode = buf_get_u32(idcode_buffer, bit_count, 32); if ((idcode & 1) == 0) -- 2.30.2