summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-06-18 13:49:54 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-06-18 13:49:54 +0000
commitf27871b2400a1397cb87e1702524fdbb42995458 (patch)
tree4d0d31916076fb5a7e4339ee0432ddc2449e5366 /src
parent5728fdce2147e4b39f2c4930f3d58b2adee3514a (diff)
downloadopenocd+libswd-f27871b2400a1397cb87e1702524fdbb42995458.tar.gz
openocd+libswd-f27871b2400a1397cb87e1702524fdbb42995458.tar.bz2
openocd+libswd-f27871b2400a1397cb87e1702524fdbb42995458.tar.xz
openocd+libswd-f27871b2400a1397cb87e1702524fdbb42995458.zip
Pavel Chromy: TAP state changed to TLR when SRST goes active with srst_pulls_trst, as in all other drivers
git-svn-id: svn://svn.berlios.de/openocd/trunk@715 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/jtag/bitq.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c
index 93bb3063..6bbfab58 100644
--- a/src/jtag/bitq.c
+++ b/src/jtag/bitq.c
@@ -283,6 +283,10 @@ int bitq_execute_queue(void)
#ifdef _DEBUG_JTAG_IO_
LOG_DEBUG("reset trst: %i srst %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst);
#endif
+ if ((cmd->cmd.reset->trst == 1) || (cmd->cmd.reset->srst && (jtag_reset_config & RESET_SRST_PULLS_TRST)))
+ {
+ cur_state = TAP_TLR;
+ }
bitq_interface->reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
if (bitq_interface->in_rdy()) bitq_in_proc();
break;