X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=0ae0d19f3537bdb87217790db09ab69944a9c406;hb=c5eb8e29bdc296c2d0b25cc771639567b5f7707f;hp=cbb28b77ebf88d2bbd5503048fddc45d15867ee5;hpb=c538a830cdaafa92c9e9a624d84915cc39cce05b;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index cbb28b77eb..0ae0d19f35 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -32,10 +32,10 @@
 #include <jtag/jtag.h>
 #include <helper/ioutil.h>
 #include <helper/configuration.h>
-#include "xsvf.h"
-#include "svf.h"
+#include <xsvf/xsvf.h>
+#include <svf/svf.h>
 #include <flash/nand.h>
-#include "pld.h"
+#include <pld/pld.h>
 #include <flash/mflash.h>
 
 #include <server/server.h>
@@ -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;
@@ -171,7 +174,7 @@ static const struct command_registration openocd_command_handlers[] = {
 	{
 		.name = "init",
 		.handler = &handle_init_command,
-		.mode = COMMAND_CONFIG,
+		.mode = COMMAND_ANY,
 		.help = "Initializes configured targets and servers.  "
 			"Changes command mode from CONFIG to EXEC.  "
 			"Unless 'noinit' is called, this command is "
@@ -181,6 +184,11 @@ static const struct command_registration openocd_command_handlers[] = {
 	COMMAND_REGISTRATION_DONE
 };
 
+int openocd_register_commands(struct command_context *cmd_ctx)
+{
+	return register_commands(cmd_ctx, NULL, openocd_command_handlers);
+}
+
 struct command_context *global_cmd_ctx;
 
 /* NB! this fn can be invoked outside this file for non PC hosted builds */
@@ -189,28 +197,41 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
 	log_init();
 	LOG_DEBUG("log_init: complete");
 
-	struct command_context *cmd_ctx;
-
-	global_cmd_ctx = cmd_ctx = command_init(openocd_startup_tcl, interp);
+	const char *startup = openocd_startup_tcl;
+	struct command_context *cmd_ctx = command_init(startup, interp);
 
-	register_commands(cmd_ctx, NULL, openocd_command_handlers);
 	/* register subsystem commands */
-	server_register_commands(cmd_ctx);
-	gdb_register_commands(cmd_ctx);
-	log_register_commands(cmd_ctx);
-	jtag_register_commands(cmd_ctx);
-	xsvf_register_commands(cmd_ctx);
-	svf_register_commands(cmd_ctx);
-	target_register_commands(cmd_ctx);
-	flash_register_commands(cmd_ctx);
-	nand_register_commands(cmd_ctx);
-	pld_register_commands(cmd_ctx);
-	mflash_register_commands(cmd_ctx);
-
+	typedef int (*command_registrant_t)(struct command_context *cmd_ctx);
+	command_registrant_t command_registrants[] = {
+		&openocd_register_commands,
+		&server_register_commands,
+		&gdb_register_commands,
+		&log_register_commands,
+		&jtag_register_commands,
+		&xsvf_register_commands,
+		&svf_register_commands,
+		&target_register_commands,
+		&flash_register_commands,
+		&nand_register_commands,
+		&pld_register_commands,
+		&mflash_register_commands,
+		NULL
+	};
+	for (unsigned i = 0; NULL != command_registrants[i]; i++)
+	{
+		int retval = (*command_registrants[i])(cmd_ctx);
+		if (ERROR_OK != retval)
+		{
+			command_done(cmd_ctx);
+			return NULL;
+		}
+	}
 	LOG_DEBUG("command registration: complete");
 
 	LOG_OUTPUT(OPENOCD_VERSION "\n");
 
+	global_cmd_ctx = cmd_ctx;
+
 	return cmd_ctx;
 }