michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: BAP: Add bondable requirement for BAP

Browse source 
BAP mandates support for bondable mode for all central and
peripheral roles.

Due to Kconfig circular dependencies, some additional
Kconfig changes had to be made.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2024-09-17 15:12:38 +02:00 • committed by Fabio Baltieri
commit f57a040808
15 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
samples/bluetooth/bap_broadcast_assistant/prj.conf
View file

@ -3,7 +3,6 @@ CONFIG_LOG=y
CONFIG_BT_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
CONFIG_BT_SMP=y CONFIG_BT_SMP=y
CONFIG_BT_BONDABLE=n
CONFIG_BT_BUF_ACL_RX_SIZE=255 CONFIG_BT_BUF_ACL_RX_SIZE=255
CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_ACL_TX_SIZE=251
CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191 CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191

2
samples/bluetooth/bap_unicast_client/prj.conf
View file

@ -1,6 +1,8 @@
CONFIG_BT=y CONFIG_BT=y
CONFIG_LOG=y CONFIG_LOG=y
CONFIG_BT_SMP=y
CONFIG_BT_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
CONFIG_BT_BAP_UNICAST_CLIENT=y CONFIG_BT_BAP_UNICAST_CLIENT=y
CONFIG_BT_ISO_TX_BUF_COUNT=4 CONFIG_BT_ISO_TX_BUF_COUNT=4

1
samples/bluetooth/bap_unicast_server/prj.conf
View file

@ -1,5 +1,6 @@
CONFIG_BT=y CONFIG_BT=y
CONFIG_LOG=y CONFIG_LOG=y
CONFIG_BT_SMP=y
CONFIG_BT_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_ISO_PERIPHERAL=y
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y

1
samples/bluetooth/cap_initiator/Kconfig
View file

@ -7,6 +7,7 @@ config SAMPLE_UNICAST
bool "Whether or not to search for CAP acceptors for unicast audio" bool "Whether or not to search for CAP acceptors for unicast audio"
default y default y
select BT_CENTRAL select BT_CENTRAL
select BT_ISO_CENTRAL
select BT_SMP select BT_SMP
select BT_KEYS_OVERWRITE_OLDEST select BT_KEYS_OVERWRITE_OLDEST
select BT_CSIP_SET_COORDINATOR select BT_CSIP_SET_COORDINATOR

1
samples/bluetooth/cap_initiator/prj.conf
View file

@ -2,6 +2,7 @@ CONFIG_LOG=y
CONFIG_MAIN_STACK_SIZE=2048 CONFIG_MAIN_STACK_SIZE=2048
CONFIG_BT=y CONFIG_BT=y
CONFIG_BT_SMP=y
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
CONFIG_BT_EXT_ADV=y CONFIG_BT_EXT_ADV=y
CONFIG_BT_DEVICE_NAME="CAP Initiator" CONFIG_BT_DEVICE_NAME="CAP Initiator"

1
samples/bluetooth/tmap_central/prj.conf
View file

@ -1,6 +1,7 @@
CONFIG_BT=y CONFIG_BT=y
CONFIG_LOG=y CONFIG_LOG=y
CONFIG_BT_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
CONFIG_BT_SMP=y CONFIG_BT_SMP=y

11
subsys/bluetooth/audio/Kconfig.bap
View file

@ -8,9 +8,6 @@
config BT_BAP_UNICAST config BT_BAP_UNICAST
bool bool
depends on BT_CONN
select BT_SMP
select BT_ISO_UNICAST
config BT_BAP_UNICAST_SERVER config BT_BAP_UNICAST_SERVER
bool "Bluetooth Unicast Audio Server Support" bool "Bluetooth Unicast Audio Server Support"
@ -21,6 +18,7 @@ config BT_BAP_UNICAST_SERVER
depends on BT_ISO_PERIPHERAL depends on BT_ISO_PERIPHERAL
depends on BT_ASCS depends on BT_ASCS
depends on BT_PACS depends on BT_PACS
depends on BT_BONDABLE
help help
This option enables support for Bluetooth Unicast Audio Server This option enables support for Bluetooth Unicast Audio Server
using Isochronous channels. using Isochronous channels.
@ -28,11 +26,12 @@ config BT_BAP_UNICAST_SERVER
config BT_BAP_UNICAST_CLIENT config BT_BAP_UNICAST_CLIENT
bool "Bluetooth Unicast Audio Client Support" bool "Bluetooth Unicast Audio Client Support"
select BT_BAP_UNICAST select BT_BAP_UNICAST
select BT_ISO_CENTRAL
select BT_CENTRAL
select BT_GATT_CLIENT select BT_GATT_CLIENT
select BT_GATT_AUTO_DISCOVER_CCC select BT_GATT_AUTO_DISCOVER_CCC
select BT_GATT_AUTO_UPDATE_MTU select BT_GATT_AUTO_UPDATE_MTU
depends on BT_CENTRAL
depends on BT_ISO_CENTRAL
depends on BT_BONDABLE
help help
This option enables support for Bluetooth Unicast Audio Client This option enables support for Bluetooth Unicast Audio Client
using Isochronous channels. using Isochronous channels.
@ -212,6 +211,7 @@ config BT_BAP_SCAN_DELEGATOR
select BT_EXT_ADV select BT_EXT_ADV
select BT_PER_ADV_SYNC select BT_PER_ADV_SYNC
select BT_ISO_SYNC_RECEIVER select BT_ISO_SYNC_RECEIVER
depends on BT_BONDABLE
help help
This option enables support for the Scan Delegator role and the This option enables support for the Scan Delegator role and the
Broadcast Audio Scan Service (BASS). Broadcast Audio Scan Service (BASS).
@ -247,6 +247,7 @@ config BT_BAP_BROADCAST_ASSISTANT
select BT_GATT_CLIENT select BT_GATT_CLIENT
select BT_GATT_AUTO_DISCOVER_CCC select BT_GATT_AUTO_DISCOVER_CCC
select BT_GATT_AUTO_UPDATE_MTU select BT_GATT_AUTO_UPDATE_MTU
depends on BT_BONDABLE
help help
This option enables support for the Broadcast Assistant role. This option enables support for the Broadcast Assistant role.

