X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=2c27fc421465eefd26788c3c9c5d13653f02b124;hp=623bd0c1625d0403e2ef294d25fe4ba31993f6b2;hb=d31803d3d9bc4750ff34d14cffb809c916401d1e;hpb=bc7fa896e69d5a325776da4e5b423940cb1124dd diff --git a/src/openocd.c b/src/openocd.c index 623bd0c162..2c27fc4214 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -2,7 +2,7 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007-2010 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * Copyright (C) 2008 Richard Missenden * @@ -31,10 +31,10 @@ #include "openocd.h" #include #include +#include #include +#include #include -#include -#include #include #include #include @@ -42,7 +42,6 @@ #include #include -#include #ifdef HAVE_STRINGS_H #include @@ -52,15 +51,29 @@ #define OPENOCD_VERSION \ "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")" -/* Give TELNET a way to find out what version this is */ -COMMAND_HANDLER(handle_version_command) +/* Give scripts and TELNET a way to find out what version this is */ +static int jim_version_command(Jim_Interp *interp, int argc, + Jim_Obj * const *argv) { - if (CMD_ARGC != 0) - return ERROR_COMMAND_SYNTAX_ERROR; - - command_print(CMD_CTX, OPENOCD_VERSION); + if (argc > 2) + { + return JIM_ERR; + } + const char *str = ""; + char * version_str; + version_str = OPENOCD_VERSION; + + if (argc == 2) + str = Jim_GetString(argv[1], NULL); + + if (strcmp("git", str) == 0) + { + version_str = GITVERSION; + } + + Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1)); - return ERROR_OK; + return JIM_OK; } static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv) @@ -120,22 +133,24 @@ COMMAND_HANDLER(handle_init_command) /* we must be able to set up the debug adapter */ return retval; } + LOG_DEBUG("Debug Adapter init complete"); - /* 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... + /* "transport init" verifies the expected devices are present; + * for JTAG, it checks the list of configured TAPs against + * what's discoverable, possibly with help from the platform's + * JTAG event handlers. (which require COMMAND_EXEC) */ command_context_mode(CMD_CTX, COMMAND_EXEC); - if (command_run_line(CMD_CTX, "jtag init") == ERROR_OK) - { - LOG_DEBUG("Examining targets..."); - if (target_examine() != ERROR_OK) - LOG_DEBUG("target examination failed"); - } - else - LOG_WARNING("jtag initialization failed; try 'jtag init' again."); + + retval = command_run_line(CMD_CTX, "transport init"); + if (ERROR_OK != retval) + return ERROR_FAIL; + + LOG_DEBUG("Examining targets..."); + if (target_examine() != ERROR_OK) + LOG_DEBUG("target examination failed"); + command_context_mode(CMD_CTX, COMMAND_CONFIG); if (command_run_line(CMD_CTX, "flash init") != ERROR_OK) @@ -172,7 +187,7 @@ COMMAND_HANDLER(handle_add_script_search_dir_command) static const struct command_registration openocd_command_handlers[] = { { .name = "version", - .handler = &handle_version_command, + .jim_handler = jim_version_command, .mode = COMMAND_ANY, .help = "show program version", }, @@ -209,8 +224,10 @@ static int openocd_register_commands(struct command_context *cmd_ctx) struct command_context *global_cmd_ctx; -/* NB! this fn can be invoked outside this file for non PC hosted builds */ -static struct command_context *setup_command_handler(Jim_Interp *interp) +/* NB! this fn can be invoked outside this file for non PC hosted builds + * NB! do not change to 'static'!!!! + */ +struct command_context *setup_command_handler(Jim_Interp *interp) { log_init(); LOG_DEBUG("log_init: complete"); @@ -219,16 +236,14 @@ static struct command_context *setup_command_handler(Jim_Interp *interp) struct command_context *cmd_ctx = command_init(startup, interp); /* register subsystem commands */ - typedef int (*command_registrant_t)(struct command_context *cmd_ctx); + typedef int (*command_registrant_t)(struct command_context *cmd_ctx_value); static const command_registrant_t command_registrants[] = { &openocd_register_commands, &server_register_commands, &gdb_register_commands, &log_register_commands, + &transport_register_commands, &interface_register_commands, - &jtag_register_commands, - &xsvf_register_commands, - &svf_register_commands, &target_register_commands, &flash_register_commands, &nand_register_commands, @@ -255,28 +270,14 @@ static struct command_context *setup_command_handler(Jim_Interp *interp) return cmd_ctx; } -/* 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[]) +/** OpenOCD runtime meat that can become single-thread in future. It parse + * commandline, reads configuration, sets up the target and starts server loop. + * Commandline arguments are passed into this function from openocd_main(). + */ +static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ctx) { int ret; - /* initialize commandline interface */ - struct command_context *cmd_ctx; - - cmd_ctx = setup_command_handler(NULL); - - if (ioutil_init(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - - LOG_OUTPUT("For bug reports, read\n\t" - "http://openocd.berlios.de/doc/doxygen/bugs.html" - "\n"); - - 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; @@ -287,27 +288,55 @@ int openocd_main(int argc, char *argv[]) if (ret != ERROR_OK) return EXIT_FAILURE; - if (httpd_start(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - ret = server_init(cmd_ctx); if (ERROR_OK != ret) return EXIT_FAILURE; + ret = command_run_line(cmd_ctx, "init_targets"); + if (ERROR_OK != ret) + ret = EXIT_FAILURE; + if (init_at_startup) { ret = command_run_line(cmd_ctx, "init"); if (ERROR_OK != ret) - ret = EXIT_FAILURE; + return EXIT_FAILURE; } - /* handle network connections */ - if (ERROR_OK == ret) - server_loop(cmd_ctx); + server_loop(cmd_ctx); server_quit(); - httpd_stop(); + return ret; +} + +/* 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 */ + struct command_context *cmd_ctx; + + cmd_ctx = setup_command_handler(NULL); + + if (util_init(cmd_ctx) != ERROR_OK) + return EXIT_FAILURE; + + if (ioutil_init(cmd_ctx) != ERROR_OK) + return EXIT_FAILURE; + + LOG_OUTPUT("For bug reports, read\n\t" + "http://openocd.sourceforge.net/doc/doxygen/bugs.html" + "\n"); + + command_context_mode(cmd_ctx, COMMAND_CONFIG); + command_set_output_handler(cmd_ctx, configuration_output_handler, NULL); + + /* Start the executable meat that can evolve into thread in future. */ + ret = openocd_thread(argc, argv, cmd_ctx); unregister_all_commands(cmd_ctx, NULL);