diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2010-03-18 12:11:58 -0700 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2010-03-18 12:11:58 -0700 |
| commit | c09035ea2cb24dee300476a3502919d23d90d1f5 (patch) | |
| tree | 1cd32a7ce1d3d0d89b098e490721a9754bae351c /src/target/adi_v5_jtag.c | |
| parent | 52a788e008ecf0ca6156f02de08a0f062d49a236 (diff) | |
| parent | ec108ff59e23ec32abf1223488ad96dd26205a5b (diff) | |
| download | openocd+libswd-c09035ea2cb24dee300476a3502919d23d90d1f5.tar.gz openocd+libswd-c09035ea2cb24dee300476a3502919d23d90d1f5.tar.bz2 openocd+libswd-c09035ea2cb24dee300476a3502919d23d90d1f5.tar.xz openocd+libswd-c09035ea2cb24dee300476a3502919d23d90d1f5.zip | |
Merge branch 'master' of ssh://dbrownell@openocd.git.sourceforge.net/gitroot/openocd/openocd
Diffstat (limited to 'src/target/adi_v5_jtag.c')
| -rw-r--r-- | src/target/adi_v5_jtag.c | 7 |
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; |