config: refactor radio config getter

use void pointer and cast to radio struct in init function.

Signed-off-by: Krzysztof Taborowski <[email protected]>

Author: ktaborowski

samples/sid_end_device/src/sidewalk_events.c

@@ -64,12 +64,7 @@ void sidewalk_event_platform_init(sidewalk_ctx_t *sid, void *ctx)
 		.mfg_store_region.addr_start = APP_MFG_CFG_FLASH_START,
 		.mfg_store_region.addr_end = APP_MFG_CFG_FLASH_END,
 #ifdef CONFIG_SIDEWALK_SUBGHZ_SUPPORT
-		.platform_init_parameters.radio_cfg =
-#if defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_SX126X)
-			(radio_sx126x_device_config_t *)get_radio_cfg(),
-#elif defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_LR1110)
-			(radio_lr1110_device_config_t *)get_radio_cfg(),
-#endif /* CONFIG_SIDEWALK_SUBGHZ_RADIO */
+		.platform_init_parameters.radio_cfg = get_radio_cfg(),
 #endif
 	};
 

subsys/config/common/include/app_subGHz_config.h

@@ -16,23 +16,14 @@
 #ifndef APP_900_CONFIG_H
 #define APP_900_CONFIG_H
 
-#if defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_SX126X)
-#include <sx126x_config.h>
-#elif defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_LR1110)
-#include <lr1110_config.h>
-#endif /* CONFIG_SIDEWALK_SUBGHZ_RADIO */
 #include <sid_pal_mfg_store_ifc.h>
 #include <sid_900_cfg.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_SX126X)
-const radio_sx126x_device_config_t* get_radio_cfg(void);
-#elif defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_LR1110)
-const radio_lr1110_device_config_t* get_radio_cfg(void);
-#endif /* CONFIG_SIDEWALK_SUBGHZ_RADIO */
+const void* get_radio_cfg(void);
 const sid_pal_mfg_store_region_t* get_mfg_cfg(void);
 struct sid_sub_ghz_links_config* app_get_sub_ghz_config(void);
 

subsys/config/common/src/app_subGHz_config.c

@@ -201,7 +201,7 @@ static radio_lr1110_device_config_t radio_lr1110_cfg = {
         },
 };
 
-const radio_lr1110_device_config_t *get_radio_cfg(void)
+const void *get_radio_cfg(void)
 {
 	radio_lr1110_cfg.gpios.power =
 		sid_gpio_utils_register_gpio((struct gpio_dt_spec)GPIO_DT_SPEC_GET_OR(

subsys/config/common/src/app_subGHz_config_lr11xx.c

@@ -148,7 +148,7 @@ static radio_sx126x_device_config_t radio_sx1262_cfg = {
 	},
 };
 
-const radio_sx126x_device_config_t *get_radio_cfg(void)
+const void *get_radio_cfg(void)
 {
 	radio_sx1262_cfg.gpio_power =
 		sid_gpio_utils_register_gpio((struct gpio_dt_spec)GPIO_DT_SPEC_GET_OR(

subsys/config/common/src/app_subGHz_config_sx126x.c

@@ -16,20 +16,9 @@
 #ifndef SID_PAL_PLATFORM_INIT_TYPES_H
 #define SID_PAL_PLATFORM_INIT_TYPES_H
 
-#if defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_SX126X)
-#include <sx126x_config.h>
-#elif defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_LR1110)
-#include <lr1110_config.h>
-#endif /* CONFIG_SIDEWALK_SUBGHZ_RADIO */
-
 typedef struct {
-//place holder for platform specific init parameters
 #if defined(CONFIG_SIDEWALK_SUBGHZ_SUPPORT)
-#if defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_SX126X)
-    radio_sx126x_device_config_t * radio_cfg;
-#elif defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_LR1110)
-    radio_lr1110_device_config_t * radio_cfg;
-#endif /* CONFIG_SIDEWALK_SUBGHZ_RADIO */
+    const void * radio_cfg;
 #endif /* CONFIG_SIDEWALK_SUBGHZ_SUPPORT */
 } platform_specific_init_parameters_t;
 

subsys/sal/common/sid_pal_types/sid_pal_platform_init_types.h

@@ -10,35 +10,38 @@
 #if defined(CONFIG_SIDEWALK_SUBGHZ_SUPPORT) && defined(CONFIG_SOC_SERIES_NRF53X)
 #include <zephyr/bluetooth/bluetooth.h>
 #endif /* defined(CONFIG_SOC_SERIES_NRF53X) && defined(CONFIG_SIDEWALK_SUBGHZ_SUPPORT) */
-#if defined(CONFIG_SIDEWALK_SUBGHZ_SUPPORT)
-#if defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_SX126X)
-#include <sx126x_config.h>
-#elif defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_LR1110)
-#include <lr1110_config.h>
-#endif /* CONFIG_SIDEWALK_SUBGHZ_RADIO */
-#endif /* CONFIG_SIDEWALK_SUBGHZ_SUPPORT */
 
 #include <zephyr/kernel.h>
 #include <zephyr/storage/flash_map.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(sid_common, CONFIG_SIDEWALK_LOG_LEVEL);
 
+#if defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_SX126X)
+#include <sx126x_config.h>
+static void set_radio_config(const void *cfg)
+{
+	set_radio_sx126x_device_config((const radio_sx126x_device_config_t *)cfg);
+}
+#elif defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_LR1110)
+#include <lr1110_config.h>
+static void set_radio_config(const void *cfg)
+{
+	set_radio_lr1110_device_config((const radio_lr1110_device_config_t *)cfg);
+}
+#endif /* CONFIG_SIDEWALK_SUBGHZ_RADIO */
+
 sid_error_t sid_pal_common_init(const platform_specific_init_parameters_t *platform_init_parameters)
 {
-	if (!platform_init_parameters
-#if defined(CONFIG_SIDEWALK_SUBGHZ_SUPPORT)
-	    || !platform_init_parameters->radio_cfg
-#endif
-	) {
+	if (!platform_init_parameters) {
 		return SID_ERROR_INCOMPATIBLE_PARAMS;
 	}
+
 #if defined(CONFIG_SIDEWALK_SUBGHZ_SUPPORT)
-#if defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_SX126X)
-	set_radio_sx126x_device_config(platform_init_parameters->radio_cfg);
-#elif defined(CONFIG_SIDEWALK_SUBGHZ_RADIO_LR1110)
-	set_radio_lr1110_device_config(platform_init_parameters->radio_cfg);
-#endif /* CONFIG_SIDEWALK_SUBGHZ_RADIO */
+	if (!platform_init_parameters->radio_cfg) {
+		return SID_ERROR_INCOMPATIBLE_PARAMS;
+	}
+	set_radio_config(platform_init_parameters->radio_cfg);
 #if defined(CONFIG_SOC_SERIES_NRF53X)
 	(void)bt_enable(NULL);
 	(void)bt_disable();