diff options
author | Paul Fertser <fercerpav@gmail.com> | 2017-01-07 21:51:32 +0300 |
---|---|---|
committer | Paul Fertser <fercerpav@gmail.com> | 2017-01-15 11:02:14 +0000 |
commit | af4a2f35184e856c08d4727393ecf9b9f09ae65b (patch) | |
tree | 761b435590d662bce741550b09345747fb3768cd /src | |
parent | 93bc4ec40ffb9c30f170af3f1e3551c4b198507f (diff) |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/jtag/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) |