X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=8cb86746bf51e61fd5f5a5b7cea4ff3d75e4d9d4;hp=629d50ae890bff1d9f73298d250c6d423a1fd524;hb=899c9975e750ff0144d4a4f63e0f2a619c0b0e58;hpb=be482a5335dd35ee1fa163faa0af481b2ec65b70 diff --git a/src/openocd.c b/src/openocd.c index 629d50ae89..8cb86746bf 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -29,19 +29,19 @@ #endif #include "openocd.h" -#include "jtag.h" -#include "configuration.h" -#include "xsvf.h" -#include "svf.h" -#include "nand.h" -#include "pld.h" -#include "mflash.h" - -#include "server.h" -#include "telnet_server.h" -#include "gdb_server.h" -#include "tcl_server.h" -#include "httpd.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include #ifdef HAVE_STRINGS_H #include @@ -62,10 +62,6 @@ COMMAND_HANDLER(handle_version_command) return ERROR_OK; } -static void exit_handler(void) -{ - jtag_interface_quit(); -} static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv) { @@ -91,7 +87,15 @@ static int log_target_callback_event_handler(struct target *target, enum target_ return ERROR_OK; } -int ioutil_init(struct command_context *cmd_ctx); +static bool init_at_startup = true; + +COMMAND_HANDLER(handle_noinit_command) +{ + if (CMD_ARGC != 0) + return ERROR_COMMAND_SYNTAX_ERROR; + init_at_startup = false; + return ERROR_OK; +} /* OpenOCD can't really handle failure of this command. Patches welcome! :-) */ COMMAND_HANDLER(handle_init_command) @@ -107,11 +111,9 @@ COMMAND_HANDLER(handle_init_command) initialized = 1; - atexit(exit_handler); - - if (target_init(CMD_CTX) != ERROR_OK) + retval = command_run_line(CMD_CTX, "target init"); + if (ERROR_OK != retval) return ERROR_FAIL; - LOG_DEBUG("target init complete"); if ((retval = jtag_interface_init(CMD_CTX)) != ERROR_OK) { @@ -120,40 +122,37 @@ COMMAND_HANDLER(handle_init_command) } 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) + /* Try to initialize & examine the JTAG chain at this point, + * but continue startup regardless. Note that platforms + * need to be able to provide JTAG event handlers that use + * a variety of JTAG operations in order to do that... + */ + command_context_mode(CMD_CTX, COMMAND_EXEC); + if (command_run_line(CMD_CTX, "jtag init") == ERROR_OK) { - LOG_DEBUG("jtag init complete"); - if (target_examine() == ERROR_OK) - { - LOG_DEBUG("jtag examine complete"); - } + LOG_DEBUG("Examining targets..."); + if (target_examine() != ERROR_OK) + LOG_DEBUG("target examination failed"); } + else + LOG_WARNING("jtag initialization failed; try 'jtag init' again."); + command_context_mode(CMD_CTX, COMMAND_CONFIG); - if (flash_init_drivers(CMD_CTX) != ERROR_OK) + if (command_run_line(CMD_CTX, "flash init") != ERROR_OK) return ERROR_FAIL; - LOG_DEBUG("flash init complete"); - if (mflash_init_drivers(CMD_CTX) != ERROR_OK) + if (command_run_line(CMD_CTX, "mflash init") != ERROR_OK) return ERROR_FAIL; - LOG_DEBUG("mflash init complete"); - if (nand_init(CMD_CTX) != ERROR_OK) + if (command_run_line(CMD_CTX, "nand init") != ERROR_OK) return ERROR_FAIL; - LOG_DEBUG("NAND init complete"); - if (pld_init(CMD_CTX) != ERROR_OK) + if (command_run_line(CMD_CTX, "pld init") != ERROR_OK) return ERROR_FAIL; - LOG_DEBUG("pld init complete"); - - /* initialize tcp server */ - server_init(); + command_context_mode(CMD_CTX, COMMAND_EXEC); /* initialize telnet subsystem */ - telnet_init("Open On-Chip Debugger"); - gdb_init(); - tcl_init(); /* allows tcl to just connect without going thru telnet */ + gdb_target_add_all(all_targets); target_register_event_callback(log_target_callback_event_handler, CMD_CTX); @@ -164,67 +163,78 @@ static const struct command_registration openocd_command_handlers[] = { { .name = "version", .handler = &handle_version_command, - .mode = COMMAND_EXEC, + .mode = COMMAND_ANY, .help = "show program version", }, + { + .name = "noinit", + .handler = &handle_noinit_command, + .mode = COMMAND_CONFIG, + .help = "Prevent 'init' from being called at startup.", + }, { .name = "init", .handler = &handle_init_command, .mode = COMMAND_ANY, .help = "Initializes configured targets and servers. " - "If called more than once, does nothing.", + "Changes command mode from CONFIG to EXEC. " + "Unless 'noinit' is called, this command is " + "called automatically at the end of startup.", + }, COMMAND_REGISTRATION_DONE }; +int openocd_register_commands(struct command_context *cmd_ctx) +{ + return register_commands(cmd_ctx, NULL, openocd_command_handlers); +} + struct command_context *global_cmd_ctx; /* NB! this fn can be invoked outside this file for non PC hosted builds */ -struct command_context *setup_command_handler(void) +struct command_context *setup_command_handler(Jim_Interp *interp) { log_init(); LOG_DEBUG("log_init: complete"); - struct command_context *cmd_ctx; + const char *startup = openocd_startup_tcl; + struct command_context *cmd_ctx = command_init(startup, interp); - global_cmd_ctx = cmd_ctx = command_init(openocd_startup_tcl); - - register_commands(cmd_ctx, NULL, openocd_command_handlers); /* 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); - 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); - + typedef int (*command_registrant_t)(struct command_context *cmd_ctx); + command_registrant_t command_registrants[] = { + &openocd_register_commands, + &server_register_commands, + &gdb_register_commands, + &log_register_commands, + &jtag_register_commands, + &xsvf_register_commands, + &svf_register_commands, + &target_register_commands, + &flash_register_commands, + &nand_register_commands, + &pld_register_commands, + &mflash_register_commands, + NULL + }; + for (unsigned i = 0; NULL != command_registrants[i]; i++) + { + int retval = (*command_registrants[i])(cmd_ctx); + if (ERROR_OK != retval) + { + command_done(cmd_ctx); + return NULL; + } + } LOG_DEBUG("command registration: complete"); LOG_OUTPUT(OPENOCD_VERSION "\n"); - return cmd_ctx; -} - -#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) -{ -} + global_cmd_ctx = cmd_ctx; -void openocd_sleep_postlude(void) -{ + return cmd_ctx; } -#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 @@ -236,14 +246,10 @@ int openocd_main(int argc, char *argv[]) /* initialize commandline interface */ struct command_context *cmd_ctx; - cmd_ctx = setup_command_handler(); + cmd_ctx = setup_command_handler(NULL); -#if BUILD_IOUTIL if (ioutil_init(cmd_ctx) != ERROR_OK) - { return EXIT_FAILURE; - } -#endif LOG_OUTPUT("For bug reports, read\n\t" "http://openocd.berlios.de/doc/doxygen/bugs.html" @@ -257,36 +263,37 @@ 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) return EXIT_FAILURE; -#if BUILD_HTTPD if (httpd_start(cmd_ctx) != ERROR_OK) return EXIT_FAILURE; -#endif - if (ret != ERROR_COMMAND_CLOSE_CONNECTION) + ret = server_init(cmd_ctx); + if (ERROR_OK != ret) + return EXIT_FAILURE; + + if (init_at_startup) { - command_context_mode(cmd_ctx, COMMAND_EXEC); - if (command_run_line(cmd_ctx, "init") != ERROR_OK) - return EXIT_FAILURE; + ret = command_run_line(cmd_ctx, "init"); + if (ERROR_OK != ret) + ret = EXIT_FAILURE; + } - /* handle network connections */ + /* handle network connections */ + if (ERROR_OK == ret) server_loop(cmd_ctx); - } - /* shut server down */ server_quit(); -#if BUILD_HTTPD httpd_stop(); -#endif unregister_all_commands(cmd_ctx, NULL); /* free commandline interface */ command_done(cmd_ctx); + jtag_interface_quit(); - return EXIT_SUCCESS; + return ret; }