[Openocd-svn] r2125 - trunk/src/jtag

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-08 12:57:51 +0200 (Mon, 08 Jun 2009)
New Revision: 2125

Modified:
   trunk/src/jtag/jtag.c
Log:
Simplify jtag_add_clocks:
- Use jtag_set_error instead of accessing jtag_error directly.
- Improve error language and whitespace.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-08 10:57:39 UTC (rev 2124)
+++ trunk/src/jtag/jtag.c	2009-06-08 10:57:51 UTC (rev 2125)
@@ -645,25 +645,20 @@
 }
 
 
-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));
 	}
 }