From dad48d12a0e9866467ca4876c9679e1b2d0dfbe1 Mon Sep 17 00:00:00 2001 From: Krzysztof Taborowski Date: Fri, 25 Oct 2024 13:51:05 +0200 Subject: [PATCH 1/2] config: remove experimental label for SOC_NRF54L15 [KRKNWK-19515] Signed-off-by: Krzysztof Taborowski --- Kconfig.dependencies | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Kconfig.dependencies b/Kconfig.dependencies index bff4d16aaf..1b7ec8703e 100644 --- a/Kconfig.dependencies +++ b/Kconfig.dependencies @@ -21,11 +21,6 @@ config SIDEWALK_BUILD help An internal config to build the NCS Sidewalk Sources. -config SIDEWALK_NRF54L15_SUPPORT - bool "Sidewalk support for nRF54L15 [EXPERIMENTAL]" - select EXPERIMENTAL - default SOC_NRF54L15 && SIDEWALK - config SIDEWALK_TFM_SUPPORT bool "Sidewalk support for TF-M [EXPERIMENTAL]" select EXPERIMENTAL From 3da9532156051994032a469b555ccb1248d1a1fd Mon Sep 17 00:00:00 2001 From: Krzysztof Taborowski Date: Fri, 25 Oct 2024 14:33:24 +0200 Subject: [PATCH 2/2] pal: remove sidewalk ble mac address types [KRKNWK-19515] Marked as deprecated. Signed-off-by: Krzysztof Taborowski --- Kconfig | 51 +----------------------- subsys/sal/sid_pal/src/sid_ble_adapter.c | 11 ----- subsys/sal/sid_pal/src/sid_ble_advert.c | 9 ----- 3 files changed, 1 insertion(+), 70 deletions(-) diff --git a/Kconfig b/Kconfig index c8ccf6b0fc..12af18536e 100644 --- a/Kconfig +++ b/Kconfig @@ -135,58 +135,9 @@ config DEPRECATED_SIDEWALK_PAL_INIT help Sidewalk 1.16 stack introduces new sid api sid_platform_init. Now new api togehter with sid_common pal are used by default. + This implementation is DEPRECATED. # BLE -config DEPRECATED_SIDEWALK_BLE_MAC_ADDR_TYPE - bool "Enable Sidewalk BLE MAC addres type choice [DEPRICATED]" - help - The BLE MAC address type can be set using NCS configs. - By default Sidewalk will use private random address. - -if DEPRECATED_SIDEWALK_BLE_MAC_ADDR_TYPE -choice SIDEWALK_BLE_MAC_ADDR_TYPE - prompt "BLE MAC address type [DEPRICATED]" - default MAC_ADDRESS_TYPE_RANDOM_PRIVATE_RESOLVABLE - -config MAC_ADDRESS_TYPE_PUBLIC - bool "Public Address [DEPRICATED]" - help - Address obtained from IEEE registration authority, no privacy. - -config MAC_ADDRESS_TYPE_RANDOM_PRIVATE_NON_RESOLVABLE - bool "Random Private Non-Resolvable Address [DEPRICATED]" - imply BT_SMP - help - Random generated address non resolvable by remote - changes on every advertisement or connection. - -config MAC_ADDRESS_TYPE_STATIC_RANDOM - bool "Random Static Address [DEPRICATED]" - help - Random generated address changes on each device boot up or - stay fixed for lifetime of device. - -config MAC_ADDRESS_TYPE_RANDOM_PRIVATE_RESOLVABLE - bool "Random Private Resolvable Address [DEPRICATED]" - imply BT_SMP - imply BT_PRIVACY - help - Random generated address with IRK(Identity Resolving Key) - resolvable by remote. Used when bonding is enabled. - -endchoice # SIDEWALK_BLE_MAC_ADDR_TYPE - -if MAC_ADDRESS_TYPE_PUBLIC -config SID_BT_PUB_ADDR - string "Public MAC address for controller [DEPRICATED]" - default "AA:FF:BB:EE:CC:DD" - help - Specify a MAC address for the BLE interface in the form of - six hex 8-bit chars separated by colons (e.g.:AA:BB:CC:DD:EE:FF). -endif # MAC_ADDRESS_TYPE_PUBLIC - -endif # DEPRECATED_SIDEWALK_BLE_MAC_ADDR_TYPE - config SIDEWALK_BLE_ADV_INT_PRECISION int "Precision of advertisement interval in ms" range 1 1000 diff --git a/subsys/sal/sid_pal/src/sid_ble_adapter.c b/subsys/sal/sid_pal/src/sid_ble_adapter.c index 5e8d568c79..c4ffad93d8 100644 --- a/subsys/sal/sid_pal/src/sid_ble_adapter.c +++ b/subsys/sal/sid_pal/src/sid_ble_adapter.c @@ -22,10 +22,6 @@ #include #include -#if defined(CONFIG_MAC_ADDRESS_TYPE_PUBLIC) -#include -#endif /* CONFIG_MAC_ADDRESS_TYPE_PUBLIC */ - #include #include @@ -223,13 +219,6 @@ static sid_error_t ble_adapter_init(const sid_ble_config_t *cfg) ARG_UNUSED(cfg); LOG_INF("Enable BT"); - -#if defined(CONFIG_MAC_ADDRESS_TYPE_PUBLIC) - bt_addr_t pub_addr; - bt_addr_from_str(CONFIG_SID_BT_PUB_ADDR, &pub_addr); - bt_ctlr_set_public_addr(pub_addr.val); -#endif /* CONFIG_MAC_ADDRESS_TYPE_PUBLIC */ - int err_code; err_code = bt_enable(NULL); switch (err_code) { diff --git a/subsys/sal/sid_pal/src/sid_ble_advert.c b/subsys/sal/sid_pal/src/sid_ble_advert.c index 356a17226f..438631fee8 100644 --- a/subsys/sal/sid_pal/src/sid_ble_advert.c +++ b/subsys/sal/sid_pal/src/sid_ble_advert.c @@ -20,13 +20,9 @@ LOG_MODULE_REGISTER(sid_ble_advert, CONFIG_SIDEWALK_BLE_ADAPTER_LOG_LEVEL); #define MS_TO_INTERVAL_VAL(ms) (uint16_t)((ms) / 0.625f) -#if defined(CONFIG_MAC_ADDRESS_TYPE_RANDOM_PRIVATE_NON_RESOLVABLE) -#define AMA_ADV_OPTIONS (BT_LE_ADV_OPT_USE_NAME | BT_LE_ADV_OPT_FORCE_NAME_IN_AD) -#else #define AMA_ADV_OPTIONS \ (BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_USE_NAME | BT_LE_ADV_OPT_FORCE_NAME_IN_AD | \ BT_LE_ADV_OPT_ONE_TIME) -#endif #if 10240 < (CONFIG_SIDEWALK_BLE_ADV_INT_FAST + CONFIG_SIDEWALK_BLE_ADV_INT_PRECISION) #error "Invalid value for CONFIG_SIDEWALK_BLE_ADV_INT_FAST or CONFIG_SIDEWALK_BLE_ADV_INT_PRECISION, sum of those values have to be smaller than 10240" @@ -130,11 +126,6 @@ int sid_ble_advert_start(void) } atomic_set(&adv_state, BLE_ADV_ENABLE); -#if defined(CONFIG_MAC_ADDRESS_TYPE_RANDOM_PRIVATE_NON_RESOLVABLE) - static struct bt_le_oob oob; - (void)bt_le_oob_get_local(BT_ID_DEFAULT, &oob); -#endif - return err; }