From f9b91b1e9eedeee2caeb2e080ee8be2fd9f33ff5 Mon Sep 17 00:00:00 2001 From: Emanuele Di Santo Date: Mon, 17 Nov 2025 13:06:37 +0100 Subject: [PATCH 1/3] sdh: soc: let the SoC observers be static Let NRF_SDH_SOC_OBSERVER declare a static observer to prevent linking errors when another observer with the same name is declared somewhere else. Signed-off-by: Emanuele Di Santo --- include/bm/softdevice_handler/nrf_sdh_soc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/bm/softdevice_handler/nrf_sdh_soc.h b/include/bm/softdevice_handler/nrf_sdh_soc.h index ebe9884a84..595e27814f 100644 --- a/include/bm/softdevice_handler/nrf_sdh_soc.h +++ b/include/bm/softdevice_handler/nrf_sdh_soc.h @@ -53,8 +53,8 @@ struct nrf_sdh_soc_evt_observer { */ #define NRF_SDH_SOC_OBSERVER(_observer, _handler, _ctx, _prio) \ PRIO_LEVEL_IS_VALID(_prio); \ - const TYPE_SECTION_ITERABLE(struct nrf_sdh_soc_evt_observer, _observer, \ - nrf_sdh_soc_evt_observers, PRIO_LEVEL_ORD(_prio)) = { \ + static const TYPE_SECTION_ITERABLE(struct nrf_sdh_soc_evt_observer, _observer, \ + nrf_sdh_soc_evt_observers, PRIO_LEVEL_ORD(_prio)) = { \ .handler = _handler, \ .context = _ctx, \ } From 914348f775d96f85f7814c5291a4c044383dbcd6 Mon Sep 17 00:00:00 2001 From: Emanuele Di Santo Date: Mon, 17 Nov 2025 13:07:12 +0100 Subject: [PATCH 2/3] sdh: let the stack observers be static Let NRF_SDH_STACK_EVT_OBSERVER declare a static observer to prevent linking errors when another observer with the same name is declared somewhere else. Signed-off-by: Emanuele Di Santo --- include/bm/softdevice_handler/nrf_sdh.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/bm/softdevice_handler/nrf_sdh.h b/include/bm/softdevice_handler/nrf_sdh.h index e33fb3646c..6efa200139 100644 --- a/include/bm/softdevice_handler/nrf_sdh.h +++ b/include/bm/softdevice_handler/nrf_sdh.h @@ -191,8 +191,8 @@ struct nrf_sdh_stack_evt_observer { #define NRF_SDH_STACK_EVT_OBSERVER(_observer, _handler, _ctx, _prio) \ PRIO_LEVEL_IS_VALID(_prio); \ static void _handler(void *); \ - const TYPE_SECTION_ITERABLE(struct nrf_sdh_stack_evt_observer, _observer, \ - nrf_sdh_stack_evt_observers, PRIO_LEVEL_ORD(_prio)) = { \ + static const TYPE_SECTION_ITERABLE(struct nrf_sdh_stack_evt_observer, _observer, \ + nrf_sdh_stack_evt_observers, PRIO_LEVEL_ORD(_prio)) = { \ .handler = _handler, \ .context = _ctx, \ } From f066b0cc40fcad1d43b6c90de3e52618255156dd Mon Sep 17 00:00:00 2001 From: Emanuele Di Santo Date: Mon, 17 Nov 2025 13:07:26 +0100 Subject: [PATCH 3/3] sdh: let the state observers be static Let NRF_SDH_STATE_EVT_OBSERVER declare a static observer to prevent linking errors when another observer with the same name is declared somewhere else. Signed-off-by: Emanuele Di Santo --- include/bm/softdevice_handler/nrf_sdh.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/bm/softdevice_handler/nrf_sdh.h b/include/bm/softdevice_handler/nrf_sdh.h index 6efa200139..819e59d5fd 100644 --- a/include/bm/softdevice_handler/nrf_sdh.h +++ b/include/bm/softdevice_handler/nrf_sdh.h @@ -150,8 +150,8 @@ struct nrf_sdh_state_evt_observer { #define NRF_SDH_STATE_EVT_OBSERVER(_observer, _handler, _ctx, _prio) \ PRIO_LEVEL_IS_VALID(_prio); \ static int _handler(enum nrf_sdh_state_evt, void *); \ - TYPE_SECTION_ITERABLE(struct nrf_sdh_state_evt_observer, _observer, \ - nrf_sdh_state_evt_observers, PRIO_LEVEL_ORD(_prio)) = { \ + static TYPE_SECTION_ITERABLE(struct nrf_sdh_state_evt_observer, _observer, \ + nrf_sdh_state_evt_observers, PRIO_LEVEL_ORD(_prio)) = { \ .handler = _handler, \ .context = _ctx, \ }