Pavel Chromy: TAP state changed to TLR when SRST goes active with srst_pulls_trst...

git-svn-id: svn://svn.berlios.de/openocd/trunk@715 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c
index 93bb30638beee9fe248526ae9729cf227b432d8a..6bbfab58eb498ed14fe771d64c40611cd8c547ff 100644 (file)
--- 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;