From d032e7ec8c2978feda5df2ca7c4ddbcaec2fcbf5 Mon Sep 17 00:00:00 2001 From: Andreas Fritiofson Date: Mon, 8 Nov 2021 19:35:27 +0100 Subject: [PATCH] rtos: Fix constness of struct rtos_type Change-Id: Iaa89f2ff4036c23f944ffb4f37fe0c7afaf5069b Signed-off-by: Andreas Fritiofson Reviewed-on: https://review.openocd.org/c/openocd/+/6680 Tested-by: jenkins Reviewed-by: Antonio Borneo --- src/rtos/FreeRTOS.c | 2 +- src/rtos/chibios.c | 2 +- src/rtos/embKernel.c | 2 +- src/rtos/mqx.c | 2 +- src/rtos/nuttx.c | 2 +- src/rtos/rtos.c | 36 ++++++++++++++++++------------------ src/rtos/zephyr.c | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/rtos/FreeRTOS.c b/src/rtos/FreeRTOS.c index 945c4b875..070275f2c 100644 --- a/src/rtos/FreeRTOS.c +++ b/src/rtos/FreeRTOS.c @@ -80,7 +80,7 @@ static int freertos_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, struct rtos_reg **reg_list, int *num_regs); static int freertos_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[]); -struct rtos_type freertos_rtos = { +const struct rtos_type freertos_rtos = { .name = "FreeRTOS", .detect_rtos = freertos_detect_rtos, diff --git a/src/rtos/chibios.c b/src/rtos/chibios.c index 8319cc883..68fe8a14c 100644 --- a/src/rtos/chibios.c +++ b/src/rtos/chibios.c @@ -97,7 +97,7 @@ static int chibios_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, struct rtos_reg **reg_list, int *num_regs); static int chibios_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[]); -struct rtos_type chibios_rtos = { +const struct rtos_type chibios_rtos = { .name = "chibios", .detect_rtos = chibios_detect_rtos, diff --git a/src/rtos/embKernel.c b/src/rtos/embKernel.c index c1b5723fc..a03b039e0 100644 --- a/src/rtos/embKernel.c +++ b/src/rtos/embKernel.c @@ -27,7 +27,7 @@ static int embkernel_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, struct rtos_reg **reg_list, int *num_regs); static int embkernel_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[]); -struct rtos_type embkernel_rtos = { +const struct rtos_type embkernel_rtos = { .name = "embKernel", .detect_rtos = embkernel_detect_rtos, .create = embkernel_create, diff --git a/src/rtos/mqx.c b/src/rtos/mqx.c index 8d483ed3b..d9b694282 100644 --- a/src/rtos/mqx.c +++ b/src/rtos/mqx.c @@ -498,7 +498,7 @@ static int mqx_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[] return ERROR_OK; } -struct rtos_type mqx_rtos = { +const struct rtos_type mqx_rtos = { .name = "mqx", .detect_rtos = mqx_detect_rtos, .create = mqx_create, diff --git a/src/rtos/nuttx.c b/src/rtos/nuttx.c index 993ff84bd..78271181e 100644 --- a/src/rtos/nuttx.c +++ b/src/rtos/nuttx.c @@ -324,7 +324,7 @@ static int nuttx_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list return 0; } -struct rtos_type nuttx_rtos = { +const struct rtos_type nuttx_rtos = { .name = "nuttx", .detect_rtos = nuttx_detect_rtos, .create = nuttx_create, diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c index bcd556a7b..f1e8956a3 100644 --- a/src/rtos/rtos.c +++ b/src/rtos/rtos.c @@ -16,22 +16,22 @@ #include "server/gdb_server.h" /* RTOSs */ -extern struct rtos_type freertos_rtos; -extern struct rtos_type threadx_rtos; -extern struct rtos_type ecos_rtos; -extern struct rtos_type linux_rtos; -extern struct rtos_type chibios_rtos; -extern struct rtos_type chromium_ec_rtos; -extern struct rtos_type embkernel_rtos; -extern struct rtos_type mqx_rtos; -extern struct rtos_type ucos_iii_rtos; -extern struct rtos_type nuttx_rtos; -extern struct rtos_type hwthread_rtos; -extern struct rtos_type riot_rtos; -extern struct rtos_type zephyr_rtos; -extern struct rtos_type rtkernel_rtos; +extern const struct rtos_type freertos_rtos; +extern const struct rtos_type threadx_rtos; +extern const struct rtos_type ecos_rtos; +extern const struct rtos_type linux_rtos; +extern const struct rtos_type chibios_rtos; +extern const struct rtos_type chromium_ec_rtos; +extern const struct rtos_type embkernel_rtos; +extern const struct rtos_type mqx_rtos; +extern const struct rtos_type ucos_iii_rtos; +extern const struct rtos_type nuttx_rtos; +extern const struct rtos_type hwthread_rtos; +extern const struct rtos_type riot_rtos; +extern const struct rtos_type zephyr_rtos; +extern const struct rtos_type rtkernel_rtos; -static struct rtos_type *rtos_types[] = { +static const struct rtos_type *rtos_types[] = { &threadx_rtos, &freertos_rtos, &ecos_rtos, @@ -70,7 +70,7 @@ static int rtos_target_for_threadid(struct connection *connection, int64_t threa return ERROR_OK; } -static int os_alloc(struct target *target, struct rtos_type *ostype) +static int os_alloc(struct target *target, const struct rtos_type *ostype) { struct rtos *os = target->rtos = calloc(1, sizeof(struct rtos)); @@ -100,7 +100,7 @@ static void os_free(struct target *target) target->rtos = NULL; } -static int os_alloc_create(struct target *target, struct rtos_type *ostype) +static int os_alloc_create(struct target *target, const struct rtos_type *ostype) { int ret = os_alloc(target, ostype); @@ -683,7 +683,7 @@ int rtos_generic_stack_read(struct target *target, static int rtos_try_next(struct target *target) { struct rtos *os = target->rtos; - struct rtos_type **type = rtos_types; + const struct rtos_type **type = rtos_types; if (!os) return 0; diff --git a/src/rtos/zephyr.c b/src/rtos/zephyr.c index b00b4b341..934a8dd1c 100644 --- a/src/rtos/zephyr.c +++ b/src/rtos/zephyr.c @@ -785,7 +785,7 @@ static int zephyr_get_symbol_list_to_lookup(struct symbol_table_elem **symbol_li return ERROR_OK; } -struct rtos_type zephyr_rtos = { +const struct rtos_type zephyr_rtos = { .name = "Zephyr", .detect_rtos = zephyr_detect_rtos,