summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-23 20:50:06 +0000
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-23 20:50:06 +0000
commitb6d87ad03d4101b828287c91948249c2f5d89791 (patch)
tree14775f8d9905d9d0e6a4a9ac61a853836a5a817c
parentd305e2c35bfbdf27cc2bb186bf1b4f5f9fb141c6 (diff)
downloadopenocd_libswd-b6d87ad03d4101b828287c91948249c2f5d89791.tar.gz
openocd_libswd-b6d87ad03d4101b828287c91948249c2f5d89791.tar.bz2
openocd_libswd-b6d87ad03d4101b828287c91948249c2f5d89791.tar.xz
openocd_libswd-b6d87ad03d4101b828287c91948249c2f5d89791.zip
Submitted by Magnus Lundin <lundin@mlu.mine.nu>:
- Add jtag_execute_queue in jtag_add_reset after interface_jtag_add_reset. - Use tap_set_state to demark TAP_RESET, instead of cmd_queue_cur_state - cmd_queue_cur_state needs to be retired. git-svn-id: svn://svn.berlios.de/openocd/trunk@1892 b42882b7-edfa-0310-969c-e2dbd0fdcd60
-rw-r--r--src/jtag/jtag.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 4b2e85c1..fce0eb8a 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -1253,6 +1253,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
jtag_error=retval;
return;
}
+ jtag_execute_queue();
if (jtag_srst)
{
@@ -1280,7 +1281,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
* and inform possible listeners about this
*/
LOG_DEBUG("TRST line asserted");
- cmd_queue_cur_state = TAP_RESET;
+ tap_set_state(TAP_RESET);
jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
}
else