From: openocd-gerrit <ope...@us...> - 2025-05-25 12:43:15
|
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 8b47a0736b249e0c2574578a184d962294e03b90 (commit) via 4c1e2105c4e5ad3188dae6e62ce019df15c7e52a (commit) from 3c7725ea703e186c9d9ced3b0e03231982abdbfd (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 8b47a0736b249e0c2574578a184d962294e03b90 Author: Antonio Borneo <bor...@gm...> Date: Sat May 10 23:52:30 2025 +0200 target: arm_cti: fix return values in handle_cti_dump() Since the initial commit f444c57bf2d6 ("arm_cti: add cti command group") the helper handle_cti_dump() return JIM error codes. Fix it by returning standard OpenOCD error codes. Change-Id: Ia36b82083d213aff90fe22fcfe7fbe26172806a3 Signed-off-by: Antonio Borneo <bor...@gm...> Reviewed-on: https://review.openocd.org/c/openocd/+/8904 Tested-by: jenkins diff --git a/src/target/arm_cti.c b/src/target/arm_cti.c index 830956e5c..032e5ac37 100644 --- a/src/target/arm_cti.c +++ b/src/target/arm_cti.c @@ -232,13 +232,13 @@ COMMAND_HANDLER(handle_cti_dump) retval = dap_run(ap->dap); if (retval != ERROR_OK) - return JIM_ERR; + return retval; for (size_t i = 0; i < ARRAY_SIZE(cti_names); i++) command_print(CMD, "%8.8s (0x%04"PRIx32") 0x%08"PRIx32, cti_names[i].label, cti_names[i].offset, values[i]); - return JIM_OK; + return ERROR_OK; } COMMAND_HANDLER(handle_cti_enable) commit 4c1e2105c4e5ad3188dae6e62ce019df15c7e52a Author: Antonio Borneo <bor...@gm...> Date: Sat May 10 14:14:05 2025 +0200 target: drop struct target_type::target_jim_commands() The API was introduced in 2008 by commit 8d73c2a9b0c0 ("duan ellis target tcl work in progress") and never used. Drop it! Change-Id: Icbc5789f59696bd28f9d1151bc3e29f4adb74670 Signed-off-by: Antonio Borneo <bor...@gm...> Reviewed-on: https://review.openocd.org/c/openocd/+/8903 Tested-by: jenkins diff --git a/src/target/target_type.h b/src/target/target_type.h index eddedbf34..5b0dc5a6c 100644 --- a/src/target/target_type.h +++ b/src/target/target_type.h @@ -201,10 +201,6 @@ struct target_type { /* otherwise: JIM_OK, or JIM_ERR, */ int (*target_jim_configure)(struct target *target, struct jim_getopt_info *goi); - /* target commands specifically handled by the target */ - /* returns JIM_OK, or JIM_ERR, or JIM_CONTINUE - if option not understood */ - int (*target_jim_commands)(struct target *target, struct jim_getopt_info *goi); - /** * This method is used to perform target setup that requires * JTAG access. ----------------------------------------------------------------------- Summary of changes: src/target/arm_cti.c | 4 ++-- src/target/target_type.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) hooks/post-receive -- Main OpenOCD repository |