diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2010-08-27 15:16:39 -0700 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2010-08-27 15:16:39 -0700 |
| commit | 6f841988417bdf64490604bee4f3c6d26a93a80b (patch) | |
| tree | c799df85904b05d50cacaf3305c3e83993a3043f /src | |
| parent | 5c98e063b9827ec96194375f383a54cdff31883f (diff) | |
| download | openocd+libswd-6f841988417bdf64490604bee4f3c6d26a93a80b.tar.gz openocd+libswd-6f841988417bdf64490604bee4f3c6d26a93a80b.tar.bz2 openocd+libswd-6f841988417bdf64490604bee4f3c6d26a93a80b.tar.xz openocd+libswd-6f841988417bdf64490604bee4f3c6d26a93a80b.zip | |
bitq: unshadow pause()
bitq.c: In function ‘bitq_scan_field’:
bitq.c:224: error: declaration of ‘pause’ shadows a global declaration
/usr/include/unistd.h:429: error: shadowed declaration is here
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/jtag/drivers/bitq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/jtag/drivers/bitq.c b/src/jtag/drivers/bitq.c index a58f6334..46eb27ae 100644 --- a/src/jtag/drivers/bitq.c +++ b/src/jtag/drivers/bitq.c @@ -221,7 +221,7 @@ void bitq_runtest(int num_cycles) } -void bitq_scan_field(struct scan_field* field, int pause) +void bitq_scan_field(struct scan_field* field, int do_pause) { int bit_cnt; int tdo_req; @@ -240,7 +240,7 @@ void bitq_scan_field(struct scan_field* field, int pause) for (bit_cnt = field->num_bits; bit_cnt > 1; bit_cnt--) bitq_io(0, 0, tdo_req); - bitq_io(pause, 0, tdo_req); + bitq_io(do_pause, 0, tdo_req); } else { @@ -259,10 +259,10 @@ void bitq_scan_field(struct scan_field* field, int pause) out_mask <<= 1; } - bitq_io(pause, ((*out_ptr) & out_mask) != 0, tdo_req); + bitq_io(do_pause, ((*out_ptr) & out_mask) != 0, tdo_req); } - if (pause) + if (do_pause) { bitq_io(0, 0, 0); if (tap_get_state() == TAP_IRSHIFT) |