diff options
| author | Paul Fertser <fercerpav@gmail.com> | 2014-11-02 15:16:13 +0300 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2015-01-09 08:36:52 +0000 |
| commit | 9f6d4d1302e778a4f57033f3d86c757718f2ca9f (patch) | |
| tree | adcf9dbea6778677d1a5db94054a788596bae9cb /src/jtag/drivers/jlink.c | |
| parent | c120fb6d893a89d9805d0b4d6083e47810143f2d (diff) | |
swd: handle various failure conditions
When communication with target fails for whatever reason, it makes
sense to do JTAG-to-SWD (in case the target got power-cycled or the
DAP method was reset anyhow), SWD line reset sequence (part of
JTAG-to-SWD already) and the mandatory IDCODE read. Schedule that to
be performed on the next poll.
Fix the return values for ftdi and jlink drivers to be consistent with
OpenOCD error codes and remove ad-hoc calls to perform DAP method
switching (as it's now done from the upper layer automatically).
Change-Id: Ie18797d4ce7ac43d8249f8f81f1064a2424e02be
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2371
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-by: Mateusz Manowiecki <segmentation@fault.pl>
Diffstat (limited to 'src/jtag/drivers/jlink.c')
| -rw-r--r-- | src/jtag/drivers/jlink.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c index 40d91cc4..ca57ae84 100644 --- a/src/jtag/drivers/jlink.c +++ b/src/jtag/drivers/jlink.c @@ -590,12 +590,6 @@ static int jlink_init(void) jlink_tap_execute(); } - if (swd_mode) - jlink_swd_switch_seq(NULL, JTAG_TO_SWD); - else - jlink_swd_switch_seq(NULL, SWD_TO_JTAG); - jlink_swd_run_queue(NULL); - return ERROR_OK; } @@ -1664,9 +1658,9 @@ static int jlink_swd_run_queue(struct adiv5_dap *dap) int ack = buf_get_u32(usb_in_buffer, pending_scan_results_buffer[i].first, 3); if (ack != SWD_ACK_OK) { - LOG_ERROR("SWD ack not OK: %d %s", ack, + LOG_DEBUG("SWD ack not OK: %d %s", ack, ack == SWD_ACK_WAIT ? "WAIT" : ack == SWD_ACK_FAULT ? "FAULT" : "JUNK"); - queued_retval = ack; + queued_retval = ack == SWD_ACK_WAIT ? ERROR_WAIT : ERROR_FAIL; goto skip; } else if (pending_scan_results_buffer[i].length) { uint32_t data = buf_get_u32(usb_in_buffer, 3 + pending_scan_results_buffer[i].first, 32); |