From aaa67f733df5ef29bfdc83e808434a23d6edb580 Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Sun, 7 May 2023 14:35:51 +0200 Subject: [PATCH] rtos: move prototype of rtos_thread_packet() in rtos.h The function rtos_thread_packet() is used across rtos and declared locally as extern. Move the prototype of the function in common include rtos.h Change-Id: I50d311b583148a2de628de0997ef1afc9103a70e Signed-off-by: Antonio Borneo Reviewed-on: https://review.openocd.org/c/openocd/+/7677 Tested-by: jenkins --- src/rtos/eCos.c | 3 --- src/rtos/hwthread.c | 2 -- src/rtos/rtos.c | 2 -- src/rtos/rtos.h | 1 + 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/rtos/eCos.c b/src/rtos/eCos.c index 963bb61cf..10ed12809 100644 --- a/src/rtos/eCos.c +++ b/src/rtos/eCos.c @@ -1161,9 +1161,6 @@ static bool ecos_detect_rtos(struct target *target) return false; } -extern int rtos_thread_packet(struct connection *connection, - const char *packet, int packet_size); - /* Since we should never have 0 as a valid eCos thread ID we use $Hg0 as the * indicator of a new session as regards flushing any cached state. */ static int ecos_packet_hook(struct connection *connection, diff --git a/src/rtos/hwthread.c b/src/rtos/hwthread.c index 03c4d8550..895f11cfc 100644 --- a/src/rtos/hwthread.c +++ b/src/rtos/hwthread.c @@ -32,8 +32,6 @@ static int hwthread_write_buffer(struct rtos *rtos, target_addr_t address, #define HW_THREAD_NAME_STR_SIZE (32) -extern int rtos_thread_packet(struct connection *connection, const char *packet, int packet_size); - static inline threadid_t threadid_from_target(const struct target *target) { return target->coreid + 1; diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c index 6c88de33c..136d93bf6 100644 --- a/src/rtos/rtos.c +++ b/src/rtos/rtos.c @@ -36,8 +36,6 @@ static const struct rtos_type *rtos_types[] = { 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) { if (target->rtos->type->smp_init) diff --git a/src/rtos/rtos.h b/src/rtos/rtos.h index e283dd21b..5ba8b2694 100644 --- a/src/rtos/rtos.h +++ b/src/rtos/rtos.h @@ -123,6 +123,7 @@ int rtos_generic_stack_read(struct target *target, struct rtos_reg **reg_list, int *num_regs); int gdb_thread_packet(struct connection *connection, char const *packet, int packet_size); +int rtos_thread_packet(struct connection *connection, const char *packet, int packet_size); int rtos_get_gdb_reg(struct connection *connection, int reg_num); int rtos_get_gdb_reg_list(struct connection *connection); int rtos_update_threads(struct target *target);