Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-185-gbfce4b41d
|
From: OpenOCD-Gerrit <ope...@us...> - 2021-05-29 20:35:59
|
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 bfce4b41d15e8983eab49c9fc1aab5fb169c602a (commit)
via a40cbd85e08df2c87b200c6053c2a608f3bc16e6 (commit)
from 30f3a2a650aa2375ab932203091a62d5bb109419 (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 bfce4b41d15e8983eab49c9fc1aab5fb169c602a
Author: Antonio Borneo <bor...@gm...>
Date: Sat Mar 27 22:23:50 2021 +0100
help: fix line size in 'usage' output
The implementation of command 'usage' is broken while checking the
line limit of 76 chars per line (e.g. 'usage load_image') and the
line wrapping is not correct. The same broken code is used for the
first output line of command 'help' too.
When call command_help_show_wrap(), include the command's name in
the string so the whole text would be wrapped.
Change-Id: Idece01ce54994db7e851d8522435ff764b11f3ac
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/6223
Tested-by: jenkins
diff --git a/src/helper/command.c b/src/helper/command.c
index c3d2e9566..d4f6a0a52 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -820,14 +820,13 @@ static COMMAND_HELPER(command_help_show, struct help_entry *c,
((c->help != NULL) && (strstr(c->help, cmd_match) != NULL));
if (is_match) {
- command_help_show_indent(n);
- LOG_USER_N("%s", c->cmd_name);
-
if (c->usage && strlen(c->usage) > 0) {
- LOG_USER_N(" ");
- command_help_show_wrap(c->usage, 0, n + 5);
- } else
- LOG_USER_N("\n");
+ char *msg = alloc_printf("%s %s", c->cmd_name, c->usage);
+ command_help_show_wrap(msg, n, n + 5);
+ free(msg);
+ } else {
+ command_help_show_wrap(c->cmd_name, n, n + 5);
+ }
}
if (is_match && show_help) {
commit a40cbd85e08df2c87b200c6053c2a608f3bc16e6
Author: Antonio Borneo <bor...@gm...>
Date: Sat Mar 27 21:41:30 2021 +0100
help text: remove trailing space
Some help text end with a useless space character.
Remove it.
Change-Id: I397e1194fac8042f0fab694222f925f906716de3
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/6222
Tested-by: jenkins
diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index cf579ede0..0dcb78ffa 100644
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -584,7 +584,7 @@ static const struct command_registration adapter_command_handlers[] = {
.handler = adapter_transports_command,
.mode = COMMAND_CONFIG,
.help = "Declare transports the adapter supports.",
- .usage = "transport ... ",
+ .usage = "transport ...",
},
{
.name = "usb",
diff --git a/src/jtag/drivers/cmsis_dap.c b/src/jtag/drivers/cmsis_dap.c
index 927b33bd7..c25937531 100644
--- a/src/jtag/drivers/cmsis_dap.c
+++ b/src/jtag/drivers/cmsis_dap.c
@@ -1763,7 +1763,7 @@ static const struct command_registration cmsis_dap_command_handlers[] = {
.handler = &cmsis_dap_handle_vid_pid_command,
.mode = COMMAND_CONFIG,
.help = "the vendor ID and product ID of the CMSIS-DAP device",
- .usage = "(vid pid)* ",
+ .usage = "(vid pid)*",
},
{
.name = "cmsis_dap_serial",
diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index e13977fb0..210d0f796 100644
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -1004,7 +1004,7 @@ static const struct command_registration ftdi_command_handlers[] = {
.handler = &ftdi_handle_vid_pid_command,
.mode = COMMAND_CONFIG,
.help = "the vendor ID and product ID of the FTDI device",
- .usage = "(vid pid)* ",
+ .usage = "(vid pid)*",
},
{
.name = "ftdi_tdo_sample_edge",
diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index 04e01d252..15651763d 100644
--- a/src/jtag/hla/hla_interface.c
+++ b/src/jtag/hla/hla_interface.c
@@ -359,7 +359,7 @@ static const struct command_registration hl_interface_command_handlers[] = {
.handler = &hl_interface_handle_vid_pid_command,
.mode = COMMAND_CONFIG,
.help = "the vendor and product ID of the adapter",
- .usage = "(vid pid)* ",
+ .usage = "(vid pid)*",
},
{
.name = "hla_stlink_backend",
diff --git a/src/jtag/hla/hla_transport.c b/src/jtag/hla/hla_transport.c
index 10028260d..d925b174a 100644
--- a/src/jtag/hla/hla_transport.c
+++ b/src/jtag/hla/hla_transport.c
@@ -76,7 +76,7 @@ hl_transport_jtag_subcommand_handlers[] = {
.help = "Create a new TAP instance named basename.tap_type, "
"and appends it to the scan chain.",
.usage = "basename tap_type '-irlen' count "
- "['-expected_id' number] ",
+ "['-expected_id' number]",
},
{
.name = "init",
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 8a52c0f18..5dc2f14f6 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -887,7 +887,7 @@ static const struct command_registration jtag_subcommand_handlers[] = {
"['-expected_id' number] "
"['-ignore-version'] "
"['-ircapture' number] "
- "['-mask' number] ",
+ "['-mask' number]",
},
{
.name = "tapisenabled",
@@ -1353,7 +1353,7 @@ static const struct command_registration jtag_command_handlers[] = {
.mode = COMMAND_ANY,
.help = "Wait for an SRST deassert. "
"Useful for cases where you need something to happen within ms "
- "of an srst deassert. Timeout in ms ",
+ "of an srst deassert. Timeout in ms",
.usage = "ms",
},
{
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index b725853fe..8ba913646 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -1149,7 +1149,7 @@ static const struct command_registration arm_exec_command_handlers[] = {
.handler = handle_arm_disassemble_command,
.mode = COMMAND_EXEC,
.usage = "address [count ['thumb']]",
- .help = "disassemble instructions ",
+ .help = "disassemble instructions",
},
{
.name = "mcr",
diff --git a/src/target/armv7a_cache_l2x.c b/src/target/armv7a_cache_l2x.c
index 3607a5122..8ecdb008d 100644
--- a/src/target/armv7a_cache_l2x.c
+++ b/src/target/armv7a_cache_l2x.c
@@ -325,7 +325,7 @@ static const struct command_registration arm7a_l2x_cache_commands[] = {
.name = "conf",
.handler = armv7a_l2x_cache_conf_cmd,
.mode = COMMAND_ANY,
- .help = "configure l2x cache ",
+ .help = "configure l2x cache",
.usage = "<base_addr> <number_of_way>",
},
{
diff --git a/src/target/dsp563xx.c b/src/target/dsp563xx.c
index b825429e0..21bed8996 100644
--- a/src/target/dsp563xx.c
+++ b/src/target/dsp563xx.c
@@ -2243,7 +2243,7 @@ static const struct command_registration dsp563xx_command_handlers[] = {
.handler = dsp563xx_remove_watchpoint_command,
.mode = COMMAND_EXEC,
.help = "remove watchpoint custom",
- .usage = " ",
+ .usage = "",
},
COMMAND_REGISTRATION_DONE
};
diff --git a/src/target/target.c b/src/target/target.c
index d60e642c9..1c1deeef9 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -6677,15 +6677,15 @@ static const struct command_registration target_exec_command_handlers[] = {
.handler = handle_target_reset_nag,
.mode = COMMAND_ANY,
.help = "Nag after each reset about options that could have been "
- "enabled to improve performance. ",
+ "enabled to improve performance.",
.usage = "['enable'|'disable']",
},
{
.name = "ps",
.handler = handle_ps_command,
.mode = COMMAND_EXEC,
- .help = "list all tasks ",
- .usage = " ",
+ .help = "list all tasks",
+ .usage = "",
},
{
.name = "test_mem_access",
-----------------------------------------------------------------------
Summary of changes:
src/helper/command.c | 13 ++++++-------
src/jtag/adapter.c | 2 +-
src/jtag/drivers/cmsis_dap.c | 2 +-
src/jtag/drivers/ftdi.c | 2 +-
src/jtag/hla/hla_interface.c | 2 +-
src/jtag/hla/hla_transport.c | 2 +-
src/jtag/tcl.c | 4 ++--
src/target/armv4_5.c | 2 +-
src/target/armv7a_cache_l2x.c | 2 +-
src/target/dsp563xx.c | 2 +-
src/target/target.c | 6 +++---
11 files changed, 19 insertions(+), 20 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
