arm720t: -Wshadow warning fix

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
__archive__
Øyvind Harboe 2010-06-15 23:17:00 +02:00
parent ab6e62ab76
commit da5979c38d
1 changed files with 4 additions and 4 deletions

View File

@ -41,7 +41,7 @@
#endif #endif
static int arm720t_scan_cp15(struct target *target, static int arm720t_scan_cp15(struct target *target,
uint32_t out, uint32_t *in, int instruction, int clock) uint32_t out, uint32_t *in, int instruction, int clock_arg)
{ {
int retval; int retval;
struct arm720t_common *arm720t = target_to_arm720(target); struct arm720t_common *arm720t = target_to_arm720(target);
@ -81,7 +81,7 @@ static int arm720t_scan_cp15(struct target *target,
jtag_add_dr_scan(jtag_info->tap, 2, fields, TAP_DRPAUSE); jtag_add_dr_scan(jtag_info->tap, 2, fields, TAP_DRPAUSE);
} }
if (clock) if (clock_arg)
jtag_add_runtest(0, TAP_DRPAUSE); jtag_add_runtest(0, TAP_DRPAUSE);
#ifdef _DEBUG_INSTRUCTION_EXECUTION_ #ifdef _DEBUG_INSTRUCTION_EXECUTION_
@ -93,9 +93,9 @@ static int arm720t_scan_cp15(struct target *target,
if (in) if (in)
LOG_DEBUG("out: %8.8x, in: %8.8x, instruction: %i, clock: %i", out, *in, instruction, clock); LOG_DEBUG("out: %8.8x, in: %8.8x, instruction: %i, clock: %i", out, *in, instruction, clock);
else else
LOG_DEBUG("out: %8.8x, instruction: %i, clock: %i", out, instruction, clock); LOG_DEBUG("out: %8.8x, instruction: %i, clock: %i", out, instruction, clock_arg);
#else #else
LOG_DEBUG("out: %8.8" PRIx32 ", instruction: %i, clock: %i", out, instruction, clock); LOG_DEBUG("out: %8.8" PRIx32 ", instruction: %i, clock: %i", out, instruction, clock_arg);
#endif #endif
return ERROR_OK; return ERROR_OK;