summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2010-06-15 23:02:46 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-06-15 23:02:46 +0200
commit9161b5fc5c4655b5320b16d52f1ab3311d69e97d (patch)
tree6a965eb47fbe2e77cde6109ee375d442dd5c2beb
parent395d3bff8ce59d6c5a34e0a626010343ca9909ba (diff)
downloadopenocd+libswd-9161b5fc5c4655b5320b16d52f1ab3311d69e97d.tar.gz
openocd+libswd-9161b5fc5c4655b5320b16d52f1ab3311d69e97d.tar.bz2
openocd+libswd-9161b5fc5c4655b5320b16d52f1ab3311d69e97d.tar.xz
openocd+libswd-9161b5fc5c4655b5320b16d52f1ab3311d69e97d.zip
zy1000: -Wshadow warning fix
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
-rw-r--r--src/jtag/zy1000/zy1000.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 13685f85..b50e96a8 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -508,7 +508,7 @@ static void shiftValueInnerFlip(const tap_state_t state, const tap_state_t endSt
#endif
// here we shuffle N bits out/in
-static __inline void scanBits(const uint8_t *out_value, uint8_t *in_value, int num_bits, bool pause, tap_state_t shiftState, tap_state_t end_state)
+static __inline void scanBits(const uint8_t *out_value, uint8_t *in_value, int num_bits, bool pause_now, tap_state_t shiftState, tap_state_t end_state)
{
tap_state_t pause_state = shiftState;
for (int j = 0; j < num_bits; j += 32)
@@ -518,7 +518,7 @@ static __inline void scanBits(const uint8_t *out_value, uint8_t *in_value, int n
{
k = 32;
/* we have more to shift out */
- } else if (pause)
+ } else if (pause_now)
{
/* this was the last to shift out this time */
pause_state = end_state;