From b61e454869c988e7fafc1c16982ccfec04415b51 Mon Sep 17 00:00:00 2001
From: Antonio Borneo <borneo.antonio@gmail.com>
Date: Fri, 4 Jan 2019 18:16:00 +0100
Subject: [PATCH] Set empty usage field for commands that do not need
parameters
The missing field causes runtime debug message
BUG: command '%s' does not have the '.usage' field filled out
While there, fix some minor typo in the help messages:
s/deasert/deassert/
s/Deasert/Deassert/
Change-Id: If3dd18265cda103ca0d05609f67f4ca58e7cbb27
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5024
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
---
src/flash/mflash.c | 1 +
src/flash/nand/tcl.c | 1 +
src/flash/nor/at91sam3.c | 1 +
src/flash/nor/at91sam4.c | 1 +
src/flash/nor/at91sam4l.c | 3 ++-
src/flash/nor/at91samd.c | 5 ++++-
src/flash/nor/atsame5.c | 2 ++
src/flash/nor/kinetis.c | 1 +
src/flash/nor/nrf5.c | 1 +
src/flash/nor/numicro.c | 1 +
src/flash/nor/tcl.c | 2 ++
src/helper/ioutil.c | 1 +
src/jtag/adapter.c | 1 +
src/jtag/drivers/arm-jtag-ew.c | 1 +
src/jtag/drivers/buspirate.c | 1 +
src/jtag/drivers/jlink.c | 12 ++++++++----
src/jtag/drivers/opendous.c | 1 +
src/pld/pld.c | 1 +
src/server/gdb_server.c | 1 +
src/target/target.c | 1 +
src/target/xscale.c | 1 +
21 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 4c95d216c..1ad7290fa 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -1327,6 +1327,7 @@ static const struct command_registration mflash_exec_command_handlers[] = {
.handler = mg_probe_cmd,
.mode = COMMAND_EXEC,
.help = "Detect bank configuration information",
+ .usage = "",
},
{
.name = "write",
diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index d9738c55b..dee4f6da8 100644
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -411,6 +411,7 @@ static const struct command_registration nand_exec_command_handlers[] = {
.handler = handle_nand_list_command,
.mode = COMMAND_EXEC,
.help = "list configured NAND flash devices",
+ .usage = "",
},
{
.name = "info",
diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index 2d61a8780..a220279cf 100644
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -3731,6 +3731,7 @@ static const struct command_registration at91sam3_exec_command_handlers[] = {
.mode = COMMAND_EXEC,
.help = "Print information about the current at91sam3 chip"
"and its flash configuration.",
+ .usage = "",
},
{
.name = "slowclk",
diff --git a/src/flash/nor/at91sam4.c b/src/flash/nor/at91sam4.c
index 446f7983b..c89c50239 100644
--- a/src/flash/nor/at91sam4.c
+++ b/src/flash/nor/at91sam4.c
@@ -3212,6 +3212,7 @@ static const struct command_registration at91sam4_exec_command_handlers[] = {
.mode = COMMAND_EXEC,
.help = "Print information about the current at91sam4 chip"
"and its flash configuration.",
+ .usage = "",
},
{
.name = "slowclk",
diff --git a/src/flash/nor/at91sam4l.c b/src/flash/nor/at91sam4l.c
index 1c2402ff0..d356398dc 100644
--- a/src/flash/nor/at91sam4l.c
+++ b/src/flash/nor/at91sam4l.c
@@ -668,7 +668,8 @@ static const struct command_registration at91sam4l_exec_command_handlers[] = {
.name = "smap_reset_deassert",
.handler = sam4l_handle_reset_deassert,
.mode = COMMAND_EXEC,
- .help = "deasert internal reset held by SMAP"
+ .help = "deassert internal reset held by SMAP",
+ .usage = "",
},
COMMAND_REGISTRATION_DONE
};
diff --git a/src/flash/nor/at91samd.c b/src/flash/nor/at91samd.c
index a0d603a2c..c325194ed 100644
--- a/src/flash/nor/at91samd.c
+++ b/src/flash/nor/at91samd.c
@@ -1217,7 +1217,8 @@ static const struct command_registration at91samd_exec_command_handlers[] = {
.name = "dsu_reset_deassert",
.handler = samd_handle_reset_deassert,
.mode = COMMAND_EXEC,
- .help = "Deasert internal reset held by DSU."
+ .help = "Deassert internal reset held by DSU.",
+ .usage = "",
},
{
.name = "info",
@@ -1225,6 +1226,7 @@ static const struct command_registration at91samd_exec_command_handlers[] = {
.mode = COMMAND_EXEC,
.help = "Print information about the current at91samd chip "
"and its flash configuration.",
+ .usage = "",
},
{
.name = "chip-erase",
@@ -1232,6 +1234,7 @@ static const struct command_registration at91samd_exec_command_handlers[] = {
.mode = COMMAND_EXEC,
.help = "Erase the entire Flash by using the Chip-"
"Erase feature in the Device Service Unit (DSU).",
+ .usage = "",
},
{
.name = "set-security",
diff --git a/src/flash/nor/atsame5.c b/src/flash/nor/atsame5.c
index 833177e1a..df4234917 100644
--- a/src/flash/nor/atsame5.c
+++ b/src/flash/nor/atsame5.c
@@ -893,12 +893,14 @@ COMMAND_HANDLER(samd_handle_reset_deassert)
static const struct command_registration same5_exec_command_handlers[] = {
{
.name = "dsu_reset_deassert",
+ .usage = "",
.handler = samd_handle_reset_deassert,
.mode = COMMAND_EXEC,
.help = "Deasert internal reset held by DSU."
},
{
.name = "chip-erase",
+ .usage = "",
.handler = same5_handle_chip_erase_command,
.mode = COMMAND_EXEC,
.help = "Erase the entire Flash by using the Chip-"
diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c
index 9b2c014ca..847513502 100644
--- a/src/flash/nor/kinetis.c
+++ b/src/flash/nor/kinetis.c
@@ -3127,6 +3127,7 @@ static const struct command_registration kinetis_exec_command_handlers[] = {
.mode = COMMAND_CONFIG,
.help = "Driver creates additional banks if device with two/four flash blocks is probed",
.handler = kinetis_create_banks_handler,
+ .usage = "",
},
COMMAND_REGISTRATION_DONE
};
diff --git a/src/flash/nor/nrf5.c b/src/flash/nor/nrf5.c
index aab80f9bc..4041bfbe4 100644
--- a/src/flash/nor/nrf5.c
+++ b/src/flash/nor/nrf5.c
@@ -1118,6 +1118,7 @@ static const struct command_registration nrf5_exec_command_handlers[] = {
.handler = nrf5_handle_mass_erase_command,
.mode = COMMAND_EXEC,
.help = "Erase all flash contents of the chip.",
+ .usage = "",
},
COMMAND_REGISTRATION_DONE
};
diff --git a/src/flash/nor/numicro.c b/src/flash/nor/numicro.c
index 8d8abd5ed..47f9a8826 100644
--- a/src/flash/nor/numicro.c
+++ b/src/flash/nor/numicro.c
@@ -1856,6 +1856,7 @@ static const struct command_registration numicro_exec_command_handlers[] = {
.handler = numicro_handle_chip_erase_command,
.mode = COMMAND_EXEC,
.help = "chip erase through ISP.",
+ .usage = "",
},
COMMAND_REGISTRATION_DONE
};
diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index 6d2d2b816..87d599a59 100644
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -1239,12 +1239,14 @@ static const struct command_registration flash_config_command_handlers[] = {
.mode = COMMAND_CONFIG,
.handler = handle_flash_init_command,
.help = "Initialize flash devices.",
+ .usage = "",
},
{
.name = "banks",
.mode = COMMAND_ANY,
.handler = handle_flash_banks_command,
.help = "Display table with information about flash banks.",
+ .usage = "",
},
{
.name = "list",
diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index f1123cd82..a48879905 100644
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -472,6 +472,7 @@ static const struct command_registration ioutil_command_handlers[] = {
.handler = handle_meminfo_command,
.mode = COMMAND_ANY,
.help = "display free heap space",
+ .usage = "",
},
#endif
{
diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index 3fb52a71e..24706f562 100644
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -555,6 +555,7 @@ static const struct command_registration interface_command_handlers[] = {
.handler = handle_interface_list_command,
.mode = COMMAND_ANY,
.help = "List all built-in debug adapter interfaces (drivers)",
+ .usage = "",
},
{
.name = "reset_config",
diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index d9ea367ce..665dd4d18 100644
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -490,6 +490,7 @@ static const struct command_registration armjtagew_command_handlers[] = {
.handler = &armjtagew_handle_armjtagew_info_command,
.mode = COMMAND_EXEC,
.help = "query armjtagew info",
+ .usage = "",
},
COMMAND_REGISTRATION_DONE
};
diff --git a/src/jtag/drivers/buspirate.c b/src/jtag/drivers/buspirate.c
index 35649c280..14c719d4c 100644
--- a/src/jtag/drivers/buspirate.c
+++ b/src/jtag/drivers/buspirate.c
@@ -491,6 +491,7 @@ static const struct command_registration buspirate_command_handlers[] = {
.handler = &buspirate_handle_adc_command,
.mode = COMMAND_EXEC,
.help = "reads voltages on adc pins",
+ .usage = "",
},
{
.name = "buspirate_vreg",
diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index c81579ab2..5a17dfd43 100644
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -1772,13 +1772,15 @@ static const struct command_registration jlink_config_subcommand_handlers[] = {
.name = "reset",
.handler = &jlink_handle_config_reset_command,
.mode = COMMAND_EXEC,
- .help = "undo configuration changes"
+ .help = "undo configuration changes",
+ .usage = "",
},
{
.name = "write",
.handler = &jlink_handle_config_write_command,
.mode = COMMAND_EXEC,
- .help = "write configuration to the device"
+ .help = "write configuration to the device",
+ .usage = "",
},
COMMAND_REGISTRATION_DONE
};
@@ -1820,13 +1822,15 @@ static const struct command_registration jlink_subcommand_handlers[] = {
.name = "freemem",
.handler = &jlink_handle_free_memory_command,
.mode = COMMAND_EXEC,
- .help = "show free device memory"
+ .help = "show free device memory",
+ .usage = "",
},
{
.name = "hwstatus",
.handler = &jlink_handle_hwstatus_command,
.mode = COMMAND_EXEC,
- .help = "show the hardware status"
+ .help = "show the hardware status",
+ .usage = "",
},
{
.name = "usb",
diff --git a/src/jtag/drivers/opendous.c b/src/jtag/drivers/opendous.c
index 458df34a7..cec453dd9 100644
--- a/src/jtag/drivers/opendous.c
+++ b/src/jtag/drivers/opendous.c
@@ -215,6 +215,7 @@ static const struct command_registration opendous_command_handlers[] = {
.handler = &opendous_handle_opendous_info_command,
.mode = COMMAND_EXEC,
.help = "show opendous info",
+ .usage = "",
},
{
.name = "opendous_hw_jtag",
diff --git a/src/pld/pld.c b/src/pld/pld.c
index 5210b97b7..3f23f6a00 100644
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -170,6 +170,7 @@ static const struct command_registration pld_exec_command_handlers[] = {
.handler = handle_pld_devices_command,
.mode = COMMAND_EXEC,
.help = "list configured pld devices",
+ .usage = "",
},
{
.name = "load",
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 3ade195cb..95e6c0491 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -3699,6 +3699,7 @@ static const struct command_registration gdb_command_handlers[] = {
.handler = handle_gdb_save_tdesc_command,
.mode = COMMAND_EXEC,
.help = "Save the target description file",
+ .usage = "",
},
COMMAND_REGISTRATION_DONE
};
diff --git a/src/target/target.c b/src/target/target.c
index 084a2cffc..380a9fcdd 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -5890,6 +5890,7 @@ static const struct command_registration target_subcommand_handlers[] = {
.mode = COMMAND_CONFIG,
.handler = handle_target_init_command,
.help = "initialize targets",
+ .usage = "",
},
{
.name = "create",
diff --git a/src/target/xscale.c b/src/target/xscale.c
index 09abd9ef0..34c5f0001 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -3577,6 +3577,7 @@ static const struct command_registration xscale_exec_command_handlers[] = {
.handler = xscale_handle_cache_info_command,
.mode = COMMAND_EXEC,
.help = "display information about CPU caches",
+ .usage = "",
},
{
.name = "mmu",
--
GitLab