diff --git a/samples/bluetooth/broadcast_audio_sink/README.rst b/samples/bluetooth/broadcast_audio_sink/README.rst index 68aeffd7413..f733dc201cf 100644 --- a/samples/bluetooth/broadcast_audio_sink/README.rst +++ b/samples/bluetooth/broadcast_audio_sink/README.rst @@ -20,5 +20,7 @@ Building and Running ******************** This sample can be found under :zephyr_file:`samples/bluetooth/broadcast_audio_sink` in the Zephyr tree. +Use `-DOVERLAY_CONFIG=overlay-bt_ll_sw_split.conf` to enable required ISO +feature support in Zephyr Bluetooth Controller on supported boards. See :ref:`bluetooth samples section ` for details. diff --git a/samples/bluetooth/broadcast_audio_sink/boards/nrf52840dk_nrf52840.conf b/samples/bluetooth/broadcast_audio_sink/boards/nrf52840dk_nrf52840.conf deleted file mode 100644 index 540990105f3..00000000000 --- a/samples/bluetooth/broadcast_audio_sink/boards/nrf52840dk_nrf52840.conf +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_BT_CTLR_SYNC_ISO=y - -# Supports the highest SDU size required by any BAP LC3 presets (155) -CONFIG_BT_CTLR_SYNC_ISO_PDU_LEN_MAX=155 -# Supports the highest advertising data that can be set in a single HCI command -CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=251 diff --git a/samples/bluetooth/broadcast_audio_sink/boards/nrf52_bsim.conf b/samples/bluetooth/broadcast_audio_sink/boards/nrf52_bsim.conf deleted file mode 100644 index 540990105f3..00000000000 --- a/samples/bluetooth/broadcast_audio_sink/boards/nrf52_bsim.conf +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_BT_CTLR_SYNC_ISO=y - -# Supports the highest SDU size required by any BAP LC3 presets (155) -CONFIG_BT_CTLR_SYNC_ISO_PDU_LEN_MAX=155 -# Supports the highest advertising data that can be set in a single HCI command -CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=251 diff --git a/samples/bluetooth/broadcast_audio_sink/overlay-bt_ll_sw_split.conf b/samples/bluetooth/broadcast_audio_sink/overlay-bt_ll_sw_split.conf new file mode 100644 index 00000000000..bc0ba2c6cdd --- /dev/null +++ b/samples/bluetooth/broadcast_audio_sink/overlay-bt_ll_sw_split.conf @@ -0,0 +1,12 @@ +# Zephyr Bluetooth Controller +CONFIG_BT_LL_SW_SPLIT=y + +# Enable support for Broadcast ISO Sync +CONFIG_BT_CTLR_SYNC_ISO=y + +# Supports the highest SDU size required by any BAP LC3 presets (155) +CONFIG_BT_CTLR_SYNC_ISO_PDU_LEN_MAX=155 + +# Supports the highest advertising data that is set in a single HCI command in +# Zephyr Bluetooth Controller +CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191 diff --git a/samples/bluetooth/broadcast_audio_sink/sample.yaml b/samples/bluetooth/broadcast_audio_sink/sample.yaml index f184f1610e4..48318561bf0 100644 --- a/samples/bluetooth/broadcast_audio_sink/sample.yaml +++ b/samples/bluetooth/broadcast_audio_sink/sample.yaml @@ -4,7 +4,21 @@ sample: tests: sample.bluetooth.broadcast_audio_sink: harness: bluetooth - platform_allow: qemu_cortex_m3 qemu_x86 nrf52_bsim - tags: bluetooth + platform_allow: > + qemu_cortex_m3 + qemu_x86 + nrf5340dk_nrf5340_cpuapp integration_platforms: - - qemu_cortex_m3 + - qemu_x86 + - nrf5340dk_nrf5340_cpuapp + tags: bluetooth + sample.bluetooth.broadcast_audio_sink.bt_ll_sw_split: + harness: bluetooth + platform_allow: > + nrf52833dk_nrf52820 + nrf52833dk_nrf52833 + integration_platforms: + - nrf52_bsim + - nrf52833dk_nrf52833 + extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf + tags: bluetooth diff --git a/samples/bluetooth/broadcast_audio_source/README.rst b/samples/bluetooth/broadcast_audio_source/README.rst index 00a90d0de04..223fa27443d 100644 --- a/samples/bluetooth/broadcast_audio_source/README.rst +++ b/samples/bluetooth/broadcast_audio_source/README.rst @@ -23,5 +23,7 @@ Building and Running ******************** This sample can be found under :zephyr_file:`samples/bluetooth/broadcast_audio_source` in the Zephyr tree. +Use `-DOVERLAY_CONFIG=overlay-bt_ll_sw_split.conf` to enable required ISO +feature support in Zephyr Bluetooth Controller on supported boards. See :ref:`bluetooth samples section ` for details. diff --git a/samples/bluetooth/broadcast_audio_source/boards/nrf52840dk_nrf52840.conf b/samples/bluetooth/broadcast_audio_source/boards/nrf52840dk_nrf52840.conf deleted file mode 100644 index c5879d03d8b..00000000000 --- a/samples/bluetooth/broadcast_audio_source/boards/nrf52840dk_nrf52840.conf +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_BT_CTLR_ADV_ISO=y -# Supports the highest SDU size required by any BAP LC3 presets (155) -CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=155 -# Sufficient ISO PDU length for any BAP LC3 presets (155) -CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=155 -# Zephyr Controller tested maximum advertising data that can be set in a single HCI command -CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191 diff --git a/samples/bluetooth/broadcast_audio_source/boards/nrf52_bsim.conf b/samples/bluetooth/broadcast_audio_source/boards/nrf52_bsim.conf deleted file mode 100644 index c5879d03d8b..00000000000 --- a/samples/bluetooth/broadcast_audio_source/boards/nrf52_bsim.conf +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_BT_CTLR_ADV_ISO=y -# Supports the highest SDU size required by any BAP LC3 presets (155) -CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=155 -# Sufficient ISO PDU length for any BAP LC3 presets (155) -CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=155 -# Zephyr Controller tested maximum advertising data that can be set in a single HCI command -CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191 diff --git a/samples/bluetooth/broadcast_audio_source/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/broadcast_audio_source/boards/nrf5340dk_nrf5340_cpuapp.conf deleted file mode 100644 index fbf93ce3ea9..00000000000 --- a/samples/bluetooth/broadcast_audio_source/boards/nrf5340dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_BT_CTLR_ADV_ISO=y diff --git a/samples/bluetooth/broadcast_audio_source/overlay-bt_ll_sw_split.conf b/samples/bluetooth/broadcast_audio_source/overlay-bt_ll_sw_split.conf new file mode 100644 index 00000000000..c73ff9c3ea9 --- /dev/null +++ b/samples/bluetooth/broadcast_audio_source/overlay-bt_ll_sw_split.conf @@ -0,0 +1,24 @@ +# Zephyr Bluetooth Controller +CONFIG_BT_LL_SW_SPLIT=y + +# Zephyr Controller tested maximum advertising data that can be set in a single HCI command +CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191 + +# Enable support for Broadcast ISO in Zephyr Bluetooth Controller +CONFIG_BT_CTLR_ADV_ISO=y + +# Sufficient ISO PDU length for any BAP LC3 presets (155) +CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=155 + +# Number of supported streams +CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2 +CONFIG_BT_CTLR_ISOAL_SOURCES=2 + +# FIXME: Host needs CONFIG_BT_ISO_TX_MTU + 4 bytes for sequence number, and optionally +# additional + 4 bytes for timestamp when not using BT_ISO_TIMESTAMP_NONE in bt_iso_chan_send(), +# otherwise Host tries to fragment ISO data. +# When Host is fixed, CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE can inherit the +# CONFIG_BT_ISO_TX_MTU value. +# +# Supports the highest SDU size required by any BAP LC3 presets (155) +CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=163 diff --git a/samples/bluetooth/broadcast_audio_source/sample.yaml b/samples/bluetooth/broadcast_audio_source/sample.yaml index b48e1f67d21..c3a59940eb5 100644 --- a/samples/bluetooth/broadcast_audio_source/sample.yaml +++ b/samples/bluetooth/broadcast_audio_source/sample.yaml @@ -4,7 +4,21 @@ sample: tests: sample.bluetooth.broadcast_audio_source: harness: bluetooth - platform_allow: qemu_cortex_m3 qemu_x86 nrf52_bsim + platform_allow: > + qemu_cortex_m3 + qemu_x86 + nrf5340dk_nrf5340_cpuapp integration_platforms: - qemu_x86 + - nrf5340dk_nrf5340_cpuapp + tags: bluetooth + sample.bluetooth.broadcast_audio_sink.bt_ll_sw_split: + harness: bluetooth + platform_allow: > + nrf52833dk_nrf52820 + nrf52833dk_nrf52833 + integration_platforms: + - nrf52_bsim + - nrf52833dk_nrf52833 + extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf tags: bluetooth