From: Paul Fertser <fercerpav@gmail.com>
Date: Sat, 7 Jan 2017 18:51:32 +0000 (+0300)
Subject: jtag: core: report TRST and SRST as asserted only when they really are
X-Git-Tag: v0.10.0-rc2~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=af4a2f35184e856c08d4727393ecf9b9f09ae65b;p=openocd

jtag: core: report TRST and SRST as asserted only when they really are

When SRST is never enabled, the global jtag_srst variable is left at its
initial state, that is, -1, and it does _not_ mean SRST is currently
asserted. Same about TRST.

Fixes "reset halt" in cases when srst_pulls_trst but srst usage is not
enabled.

Change-Id: I8d2e9120479de4cfbf5561033926c9ef945eecc9
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/3943
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
---

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 77269e4f..8c79eb23 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -1717,11 +1717,11 @@ void jtag_set_reset_config(enum reset_types type)
 
 int jtag_get_trst(void)
 {
-	return jtag_trst;
+	return jtag_trst == 1;
 }
 int jtag_get_srst(void)
 {
-	return jtag_srst;
+	return jtag_srst == 1;
 }
 
 void jtag_set_nsrst_delay(unsigned delay)