X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=01c77083a6976917e9fa8583d385d16b8211027f;hb=e48e7000b0f88dee06f52bcda8e1e7fafe37afaa;hp=51e40537781e5e35b9d012519b0f6570c7903b51;hpb=71c73068858ad80020c7956a215a5ec590704ddb;p=openocd.git diff --git a/src/openocd.c b/src/openocd.c index 51e4053778..01c77083a6 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -24,54 +24,41 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV - #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include "log.h" -#include "types.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 -#include +#ifdef HAVE_STRINGS_H #include -#include -#include -#include -#include -#include - -#ifdef _WIN32 -#include -#else -#include #endif -#include "replacements.h" -void print_version(void) +#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"); + 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 */ @@ -79,27 +66,20 @@ void print_version(void) /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */ } - - - - - - - - /* 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) +static int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { + if (argc != 0) + return ERROR_COMMAND_SYNTAX_ERROR; + 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) @@ -107,10 +87,10 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe 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) @@ -126,15 +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); + /* 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) +static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { + + 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); @@ -142,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; @@ -191,6 +177,7 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg command_context_t *global_cmd_ctx; +/* NB! this fn can be invoked outside this file for non PC hosted builds */ command_context_t *setup_command_handler(void) { command_context_t *cmd_ctx; @@ -208,6 +195,7 @@ command_context_t *setup_command_handler(void) log_register_commands(cmd_ctx); jtag_register_commands(cmd_ctx); xsvf_register_commands(cmd_ctx); + svf_register_commands(cmd_ctx); target_register_commands(cmd_ctx); flash_register_commands(cmd_ctx); nand_register_commands(cmd_ctx); @@ -220,7 +208,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"); @@ -228,6 +216,24 @@ command_context_t *setup_command_handler(void) 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 * application will have it's own implementation of main(). */ @@ -240,10 +246,18 @@ int openocd_main(int argc, char *argv[]) cmd_ctx = setup_command_handler(); - LOG_OUTPUT( "\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n"); +#if BUILD_IOUTIL + if (ioutil_init(cmd_ctx) != ERROR_OK) + { + return EXIT_FAILURE; + } +#endif print_version(); + LOG_OUTPUT("For bug reports, read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n"); + + command_context_mode(cmd_ctx, COMMAND_CONFIG); command_set_output_handler(cmd_ctx, configuration_output_handler, NULL); @@ -251,13 +265,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) + 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 */ @@ -267,10 +286,15 @@ int openocd_main(int argc, char *argv[]) /* shut server down */ server_quit(); +#if BUILD_HTTPD + httpd_stop(); +#endif + unregister_all_commands(cmd_ctx); /* free commandline interface */ command_done(cmd_ctx); + return EXIT_SUCCESS; }