X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=6babbb8420d837635181f7df7080546cb3816dd7;hp=b078958e0cdace0fc375fb419475e037adf69305;hb=c1ee650a9aead0bd25d7aa37fd65e5a3ed0c6e38;hpb=7d244761461701e1161df32c2f1d4cd50ae2bb26 diff --git a/src/openocd.c b/src/openocd.c index b078958e0c..6babbb8420 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 (2006-08-01 12:00 CEST)" +#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,15 +28,17 @@ #include "types.h" #include "jtag.h" #include "configuration.h" -#include "interpreter.h" #include "xsvf.h" #include "target.h" #include "flash.h" +#include "nand.h" +#include "pld.h" #include "command.h" #include "server.h" #include "telnet_server.h" #include "gdb_server.h" +#include "tcl_server.h" #include #include @@ -47,6 +49,15 @@ #include #include +#ifdef _WIN32 +#include +#else +#include +#endif + +#include "replacements.h" + + /* 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) { @@ -55,12 +66,77 @@ int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char ** return ERROR_OK; } -int main(int argc, char *argv[]) + +void exit_handler(void) { - /* initialize commandline interface */ - command_context_t *cmd_ctx, *cfg_cmd_ctx; - cmd_ctx = command_init(); + /* close JTAG interface */ + 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; + + 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(); + tcl_init(); /* allows tcl to just connect without going thru telnet */ + + return ERROR_OK; +} +command_context_t *setup_command_handler(void) +{ + command_context_t *cmd_ctx; + + cmd_ctx = command_init(); + register_command(cmd_ctx, NULL, "version", handle_version_command, COMMAND_EXEC, "show OpenOCD version"); @@ -68,58 +144,74 @@ int main(int argc, char *argv[]) server_register_commands(cmd_ctx); telnet_register_commands(cmd_ctx); gdb_register_commands(cmd_ctx); + tcl_register_commands(cmd_ctx); /* tcl server commands */ log_register_commands(cmd_ctx); jtag_register_commands(cmd_ctx); - interpreter_register_commands(cmd_ctx); xsvf_register_commands(cmd_ctx); target_register_commands(cmd_ctx); flash_register_commands(cmd_ctx); + nand_register_commands(cmd_ctx); + pld_register_commands(cmd_ctx); if (log_init(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - DEBUG("log init complete"); - - INFO( OPENOCD_VERSION ); + { + exit(-1); + } + LOG_DEBUG("log init complete"); - cfg_cmd_ctx = copy_command_context(cmd_ctx); - cfg_cmd_ctx->mode = COMMAND_CONFIG; - command_set_output_handler(cfg_cmd_ctx, configuration_output_handler, NULL); + LOG_OUTPUT( OPENOCD_VERSION "\n" ); - if (parse_cmdline_args(cfg_cmd_ctx, argc, argv) != ERROR_OK) - return EXIT_FAILURE; + register_command(cmd_ctx, NULL, "init", handle_init_command, + COMMAND_ANY, "initializes target and servers - nop on subsequent invocations"); - if (parse_config_file(cfg_cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - - command_done(cfg_cmd_ctx); + return cmd_ctx; +} - if (jtag_init(cmd_ctx) != ERROR_OK) +/* 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[]) +{ + /* initialize commandline interface */ + command_context_t *cmd_ctx; + + cmd_ctx = setup_command_handler(); + + /* 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 */ + + 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; - DEBUG("jtag init complete"); - - if (target_init(cmd_ctx) != ERROR_OK) + + if (parse_config_file(cmd_ctx) != ERROR_OK) return EXIT_FAILURE; - DEBUG("target init complete"); - if (flash_init(cmd_ctx) != ERROR_OK) + command_context_mode(cmd_ctx, COMMAND_EXEC); + if (command_run_line(cmd_ctx, "init")!=ERROR_OK) return EXIT_FAILURE; - DEBUG("flash init complete"); - - /* initialize tcp server */ - server_init(); - /* initialize telnet subsystem */ - telnet_init("Open On-Chip Debugger"); - gdb_init(); - /* 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; }