summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2010-06-15 23:17:00 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-06-15 23:17:00 +0200
commitda5979c38d7b373f6aa345ff8f961f5401e67902 (patch)
treeb0acb9cfb7691c890bff0c48c9c07f54ebd62c16
parentab6e62ab76226a4596f7f728d8915acb61507b44 (diff)
downloadopenocd+libswd-da5979c38d7b373f6aa345ff8f961f5401e67902.tar.gz
openocd+libswd-da5979c38d7b373f6aa345ff8f961f5401e67902.tar.bz2
openocd+libswd-da5979c38d7b373f6aa345ff8f961f5401e67902.tar.xz
openocd+libswd-da5979c38d7b373f6aa345ff8f961f5401e67902.zip
arm720t: -Wshadow warning fix
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
-rw-r--r--src/target/arm720t.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index 8db0b5d5..0ea6cb2b 100644
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -41,7 +41,7 @@
#endif
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;
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);
}
- if (clock)
+ if (clock_arg)
jtag_add_runtest(0, TAP_DRPAUSE);
#ifdef _DEBUG_INSTRUCTION_EXECUTION_
@@ -93,9 +93,9 @@ static int arm720t_scan_cp15(struct target *target,
if (in)
LOG_DEBUG("out: %8.8x, in: %8.8x, instruction: %i, clock: %i", out, *in, instruction, clock);
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
- 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
return ERROR_OK;