summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-11-20 16:58:45 -0800
committerZachary T Welch <zw@superlucidity.net>2009-11-24 21:37:32 -0800
commit1595fd7c4b6ea2e2fcd5f82e89a1f46dc8e525e8 (patch)
tree43c3b73f2eead8faff3f34efc1eb437b856e2117 /src
parent16e0404777581e55bb42b95f5c9208b2c411debe (diff)
downloadopenocd+libswd-1595fd7c4b6ea2e2fcd5f82e89a1f46dc8e525e8.tar.gz
openocd+libswd-1595fd7c4b6ea2e2fcd5f82e89a1f46dc8e525e8.tar.bz2
openocd+libswd-1595fd7c4b6ea2e2fcd5f82e89a1f46dc8e525e8.tar.xz
openocd+libswd-1595fd7c4b6ea2e2fcd5f82e89a1f46dc8e525e8.zip
openocd: use register_commands()
Use register_commands() for top-level version and init command.
Diffstat (limited to 'src')
-rw-r--r--src/openocd.c24
1 files changed, 18 insertions, 6 deletions
diff --git a/src/openocd.c b/src/openocd.c
index 379373ce..63289e44 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -159,6 +159,23 @@ COMMAND_HANDLER(handle_init_command)
return ERROR_OK;
}
+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
@@ -171,9 +188,7 @@ struct command_context *setup_command_handler(void)
global_cmd_ctx = cmd_ctx = command_init(openocd_startup_tcl);
- COMMAND_REGISTER(cmd_ctx, NULL, "version", handle_version_command,
- COMMAND_EXEC, "show OpenOCD version");
-
+ register_commands(cmd_ctx, NULL, openocd_command_handlers);
/* register subsystem commands */
hello_register_commands(cmd_ctx);
server_register_commands(cmd_ctx);
@@ -198,9 +213,6 @@ struct command_context *setup_command_handler(void)
LOG_OUTPUT(OPENOCD_VERSION "\n");
- COMMAND_REGISTER(cmd_ctx, NULL, "init", handle_init_command,
- COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
-
return cmd_ctx;
}