From 25b8b376387724e4c74d0c5d005b15504d44ff4c Mon Sep 17 00:00:00 2001
From: Antonio Borneo <borneo.antonio@gmail.com>
Date: Sun, 23 Aug 2020 01:35:09 +0200
Subject: [PATCH] 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 <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5823
Tested-by: jenkins
---
 src/jtag/aice/aice_interface.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/jtag/aice/aice_interface.c b/src/jtag/aice/aice_interface.c
index a2bec327f3..160eb1105a 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
-- 
2.30.2