summaryrefslogtreecommitdiff
path: root/src/target/adi_v5_jtag.c
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2010-03-18 12:07:41 +0100
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-03-18 12:08:11 +0100
commitec108ff59e23ec32abf1223488ad96dd26205a5b (patch)
tree199488e7e879e24a2d02822a76b8b011db81813f /src/target/adi_v5_jtag.c
parent46f92878da6c65eac275d1783e4e4019ec3c9af9 (diff)
downloadopenocd+libswd-ec108ff59e23ec32abf1223488ad96dd26205a5b.tar.gz
openocd+libswd-ec108ff59e23ec32abf1223488ad96dd26205a5b.tar.bz2
openocd+libswd-ec108ff59e23ec32abf1223488ad96dd26205a5b.tar.xz
openocd+libswd-ec108ff59e23ec32abf1223488ad96dd26205a5b.zip
jtag: retire one instance of jtag_get_end_state() usage
Less global variables.... Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/target/adi_v5_jtag.c')
-rw-r--r--src/target/adi_v5_jtag.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/target/adi_v5_jtag.c b/src/target/adi_v5_jtag.c
index 091b77ab..41443ff2 100644
--- a/src/target/adi_v5_jtag.c
+++ b/src/target/adi_v5_jtag.c
@@ -88,7 +88,7 @@ int adi_jtag_dp_scan(struct adiv5_dap *swjdp,
uint8_t out_addr_buf;
jtag_set_end_state(TAP_IDLE);
- arm_jtag_set_instr(jtag_info, instr, NULL);
+ arm_jtag_set_instr(jtag_info, instr, NULL, TAP_IDLE);
/* Scan out a read or write operation using some DP or AP register.
* For APACC access with any sticky error flag set, this is discarded.
@@ -330,10 +330,9 @@ static int jtag_idcode_q_read(struct adiv5_dap *dap,
int retval;
struct scan_field fields[1];
- jtag_set_end_state(TAP_IDLE);
-
/* This is a standard JTAG operation -- no DAP tweakage */
- retval = arm_jtag_set_instr(jtag_info, JTAG_DP_IDCODE, NULL);
+ jtag_set_end_state(TAP_IDLE);
+ retval = arm_jtag_set_instr(jtag_info, JTAG_DP_IDCODE, NULL, TAP_IDLE);
if (retval != ERROR_OK)
return retval;