summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Borneo <borneo.antonio@gmail.com>2010-06-17 23:13:08 +0800
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-06-17 18:14:20 +0200
commitf2f798fdd3a4c6d221569ba278945385c2f47504 (patch)
tree295bf482a1666f74ed3f84a7af533c5a56afd40c
parentd4e4da0fa177c640196e5bc3476ed03c3a70be00 (diff)
downloadopenocd+libswd-f2f798fdd3a4c6d221569ba278945385c2f47504.tar.gz
openocd+libswd-f2f798fdd3a4c6d221569ba278945385c2f47504.tar.bz2
openocd+libswd-f2f798fdd3a4c6d221569ba278945385c2f47504.tar.xz
openocd+libswd-f2f798fdd3a4c6d221569ba278945385c2f47504.zip
jlink: fix -Wshadow warning
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
-rw-r--r--src/jtag/drivers/jlink.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 34fce388..52f12b43 100644
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -712,9 +712,9 @@ static void jlink_tap_ensure_space(int scans, int bits)
static void jlink_tap_append_step(int tms, int tdi)
{
- int index = tap_length / 8;
+ int index_var = tap_length / 8;
- if (index >= JLINK_TAP_BUFFER_SIZE)
+ if (index_var >= JLINK_TAP_BUFFER_SIZE)
{
LOG_ERROR("jlink_tap_append_step: overflow");
*(uint32_t *)0xFFFFFFFF = 0;
@@ -727,18 +727,18 @@ static void jlink_tap_append_step(int tms, int tdi)
// we do not pad TMS, so be sure to initialize all bits
if (0 == bit_index)
{
- tms_buffer[index] = tdi_buffer[index] = 0;
+ tms_buffer[index_var] = tdi_buffer[index_var] = 0;
}
if (tms)
- tms_buffer[index] |= bit;
+ tms_buffer[index_var] |= bit;
else
- tms_buffer[index] &= ~bit;
+ tms_buffer[index_var] &= ~bit;
if (tdi)
- tdi_buffer[index] |= bit;
+ tdi_buffer[index_var] |= bit;
else
- tdi_buffer[index] &= ~bit;
+ tdi_buffer[index_var] &= ~bit;
tap_length++;
}