summaryrefslogtreecommitdiff
path: root/src/jtag
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-05-19 18:54:50 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-05-19 18:54:50 +0000
commitb723e78d70648304d8e813a86fc81c2c9e82380f (patch)
tree39f3162c39f58572079bd5a834a1635387b39f49 /src/jtag
parent454b0a65e6addf87c12da37bb4121d330aec262c (diff)
downloadopenocd_libswd-b723e78d70648304d8e813a86fc81c2c9e82380f.tar.gz
openocd_libswd-b723e78d70648304d8e813a86fc81c2c9e82380f.tar.bz2
openocd_libswd-b723e78d70648304d8e813a86fc81c2c9e82380f.tar.xz
openocd_libswd-b723e78d70648304d8e813a86fc81c2c9e82380f.zip
Michael Fischer found this bogus warning. Fixed.
Error: jtag.c:941 jtag_add_reset(): BUG: transition of req_tlr_or_trst ... git-svn-id: svn://svn.berlios.de/openocd/trunk@665 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag')
-rw-r--r--src/jtag/jtag.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index e78d99d9..1e0e889b 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -930,8 +930,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
*/
if ((jtag_reset_config & RESET_HAS_SRST)&&
(jtag_reset_config & RESET_HAS_TRST)&&
- ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0)&&
- ((jtag_reset_config & RESET_TRST_PULLS_SRST)==0))
+ ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0))
{
if (((req_tlr_or_trst&&!jtag_trst)||
(!req_tlr_or_trst&&jtag_trst))&&
@@ -1593,8 +1592,7 @@ int jtag_init_reset(struct command_context_s *cmd_ctx)
if (jtag_reset_config & RESET_HAS_SRST)
{
jtag_add_reset(1, 1);
- if ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0)
- jtag_add_reset(0, 1);
+ jtag_add_reset(0, 1);
}
jtag_add_reset(0, 0);
if ((retval = jtag_execute_queue()) != ERROR_OK)