diff --git a/doc/releases/release-notes-4.1.rst b/doc/releases/release-notes-4.1.rst index e23bdb695f3c6..3b712ec57ce93 100644 --- a/doc/releases/release-notes-4.1.rst +++ b/doc/releases/release-notes-4.1.rst @@ -178,6 +178,8 @@ Deprecated APIs and options * :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT` +* :kconfig:option:`CONFIG_BT_CTLR_SCAN_AUX_SET` + * All HWMv1 board name aliases which were added as deprecated in v3.7 are now removed (:github:`82247`). diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf index 9e32256218423..9da71aaca7d1a 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf @@ -68,9 +68,10 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=3 -# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y -# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 +CONFIG_BT_CTLR_LOW_LAT_ULL=y +# CONFIG_BT_CTLR_SCAN_AUX_SET=3 # DEPRECATED +CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y +CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n CONFIG_BT_CTLR_SCAN_UNRESERVED=y diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf index 740de0cc83eb6..175826fa223cc 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf @@ -65,9 +65,10 @@ CONFIG_BT_CTLR_ADV_AUX_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=3 -# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y -# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 +CONFIG_BT_CTLR_LOW_LAT_ULL=y +# CONFIG_BT_CTLR_SCAN_AUX_SET=3 # DEPRECATED +CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y +CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf index 663751c16e65e..c0455360ef21a 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf @@ -53,9 +53,10 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=1 -# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y -# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 +CONFIG_BT_CTLR_LOW_LAT_ULL=y +# CONFIG_BT_CTLR_SCAN_AUX_SET=3 # DEPRECATED +CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y +CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3 CONFIG_BT_CTLR_SCAN_UNRESERVED=y CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf index 710530568acb8..37ec9e3383d45 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf @@ -77,10 +77,10 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=3 CONFIG_BT_CTLR_LOW_LAT_ULL=y -# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y -# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 +# CONFIG_BT_CTLR_SCAN_AUX_SET=3 # DEPRECATED +CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y +CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y diff --git a/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf b/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf index 05fbeb7be7808..adab4940dbb47 100644 --- a/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf @@ -52,9 +52,10 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=3 -# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y -# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 +CONFIG_BT_CTLR_LOW_LAT_ULL=y +# CONFIG_BT_CTLR_SCAN_AUX_SET=3 # DEPRECATED +CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y +CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y diff --git a/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf b/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf index 48a48893dc8c2..3ec101a6f556a 100644 --- a/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf @@ -51,9 +51,10 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=3 -# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y -# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 +CONFIG_BT_CTLR_LOW_LAT_ULL=y +# CONFIG_BT_CTLR_SCAN_AUX_SET=3 # DEPRECATED +CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y +CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y diff --git a/subsys/bluetooth/controller/Kconfig.ll_sw_split b/subsys/bluetooth/controller/Kconfig.ll_sw_split index a4954e89b81aa..15f70f1db56b7 100644 --- a/subsys/bluetooth/controller/Kconfig.ll_sw_split +++ b/subsys/bluetooth/controller/Kconfig.ll_sw_split @@ -532,20 +532,13 @@ config BT_CTRL_ADV_ADI_IN_SCAN_RSP config BT_CTLR_SCAN_AUX_USE_CHAINS bool "Use new chains based implementation for following advertising chains" depends on BT_OBSERVER && BT_CTLR_ADV_EXT + default y help Use the new chains based implementation of following advertising chains instead of the old sets based one. The new implementation has a much lighter footprint, since it limits allocations per advertising chain to the bare minimum and only uses one ticker -config BT_CTLR_SCAN_AUX_SET - int "LE Extended Scanning Auxiliary Sets" - depends on BT_OBSERVER && BT_CTLR_ADV_EXT && !BT_CTLR_SCAN_AUX_USE_CHAINS - range 1 64 - default 1 - help - Maximum supported auxiliary channel scan sets. - config BT_CTLR_SCAN_AUX_CHAIN_COUNT int "LE Extended Scanning Auxiliary Chains" depends on BT_OBSERVER && BT_CTLR_ADV_EXT && BT_CTLR_SCAN_AUX_USE_CHAINS @@ -555,6 +548,21 @@ config BT_CTLR_SCAN_AUX_CHAIN_COUNT Maximum number of extended/periodic advertising chains that can be followed simultaneously +config BT_CTLR_SCAN_AUX_SET + int "LE Extended Scanning Auxiliary Sets [DEPRECATED]" + depends on BT_OBSERVER && BT_CTLR_ADV_EXT && !BT_CTLR_SCAN_AUX_USE_CHAINS + range 1 64 + default 1 + help + Maximum supported auxiliary channel scan sets. + +config BT_CTLR_SCAN_AUX_SET_DEPRECATED + # Hidden Kconfig to select DEPRECATED if BT_CTLR_SCAN_AUX_SET is used + bool + depends on BT_OBSERVER && BT_CTLR_ADV_EXT && !BT_CTLR_SCAN_AUX_USE_CHAINS + select DEPRECATED + default y + config BT_CTLR_SCAN_AUX_SYNC_RESERVE_MIN bool "Use minimal Scan Auxiliary and Periodic Sync PDU time reservation" depends on (BT_OBSERVER && BT_CTLR_ADV_EXT) || BT_CTLR_SYNC_PERIODIC diff --git a/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf b/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf index 502feb63f94be..2338559f92413 100644 --- a/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf +++ b/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf @@ -23,9 +23,10 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=3 -# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y -# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 +CONFIG_BT_CTLR_LOW_LAT_ULL=y +# CONFIG_BT_CTLR_SCAN_AUX_SET=3 # DEPRECATED +CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y +CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y diff --git a/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf b/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf index be19c24777c28..66d92487cf175 100644 --- a/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf +++ b/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf @@ -62,9 +62,10 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=3 -# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y -# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 +CONFIG_BT_CTLR_LOW_LAT_ULL=y +# CONFIG_BT_CTLR_SCAN_AUX_SET=3 # DEPRECATED +CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y +CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n