summaryrefslogtreecommitdiff
path: root/src/jtag/bitbang.c
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-03-31 19:39:05 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-03-31 19:39:05 +0000
commitafe5371bc8bde3fc1a833c3d7e459920711a9584 (patch)
tree78600edd255a9cdfca9035ebe392f4b343bd8558 /src/jtag/bitbang.c
parent86d3e744641ef670f4376e47589afac37d9a87ab (diff)
downloadopenocd+libswd-afe5371bc8bde3fc1a833c3d7e459920711a9584.tar.gz
openocd+libswd-afe5371bc8bde3fc1a833c3d7e459920711a9584.tar.bz2
openocd+libswd-afe5371bc8bde3fc1a833c3d7e459920711a9584.tar.xz
openocd+libswd-afe5371bc8bde3fc1a833c3d7e459920711a9584.zip
Do not assert trst in srst_only case even if srst_pulls_trst.
git-svn-id: svn://svn.berlios.de/openocd/trunk@530 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag/bitbang.c')
-rw-r--r--src/jtag/bitbang.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jtag/bitbang.c b/src/jtag/bitbang.c
index a4e415c2..16b5f191 100644
--- a/src/jtag/bitbang.c
+++ b/src/jtag/bitbang.c
@@ -239,7 +239,7 @@ int bitbang_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)
+ if ((cmd->cmd.reset->trst == 1) || (cmd->cmd.reset->srst && (jtag_reset_config & RESET_SRST_PULLS_TRST)))
{
cur_state = TAP_TLR;
}