From a6752a1671f7387ee3232bf84fe27a3746a55ac9 Mon Sep 17 00:00:00 2001 From: Samuel Obuch Date: Mon, 8 Sep 2025 12:25:32 +0200 Subject: [PATCH] jtag/drivers/cmsis_dap: fix build with cmsis_dap_tcp backend For some hosts build fails after the recent cmsis_dap_tcp addition (see commit fcff4b712c53 ("jtag/drivers/cmsis_dap: add new backend cmsis_dap_tcp") or https://review.openocd.org/c/openocd/+/8973) - Header 'hidapi.h' may not be available and should not be needed here. - Global pointer variable is not guaranteed to be treated as a constant expression even with const modifier. Use global array instead, to avoid 'error: initializer element is not constant', as address of a global array is a constant expression. Change-Id: I0c72ff52340f546a5f635663a8fde28c99176d1b Signed-off-by: Samuel Obuch Reviewed-on: https://review.openocd.org/c/openocd/+/9115 Tested-by: jenkins Reviewed-by: Brian Kuschak Reviewed-by: Tomas Vanek --- src/jtag/drivers/cmsis_dap_tcp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/jtag/drivers/cmsis_dap_tcp.c b/src/jtag/drivers/cmsis_dap_tcp.c index a654c6bff..8a96cd624 100644 --- a/src/jtag/drivers/cmsis_dap_tcp.c +++ b/src/jtag/drivers/cmsis_dap_tcp.c @@ -20,7 +20,6 @@ #include "config.h" #endif -#include #ifdef HAVE_NETDB_H #include #endif @@ -90,7 +89,7 @@ struct cmsis_dap_backend_data { }; static char *cmsis_dap_tcp_host; -static char *const cmsis_dap_tcp_port_default = STRINGIFY(CMSIS_DAP_TCP_PORT); +static char cmsis_dap_tcp_port_default[] = STRINGIFY(CMSIS_DAP_TCP_PORT); static char *cmsis_dap_tcp_port = cmsis_dap_tcp_port_default; static int cmsis_dap_tcp_min_timeout_ms = DEFAULT_MIN_TIMEOUT_MS;