X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=54c454d7486b6e21cae8f17157bdc90d909d081a;hb=ec1c90e3cd53446939b4655f55166bff6b3d39f4;hp=1105d2a4366a0d8c177eae42a67a4ecf307bdc6f;hpb=08589462adf3f81b480faacecb8352428212a2f5;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index 1105d2a436..54c454d748 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -29,6 +29,7 @@
 #endif
 
 #include "openocd.h"
+#include <jtag/driver.h>
 #include <jtag/jtag.h>
 #include <helper/ioutil.h>
 #include <helper/configuration.h>
@@ -114,12 +115,12 @@ COMMAND_HANDLER(handle_init_command)
 	if (ERROR_OK != retval)
 		return ERROR_FAIL;
 
-	if ((retval = jtag_interface_init(CMD_CTX)) != ERROR_OK)
+	if ((retval = adapter_init(CMD_CTX)) != ERROR_OK)
 	{
-		/* we must be able to set up the jtag interface */
+		/* we must be able to set up the debug adapter */
 		return retval;
 	}
-	LOG_DEBUG("jtag interface init complete");
+	LOG_DEBUG("Debug Adapter init complete");
 
 	/* Try to initialize & examine the JTAG chain at this point,
 	 * but continue startup regardless.  Note that platforms
@@ -158,6 +159,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",
@@ -180,6 +191,13 @@ 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
 };
@@ -202,11 +220,12 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
 
 	/* register subsystem commands */
 	typedef int (*command_registrant_t)(struct command_context *cmd_ctx);
-	command_registrant_t command_registrants[] = {
+	static const command_registrant_t command_registrants[] = {
 		&openocd_register_commands,
 		&server_register_commands,
 		&gdb_register_commands,
 		&log_register_commands,
+		&interface_register_commands,
 		&jtag_register_commands,
 		&xsvf_register_commands,
 		&svf_register_commands,
@@ -228,7 +247,8 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
 	}
 	LOG_DEBUG("command registration: complete");
 
-	LOG_OUTPUT(OPENOCD_VERSION "\n");
+	LOG_OUTPUT(OPENOCD_VERSION "\n"
+			"Licensed under GNU GPL v2\n");
 
 	global_cmd_ctx = cmd_ctx;
 
@@ -294,7 +314,7 @@ int openocd_main(int argc, char *argv[])
 	/* free commandline interface */
 	command_done(cmd_ctx);
 
-	jtag_interface_quit();
+	adapter_quit();
 
 	return ret;
 }