X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=946cd93c44842f1b507943f201ae21ecd3598490;hb=9f8d50bf81f3628b3ff3b57438eeb26faa535221;hp=57d2dc4bae04d329cf4668ccda002d7698860ce9;hpb=9061c08aa7c8a6fb26fb798ef8a7671d5bc1c36d;p=openocd.git diff --git a/src/openocd.c b/src/openocd.c index 57d2dc4bae..946cd93c44 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#define OPENOCD_VERSION "Open On-Chip Debugger (2007-07-31 19:00 CEST)" +#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV #ifdef HAVE_CONFIG_H #include "config.h" @@ -57,12 +57,104 @@ int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char ** return ERROR_OK; } +static int daemon_startup = 0; + +int handle_daemon_startup_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +{ + if (argc==0) + return ERROR_OK; + if (argc > 1 ) + return ERROR_COMMAND_SYNTAX_ERROR; + + daemon_startup = strcmp("reset", args[0])==0; + + command_print(cmd_ctx, OPENOCD_VERSION); + + return ERROR_OK; +} + + void exit_handler(void) { /* close JTAG interface */ - if (jtag && jtag->quit) jtag->quit(); + if (jtag && jtag->quit) + jtag->quit(); +} + + +/* 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) +{ + int retval; + static int initialized=0; + if (initialized) + return ERROR_OK; + + initialized=1; + + command_set_output_handler(cmd_ctx, configuration_output_handler, NULL); + + atexit(exit_handler); + + + if (target_init(cmd_ctx) != ERROR_OK) + return ERROR_FAIL; + LOG_DEBUG("target init complete"); + + if ((retval=jtag_interface_init(cmd_ctx)) != ERROR_OK) + { + /* we must be able to set up the jtag interface */ + return retval; + } + LOG_DEBUG("jtag interface init complete"); + + /* Try to initialize & examine the JTAG chain at this point, but + * continue startup regardless + */ + if (jtag_init(cmd_ctx) == ERROR_OK) + { + LOG_DEBUG("jtag init complete"); + if (target_examine(cmd_ctx) == ERROR_OK) + { + LOG_DEBUG("jtag examine complete"); + } + } + + + if (flash_init_drivers(cmd_ctx) != ERROR_OK) + return ERROR_FAIL; + LOG_DEBUG("flash init complete"); + + if (nand_init(cmd_ctx) != ERROR_OK) + return ERROR_FAIL; + LOG_DEBUG("NAND init complete"); + + if (pld_init(cmd_ctx) != ERROR_OK) + return ERROR_FAIL; + LOG_DEBUG("pld init complete"); + + /* initialize tcp server */ + server_init(); + + /* initialize telnet subsystem */ + telnet_init("Open On-Chip Debugger"); + gdb_init(); + + return ERROR_OK; } + +/* implementations of OpenOCD that uses multithreading needs to lock OpenOCD while calling + * OpenOCD fn's. No-op in vanilla OpenOCD + */ +void lockBigLock() +{ +} +void unlockBigLock() +{ +} + + int main(int argc, char *argv[]) { /* initialize commandline interface */ @@ -71,6 +163,8 @@ int main(int argc, char *argv[]) register_command(cmd_ctx, NULL, "version", handle_version_command, COMMAND_EXEC, "show OpenOCD version"); + register_command(cmd_ctx, NULL, "daemon_startup", handle_daemon_startup_command, COMMAND_CONFIG, + "deprecated - use \"init\" and \"reset\" at end of startup script instead"); /* register subsystem commands */ server_register_commands(cmd_ctx); @@ -87,9 +181,25 @@ int main(int argc, char *argv[]) if (log_init(cmd_ctx) != ERROR_OK) return EXIT_FAILURE; - DEBUG("log init complete"); + LOG_DEBUG("log init complete"); + + LOG_OUTPUT( OPENOCD_VERSION "\n" ); + - INFO( OPENOCD_VERSION ); + /* 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 */ + + register_command(cmd_ctx, NULL, "init", handle_init_command, + COMMAND_ANY, "initializes target and servers - nop on subsequent invocations"); cfg_cmd_ctx = copy_command_context(cmd_ctx); cfg_cmd_ctx->mode = COMMAND_CONFIG; @@ -103,45 +213,23 @@ int main(int argc, char *argv[]) command_done(cfg_cmd_ctx); - command_set_output_handler(cmd_ctx, configuration_output_handler, NULL); - - atexit(exit_handler); - - if (jtag_init(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - DEBUG("jtag init complete"); - - if (target_init(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - DEBUG("target init complete"); - - if (flash_init(cmd_ctx) != ERROR_OK) + if (command_run_line(cmd_ctx, "init")!=ERROR_OK) return EXIT_FAILURE; - DEBUG("flash init complete"); - - if (nand_init(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - DEBUG("NAND init complete"); - - if (pld_init(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - DEBUG("pld init complete"); - - /* initialize tcp server */ - server_init(); - /* initialize telnet subsystem */ - telnet_init("Open On-Chip Debugger"); - gdb_init(); + if (daemon_startup) + command_run_line(cmd_ctx, "reset"); /* handle network connections */ server_loop(cmd_ctx); - + /* shut server down */ server_quit(); + + unregister_all_commands(cmd_ctx); /* free commandline interface */ command_done(cmd_ctx); - + return EXIT_SUCCESS; } +