X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=048ce8524809e319579a68f163cec12bdb829b0e;hp=5f890dbe0fc231019a4c925b9c0fea3d211f306c;hb=b7d2cdc0d4fc319169c60362708a67e2ff626525;hpb=505d4633cd7a4e8623ef70932cd7edc9f22e71d4 diff --git a/src/openocd.c b/src/openocd.c index 5f890dbe0f..048ce85248 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -31,7 +31,7 @@ #include "openocd.h" #include #include -#include +#include #include #include #include @@ -42,45 +42,40 @@ #include #include -#include #ifdef HAVE_STRINGS_H #include #endif - -#define OPENOCD_VERSION \ - "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")" +#define OPENOCD_VERSION \ + "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")" /* 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) + Jim_Obj * const *argv) { if (argc > 2) - { return JIM_ERR; - } const char *str = ""; - char * version_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 JIM_OK; } -static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv) +static int log_target_callback_event_handler(struct target *target, + enum target_event event, + void *priv) { - switch (event) - { + switch (event) { case TARGET_EVENT_GDB_START: target->display = 0; break; @@ -88,8 +83,7 @@ static int log_target_callback_event_handler(struct target *target, enum target_ target->display = 1; break; case TARGET_EVENT_HALTED: - if (target->display) - { + if (target->display) { /* do not display information when debugger caused the halt */ target_arch_state(target); } @@ -119,7 +113,7 @@ COMMAND_HANDLER(handle_init_command) return ERROR_COMMAND_SYNTAX_ERROR; int retval; - static int initialized = 0; + static int initialized; if (initialized) return ERROR_OK; @@ -129,8 +123,8 @@ COMMAND_HANDLER(handle_init_command) if (ERROR_OK != retval) return ERROR_FAIL; - if ((retval = adapter_init(CMD_CTX)) != ERROR_OK) - { + retval = adapter_init(CMD_CTX); + if (retval != ERROR_OK) { /* we must be able to set up the debug adapter */ return retval; } @@ -197,6 +191,7 @@ static const struct command_registration openocd_command_handlers[] = { .handler = &handle_noinit_command, .mode = COMMAND_CONFIG, .help = "Prevent 'init' from being called at startup.", + .usage = "" }, { .name = "init", @@ -206,14 +201,14 @@ static const struct command_registration openocd_command_handlers[] = { "Changes command mode from CONFIG to EXEC. " "Unless 'noinit' is called, this command is " "called automatically at the end of startup.", - + .usage = "" }, { .name = "add_script_search_dir", .handler = &handle_add_script_search_dir_command, .mode = COMMAND_ANY, .help = "dir to search for config files and scripts", - + .usage = "" }, COMMAND_REGISTRATION_DONE }; @@ -237,7 +232,7 @@ 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, @@ -252,11 +247,9 @@ struct command_context *setup_command_handler(Jim_Interp *interp) &mflash_register_commands, NULL }; - for (unsigned i = 0; NULL != command_registrants[i]; i++) - { + for (unsigned i = 0; NULL != command_registrants[i]; i++) { int retval = (*command_registrants[i])(cmd_ctx); - if (ERROR_OK != retval) - { + if (ERROR_OK != retval) { command_done(cmd_ctx); return NULL; } @@ -264,38 +257,21 @@ struct command_context *setup_command_handler(Jim_Interp *interp) LOG_DEBUG("command registration: complete"); LOG_OUTPUT(OPENOCD_VERSION "\n" - "Licensed under GNU GPL v2\n"); + "Licensed under GNU GPL v2\n"); global_cmd_ctx = cmd_ctx; 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 (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.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; @@ -306,27 +282,50 @@ 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; - if (init_at_startup) - { + 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);