X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=51e40537781e5e35b9d012519b0f6570c7903b51;hp=99e566893c5fa648f665db0931eaf195713b0a26;hb=a28eaa85f73759bb189a46308642502c9fa5aa4b;hpb=34424b4bb532437f61f64e650b42883e1f4d1ee7 diff --git a/src/openocd.c b/src/openocd.c index 99e566893c..51e4053778 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -2,6 +2,12 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * 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 * @@ -28,17 +34,18 @@ #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 "mflash.h" #include "command.h" #include "server.h" #include "telnet_server.h" #include "gdb_server.h" +#include "tcl_server.h" #include #include @@ -49,6 +56,37 @@ #include #include +#ifdef _WIN32 +#include +#else +#include +#endif + +#include "replacements.h" + +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"); + /* 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 */ +} + + + + + + + + + /* 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) { @@ -64,94 +102,175 @@ void exit_handler(void) jtag->quit(); } -int main(int argc, char *argv[]) +static int log_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv) { - /* initialize commandline interface */ - command_context_t *cmd_ctx, *cfg_cmd_ctx; - cmd_ctx = command_init(); + switch (event) + { + case TARGET_EVENT_GDB_START: + target->display=0; + break; + case TARGET_EVENT_GDB_END: + target->display=1; + break; + case TARGET_EVENT_HALTED: + if (target->display) + { + /* do not display information when debugger caused the halt */ + target_arch_state(target); + } + break; + default: + break; + } + + return ERROR_OK; +} + +/* 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() == ERROR_OK) + { + 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"); + + 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 */ + + target_register_event_callback(log_target_callback_event_handler, cmd_ctx); + + return ERROR_OK; +} + +command_context_t *global_cmd_ctx; + +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); 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); - + mflash_register_commands(cmd_ctx); + if (log_init(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - DEBUG("log init complete"); - - printf( OPENOCD_VERSION ); - printf( "\n$URL$\n"); - - DEBUG( OPENOCD_VERSION ); - DEBUG( "$URL$"); - - 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); - - if (parse_cmdline_args(cfg_cmd_ctx, argc, argv) != ERROR_OK) - return EXIT_FAILURE; + { + exit(-1); + } + LOG_DEBUG("log init complete"); - if (parse_config_file(cfg_cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - - command_done(cfg_cmd_ctx); + LOG_OUTPUT( OPENOCD_VERSION "\n" ); - command_set_output_handler(cmd_ctx, configuration_output_handler, NULL); + register_command(cmd_ctx, NULL, "init", handle_init_command, + COMMAND_ANY, "initializes target and servers - nop on subsequent invocations"); - atexit(exit_handler); + return cmd_ctx; +} - if (jtag_init(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - DEBUG("jtag init complete"); +/* 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; - if (target_init(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - DEBUG("target init complete"); + /* initialize commandline interface */ + command_context_t *cmd_ctx; - if (flash_init_drivers(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - DEBUG("flash init complete"); + cmd_ctx = setup_command_handler(); - if (nand_init(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - DEBUG("NAND init complete"); + LOG_OUTPUT( "\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n"); - if (pld_init(cmd_ctx) != ERROR_OK) + 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; - DEBUG("pld init complete"); - /* initialize tcp server */ - server_init(); - - /* initialize telnet subsystem */ - telnet_init("Open On-Chip Debugger"); - gdb_init(); - - /* call any target resets */ - if (target_init_reset(cmd_ctx) != ERROR_OK) + ret = parse_config_file(cmd_ctx); + if ( (ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION) ) return EXIT_FAILURE; - DEBUG("target init reset complete"); - - /* handle network connections */ - server_loop(cmd_ctx); - + + 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(); - + + unregister_all_commands(cmd_ctx); + /* free commandline interface */ command_done(cmd_ctx); - + return EXIT_SUCCESS; }