From 57962f4d1c2db12dffa03c7357f5d7e0d8f71fb8 Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Fri, 4 Jan 2019 15:13:53 +0100 Subject: [PATCH 1/1] command_registration: add empty usage field to chained commands Chained command require a subcommand as first argument. The usage field for chained commands is not really important because the "help" command will list all the subcommands with their respective usage. Add a empty usage field on all chained command. The command "jlink config" can be either followed by a subcommand or used alone, so use a dedicated usage string. Change-Id: I43c3f8a766f96a9bdab4e709e3c90713be41fcef Signed-off-by: Antonio Borneo Reviewed-on: http://openocd.zylin.com/5017 Tested-by: jenkins Reviewed-by: Tomas Vanek --- src/flash/nand/mxc.c | 3 ++- src/flash/nor/faux.c | 1 + src/flash/nor/max32xxx.c | 1 + src/flash/nor/tcl.c | 1 + src/hello.c | 2 +- src/helper/command.c | 1 + src/jtag/drivers/dummy.c | 2 +- src/jtag/drivers/jlink.c | 5 ++++- src/target/arm_cti.c | 1 + src/target/arm_dap.c | 1 + src/target/etb.c | 1 + src/target/etm_dummy.c | 1 + src/target/target.c | 2 +- src/target/testee.c | 2 +- 14 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/flash/nand/mxc.c b/src/flash/nand/mxc.c index 6be416057b..6069c62685 100644 --- a/src/flash/nand/mxc.c +++ b/src/flash/nand/mxc.c @@ -193,7 +193,8 @@ static const struct command_registration mxc_nand_command_handler[] = { .name = "mxc", .mode = COMMAND_ANY, .help = "MXC NAND flash controller commands", - .chain = mxc_sub_command_handlers + .chain = mxc_sub_command_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/flash/nor/faux.c b/src/flash/nor/faux.c index 49b6dccd01..a894d0398e 100644 --- a/src/flash/nor/faux.c +++ b/src/flash/nor/faux.c @@ -109,6 +109,7 @@ static const struct command_registration faux_command_handlers[] = { .mode = COMMAND_ANY, .help = "faux flash command group", .chain = hello_command_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/flash/nor/max32xxx.c b/src/flash/nor/max32xxx.c index 12e3db9403..f51f6e2a99 100644 --- a/src/flash/nor/max32xxx.c +++ b/src/flash/nor/max32xxx.c @@ -977,6 +977,7 @@ static const struct command_registration max32xxx_command_handlers[] = { .mode = COMMAND_EXEC, .help = "max32xxx flash command group", .chain = max32xxx_exec_command_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c index 6e216e68eb..6d2d2b816b 100644 --- a/src/flash/nor/tcl.c +++ b/src/flash/nor/tcl.c @@ -1260,6 +1260,7 @@ static const struct command_registration flash_command_handlers[] = { .mode = COMMAND_ANY, .help = "NOR flash command group", .chain = flash_config_command_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/hello.c b/src/hello.c index 25938bcf88..2afbba3a3e 100644 --- a/src/hello.c +++ b/src/hello.c @@ -105,8 +105,8 @@ const struct command_registration hello_command_handlers[] = { .name = "foo", .mode = COMMAND_ANY, .help = "example command handler skeleton", - .chain = foo_command_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/helper/command.c b/src/helper/command.c index 7a3c2d4fe4..869eff559c 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -1294,6 +1294,7 @@ static const struct command_registration command_builtin_handlers[] = { .mode = COMMAND_ANY, .help = "core command group (introspection)", .chain = command_subcommand_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/jtag/drivers/dummy.c b/src/jtag/drivers/dummy.c index db1ba13a49..4e5b6152c8 100644 --- a/src/jtag/drivers/dummy.c +++ b/src/jtag/drivers/dummy.c @@ -136,8 +136,8 @@ static const struct command_registration dummy_command_handlers[] = { .name = "dummy", .mode = COMMAND_ANY, .help = "dummy interface driver commands", - .chain = hello_command_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE, }; diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c index 1eae827340..c81579ab29 100644 --- a/src/jtag/drivers/jlink.c +++ b/src/jtag/drivers/jlink.c @@ -1849,12 +1849,14 @@ static const struct command_registration jlink_subcommand_handlers[] = { .help = "access the device configuration. If no argument is given " "this will show the device configuration", .chain = jlink_config_subcommand_handlers, + .usage = "[]", }, { .name = "emucom", .mode = COMMAND_EXEC, .help = "access EMUCOM channel", - .chain = jlink_emucom_subcommand_handlers + .chain = jlink_emucom_subcommand_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE }; @@ -1865,6 +1867,7 @@ static const struct command_registration jlink_command_handlers[] = { .mode = COMMAND_ANY, .help = "perform jlink management", .chain = jlink_subcommand_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/target/arm_cti.c b/src/target/arm_cti.c index f33379240d..3fa54d69c4 100644 --- a/src/target/arm_cti.c +++ b/src/target/arm_cti.c @@ -576,6 +576,7 @@ static const struct command_registration cti_command_handlers[] = { .mode = COMMAND_CONFIG, .help = "CTI commands", .chain = cti_subcommand_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/target/arm_dap.c b/src/target/arm_dap.c index 119e5117d2..dd7ec9b589 100644 --- a/src/target/arm_dap.c +++ b/src/target/arm_dap.c @@ -373,6 +373,7 @@ static const struct command_registration dap_commands[] = { .mode = COMMAND_CONFIG, .help = "DAP commands", .chain = dap_subcommand_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/target/etb.c b/src/target/etb.c index 98a90a5561..7cd8b6cd5c 100644 --- a/src/target/etb.c +++ b/src/target/etb.c @@ -441,6 +441,7 @@ static const struct command_registration etb_command_handlers[] = { .mode = COMMAND_ANY, .help = "Embedded Trace Buffer command group", .chain = etb_config_command_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/target/etm_dummy.c b/src/target/etm_dummy.c index b18ce17449..9f18d84a19 100644 --- a/src/target/etm_dummy.c +++ b/src/target/etm_dummy.c @@ -66,6 +66,7 @@ static const struct command_registration etm_dummy_command_handlers[] = { .mode = COMMAND_ANY, .help = "Dummy ETM capture driver command group", .chain = etm_dummy_config_command_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/target/target.c b/src/target/target.c index 5295dd6268..084a2cffc2 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -6096,8 +6096,8 @@ static const struct command_registration target_command_handlers[] = { .name = "target", .mode = COMMAND_CONFIG, .help = "configure target", - .chain = target_subcommand_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/target/testee.c b/src/target/testee.c index 5b6ccedd85..236ac9aba9 100644 --- a/src/target/testee.c +++ b/src/target/testee.c @@ -30,8 +30,8 @@ static const struct command_registration testee_command_handlers[] = { .name = "testee", .mode = COMMAND_ANY, .help = "testee target commands", - .chain = hello_command_handlers, + .usage = "", }, COMMAND_REGISTRATION_DONE }; -- 2.30.2