From f27871b2400a1397cb87e1702524fdbb42995458 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Wed, 18 Jun 2008 13:49:54 +0000
Subject: 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
---
 src/jtag/bitq.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/jtag')

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;
-- 
cgit v1.2.3-18-g5258