|
From: openocd-gerrit <ope...@us...> - 2023-03-25 18:16:12
|
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 12b405a4ac3dddd18e2fd822e135bb783cae0236 (commit)
via d9d698103e974b2a94c611864cccb92359509b7d (commit)
from 26f457896c456c57a57719e484d055d444ba67ee (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 12b405a4ac3dddd18e2fd822e135bb783cae0236
Author: Antonio Borneo <bor...@gm...>
Date: Mon Dec 19 23:58:01 2022 +0100
target: rewrite command 'target names' as COMMAND_HANDLER
Print one entry per line.
While there add the mandatory 'usage' field.
Change-Id: Ia832684817f3bdbfa4cb943cd97e3f9fb2605902
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/7510
Tested-by: jenkins
diff --git a/src/target/target.c b/src/target/target.c
index b77a25a2a..3fdb34ec6 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -6388,20 +6388,18 @@ COMMAND_HANDLER(handle_target_types)
return ERROR_OK;
}
-static int jim_target_names(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+COMMAND_HANDLER(handle_target_names)
{
- if (argc != 1) {
- Jim_WrongNumArgs(interp, 1, argv, "Too many parameters");
- return JIM_ERR;
- }
- Jim_SetResult(interp, Jim_NewListObj(interp, NULL, 0));
+ if (CMD_ARGC != 0)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
struct target *target = all_targets;
while (target) {
- Jim_ListAppendElement(interp, Jim_GetResult(interp),
- Jim_NewStringObj(interp, target_name(target), -1));
+ command_print(CMD, "%s", target_name(target));
target = target->next;
}
- return JIM_OK;
+
+ return ERROR_OK;
}
static struct target_list *
@@ -6531,8 +6529,9 @@ static const struct command_registration target_subcommand_handlers[] = {
{
.name = "names",
.mode = COMMAND_ANY,
- .jim_handler = jim_target_names,
+ .handler = handle_target_names,
.help = "Returns the names of all targets as a list of strings",
+ .usage = "",
},
{
.name = "smp",
commit d9d698103e974b2a94c611864cccb92359509b7d
Author: Antonio Borneo <bor...@gm...>
Date: Mon Dec 19 23:54:10 2022 +0100
target: rewrite command 'target types' as COMMAND_HANDLER
Print one entry per line.
While there add the mandatory 'usage' field.
Change-Id: I135556e12154e33fdbd0f71d89f6fe37c69813b7
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/7509
Tested-by: jenkins
diff --git a/src/target/target.c b/src/target/target.c
index ae5f74cbf..b77a25a2a 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -6377,18 +6377,15 @@ COMMAND_HANDLER(handle_target_current)
return ERROR_OK;
}
-static int jim_target_types(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+COMMAND_HANDLER(handle_target_types)
{
- if (argc != 1) {
- Jim_WrongNumArgs(interp, 1, argv, "Too many parameters");
- return JIM_ERR;
- }
- Jim_SetResult(interp, Jim_NewListObj(interp, NULL, 0));
- for (unsigned x = 0; target_types[x]; x++) {
- Jim_ListAppendElement(interp, Jim_GetResult(interp),
- Jim_NewStringObj(interp, target_types[x]->name, -1));
- }
- return JIM_OK;
+ if (CMD_ARGC != 0)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
+ for (unsigned int x = 0; target_types[x]; x++)
+ command_print(CMD, "%s", target_types[x]->name);
+
+ return ERROR_OK;
}
static int jim_target_names(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
@@ -6526,9 +6523,10 @@ static const struct command_registration target_subcommand_handlers[] = {
{
.name = "types",
.mode = COMMAND_ANY,
- .jim_handler = jim_target_types,
+ .handler = handle_target_types,
.help = "Returns the available target types as "
"a list of strings",
+ .usage = "",
},
{
.name = "names",
-----------------------------------------------------------------------
Summary of changes:
src/target/target.c | 41 +++++++++++++++++++----------------------
1 file changed, 19 insertions(+), 22 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|