From 8c21ca7e81d3408392e6691fc34cb793eb964749 Mon Sep 17 00:00:00 2001 From: zwelch Date: Mon, 8 Jun 2009 10:58:13 +0000 Subject: [PATCH] Simplify jtag_add_reset: - Use jtag_set_error instead of accessing jtag_error directly. - Remove superfluous retval temporary variable. git-svn-id: svn://svn.berlios.de/openocd/trunk@2126 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/jtag.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index 4636b5f1..f53bd26c 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -665,7 +665,6 @@ void jtag_add_clocks(int num_cycles) void jtag_add_reset(int req_tlr_or_trst, int req_srst) { int trst_with_tlr = 0; - int retval; /* FIX!!! there are *many* different cases here. A better * approach is needed for legal combinations of transitions... @@ -689,7 +688,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst) if (((jtag_reset_config & RESET_SRST_PULLS_TRST) && (req_srst == 1)) && (!req_tlr_or_trst)) { LOG_ERROR("BUG: requested reset would assert trst"); - jtag_error=ERROR_FAIL; + jtag_set_error(ERROR_FAIL); return; } @@ -702,7 +701,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst) if (req_srst && !(jtag_reset_config & RESET_HAS_SRST)) { LOG_ERROR("BUG: requested SRST assertion, but the current configuration doesn't support this"); - jtag_error=ERROR_FAIL; + jtag_set_error(ERROR_FAIL); return; } @@ -722,10 +721,10 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst) jtag_srst = req_srst; - retval = interface_jtag_add_reset(jtag_trst, jtag_srst); - if (retval!=ERROR_OK) + int retval = interface_jtag_add_reset(jtag_trst, jtag_srst); + if (retval != ERROR_OK) { - jtag_error=retval; + jtag_set_error(retval); return; } jtag_execute_queue(); -- 2.39.5