X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=629d50ae890bff1d9f73298d250c6d423a1fd524;hb=30f6142fc8570549ff42676ffe16425c6a6ef264;hp=9edd611dd3787d814ffb54382eee03cb37528ed3;hpb=2861877b32a7a2f4022a1c3d9b66c9b4879878ac;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index 9edd611dd3..629d50ae89 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -28,6 +28,7 @@
 #include "config.h"
 #endif
 
+#include "openocd.h"
 #include "jtag.h"
 #include "configuration.h"
 #include "xsvf.h"
@@ -40,6 +41,7 @@
 #include "telnet_server.h"
 #include "gdb_server.h"
 #include "tcl_server.h"
+#include "httpd.h"
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
@@ -158,23 +160,37 @@ COMMAND_HANDLER(handle_init_command)
 	return ERROR_OK;
 }
 
-struct command_context *global_cmd_ctx;
+static const struct command_registration openocd_command_handlers[] = {
+	{
+		.name = "version",
+		.handler = &handle_version_command,
+		.mode = COMMAND_EXEC,
+		.help = "show program version",
+	},
+	{
+		.name = "init",
+		.handler = &handle_init_command,
+		.mode = COMMAND_ANY,
+		.help = "Initializes configured targets and servers.  "
+			"If called more than once, does nothing.",
+	},
+	COMMAND_REGISTRATION_DONE
+};
 
-/// src/hello.c gives a simple example for writing new command modules
-int hello_register_commands(struct command_context *cmd_ctx);
+struct command_context *global_cmd_ctx;
 
 /* NB! this fn can be invoked outside this file for non PC hosted builds */
 struct command_context *setup_command_handler(void)
 {
-	struct command_context *cmd_ctx;
+	log_init();
+	LOG_DEBUG("log_init: complete");
 
-	global_cmd_ctx = cmd_ctx = command_init();
+	struct command_context *cmd_ctx;
 
-	register_command(cmd_ctx, NULL, "version", handle_version_command,
-					 COMMAND_EXEC, "show OpenOCD version");
+	global_cmd_ctx = cmd_ctx = command_init(openocd_startup_tcl);
 
+	register_commands(cmd_ctx, NULL, openocd_command_handlers);
 	/* register subsystem commands */
-	hello_register_commands(cmd_ctx);
 	server_register_commands(cmd_ctx);
 	telnet_register_commands(cmd_ctx);
 	gdb_register_commands(cmd_ctx);
@@ -189,24 +205,13 @@ struct command_context *setup_command_handler(void)
 	pld_register_commands(cmd_ctx);
 	mflash_register_commands(cmd_ctx);
 
-	if (log_init(cmd_ctx) != ERROR_OK)
-	{
-		exit(-1);
-	}
-	LOG_DEBUG("log init complete");
+	LOG_DEBUG("command registration: complete");
 
 	LOG_OUTPUT(OPENOCD_VERSION "\n");
 
-	register_command(cmd_ctx, NULL, "init", handle_init_command,
-					 COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
-
 	return cmd_ctx;
 }
 
-int httpd_start(void);
-void httpd_stop(void);
-
-
 #if !BUILD_HTTPD && !BUILD_ECOSBOARD
 /* implementations of OpenOCD that uses multithreading needs to know when
  * OpenOCD is sleeping. No-op in vanilla OpenOCD
@@ -256,7 +261,7 @@ int openocd_main(int argc, char *argv[])
 		return EXIT_FAILURE;
 
 #if BUILD_HTTPD
-	if (httpd_start() != ERROR_OK)
+	if (httpd_start(cmd_ctx) != ERROR_OK)
 		return EXIT_FAILURE;
 #endif
 
@@ -277,7 +282,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);