X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=379373cedba3da680d8e61bca0ecd2eb56984886;hp=e35a0ae596a89296cb1e54c92f3ab250d2fed574;hb=833e7f5248778bcb31b4db1a1b91160995415203;hpb=1186f7efa72a86a7000dce60b090bd4f822cdceb

diff --git a/src/openocd.c b/src/openocd.c
index e35a0ae596..379373cedb 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -28,11 +28,11 @@
 #include "config.h"
 #endif
 
+#include "openocd.h"
 #include "jtag.h"
 #include "configuration.h"
 #include "xsvf.h"
 #include "svf.h"
-#include "target.h"
 #include "nand.h"
 #include "pld.h"
 #include "mflash.h"
@@ -53,10 +53,10 @@
 /* Give TELNET a way to find out what version this is */
 COMMAND_HANDLER(handle_version_command)
 {
-	if (argc != 0)
+	if (CMD_ARGC != 0)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	command_print(cmd_ctx, OPENOCD_VERSION);
+	command_print(CMD_CTX, OPENOCD_VERSION);
 
 	return ERROR_OK;
 }
@@ -96,7 +96,7 @@ int ioutil_init(struct command_context *cmd_ctx);
 COMMAND_HANDLER(handle_init_command)
 {
 
-	if (argc != 0)
+	if (CMD_ARGC != 0)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	int retval;
@@ -108,11 +108,11 @@ COMMAND_HANDLER(handle_init_command)
 
 	atexit(exit_handler);
 
-	if (target_init(cmd_ctx) != ERROR_OK)
+	if (target_init(CMD_CTX) != ERROR_OK)
 		return ERROR_FAIL;
 	LOG_DEBUG("target init complete");
 
-	if ((retval = jtag_interface_init(cmd_ctx)) != ERROR_OK)
+	if ((retval = jtag_interface_init(CMD_CTX)) != ERROR_OK)
 	{
 		/* we must be able to set up the jtag interface */
 		return retval;
@@ -121,7 +121,7 @@ COMMAND_HANDLER(handle_init_command)
 
 	/* Try to initialize & examine the JTAG chain at this point, but
 	 * continue startup regardless */
-	if (jtag_init(cmd_ctx) == ERROR_OK)
+	if (jtag_init(CMD_CTX) == ERROR_OK)
 	{
 		LOG_DEBUG("jtag init complete");
 		if (target_examine() == ERROR_OK)
@@ -130,19 +130,19 @@ COMMAND_HANDLER(handle_init_command)
 		}
 	}
 
-	if (flash_init_drivers(cmd_ctx) != ERROR_OK)
+	if (flash_init_drivers(CMD_CTX) != ERROR_OK)
 		return ERROR_FAIL;
 	LOG_DEBUG("flash init complete");
 
-	if (mflash_init_drivers(cmd_ctx) != ERROR_OK)
+	if (mflash_init_drivers(CMD_CTX) != ERROR_OK)
 		return ERROR_FAIL;
 	LOG_DEBUG("mflash init complete");
 
-	if (nand_init(cmd_ctx) != ERROR_OK)
+	if (nand_init(CMD_CTX) != ERROR_OK)
 		return ERROR_FAIL;
 	LOG_DEBUG("NAND init complete");
 
-	if (pld_init(cmd_ctx) != ERROR_OK)
+	if (pld_init(CMD_CTX) != ERROR_OK)
 		return ERROR_FAIL;
 	LOG_DEBUG("pld init complete");
 
@@ -154,7 +154,7 @@ COMMAND_HANDLER(handle_init_command)
 	gdb_init();
 	tcl_init(); /* allows tcl to just connect without going thru telnet */
 
-	target_register_event_callback(log_target_callback_event_handler, cmd_ctx);
+	target_register_event_callback(log_target_callback_event_handler, CMD_CTX);
 
 	return ERROR_OK;
 }
@@ -169,9 +169,9 @@ struct command_context *setup_command_handler(void)
 {
 	struct command_context *cmd_ctx;
 
-	global_cmd_ctx = cmd_ctx = command_init();
+	global_cmd_ctx = cmd_ctx = command_init(openocd_startup_tcl);
 
-	register_command(cmd_ctx, NULL, "version", handle_version_command,
+	COMMAND_REGISTER(cmd_ctx, NULL, "version", handle_version_command,
 					 COMMAND_EXEC, "show OpenOCD version");
 
 	/* register subsystem commands */
@@ -198,7 +198,7 @@ struct command_context *setup_command_handler(void)
 
 	LOG_OUTPUT(OPENOCD_VERSION "\n");
 
-	register_command(cmd_ctx, NULL, "init", handle_init_command,
+	COMMAND_REGISTER(cmd_ctx, NULL, "init", handle_init_command,
 					 COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
 
 	return cmd_ctx;
@@ -278,7 +278,7 @@ int openocd_main(int argc, char *argv[])
 	httpd_stop();
 #endif
 
-	unregister_all_commands(cmd_ctx);
+	unregister_all_commands(cmd_ctx, NULL);
 
 	/* free commandline interface */
 	command_done(cmd_ctx);