X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=7e8b7cdf3ac905eafe8a7ffd1f1991e590403b4b;hp=b09ef1e73053b6f9294573d4d3917819125b46a3;hb=104580e0bfb5aa2f79bc6c4c96935a8832f5f787;hpb=9d4f9dbd0b75805efc2d3f18afe02bb164a86f0e diff --git a/src/openocd.c b/src/openocd.c index b09ef1e730..7e8b7cdf3a 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -5,6 +5,9 @@ * Copyright (C) 2007,2008 Øyvind Harboe * * oyvind.harboe@zylin.com * * * + * Copyright (C) 2008 Richard Missenden * + * richard.missenden@googlemail.com * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -21,8 +24,6 @@ * 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 @@ -32,10 +33,12 @@ #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" @@ -52,27 +55,18 @@ #include #include -#ifdef _WIN32 -#include -#else -#include -#endif - -#include "replacements.h" - - - - +#define OPENOCD_VERSION \ + "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") " RELSTR PKGBLDREV -void print_version() +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 */ @@ -80,23 +74,18 @@ void print_version() /* 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) @@ -107,8 +96,18 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe { switch (event) { + case TARGET_EVENT_GDB_START: + target->display=0; + break; + case TARGET_EVENT_GDB_END: + target->display=1; + break; case TARGET_EVENT_HALTED: - target_arch_state(target); + if (target->display) + { + /* do not display information when debugger caused the halt */ + target_arch_state(target); + } break; default: break; @@ -117,18 +116,24 @@ 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; if (initialized) return ERROR_OK; - + initialized=1; - + atexit(exit_handler); - + if (target_init(cmd_ctx) != ERROR_OK) return ERROR_FAIL; LOG_DEBUG("target init complete"); @@ -150,11 +155,15 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg LOG_DEBUG("jtag examine complete"); } } - + if (flash_init_drivers(cmd_ctx) != ERROR_OK) return ERROR_FAIL; LOG_DEBUG("flash init complete"); + if (mflash_init_drivers(cmd_ctx) != ERROR_OK) + return ERROR_FAIL; + LOG_DEBUG("mflash init complete"); + if (nand_init(cmd_ctx) != ERROR_OK) return ERROR_FAIL; LOG_DEBUG("NAND init complete"); @@ -172,21 +181,22 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg tcl_init(); /* allows tcl to just connect without going thru telnet */ target_register_event_callback(log_target_callback_event_handler, cmd_ctx); - + return ERROR_OK; } 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; - + global_cmd_ctx = cmd_ctx = command_init(); - + register_command(cmd_ctx, NULL, "version", handle_version_command, COMMAND_EXEC, "show OpenOCD version"); - + /* register subsystem commands */ server_register_commands(cmd_ctx); telnet_register_commands(cmd_ctx); @@ -195,11 +205,13 @@ 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); pld_register_commands(cmd_ctx); - + mflash_register_commands(cmd_ctx); + if (log_init(cmd_ctx) != ERROR_OK) { exit(-1); @@ -207,50 +219,91 @@ command_context_t *setup_command_handler(void) LOG_DEBUG("log init complete"); LOG_OUTPUT( OPENOCD_VERSION "\n" ); - + register_command(cmd_ctx, NULL, "init", handle_init_command, COMMAND_ANY, "initializes target and servers - nop on subsequent invocations"); 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(). */ int openocd_main(int argc, char *argv[]) { + int ret; + /* initialize commandline interface */ command_context_t *cmd_ctx; 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 + + LOG_OUTPUT("\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n"); print_version(); - + command_context_mode(cmd_ctx, COMMAND_CONFIG); command_set_output_handler(cmd_ctx, configuration_output_handler, NULL); if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK) return EXIT_FAILURE; - - if (parse_config_file(cmd_ctx) != ERROR_OK) + + ret = parse_config_file(cmd_ctx); + if ( (ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION) ) return EXIT_FAILURE; - command_context_mode(cmd_ctx, COMMAND_EXEC); - if (command_run_line(cmd_ctx, "init")!=ERROR_OK) +#if BUILD_HTTPD + if (httpd_start()!=ERROR_OK) return EXIT_FAILURE; - - /* handle network connections */ - server_loop(cmd_ctx); +#endif + + if (ret != ERROR_COMMAND_CLOSE_CONNECTION) + { + command_context_mode(cmd_ctx, COMMAND_EXEC); + if (command_run_line(cmd_ctx, "init")!=ERROR_OK) + return EXIT_FAILURE; + + /* handle network connections */ + server_loop(cmd_ctx); + } /* 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; }