1
tests/bluetooth/audio/ascs/prj.conf
View file

@ -1,6 +1,7 @@
CONFIG_ZTEST=y CONFIG_ZTEST=y
CONFIG_BT=y CONFIG_BT=y
CONFIG_BT_SMP=y
CONFIG_BT_MAX_CONN=1 CONFIG_BT_MAX_CONN=1
CONFIG_BT_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_ISO_PERIPHERAL=y

2
tests/bluetooth/audio/bap_base/prj.conf
View file

@ -1,7 +1,9 @@
CONFIG_ZTEST=y CONFIG_ZTEST=y
CONFIG_BT=y CONFIG_BT=y
CONFIG_BT_SMP=y
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
CONFIG_BT_PERIPHERAL=y
# Need to enable one broadcast role to enable CONFIG_BT_BAP_BASE # Need to enable one broadcast role to enable CONFIG_BT_BAP_BASE
CONFIG_BT_BAP_SCAN_DELEGATOR=y CONFIG_BT_BAP_SCAN_DELEGATOR=y

1
tests/bluetooth/audio/cap_commander/prj.conf
View file

@ -1,6 +1,7 @@
CONFIG_ZTEST=y CONFIG_ZTEST=y
CONFIG_BT=y CONFIG_BT=y
CONFIG_BT_SMP=y
CONFIG_BT_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BT_MAX_CONN=2 CONFIG_BT_MAX_CONN=2
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y

2
tests/bluetooth/audio/cap_initiator/prj.conf
View file

@ -2,7 +2,9 @@ CONFIG_ZTEST=y
CONFIG_LOG=y CONFIG_LOG=y
CONFIG_BT=y CONFIG_BT=y
CONFIG_BT_SMP=y
CONFIG_BT_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
# Dependencies for CAP initiator unicast # Dependencies for CAP initiator unicast

1
tests/bluetooth/audio/codec/prj.conf
View file

@ -1,6 +1,7 @@
CONFIG_ZTEST=y CONFIG_ZTEST=y
CONFIG_BT=y CONFIG_BT=y
CONFIG_BT_SMP=y
CONFIG_BT_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_ISO_PERIPHERAL=y
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y

3
tests/bluetooth/shell/audio.conf
View file

@ -7,8 +7,10 @@ CONFIG_BT_RX_STACK_SIZE=8192
CONFIG_TEST=y CONFIG_TEST=y
CONFIG_TEST_LOGGING_DEFAULTS=n CONFIG_TEST_LOGGING_DEFAULTS=n
CONFIG_BT=y CONFIG_BT=y
CONFIG_BT_SMP=y
CONFIG_BT_TESTING=y CONFIG_BT_TESTING=y
CONFIG_BT_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BT_PRIVACY=y CONFIG_BT_PRIVACY=y
CONFIG_BT_L2CAP_ECRED=y CONFIG_BT_L2CAP_ECRED=y
@ -72,7 +74,6 @@ CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_SIZE=255
CONFIG_BT_ASCS=y CONFIG_BT_ASCS=y
CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2 CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2
CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=2 CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=2
CONFIG_BT_BAP_UNICAST_CLIENT=y
CONFIG_BT_BAP_BROADCAST_SOURCE=y CONFIG_BT_BAP_BROADCAST_SOURCE=y
CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT=4 CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT=4
CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=4 CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=4

1
tests/bluetooth/tester/overlay-le-audio.conf
View file

@ -1,6 +1,7 @@
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
CONFIG_BT_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_ISO_PERIPHERAL=y
CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_EXT_ADV=y CONFIG_BT_EXT_ADV=y
CONFIG_BT_BAP_UNICAST_SERVER=y CONFIG_BT_BAP_UNICAST_SERVER=y
CONFIG_BT_BAP_UNICAST_CLIENT=y CONFIG_BT_BAP_UNICAST_CLIENT=y

1
tests/bsim/bluetooth/audio/prj.conf
View file

@ -4,6 +4,7 @@ CONFIG_NO_OPTIMIZATIONS=y
CONFIG_BT=y CONFIG_BT=y
CONFIG_BT_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BT_DEVICE_NAME="bsim_test_audio" CONFIG_BT_DEVICE_NAME="bsim_test_audio"
# TBS Client may require up to 12 buffers # TBS Client may require up to 12 buffers