Bluetooth: Controller: Default stream count based upon app configs

When building ISO applications on a device that has the host and controller on the same core, the application developer shouldn't have to set controller specific configurations. Without this change the samples iso_receive and iso_broadcast will fail to run on NRF52 series devices as the samples try to set up two streams but the controller is configured to support only one. Controller unit tests that were previously only enabling the controller specific ISO configurations now also enable the top-level ISO configurations to ensure that the default stream count is properly configured. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2024-04-15 10:02:49 +02:00 · 2024-04-15 10:02:49 +02:00 · ebae4b8cf7
parent 09048e0a16
commit ebae4b8cf7
33 changed files with 67 additions and 1 deletions
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@ -804,6 +804,7 @@ config BT_CTLR_ADV_ISO_STREAM_COUNT
 	int "Maximum Broadcast ISO Streams"
 	depends on BT_CTLR_ADV_ISO
 	range BT_CTLR_ADV_ISO_STREAM_MAX 64
+	default BT_ISO_MAX_CHAN
 	help
 	  Maximum Broadcast ISO Streams supported in the the Controller across
 	  all Broadcast ISO groups.
@ -836,6 +837,7 @@ config BT_CTLR_SYNC_ISO_STREAM_COUNT
 	int "Maximum ISO Synchronized Receiver Streams"
 	depends on BT_CTLR_SYNC_ISO
 	range BT_CTLR_SYNC_ISO_STREAM_MAX 64
+	default BT_ISO_MAX_CHAN
 	help
 	  Maximum ISO Synchronized Receiver Streams supported in the the
 	  Controller across all Broadcast ISO groups.
@ -894,7 +896,7 @@ config BT_CTLR_CONN_ISO_STREAMS
 	int "LE Connected Isochronous Streams"
 	depends on BT_CTLR_CONN_ISO
 	range 1 64
-	default 2
+	default BT_ISO_MAX_CHAN
 	help
 	  Maximum supported total number of CISes.

--- a/tests/bluetooth/controller/ctrl_api/prj.conf
+++ b/tests/bluetooth/controller/ctrl_api/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_chmu/prj.conf
+++ b/tests/bluetooth/controller/ctrl_chmu/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_cis_create/prj.conf
+++ b/tests/bluetooth/controller/ctrl_cis_create/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_cis_terminate/prj.conf
+++ b/tests/bluetooth/controller/ctrl_cis_terminate/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_collision/prj.conf
+++ b/tests/bluetooth/controller/ctrl_collision/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_conn_update/prj.conf
+++ b/tests/bluetooth/controller/ctrl_conn_update/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y
 CONFIG_BT_CTLR_CONN_PARAM_REQ=y
--- a/tests/bluetooth/controller/ctrl_conn_update/prj_apm.conf
+++ b/tests/bluetooth/controller/ctrl_conn_update/prj_apm.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y
 CONFIG_BT_CTLR_CONN_PARAM_REQ=y
--- a/tests/bluetooth/controller/ctrl_conn_update/prj_no_param_req.conf
+++ b/tests/bluetooth/controller/ctrl_conn_update/prj_no_param_req.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y
 CONFIG_BT_CTLR_CONN_PARAM_REQ=n
--- a/tests/bluetooth/controller/ctrl_cte_req/prj.conf
+++ b/tests/bluetooth/controller/ctrl_cte_req/prj.conf
@ -17,6 +17,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_data_length_update/prj.conf
+++ b/tests/bluetooth/controller/ctrl_data_length_update/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_data_length_update/prj_nocoded.conf
+++ b/tests/bluetooth/controller/ctrl_data_length_update/prj_nocoded.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_data_length_update/prj_nophy.conf
+++ b/tests/bluetooth/controller/ctrl_data_length_update/prj_nophy.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_encrypt/prj.conf
+++ b/tests/bluetooth/controller/ctrl_encrypt/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_feature_exchange/prj.conf
+++ b/tests/bluetooth/controller/ctrl_feature_exchange/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_hci/prj.conf
+++ b/tests/bluetooth/controller/ctrl_hci/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y
 CONFIG_BT_MAX_CONN=4
--- a/tests/bluetooth/controller/ctrl_invalid/prj.conf
+++ b/tests/bluetooth/controller/ctrl_invalid/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_le_ping/prj.conf
+++ b/tests/bluetooth/controller/ctrl_le_ping/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_min_used_chans/prj.conf
+++ b/tests/bluetooth/controller/ctrl_min_used_chans/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_phy_update/prj.conf
+++ b/tests/bluetooth/controller/ctrl_phy_update/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_phy_update/prj_rx_cnt.conf
+++ b/tests/bluetooth/controller/ctrl_phy_update/prj_rx_cnt.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_sca_update/prj.conf
+++ b/tests/bluetooth/controller/ctrl_sca_update/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_terminate/prj.conf
+++ b/tests/bluetooth/controller/ctrl_terminate/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj.conf
+++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj.conf
@ -15,6 +15,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y
 CONFIG_BT_MAX_CONN=4
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_1.conf
+++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_1.conf
@ -15,6 +15,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y
 CONFIG_BT_MAX_CONN=4
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_2.conf
+++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_2.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_3.conf
+++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_3.conf
@ -15,6 +15,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y
 CONFIG_BT_MAX_CONN=4
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_max.conf
+++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_max.conf
@ -15,6 +15,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y
 CONFIG_BT_MAX_CONN=4
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_max_common.conf
+++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/prj_max_common.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_tx_queue/prj.conf
+++ b/tests/bluetooth/controller/ctrl_tx_queue/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_unsupported/prj.conf
+++ b/tests/bluetooth/controller/ctrl_unsupported/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_unsupported/prj_unsupported.conf
+++ b/tests/bluetooth/controller/ctrl_unsupported/prj_unsupported.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y

--- a/tests/bluetooth/controller/ctrl_version/prj.conf
+++ b/tests/bluetooth/controller/ctrl_version/prj.conf
@ -14,6 +14,8 @@ CONFIG_BT_LLL_VENDOR_NORDIC=y

 CONFIG_BT_CENTRAL=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y