From 13388f1d8a7687d1b5bc7ff21518c4b7d25a8745 Mon Sep 17 00:00:00 2001 From: Rodrigo L. Rosa Date: Tue, 9 Aug 2011 11:25:23 -0700 Subject: [PATCH 2/2] fix tapenabler return code if tap enable/disable failed then a warning was written to the log, but JIM_OK was returned. if using openocd via a TCP interface to the TCL port, there is no way to catch that the command failed (it didn't enable the tap, so it failed) now it return an error if it fails. --- src/jtag/tcl.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index 267802e..3b2f83b 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -774,11 +774,15 @@ static int jim_jtag_tap_enabler(Jim_Interp *interp, int argc, Jim_Obj *const *ar if (strcasecmp(cmd_name, "tapisenabled") == 0) { // do nothing, just return the value } else if (strcasecmp(cmd_name, "tapenable") == 0) { - if (!jtag_tap_enable(t)) + if (!jtag_tap_enable(t)){ LOG_WARNING("failed to enable tap %s", t->dotted_name); + return JIM_ERR; + } } else if (strcasecmp(cmd_name, "tapdisable") == 0) { - if (!jtag_tap_disable(t)) + if (!jtag_tap_disable(t)){ LOG_WARNING("failed to disable tap %s", t->dotted_name); + return JIM_ERR; + } } else { LOG_ERROR("command '%s' unknown", cmd_name); return JIM_ERR; -- 1.7.0.4