X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=69ed7601e63689343f9256e330b3a6868dc93fcd;hp=d376f5f8e1b1b5923419a9466349e931be483013;hb=630fc86ee339aa400f58fe80cbc5a1926eb3ef39;hpb=c25fda2c95f130d758c7784277fe5f2693ff3dd4

diff --git a/src/openocd.c b/src/openocd.c
index d376f5f8e1..69ed7601e6 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -31,10 +31,10 @@
 #include "openocd.h"
 #include <jtag/driver.h>
 #include <jtag/jtag.h>
+#include <jtag/transport.h>
 #include <helper/ioutil.h>
+#include <helper/util.h>
 #include <helper/configuration.h>
-#include <xsvf/xsvf.h>
-#include <svf/svf.h>
 #include <flash/nor/core.h>
 #include <flash/nand/core.h>
 #include <pld/pld.h>
@@ -120,22 +120,24 @@ COMMAND_HANDLER(handle_init_command)
 		/* we must be able to set up the debug adapter */
 		return retval;
 	}
+
 	LOG_DEBUG("Debug Adapter init complete");
 
-	/* 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...
+	/* "transport init" verifies the expected devices are present;
+	 * for JTAG, it checks the list of configured TAPs against
+	 * what's discoverable, possibly with help from the platform's
+	 * JTAG event handlers.  (which require COMMAND_EXEC)
 	 */
 	command_context_mode(CMD_CTX, COMMAND_EXEC);
-	if (command_run_line(CMD_CTX, "jtag init") == ERROR_OK)
-	{
-		LOG_DEBUG("Examining targets...");
-		if (target_examine() != ERROR_OK)
-			LOG_DEBUG("target examination failed");
-	}
-	else
-		LOG_WARNING("jtag initialization failed; try 'jtag init' again.");
+
+	retval = command_run_line(CMD_CTX, "transport init");
+	if (ERROR_OK != retval)
+		return ERROR_FAIL;
+
+	LOG_DEBUG("Examining targets...");
+	if (target_examine() != ERROR_OK)
+		LOG_DEBUG("target examination failed");
+
 	command_context_mode(CMD_CTX, COMMAND_CONFIG);
 
 	if (command_run_line(CMD_CTX, "flash init") != ERROR_OK)
@@ -159,6 +161,16 @@ COMMAND_HANDLER(handle_init_command)
 	return ERROR_OK;
 }
 
+COMMAND_HANDLER(handle_add_script_search_dir_command)
+{
+	if (CMD_ARGC != 1)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	add_script_search_dir(CMD_ARGV[0]);
+
+	return ERROR_OK;
+}
+
 static const struct command_registration openocd_command_handlers[] = {
 	{
 		.name = "version",
@@ -181,18 +193,27 @@ static const struct command_registration openocd_command_handlers[] = {
 			"Unless 'noinit' is called, this command is "
 			"called automatically at the end of startup.",
 
+	},
+	{
+		.name = "add_script_search_dir",
+		.handler = &handle_add_script_search_dir_command,
+		.mode = COMMAND_ANY,
+		.help = "dir to search for config files and scripts",
+
 	},
 	COMMAND_REGISTRATION_DONE
 };
 
-int openocd_register_commands(struct command_context *cmd_ctx)
+static 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 */
+/* NB! this fn can be invoked outside this file for non PC hosted builds
+ * NB! do not change to 'static'!!!!
+ */
 struct command_context *setup_command_handler(Jim_Interp *interp)
 {
 	log_init();
@@ -208,10 +229,8 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
 		&server_register_commands,
 		&gdb_register_commands,
 		&log_register_commands,
+		&transport_register_commands,
 		&interface_register_commands,
-		&jtag_register_commands,
-		&xsvf_register_commands,
-		&svf_register_commands,
 		&target_register_commands,
 		&flash_register_commands,
 		&nand_register_commands,
@@ -250,6 +269,9 @@ int openocd_main(int argc, char *argv[])
 
 	cmd_ctx = setup_command_handler(NULL);
 
+	if (util_init(cmd_ctx) != ERROR_OK)
+		return EXIT_FAILURE;
+
 	if (ioutil_init(cmd_ctx) != ERROR_OK)
 		return EXIT_FAILURE;