From 79dbfc108a113f594cfb383b3e0320e801431fe9 Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Thu, 24 Mar 2022 06:13:27 +0530 Subject: [PATCH] Bluetooth: Controller: Remove experimental from Ext and Periodic Adv Remove experimental label from Advertising Extensions and Periodic Advertising features in the Controller. Signed-off-by: Vinayak Kariappa Chettimada --- subsys/bluetooth/controller/CMakeLists.txt | 4 --- subsys/bluetooth/controller/Kconfig | 33 +++------------------- 2 files changed, 4 insertions(+), 33 deletions(-) diff --git a/subsys/bluetooth/controller/CMakeLists.txt b/subsys/bluetooth/controller/CMakeLists.txt index 5b078bfb19..4b86103fb3 100644 --- a/subsys/bluetooth/controller/CMakeLists.txt +++ b/subsys/bluetooth/controller/CMakeLists.txt @@ -25,10 +25,6 @@ if(CONFIG_BT_LL_SW_SPLIT) "default value change could change Zephyr Bluetooth " "Controller's functional behavior.") endif() - if(CONFIG_BT_CTLR_ADV_EXT) - message(WARNING "\nCONFIG_BT_CTLR_ADV_EXT=y, Advertising Extensions " - "Feature in Zephyr Bluetooth Controller is EXPERIMENTAL.") - endif() zephyr_library_sources( ll_sw/ll_feat.c ll_sw/ull.c diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index d1812c79d7..d1483ac6ed 100644 --- a/subsys/bluetooth/controller/Kconfig +++ b/subsys/bluetooth/controller/Kconfig @@ -482,26 +482,15 @@ config BT_CTLR_CHAN_SEL_2 the Controller. config BT_CTLR_ADV_EXT - bool "LE Advertising Extensions" if !BT_LL_SW_SPLIT + bool "LE Advertising Extensions" depends on BT_CTLR_ADV_EXT_SUPPORT select BT_CTLR_CHAN_SEL_2 if BT_LL_SW_SPLIT && BT_BROADCASTER select BT_CTLR_SCAN_REQ_NOTIFY if BT_LL_SW_SPLIT && BT_BROADCASTER - # Enable by default for BT_LL_SW_SPLIT when "LE Advertising Set Terminated event" is implemented - default y if BT_EXT_ADV && !BT_LL_SW_SPLIT + default y if BT_EXT_ADV help Enable support for Bluetooth 5.0 LE Advertising Extensions in the Controller. -config BT_CTLR_ADV_EXT - prompt "LE Advertising Extensions (Split Link Layer) [EXPERIMENTAL]" if BT_LL_SW_SPLIT - select EXPERIMENTAL if BT_LL_SW_SPLIT - -config PROMPT_ADJUSTMENT_WORKAROUND - bool - help - Unused and hidden Kconfig symbol to allow prompt adjustment. - Work around for https://github.com/ulfalizer/Kconfiglib/issues/117 - if BT_CTLR_ADV_EXT config BT_CTLR_ADV_SET @@ -546,7 +535,7 @@ config BT_CTLR_SCAN_DATA_LEN_MAX Maximum Extended Scanning Data Length. config BT_CTLR_ADV_PERIODIC - bool "LE Periodic Advertising in Advertising State" if !BT_LL_SW_SPLIT + bool "LE Periodic Advertising in Advertising State" depends on BT_BROADCASTER && BT_CTLR_ADV_PERIODIC_SUPPORT select BT_CTLR_CHAN_SEL_2 default y if BT_PER_ADV @@ -554,13 +543,6 @@ config BT_CTLR_ADV_PERIODIC Enable support for Bluetooth 5.0 LE Periodic Advertising in the Controller. -config BT_CTLR_ADV_PERIODIC - bool "LE Periodic Advertising in Advertising State (Split Link Layer) [EXPERIMENTAL]" if BT_LL_SW_SPLIT - select EXPERIMENTAL if BT_LL_SW_SPLIT - -config PROMPT_ADJUSTMENT_WORKAROUND - bool - if BT_CTLR_ADV_PERIODIC config BT_CTLR_ADV_PERIODIC_ADI_SUPPORT @@ -583,7 +565,7 @@ config BT_CTLR_ADV_PERIODIC_INTERVAL_MAX endif # BT_CTLR_ADV_PERIODIC config BT_CTLR_SYNC_PERIODIC - bool "LE Periodic Advertising in Synchronization State" if !BT_LL_SW_SPLIT + bool "LE Periodic Advertising in Synchronization State" depends on BT_OBSERVER && BT_CTLR_SYNC_PERIODIC_SUPPORT select BT_CTLR_CHAN_SEL_2 default y if BT_PER_ADV_SYNC @@ -591,13 +573,6 @@ config BT_CTLR_SYNC_PERIODIC Enable support for Bluetooth 5.0 LE Periodic Advertising in Synchronization state in the Controller. -config BT_CTLR_SYNC_PERIODIC - bool "LE Periodic Advertising in Synchronization State (Split Link Layer) [EXPERIMENTAL]" if BT_LL_SW_SPLIT - select EXPERIMENTAL if BT_LL_SW_SPLIT - -config PROMPT_ADJUSTMENT_WORKAROUND - bool - config BT_CTLR_SYNC_PERIODIC_ADV_LIST bool "LE Periodic Advertiser List support" depends on BT_CTLR_SYNC_PERIODIC