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

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

Author: zwelch
Date: 2009-06-02 08:49:53 +0200 (Tue, 02 Jun 2009)
New Revision: 1995

Modified:
   trunk/src/jtag/jtag.c
Log:
More JTAG interface driver cleanup:
- Moves references to global jtag interface to default core implementation.
- Missed this reference in the earlier "pointless" patch.  Mea culpa.

Important: this has a side-effect.  Previously, the error return inside
the interface routine short-circuited the remainder of that function
when 'init' has not been called.  With this patch, the command queue
will be cleared in the case that 'init' has been called.  Since that
case indicates a buggy script, this does not seem to be a problem.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-02 06:33:19 UTC (rev 1994)
+++ trunk/src/jtag/jtag.c	2009-06-02 06:49:53 UTC (rev 1995)
@@ -1568,16 +1568,7 @@
 
 int interface_jtag_execute_queue(void)
 {
-	int retval;
-
-	if (jtag==NULL)
-	{
-		LOG_ERROR("No JTAG interface configured yet. Issue 'init' command in startup scripts before communicating with targets.");
-		return ERROR_FAIL;
-	}
-
-	retval = default_interface_jtag_execute_queue();
-
+	int retval = default_interface_jtag_execute_queue();
 	if (retval == ERROR_OK)
 	{
 		struct jtag_callback_entry *entry;
@@ -1598,6 +1589,14 @@
 
 int default_interface_jtag_execute_queue(void)
 {
+	if (NULL == jtag)
+	{
+		LOG_ERROR("No JTAG interface configured yet.  "
+			"Issue 'init' command in startup scripts "
+			"before communicating with targets.");
+		return ERROR_FAIL;
+	}
+
 	return jtag->execute_queue();
 }