jlink: fix -Wshadow warning

Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
This commit is contained in:
Antonio Borneo 2010-06-17 23:13:08 +08:00 committed by Øyvind Harboe
parent d4e4da0fa1
commit f2f798fdd3
1 changed files with 7 additions and 7 deletions

View File

@ -712,9 +712,9 @@ static void jlink_tap_ensure_space(int scans, int bits)
static void jlink_tap_append_step(int tms, int tdi) 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"); LOG_ERROR("jlink_tap_append_step: overflow");
*(uint32_t *)0xFFFFFFFF = 0; *(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 // we do not pad TMS, so be sure to initialize all bits
if (0 == bit_index) if (0 == bit_index)
{ {
tms_buffer[index] = tdi_buffer[index] = 0; tms_buffer[index_var] = tdi_buffer[index_var] = 0;
} }
if (tms) if (tms)
tms_buffer[index] |= bit; tms_buffer[index_var] |= bit;
else else
tms_buffer[index] &= ~bit; tms_buffer[index_var] &= ~bit;
if (tdi) if (tdi)
tdi_buffer[index] |= bit; tdi_buffer[index_var] |= bit;
else else
tdi_buffer[index] &= ~bit; tdi_buffer[index_var] &= ~bit;
tap_length++; tap_length++;
} }