From 6f4de887f76a82fff9a9f080c497a047bfb15e4e Mon Sep 17 00:00:00 2001 From: zwelch Date: Mon, 8 Jun 2009 10:57:51 +0000 Subject: [PATCH] Simplify jtag_add_clocks: - Use jtag_set_error instead of accessing jtag_error directly. - Improve error language and whitespace. git-svn-id: svn://svn.berlios.de/openocd/trunk@2125 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/jtag.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index 4e6f269bee..4636b5f1ac 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -645,25 +645,20 @@ void jtag_add_runtest(int num_cycles, tap_state_t 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)); } } -- 2.30.2