From: OpenOCD-Gerrit <ope...@us...> - 2020-11-04 17:40:44
|
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 c8628541ae64e954bd72628666b22660d61c5335 (commit) via 9d50f3f3afe1df4457602407c46fc158e7f8f64f (commit) via 61f872311c6051c5aab2834195bceb7482caf2e9 (commit) via a8b436c511dc39e0785af4c9256b7723692ba60e (commit) from f3db7f173ecad8aa78367d8995c8b1fe7f2c4332 (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 c8628541ae64e954bd72628666b22660d61c5335 Author: Antonio Borneo <bor...@gm...> Date: Thu Oct 29 01:34:37 2020 +0100 target/adi_v5_jtag: remove unused global variable Change-Id: Ia4e8b90359c23f4be1d3677b44b0ebd063bb8dcc Signed-off-by: Antonio Borneo <bor...@gm...> Reviewed-on: http://openocd.zylin.com/5901 Tested-by: jenkins Reviewed-by: Tomas Vanek <va...@fb...> diff --git a/src/target/adi_v5_jtag.c b/src/target/adi_v5_jtag.c index c2100eb47..6dede972c 100644 --- a/src/target/adi_v5_jtag.c +++ b/src/target/adi_v5_jtag.c @@ -145,7 +145,7 @@ struct dap_cmd { struct dap_cmd_pool { struct list_head lh; struct dap_cmd cmd; -} dap_cmd_pool; +}; static void log_dap_cmd(const char *header, struct dap_cmd *el) { commit 9d50f3f3afe1df4457602407c46fc158e7f8f64f Author: Antonio Borneo <bor...@gm...> Date: Wed Oct 28 23:48:57 2020 +0100 cortex_m: declare local functions as static Functions that are not used outside the file should be declared as static. Change-Id: Ie81f6bdce91e2a1456364b47f30aa4d35c7ee7bc Signed-off-by: Antonio Borneo <bor...@gm...> Reviewed-on: http://openocd.zylin.com/5900 Reviewed-by: Tomas Vanek <va...@fb...> Reviewed-by: Tarek BOCHKATI <tar...@gm...> Tested-by: jenkins diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c index 503995a5d..08b3661ea 100644 --- a/src/target/cortex_m.c +++ b/src/target/cortex_m.c @@ -1413,7 +1413,7 @@ int cortex_m_remove_breakpoint(struct target *target, struct breakpoint *breakpo return cortex_m_unset_breakpoint(target, breakpoint); } -int cortex_m_set_watchpoint(struct target *target, struct watchpoint *watchpoint) +static int cortex_m_set_watchpoint(struct target *target, struct watchpoint *watchpoint) { int dwt_num = 0; struct cortex_m_common *cortex_m = target_to_cm(target); @@ -1496,7 +1496,7 @@ int cortex_m_set_watchpoint(struct target *target, struct watchpoint *watchpoint return ERROR_OK; } -int cortex_m_unset_watchpoint(struct target *target, struct watchpoint *watchpoint) +static int cortex_m_unset_watchpoint(struct target *target, struct watchpoint *watchpoint) { struct cortex_m_common *cortex_m = target_to_cm(target); struct cortex_m_dwt_comparator *comparator; @@ -1989,7 +1989,7 @@ static void cortex_m_dwt_addreg(struct target *t, struct reg *r, const struct dw r->type = &dwt_reg_type; } -void cortex_m_dwt_setup(struct cortex_m_common *cm, struct target *target) +static void cortex_m_dwt_setup(struct cortex_m_common *cm, struct target *target) { uint32_t dwtcr; struct reg_cache *cache; diff --git a/src/target/cortex_m.h b/src/target/cortex_m.h index 415a6c22f..b470fbd70 100644 --- a/src/target/cortex_m.h +++ b/src/target/cortex_m.h @@ -233,13 +233,10 @@ int cortex_m_set_breakpoint(struct target *target, struct breakpoint *breakpoint int cortex_m_unset_breakpoint(struct target *target, struct breakpoint *breakpoint); int cortex_m_add_breakpoint(struct target *target, struct breakpoint *breakpoint); int cortex_m_remove_breakpoint(struct target *target, struct breakpoint *breakpoint); -int cortex_m_set_watchpoint(struct target *target, struct watchpoint *watchpoint); -int cortex_m_unset_watchpoint(struct target *target, struct watchpoint *watchpoint); int cortex_m_add_watchpoint(struct target *target, struct watchpoint *watchpoint); int cortex_m_remove_watchpoint(struct target *target, struct watchpoint *watchpoint); void cortex_m_enable_breakpoints(struct target *target); void cortex_m_enable_watchpoints(struct target *target); -void cortex_m_dwt_setup(struct cortex_m_common *cm, struct target *target); void cortex_m_deinit_target(struct target *target); int cortex_m_profiling(struct target *target, uint32_t *samples, uint32_t max_num_samples, uint32_t *num_samples, uint32_t seconds); commit 61f872311c6051c5aab2834195bceb7482caf2e9 Author: Antonio Borneo <bor...@gm...> Date: Wed Oct 28 23:44:07 2020 +0100 rtos: make private the API rtos_try_next() The function rtos_try_next() is only used internally. Make it private. Change-Id: I68c6b8d8e6bbf3d674b0e0199e63bc02d358c04e Signed-off-by: Antonio Borneo <bor...@gm...> Reviewed-on: http://openocd.zylin.com/5899 Tested-by: jenkins diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c index 62b65aae1..d9ba735f2 100644 --- a/src/rtos/rtos.c +++ b/src/rtos/rtos.c @@ -57,6 +57,8 @@ static struct rtos_type *rtos_types[] = { NULL }; +static int rtos_try_next(struct target *target); + int rtos_thread_packet(struct connection *connection, const char *packet, int packet_size); int rtos_smp_init(struct target *target) @@ -629,7 +631,7 @@ int rtos_generic_stack_read(struct target *target, return ERROR_OK; } -int rtos_try_next(struct target *target) +static int rtos_try_next(struct target *target) { struct rtos *os = target->rtos; struct rtos_type **type = rtos_types; diff --git a/src/rtos/rtos.h b/src/rtos/rtos.h index c755eec29..b437be0dd 100644 --- a/src/rtos/rtos.h +++ b/src/rtos/rtos.h @@ -119,7 +119,6 @@ int rtos_generic_stack_read(struct target *target, int64_t stack_ptr, struct rtos_reg **reg_list, int *num_regs); -int rtos_try_next(struct target *target); int gdb_thread_packet(struct connection *connection, char const *packet, int packet_size); int rtos_get_gdb_reg(struct connection *connection, int reg_num); int rtos_get_gdb_reg_list(struct connection *connection); commit a8b436c511dc39e0785af4c9256b7723692ba60e Author: Antonio Borneo <bor...@gm...> Date: Wed Oct 28 23:20:42 2020 +0100 transport: remove unused function transports_are_declared() The only use of this function has been removed with commit 159f11fefc19 ("jtag: set default "jtag_only" to uninitialized transports"). Get rid of the unused function. Change-Id: I79dd1d55bd54ed8edc39ed3443e6c3c01794f063 Signed-off-by: Antonio Borneo <bor...@gm...> Reviewed-on: http://openocd.zylin.com/5898 Tested-by: jenkins Reviewed-by: Tomas Vanek <va...@fb...> diff --git a/src/transport/transport.c b/src/transport/transport.c index 9214dcd77..cb000ab11 100644 --- a/src/transport/transport.c +++ b/src/transport/transport.c @@ -121,16 +121,6 @@ int allow_transports(struct command_context *ctx, const char * const *vector) return ERROR_OK; } -/** - * Used to verify correct adapter driver initialization. - * - * @returns true if the adapter declares one or more transports. - */ -bool transports_are_declared(void) -{ - return allowed_transports != NULL; -} - /** * Registers a transport. There are general purpose transports * (such as JTAG), as well as relatively proprietary ones which are diff --git a/src/transport/transport.h b/src/transport/transport.h index 809564e78..e04f78063 100644 --- a/src/transport/transport.h +++ b/src/transport/transport.h @@ -92,8 +92,6 @@ COMMAND_HELPER(transport_list_parse, char ***vector); int allow_transports(struct command_context *ctx, const char * const *vector); -bool transports_are_declared(void); - bool transport_is_jtag(void); bool transport_is_swd(void); bool transport_is_dapdirect_jtag(void); ----------------------------------------------------------------------- Summary of changes: src/rtos/rtos.c | 4 +++- src/rtos/rtos.h | 1 - src/target/adi_v5_jtag.c | 2 +- src/target/cortex_m.c | 6 +++--- src/target/cortex_m.h | 3 --- src/transport/transport.c | 10 ---------- src/transport/transport.h | 2 -- 7 files changed, 7 insertions(+), 21 deletions(-) hooks/post-receive -- Main OpenOCD repository |