X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=234b01c2f3141f10a2e67d876de0ae23f75d3b4d;hb=a502676df7e6e99c29f207003ec02a128012d325;hp=2e886e34ce3f620f02e5f4cdd3221db356c4e8df;hpb=f90d8fa45f2d4c9d4b7990f198b232ee55cbb4e1;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index 2e886e34ce..234b01c2f3 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008 Richard Missenden                                  *
@@ -49,25 +49,10 @@
 
 
 #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)
 		return ERROR_COMMAND_SYNTAX_ERROR;
@@ -82,7 +67,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,10 +91,10 @@ 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)
@@ -175,12 +160,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 +176,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);
@@ -208,7 +197,7 @@ command_context_t *setup_command_handler(void)
 	}
 	LOG_DEBUG("log init complete");
 
-	LOG_OUTPUT(OPENOCD_VERSION "\n" );
+	LOG_OUTPUT(OPENOCD_VERSION "\n");
 
 	register_command(cmd_ctx, NULL, "init", handle_init_command,
 					 COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
@@ -242,7 +231,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 +242,10 @@ int openocd_main(int argc, char *argv[])
 	}
 #endif
 
-	LOG_OUTPUT("\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
+	LOG_OUTPUT("For bug reports, read\n\t"
+		"http://openocd.berlios.de/doc/doxygen/bugs.html"
+		"\n");
 
-	print_version();
 
 	command_context_mode(cmd_ctx, COMMAND_CONFIG);
 	command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
@@ -264,7 +254,7 @@ int openocd_main(int argc, char *argv[])
 		return EXIT_FAILURE;
 
 	ret = parse_config_file(cmd_ctx);
-	if ((ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION) )
+	if ((ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION))
 		return EXIT_FAILURE;
 
 #if BUILD_HTTPD