aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonio Borneo <borneo.antonio@gmail.com>2020-05-01 18:30:00 +0200
committerAntonio Borneo <borneo.antonio@gmail.com>2020-05-09 14:36:44 +0100
commit8807a5937e5fe5d09828c3e535beafb48e171621 (patch)
tree8311605c611ce05b9b253e5d4c22db17e585eda8
parent2a8303b0bd1ea10b1a60891cbff24d717a985f6f (diff)
downloadopenocd-jz4730-8807a5937e5fe5d09828c3e535beafb48e171621.tar.gz
helper/command: register all commands through register_commands()
The commands "ocd_find" and "capture" are registered directly through the jim API, instead of the common way to describe them in a struct command_registration that is then passed to the helper register_commands(). This cause the two commands above to not have either "help" nor "usage" string nor a properly identified "mode". Since the following line registers the commands listed in struct command_builtin_handlers, simply add the two commands above in the same struct. Change-Id: Id6ee11dac3b18364deeed65ee8e18ad80152750a Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Reviewed-on: http://openocd.zylin.com/5644 Tested-by: jenkins Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
-rw-r--r--src/helper/command.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/helper/command.c b/src/helper/command.c
index ec07a5fef..0882ecd58 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -1230,6 +1230,21 @@ static const struct command_registration command_subcommand_handlers[] = {
static const struct command_registration command_builtin_handlers[] = {
{
+ .name = "ocd_find",
+ .mode = COMMAND_ANY,
+ .jim_handler = jim_find,
+ .help = "find full path to file",
+ .usage = "file",
+ },
+ {
+ .name = "capture",
+ .mode = COMMAND_ANY,
+ .jim_handler = jim_capture,
+ .help = "Capture progress output and return as tcl return value. If the "
+ "progress output was empty, return tcl return value.",
+ .usage = "command",
+ },
+ {
.name = "echo",
.handler = jim_echo,
.mode = COMMAND_ANY,
@@ -1339,9 +1354,6 @@ struct command_context *command_init(const char *startup_tcl, Jim_Interp *interp
Jim_SetGlobalVariableStr(interp, "ocd_HOSTOS",
Jim_NewStringObj(interp, HostOs, strlen(HostOs)));
- Jim_CreateCommand(interp, "ocd_find", jim_find, NULL, NULL);
- Jim_CreateCommand(interp, "capture", jim_capture, NULL, NULL);
-
register_commands(context, NULL, command_builtin_handlers);
Jim_SetAssocData(interp, "context", NULL, context);