From: OpenOCD-Gerrit <ope...@us...> - 2020-09-05 16:14:42
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via f788949651ef714024a29b08f4b064e78c9b4791 (commit) via 25b8b376387724e4c74d0c5d005b15504d44ff4c (commit) via 42faa8a4bc3d757890aeb6b5c7dcd99fdda6ceed (commit) from d3249fd45a7832ed922ed4227c867c3c674b4812 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f788949651ef714024a29b08f4b064e78c9b4791 Author: Antonio Borneo <bor...@gm...> Date: Sun Aug 23 01:43:21 2020 +0200 openocd: fix command's usage string The usage string should contain only the command parameters. OpenOCD will automatically prepend the command name to the usage string while dumping the usage or help message. Remove the repeated command name from the usage string. Change-Id: If10a0f1c254aee302b9ca08958390b7f21cdb21b Signed-off-by: Antonio Borneo <bor...@gm...> Reviewed-on: http://openocd.zylin.com/5824 Tested-by: jenkins diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c index 7be9b2dea..490eb9f4d 100644 --- a/src/jtag/hla/hla_interface.c +++ b/src/jtag/hla/hla_interface.c @@ -341,7 +341,7 @@ static const struct command_registration hl_interface_command_handlers[] = { .handler = &interface_handle_hla_command, .mode = COMMAND_EXEC, .help = "execute a custom adapter-specific command", - .usage = "hla_command <command>", + .usage = "<command>", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/svf/svf.c b/src/svf/svf.c index b62cdae08..608703434 100644 --- a/src/svf/svf.c +++ b/src/svf/svf.c @@ -1556,7 +1556,7 @@ static const struct command_registration svf_command_handlers[] = { .handler = handle_svf_command, .mode = COMMAND_EXEC, .help = "Runs a SVF file.", - .usage = "svf [-tap device.tap] <file> [quiet] [nil] [progress] [ignore_error]", + .usage = "[-tap device.tap] <file> [quiet] [nil] [progress] [ignore_error]", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/target/nds32_cmd.c b/src/target/nds32_cmd.c index d7d040e4b..1684ea882 100644 --- a/src/target/nds32_cmd.c +++ b/src/target/nds32_cmd.c @@ -1036,7 +1036,7 @@ static const struct command_registration nds32_exec_command_handlers[] = { .name = "login_edm_operation", .handler = handle_nds32_login_edm_operation_command, .mode = COMMAND_CONFIG, - .usage = "login_edm_operation misc_reg_no value", + .usage = "misc_reg_no value", .help = "add EDM operations for secure MCU debugging.", }, { diff --git a/src/target/openrisc/or1k.c b/src/target/openrisc/or1k.c index 71491119b..93fb9c6a3 100644 --- a/src/target/openrisc/or1k.c +++ b/src/target/openrisc/or1k.c @@ -1377,21 +1377,21 @@ static const struct command_registration or1k_hw_ip_command_handlers[] = { .name = "tap_select", .handler = or1k_tap_select_command_handler, .mode = COMMAND_ANY, - .usage = "tap_select name", + .usage = "name", .help = "Select the TAP core to use", }, { .name = "tap_list", .handler = or1k_tap_list_command_handler, .mode = COMMAND_ANY, - .usage = "tap_list", + .usage = "", .help = "Display available TAP core", }, { .name = "du_select", .handler = or1k_du_select_command_handler, .mode = COMMAND_ANY, - .usage = "du_select name", + .usage = "name", .help = "Select the Debug Unit core to use", }, { @@ -1409,7 +1409,7 @@ static const struct command_registration or1k_reg_command_handlers[] = { .name = "addreg", .handler = or1k_addreg_command_handler, .mode = COMMAND_ANY, - .usage = "addreg name addr feature group", + .usage = "name addr feature group", .help = "Add a register to the register list", }, COMMAND_REGISTRATION_DONE commit 25b8b376387724e4c74d0c5d005b15504d44ff4c Author: Antonio Borneo <bor...@gm...> Date: Sun Aug 23 01:35:09 2020 +0200 jtag/aice: fix command's usage string The usage string should contain only the command parameters. OpenOCD will automatically prepend the command name to the usage string while dumping the usage or help message. Remove the repeated command name from the usage string. Change-Id: Idbc301b34fab19e221131d232577c1629568e6ea Signed-off-by: Antonio Borneo <bor...@gm...> Reviewed-on: http://openocd.zylin.com/5823 Tested-by: jenkins diff --git a/src/jtag/aice/aice_interface.c b/src/jtag/aice/aice_interface.c index a2bec327f..160eb1105 100644 --- a/src/jtag/aice/aice_interface.c +++ b/src/jtag/aice/aice_interface.c @@ -422,83 +422,83 @@ static const struct command_registration aice_subcommand_handlers[] = { .handler = &aice_handle_aice_info_command, .mode = COMMAND_EXEC, .help = "show aice info", - .usage = "aice info", + .usage = "", }, { .name = "port", .handler = &aice_handle_aice_port_command, .mode = COMMAND_CONFIG, .help = "set the port of the AICE", - .usage = "aice port ['aice_pipe'|'aice_usb']", + .usage = "['aice_pipe'|'aice_usb']", }, { .name = "desc", .handler = &aice_handle_aice_desc_command, .mode = COMMAND_CONFIG, .help = "set the aice device description", - .usage = "aice desc [desciption string]", + .usage = "[desciption string]", }, { .name = "serial", .handler = &aice_handle_aice_serial_command, .mode = COMMAND_CONFIG, .help = "set the serial number of the AICE device", - .usage = "aice serial [serial string]", + .usage = "[serial string]", }, { .name = "vid_pid", .handler = &aice_handle_aice_vid_pid_command, .mode = COMMAND_CONFIG, .help = "the vendor and product ID of the AICE device", - .usage = "aice vid_pid (vid pid)*", + .usage = "(vid pid)*", }, { .name = "adapter", .handler = &aice_handle_aice_adapter_command, .mode = COMMAND_CONFIG, .help = "set the file name of adapter", - .usage = "aice adapter [adapter name]", + .usage = "[adapter name]", }, { .name = "retry_times", .handler = &aice_handle_aice_retry_times_command, .mode = COMMAND_CONFIG, .help = "set retry times as AICE timeout", - .usage = "aice retry_times num_of_retry", + .usage = "num_of_retry", }, { .name = "count_to_check_dbger", .handler = &aice_handle_aice_count_to_check_dbger_command, .mode = COMMAND_CONFIG, .help = "set retry times as checking $DBGER status", - .usage = "aice count_to_check_dbger count_of_checking", + .usage = "count_of_checking", }, { .name = "custom_srst_script", .handler = &aice_handle_aice_custom_srst_script_command, .mode = COMMAND_CONFIG, - .usage = "custom_srst_script script_file_name", + .usage = "script_file_name", .help = "set custom srst script", }, { .name = "custom_trst_script", .handler = &aice_handle_aice_custom_trst_script_command, .mode = COMMAND_CONFIG, - .usage = "custom_trst_script script_file_name", + .usage = "script_file_name", .help = "set custom trst script", }, { .name = "custom_restart_script", .handler = &aice_handle_aice_custom_restart_script_command, .mode = COMMAND_CONFIG, - .usage = "custom_restart_script script_file_name", + .usage = "script_file_name", .help = "set custom restart script", }, { .name = "reset", .handler = &aice_handle_aice_reset_command, .mode = COMMAND_EXEC, - .usage = "aice reset", + .usage = "", .help = "reset AICE", }, COMMAND_REGISTRATION_DONE @@ -509,7 +509,7 @@ static const struct command_registration aice_command_handlers[] = { .name = "aice", .mode = COMMAND_ANY, .help = "perform aice management", - .usage = "aice [subcommand]", + .usage = "[subcommand]", .chain = aice_subcommand_handlers, }, COMMAND_REGISTRATION_DONE commit 42faa8a4bc3d757890aeb6b5c7dcd99fdda6ceed Author: Antonio Borneo <bor...@gm...> Date: Sun Aug 23 01:28:38 2020 +0200 target/arc: fix command's usage string The usage string should contain only the command parameters. OpenOCD will automatically prepend the command name to the usage string while dumping the usage or help message. Remove the repeated command name from the usage string. Change-Id: I691094a6395acb0e4ea3bea2347ff38379002464 Signed-off-by: Antonio Borneo <bor...@gm...> Reviewed-on: http://openocd.zylin.com/5822 Tested-by: jenkins diff --git a/src/target/arc_cmd.c b/src/target/arc_cmd.c index 36babc768..18f5cb8f4 100644 --- a/src/target/arc_cmd.c +++ b/src/target/arc_cmd.c @@ -451,7 +451,7 @@ static const struct command_registration arc_jtag_command_group[] = { "raw JTAG request that bypasses OpenOCD register cache " "and thus is unsafe and can have unexpected consequences. " "Use at your own risk.", - .usage = "arc jtag get-aux-reg <regnum>" + .usage = "<regnum>" }, { .name = "set-aux-reg", @@ -461,7 +461,7 @@ static const struct command_registration arc_jtag_command_group[] = { "raw JTAG request that bypasses OpenOCD register cache " "and thus is unsafe and can have unexpected consequences. " "Use at your own risk.", - .usage = "arc jtag set-aux-reg <regnum> <value>" + .usage = "<regnum> <value>" }, { .name = "get-core-reg", @@ -471,7 +471,7 @@ static const struct command_registration arc_jtag_command_group[] = { "raw JTAG request that bypasses OpenOCD register cache " "and thus is unsafe and can have unexpected consequences. " "Use at your own risk.", - .usage = "arc jtag get-core-reg <regnum> [<value>]" + .usage = "<regnum> [<value>]" }, { .name = "set-core-reg", @@ -481,7 +481,7 @@ static const struct command_registration arc_jtag_command_group[] = { "raw JTAG request that bypasses OpenOCD register cache " "and thus is unsafe and can have unexpected consequences. " "Use at your own risk.", - .usage = "arc jtag set-core-reg <regnum> [<value>]" + .usage = "<regnum> [<value>]" }, COMMAND_REGISTRATION_DONE }; @@ -1010,7 +1010,7 @@ static const struct command_registration arc_core_command_handlers[] = { .name = "add-reg-type-flags", .jim_handler = jim_arc_add_reg_type_flags, .mode = COMMAND_CONFIG, - .usage = "arc ardd-reg-type-flags -name <string> -flag <name> <position> " + .usage = "-name <string> -flag <name> <position> " "[-flag <name> <position>]...", .help = "Add new 'flags' register data type. Only single bit flags " "are supported. Type name is global. Bitsize of register is fixed " @@ -1020,7 +1020,7 @@ static const struct command_registration arc_core_command_handlers[] = { .name = "add-reg-type-struct", .jim_handler = jim_arc_add_reg_type_struct, .mode = COMMAND_CONFIG, - .usage = "arc add-reg-type-struct -name <string> -bitfield <name> <start> <end> " + .usage = "-name <string> -bitfield <name> <start> <end> " "[-bitfield <name> <start> <end>]...", .help = "Add new 'struct' register data type. Only bit-fields are " "supported so far, which means that for each bitfield start and end " @@ -1032,7 +1032,7 @@ static const struct command_registration arc_core_command_handlers[] = { .name = "add-reg", .jim_handler = jim_arc_add_reg, .mode = COMMAND_CONFIG, - .usage = "arc add-reg -name <string> -num <int> -feature <string> [-gdbnum <int>] " + .usage = "-name <string> -num <int> -feature <string> [-gdbnum <int>] " "[-core|-bcr] [-type <type_name>] [-g]", .help = "Add new register. Name, architectural number and feature name " "are required options. GDB regnum will default to previous register " @@ -1043,7 +1043,7 @@ static const struct command_registration arc_core_command_handlers[] = { .name = "set-reg-exists", .handler = arc_set_reg_exists, .mode = COMMAND_ANY, - .usage = "arc set-reg-exists <register-name> [<register-name>]...", + .usage = "<register-name> [<register-name>]...", .help = "Set that register exists. Accepts multiple register names as " "arguments.", }, @@ -1051,7 +1051,7 @@ static const struct command_registration arc_core_command_handlers[] = { .name = "get-reg-field", .jim_handler = jim_arc_get_reg_field, .mode = COMMAND_ANY, - .usage = "arc get-reg-field <regname> <field_name>", + .usage = "<regname> <field_name>", .help = "Returns value of field in a register with 'struct' type.", }, { @@ -1083,7 +1083,7 @@ const struct command_registration arc_monitor_command_handlers[] = { .name = "arc", .mode = COMMAND_ANY, .help = "ARC monitor command group", - .usage = "Help info ...", + .usage = "", .chain = arc_core_command_handlers, }, COMMAND_REGISTRATION_DONE ----------------------------------------------------------------------- Summary of changes: src/jtag/aice/aice_interface.c | 26 +++++++++++++------------- src/jtag/hla/hla_interface.c | 2 +- src/svf/svf.c | 2 +- src/target/arc_cmd.c | 20 ++++++++++---------- src/target/nds32_cmd.c | 2 +- src/target/openrisc/or1k.c | 8 ++++---- 6 files changed, 30 insertions(+), 30 deletions(-) hooks/post-receive -- Main OpenOCD repository |