X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=78f220c7d3107fa8803fef9f5f2f2a2652789e4d;hp=56576ee351fff82e970564c77e150dbbbf699d07;hb=4088b1e622cff0673f2859de5ee611da736bdba7;hpb=1743395250abad9010c539459d301ade6c32d746 diff --git a/src/openocd.c b/src/openocd.c index 56576ee351..78f220c7d3 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 * @@ -28,8 +28,6 @@ #include "config.h" #endif -#include "log.h" -#include "types.h" #include "jtag.h" #include "configuration.h" #include "xsvf.h" @@ -40,27 +38,20 @@ #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 -#include +#ifdef HAVE_STRINGS_H #include -#include -#include -#include -#include -#include +#endif #define OPENOCD_VERSION \ - "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") " RELSTR PKGBLDREV - + "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")" -void print_version(void) +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 */ @@ -76,9 +67,9 @@ void print_version(void) } /* 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 (argc != 0) return ERROR_COMMAND_SYNTAX_ERROR; command_print(cmd_ctx, OPENOCD_VERSION); @@ -86,22 +77,20 @@ int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char ** 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) @@ -117,21 +106,21 @@ 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 (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); @@ -139,7 +128,7 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg 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; @@ -186,11 +175,15 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg return ERROR_OK; } -command_context_t *global_cmd_ctx; +struct command_context *global_cmd_ctx; -command_context_t *setup_command_handler(void) +/// 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 */ +struct command_context *setup_command_handler(void) { - command_context_t *cmd_ctx; + struct command_context *cmd_ctx; global_cmd_ctx = cmd_ctx = command_init(); @@ -198,6 +191,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); @@ -218,7 +212,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"); @@ -229,6 +223,21 @@ command_context_t *setup_command_handler(void) 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 * application will have it's own implementation of main(). */ @@ -237,7 +246,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(); @@ -248,10 +257,13 @@ 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"); - print_version(); + LOG_OUTPUT("For bug reports, read\n\t" + "http://openocd.berlios.de/doc/doxygen/bugs.html" + "\n"); + + command_context_mode(cmd_ctx, COMMAND_CONFIG); command_set_output_handler(cmd_ctx, configuration_output_handler, NULL); @@ -259,18 +271,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() != 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 */