X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=63289e44e69ba76fcdf85292c53638d879a0fb37;hb=737f8f2735011256f9ca5a3988ee02167f2847a2;hp=95c2f237db33bc4a05d43200f00d9badb67096a1;hpb=8b994145b849c40b0a195c3fb332b9770b2f9097;p=openocd.git diff --git a/src/openocd.c b/src/openocd.c index 95c2f237db..63289e44e6 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -28,12 +28,11 @@ #include "config.h" #endif +#include "openocd.h" #include "jtag.h" #include "configuration.h" #include "xsvf.h" #include "svf.h" -#include "target.h" -#include "flash.h" #include "nand.h" #include "pld.h" #include "mflash.h" @@ -49,30 +48,15 @@ #define OPENOCD_VERSION \ - "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") " RELSTR PKGBLDREV - -static 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 */ -} + "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")" /* Give TELNET a way to find out what version this is */ -static int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_version_command) { - if (argc != 0) + if (CMD_ARGC != 0) return ERROR_COMMAND_SYNTAX_ERROR; - command_print(cmd_ctx, OPENOCD_VERSION); + command_print(CMD_CTX, OPENOCD_VERSION); return ERROR_OK; } @@ -82,7 +66,7 @@ static void exit_handler(void) jtag_interface_quit(); } -static int log_target_callback_event_handler(struct target_s *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) { @@ -106,13 +90,13 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe return ERROR_OK; } -int ioutil_init(struct command_context_s *cmd_ctx); +int ioutil_init(struct command_context *cmd_ctx); /* OpenOCD can't really handle failure of this command. Patches welcome! :-) */ -static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_init_command) { - if (argc != 0) + if (CMD_ARGC != 0) return ERROR_COMMAND_SYNTAX_ERROR; int retval; @@ -124,11 +108,11 @@ static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, cha atexit(exit_handler); - if (target_init(cmd_ctx) != ERROR_OK) + if (target_init(CMD_CTX) != ERROR_OK) return ERROR_FAIL; LOG_DEBUG("target init complete"); - if ((retval = jtag_interface_init(cmd_ctx)) != ERROR_OK) + if ((retval = jtag_interface_init(CMD_CTX)) != ERROR_OK) { /* we must be able to set up the jtag interface */ return retval; @@ -137,7 +121,7 @@ static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, cha /* Try to initialize & examine the JTAG chain at this point, but * continue startup regardless */ - if (jtag_init(cmd_ctx) == ERROR_OK) + if (jtag_init(CMD_CTX) == ERROR_OK) { LOG_DEBUG("jtag init complete"); if (target_examine() == ERROR_OK) @@ -146,19 +130,19 @@ static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, cha } } - if (flash_init_drivers(cmd_ctx) != ERROR_OK) + if (flash_init_drivers(CMD_CTX) != ERROR_OK) return ERROR_FAIL; LOG_DEBUG("flash init complete"); - if (mflash_init_drivers(cmd_ctx) != ERROR_OK) + if (mflash_init_drivers(CMD_CTX) != ERROR_OK) return ERROR_FAIL; LOG_DEBUG("mflash init complete"); - if (nand_init(cmd_ctx) != ERROR_OK) + if (nand_init(CMD_CTX) != ERROR_OK) return ERROR_FAIL; LOG_DEBUG("NAND init complete"); - if (pld_init(cmd_ctx) != ERROR_OK) + if (pld_init(CMD_CTX) != ERROR_OK) return ERROR_FAIL; LOG_DEBUG("pld init complete"); @@ -170,24 +154,43 @@ static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, cha gdb_init(); tcl_init(); /* allows tcl to just connect without going thru telnet */ - target_register_event_callback(log_target_callback_event_handler, cmd_ctx); + target_register_event_callback(log_target_callback_event_handler, CMD_CTX); return ERROR_OK; } -command_context_t *global_cmd_ctx; +static const struct command_registration openocd_command_handlers[] = { + { + .name = "version", + .handler = &handle_version_command, + .mode = COMMAND_EXEC, + .help = "show program version", + }, + { + .name = "init", + .handler = &handle_init_command, + .mode = COMMAND_ANY, + .help = "Initializes configured targets and servers. " + "If called more than once, does nothing.", + }, + COMMAND_REGISTRATION_DONE +}; + +struct command_context *global_cmd_ctx; + +/// src/hello.c gives a simple example for writing new command modules +int hello_register_commands(struct command_context *cmd_ctx); /* NB! this fn can be invoked outside this file for non PC hosted builds */ -command_context_t *setup_command_handler(void) +struct command_context *setup_command_handler(void) { - command_context_t *cmd_ctx; - - global_cmd_ctx = cmd_ctx = command_init(); + struct command_context *cmd_ctx; - register_command(cmd_ctx, NULL, "version", handle_version_command, - COMMAND_EXEC, "show OpenOCD version"); + global_cmd_ctx = cmd_ctx = command_init(openocd_startup_tcl); + register_commands(cmd_ctx, NULL, openocd_command_handlers); /* register subsystem commands */ + hello_register_commands(cmd_ctx); server_register_commands(cmd_ctx); telnet_register_commands(cmd_ctx); gdb_register_commands(cmd_ctx); @@ -210,9 +213,6 @@ command_context_t *setup_command_handler(void) LOG_OUTPUT(OPENOCD_VERSION "\n"); - register_command(cmd_ctx, NULL, "init", handle_init_command, - COMMAND_ANY, "initializes target and servers - nop on subsequent invocations"); - return cmd_ctx; } @@ -242,7 +242,7 @@ int openocd_main(int argc, char *argv[]) int ret; /* initialize commandline interface */ - command_context_t *cmd_ctx; + struct command_context *cmd_ctx; cmd_ctx = setup_command_handler(); @@ -253,9 +253,9 @@ int openocd_main(int argc, char *argv[]) } #endif - print_version(); - - LOG_OUTPUT("For bug reports, read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n"); + LOG_OUTPUT("For bug reports, read\n\t" + "http://openocd.berlios.de/doc/doxygen/bugs.html" + "\n"); command_context_mode(cmd_ctx, COMMAND_CONFIG); @@ -290,7 +290,7 @@ int openocd_main(int argc, char *argv[]) httpd_stop(); #endif - unregister_all_commands(cmd_ctx); + unregister_all_commands(cmd_ctx, NULL); /* free commandline interface */ command_done(cmd_ctx);