X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=1a43b3c07c6b7246a71ad9bec810b0efc63a22a2;hp=95c2f237db33bc4a05d43200f00d9badb67096a1;hb=7bf1a86e473a12882bf6f71cb4d0d416394b69d4;hpb=8b994145b849c40b0a195c3fb332b9770b2f9097

diff --git a/src/openocd.c b/src/openocd.c
index 95c2f237db..1a43b3c07c 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -32,8 +32,6 @@
 #include "configuration.h"
 #include "xsvf.h"
 #include "svf.h"
-#include "target.h"
-#include "flash.h"
 #include "nand.h"
 #include "pld.h"
 #include "mflash.h"
@@ -49,27 +47,12 @@
 
 
 #define OPENOCD_VERSION \
-		"Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") " RELSTR PKGBLDREV
-
-static void print_version(void)
-{
-	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-	LOG_OUTPUT("$URL$\n");
-	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-}
+		"Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
 
 /* Give TELNET a way to find out what version this is */
-static int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_version_command)
 {
-	if (argc != 0)
+	if (CMD_ARGC != 0)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	command_print(cmd_ctx, OPENOCD_VERSION);
@@ -82,7 +65,7 @@ static void exit_handler(void)
 	jtag_interface_quit();
 }
 
-static int log_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)
+static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv)
 {
 	switch (event)
 	{
@@ -106,13 +89,13 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe
 	return ERROR_OK;
 }
 
-int ioutil_init(struct command_context_s *cmd_ctx);
+int ioutil_init(struct command_context *cmd_ctx);
 
 /* OpenOCD can't really handle failure of this command. Patches welcome! :-) */
-static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_init_command)
 {
 
-	if (argc != 0)
+	if (CMD_ARGC != 0)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	int retval;
@@ -175,12 +158,15 @@ static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, cha
 	return ERROR_OK;
 }
 
-command_context_t *global_cmd_ctx;
+struct command_context *global_cmd_ctx;
+
+/// src/hello.c gives a simple example for writing new command modules
+int hello_register_commands(struct command_context *cmd_ctx);
 
 /* NB! this fn can be invoked outside this file for non PC hosted builds */
-command_context_t *setup_command_handler(void)
+struct command_context *setup_command_handler(void)
 {
-	command_context_t *cmd_ctx;
+	struct command_context *cmd_ctx;
 
 	global_cmd_ctx = cmd_ctx = command_init();
 
@@ -188,6 +174,7 @@ command_context_t *setup_command_handler(void)
 					 COMMAND_EXEC, "show OpenOCD version");
 
 	/* register subsystem commands */
+	hello_register_commands(cmd_ctx);
 	server_register_commands(cmd_ctx);
 	telnet_register_commands(cmd_ctx);
 	gdb_register_commands(cmd_ctx);
@@ -242,7 +229,7 @@ int openocd_main(int argc, char *argv[])
 	int ret;
 
 	/* initialize commandline interface */
-	command_context_t *cmd_ctx;
+	struct command_context *cmd_ctx;
 
 	cmd_ctx = setup_command_handler();
 
@@ -253,9 +240,9 @@ int openocd_main(int argc, char *argv[])
 	}
 #endif
 
-	print_version();
-
-	LOG_OUTPUT("For bug reports, read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n");
+	LOG_OUTPUT("For bug reports, read\n\t"
+		"http://openocd.berlios.de/doc/doxygen/bugs.html"
+		"\n");
 
 
 	command_context_mode(cmd_ctx, COMMAND_CONFIG);