[openocd-svn] Main OpenOCD repository branch, master, updated. v0.3.0-835-gadbf40a

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  adbf40a04537acba3cf5fea7b71dab6ac3249646 (commit)
      from  de27ebfa837a13309a03bfa0674513deed0d59e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit adbf40a04537acba3cf5fea7b71dab6ac3249646
Author: David Brownell <dbr...@us...>
Date:   Thu Dec 3 14:44:03 2009 -0800

    fix another init regression
    
    This makes Beagle work again, instead of losing horribly because
    the JTAG event handlers are no longer able to e.g. "runtest".  I
    get the previous quirky behavior ... comes up OK but "reset halt"
    somewhat mysteriously makes it all better.  (Instead of nothing
    being able to work at all...)  However, I'm still seeing:
    
     The 'init' command must be used before 'init'.
    
    That seems to come from invoking "jtag init", sometime after it
    gets mapped to "ocd_jtag init", according to debug message traces.
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/src/openocd.c b/src/openocd.c
index 03a57dc..da15969 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -121,18 +121,21 @@ COMMAND_HANDLER(handle_init_command)
 	}
 	LOG_DEBUG("jtag interface init complete");
 
-	/* Try to initialize & examine the JTAG chain at this point, but
-	 * continue startup regardless */
+	/* Try to initialize & examine the JTAG chain at this point,
+	 * but continue startup regardless.  Note that platforms
+	 * need to be able to provide JTAG event handlers that use
+	 * a variety of JTAG operations in order to do that...
+	 */
+	command_context_mode(CMD_CTX, COMMAND_EXEC);
 	if (command_run_line(CMD_CTX, "jtag init") == ERROR_OK)
 	{
-		command_context_mode(CMD_CTX, COMMAND_EXEC);
 		LOG_DEBUG("Examining targets...");
 		if (target_examine() != ERROR_OK)
 			LOG_DEBUG("target examination failed");
-		command_context_mode(CMD_CTX, COMMAND_CONFIG);
 	}
 	else
 		LOG_WARNING("jtag initialization failed; try 'jtag init' again.");
+	command_context_mode(CMD_CTX, COMMAND_CONFIG);
 
 	if (command_run_line(CMD_CTX, "flash init") != ERROR_OK)
 		return ERROR_FAIL;

-----------------------------------------------------------------------

Summary of changes:
 src/openocd.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository