X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=629d50ae890bff1d9f73298d250c6d423a1fd524;hp=084b8a1d05be6361d4ec36d57fac59131ca254ad;hb=c4992c6d863d0ead91d84d19bbfe1643d720b205;hpb=15b4be1c9c8abff091a9c6048b3bb5bea256dce9 diff --git a/src/openocd.c b/src/openocd.c index 084b8a1d05..629d50ae89 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 * @@ -24,81 +24,58 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") "RELSTR PKGBLDREV - #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include "log.h" -#include "types.h" +#include "openocd.h" #include "jtag.h" #include "configuration.h" #include "xsvf.h" #include "svf.h" -#include "target.h" -#include "flash.h" #include "nand.h" #include "pld.h" #include "mflash.h" -#include "command.h" #include "server.h" #include "telnet_server.h" #include "gdb_server.h" #include "tcl_server.h" +#include "httpd.h" -#include -#include +#ifdef HAVE_STRINGS_H #include -#include -#include -#include -#include -#include +#endif -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 */ -} + +#define OPENOCD_VERSION \ + "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")" /* Give TELNET a way to find out what version this is */ -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); + command_print(CMD_CTX, OPENOCD_VERSION); return ERROR_OK; } -void exit_handler(void) +static void exit_handler(void) { - /* close JTAG interface */ - if (jtag && jtag->quit) - jtag->quit(); + 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) { case TARGET_EVENT_GDB_START: - target->display=0; + target->display = 0; break; case TARGET_EVENT_GDB_END: - target->display=1; + target->display = 1; break; case TARGET_EVENT_HALTED: if (target->display) @@ -114,29 +91,29 @@ 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! :-) */ -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; - static int initialized=0; + static int initialized = 0; if (initialized) return ERROR_OK; - initialized=1; + initialized = 1; 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; @@ -145,7 +122,7 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg /* 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) @@ -154,19 +131,19 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg } } - 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"); @@ -178,22 +155,41 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg 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; } -command_context_t *global_cmd_ctx; - -command_context_t *setup_command_handler(void) +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 +}; + +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) { - command_context_t *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 */ server_register_commands(cmd_ctx); telnet_register_commands(cmd_ctx); @@ -209,22 +205,26 @@ command_context_t *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_OUTPUT( OPENOCD_VERSION "\n" ); + LOG_DEBUG("command registration: complete"); - register_command(cmd_ctx, NULL, "init", handle_init_command, - COMMAND_ANY, "initializes target and servers - nop on subsequent invocations"); + LOG_OUTPUT(OPENOCD_VERSION "\n"); 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 + */ +void openocd_sleep_prelude(void) +{ +} + +void openocd_sleep_postlude(void) +{ +} +#endif + /* normally this is the main() function entry, but if OpenOCD is linked * into application, then this fn will not be invoked, but rather that @@ -234,7 +234,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(); @@ -245,9 +245,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); @@ -256,18 +257,18 @@ 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 - if (httpd_start()!=ERROR_OK) + if (httpd_start(cmd_ctx) != ERROR_OK) return EXIT_FAILURE; #endif if (ret != ERROR_COMMAND_CLOSE_CONNECTION) { command_context_mode(cmd_ctx, COMMAND_EXEC); - if (command_run_line(cmd_ctx, "init")!=ERROR_OK) + if (command_run_line(cmd_ctx, "init") != ERROR_OK) return EXIT_FAILURE; /* handle network connections */ @@ -281,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);