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

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

Author: zwelch
Date: 2009-06-08 12:58:28 +0200 (Mon, 08 Jun 2009)
New Revision: 2127

Modified:
   trunk/src/jtag/jtag.c
Log:
Simplify jtag_add_sleep:
- Add todo for removing keep_alive: is this a layering violation?
- Use jtag_set_error instead of accessing jtag_error directly.
- Remove superfluous retval temporary variable and empty return.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-08 10:58:13 UTC (rev 2126)
+++ trunk/src/jtag/jtag.c	2009-06-08 10:58:28 UTC (rev 2127)
@@ -783,11 +783,9 @@
 
 void jtag_add_sleep(u32 us)
 {
-	keep_alive(); /* we might be running on a very slow JTAG clk */
-	int retval=interface_jtag_add_sleep(us);
-	if (retval!=ERROR_OK)
-		jtag_error=retval;
-	return;
+	/// @todo Here, keep_alive() appears to be a layering violation!!!
+	keep_alive();
+	jtag_set_error(interface_jtag_add_sleep(us));
 }
 
 int jtag_check_value_inner(u8 *captured, u8 *in_check_value, u8 *in_check_mask, int num_bits)