Simplify jtag_add_reset:

[openocd.git] / src / jtag / jtag.c

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index b4d0cae89c66d1955a25cb121c778902ddcceb92..f53bd26cf370e708bebe6145dd11f82ba04d1fa7 100644 (file)
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -606,8 +606,6 @@ void jtag_add_tlr(void)
 void jtag_add_pathmove(int num_states, const tap_state_t *path)
 {
        tap_state_t cur_state = cmd_queue_cur_state;
-       int i;
-       int retval;
 
        /* the last state has to be a stable state */
        if (!tap_is_state_stable(path[num_states - 1]))
@@ -616,7 +614,7 @@ void jtag_add_pathmove(int num_states, const tap_state_t *path)
                exit(-1);
        }
 
-       for (i=0; i<num_states; i++)
+       for (int i = 0; i < num_states; i++)
        {
                if (path[i] == TAP_RESET)
                {
@@ -627,7 +625,8 @@ void jtag_add_pathmove(int num_states, const tap_state_t *path)
                if ( tap_state_transition(cur_state, true)  != path[i]
                  && tap_state_transition(cur_state, false) != path[i])
                {
-                       LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_name(cur_state), tap_state_name(path[i]));
+                       LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition",
+                                       tap_state_name(cur_state), tap_state_name(path[i]));
                        exit(-1);
                }
                cur_state = path[i];
@@ -635,51 +634,37 @@ void jtag_add_pathmove(int num_states, const tap_state_t *path)
 
        jtag_checks();
 
-       retval = interface_jtag_add_pathmove(num_states, path);
+       jtag_set_error(interface_jtag_add_pathmove(num_states, path));
        cmd_queue_cur_state = path[num_states - 1];
-       if (retval!=ERROR_OK)
-               jtag_error=retval;
 }
 
 void jtag_add_runtest(int num_cycles, tap_state_t state)
 {
-       int retval;
-
        jtag_prelude(state);
-
-       /* executed by sw or hw fifo */
-       retval=interface_jtag_add_runtest(num_cycles, state);
-       if (retval!=ERROR_OK)
-               jtag_error=retval;
+       jtag_set_error(interface_jtag_add_runtest(num_cycles, state));
 }
 
 
-void jtag_add_clocks( int num_cycles )
+void jtag_add_clocks(int num_cycles)
 {
-       int retval;
-
-       if( !tap_is_state_stable(cmd_queue_cur_state) )
+       if (!tap_is_state_stable(cmd_queue_cur_state))
        {
-                LOG_ERROR( "jtag_add_clocks() was called with TAP in non-stable state \"%s\"",
-                                tap_state_name(cmd_queue_cur_state) );
-                jtag_error = ERROR_JTAG_NOT_STABLE_STATE;
+                LOG_ERROR("jtag_add_clocks() called with TAP in unstable state \"%s\"",
+                                tap_state_name(cmd_queue_cur_state));
+                jtag_set_error(ERROR_JTAG_NOT_STABLE_STATE);
                 return;
        }
 
-       if( num_cycles > 0 )
+       if (num_cycles > 0)
        {
                jtag_checks();
-
-               retval = interface_jtag_add_clocks(num_cycles);
-               if (retval != ERROR_OK)
-                       jtag_error=retval;
+               jtag_set_error(interface_jtag_add_clocks(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...
@@ -703,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;
        }
 
@@ -716,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;
        }
 
@@ -736,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();