michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Audio: depends on GATT instead of select

Browse source 
Modify the Kconfig options to depend on the GATT
features rather than selecting them.

This is part of an effort to reduce the amount of
selects we use in LE Audio.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2024-11-13 11:43:54 +01:00 • committed by Alberto Escolar
commit df6b5981bf
19 changed files with 53 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,9 @@
CONFIG_BT=y CONFIG_BT=y
CONFIG_LOG=y CONFIG_LOG=y
CONFIG_BT_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
CONFIG_BT_SMP=y CONFIG_BT_SMP=y
CONFIG_BT_BUF_ACL_RX_SIZE=255 CONFIG_BT_BUF_ACL_RX_SIZE=255

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

@ -3,6 +3,9 @@ CONFIG_LOG=y
CONFIG_BT_SMP=y CONFIG_BT_SMP=y
CONFIG_BT_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BT_ISO_CENTRAL=y CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
CONFIG_BT_GATT_AUTO_UPDATE_MTU=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

3
samples/bluetooth/cap_initiator/Kconfig
View file

@ -7,6 +7,9 @@ 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_GATT_CLIENT
select BT_GATT_AUTO_DISCOVER_CCC
select BT_GATT_AUTO_UPDATE_MTU
select BT_ISO_CENTRAL select BT_ISO_CENTRAL
select BT_SMP select BT_SMP
select BT_KEYS_OVERWRITE_OLDEST select BT_KEYS_OVERWRITE_OLDEST

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

@ -4,6 +4,8 @@ CONFIG_BT_ISO_PERIPHERAL=y
CONFIG_BT_PRIVACY=y CONFIG_BT_PRIVACY=y
CONFIG_BT_GATT_CACHING=y CONFIG_BT_GATT_CACHING=y
CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
CONFIG_BT_SMP=y CONFIG_BT_SMP=y
CONFIG_BT_SMP_SC_PAIR_ONLY=y CONFIG_BT_SMP_SC_PAIR_ONLY=y

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

@ -2,6 +2,9 @@ CONFIG_BT=y
CONFIG_LOG=y CONFIG_LOG=y
CONFIG_BT_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BT_ISO_CENTRAL=y CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
CONFIG_BT_SMP=y CONFIG_BT_SMP=y

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

@ -2,6 +2,8 @@ CONFIG_BT=y
CONFIG_LOG=y CONFIG_LOG=y
CONFIG_BT_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_ISO_PERIPHERAL=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
CONFIG_BT_PRIVACY=y CONFIG_BT_PRIVACY=y
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
CONFIG_UTF8=y CONFIG_UTF8=y

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

@ -24,9 +24,9 @@ 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_GATT_CLIENT depends on BT_GATT_CLIENT
select BT_GATT_AUTO_DISCOVER_CCC depends on BT_GATT_AUTO_DISCOVER_CCC
select BT_GATT_AUTO_UPDATE_MTU depends on BT_GATT_AUTO_UPDATE_MTU
depends on BT_CENTRAL depends on BT_CENTRAL
depends on BT_ISO_CENTRAL depends on BT_ISO_CENTRAL
depends on BT_BONDABLE depends on BT_BONDABLE
@ -241,9 +241,9 @@ config BT_BAP_BROADCAST_ASSISTANT
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
select BT_GATT_CLIENT depends on BT_GATT_CLIENT
select BT_GATT_AUTO_DISCOVER_CCC depends on BT_GATT_AUTO_DISCOVER_CCC
select BT_GATT_AUTO_UPDATE_MTU depends on BT_GATT_AUTO_UPDATE_MTU
depends on BT_OBSERVER depends on BT_OBSERVER
depends on BT_BONDABLE depends on BT_BONDABLE
help help

4
subsys/bluetooth/audio/Kconfig.csip
View file

@ -57,8 +57,8 @@ endif # BT_CSIP_SET_MEMBER
config BT_CSIP_SET_COORDINATOR config BT_CSIP_SET_COORDINATOR
bool "Coordinated Set Identification Profile Set Coordinator Support" bool "Coordinated Set Identification Profile Set Coordinator Support"
select BT_GATT_CLIENT depends on BT_GATT_CLIENT
select BT_GATT_AUTO_DISCOVER_CCC depends on BT_GATT_AUTO_DISCOVER_CCC
help help
This option enables support for Coordinated Set Identification This option enables support for Coordinated Set Identification
Profile Set Coordinator. Profile Set Coordinator.

6
subsys/bluetooth/audio/Kconfig.has
View file

@ -56,9 +56,9 @@ endif # BT_HAS
config BT_HAS_CLIENT config BT_HAS_CLIENT
bool "Hearing Access Service Client support" bool "Hearing Access Service Client support"
select BT_GATT_CLIENT depends on BT_GATT_CLIENT
select BT_GATT_AUTO_DISCOVER_CCC depends on BT_GATT_AUTO_DISCOVER_CCC
select BT_GATT_AUTO_UPDATE_MTU
select UTF8 select UTF8
depends on BT_GATT_AUTO_UPDATE_MTU
help help
This option enables support for Hearing Access Service Client. This option enables support for Hearing Access Service Client.

4
subsys/bluetooth/audio/Kconfig.mcs
View file

@ -20,8 +20,8 @@ config BT_MCS
config BT_MCC config BT_MCC
bool "Media Control Client Support" bool "Media Control Client Support"
select BT_GATT_CLIENT depends on BT_GATT_CLIENT
select BT_GATT_AUTO_DISCOVER_CCC depends on BT_GATT_AUTO_DISCOVER_CCC
help help
This option enables support for the Media Control Client. This option enables support for the Media Control Client.

4
subsys/bluetooth/audio/Kconfig.micp
View file

@ -40,8 +40,8 @@ endif # BT_MICP_MIC_DEV
config BT_MICP_MIC_CTLR config BT_MICP_MIC_CTLR
bool "Microphone Control Profile Microphone Controller Support" bool "Microphone Control Profile Microphone Controller Support"
select BT_GATT_CLIENT depends on BT_GATT_CLIENT
select BT_GATT_AUTO_DISCOVER_CCC depends on BT_GATT_AUTO_DISCOVER_CCC
depends on BT_BONDABLE depends on BT_BONDABLE
help help
This option enables support for the Microphone Control Profile This option enables support for the Microphone Control Profile

4
subsys/bluetooth/audio/Kconfig.tbs
View file

@ -70,8 +70,8 @@ config BT_TBS_CLIENT_TBS
config BT_TBS_CLIENT config BT_TBS_CLIENT
def_bool BT_TBS_CLIENT_GTBS || BT_TBS_CLIENT_TBS def_bool BT_TBS_CLIENT_GTBS || BT_TBS_CLIENT_TBS
select BT_GATT_CLIENT depends on BT_GATT_CLIENT
select BT_GATT_AUTO_DISCOVER_CCC depends on BT_GATT_AUTO_DISCOVER_CCC
if BT_TBS_CLIENT if BT_TBS_CLIENT

4
subsys/bluetooth/audio/Kconfig.vcp
View file

@ -58,8 +58,8 @@ endif # BT_VCP_VOL_REND
config BT_VCP_VOL_CTLR config BT_VCP_VOL_CTLR
bool "Volume Control Profile Volume Controller Support" bool "Volume Control Profile Volume Controller Support"
select BT_GATT_CLIENT depends on BT_GATT_CLIENT
select BT_GATT_AUTO_DISCOVER_CCC depends on BT_GATT_AUTO_DISCOVER_CCC
help help
This option enables support for Volume Control Profile Volume This option enables support for Volume Control Profile Volume
Controller. Controller.

3
tests/bluetooth/audio/ascs/testcase.yaml
View file

@ -17,6 +17,9 @@ tests:
type: unit type: unit
extra_configs: extra_configs:
- CONFIG_BT_BAP_UNICAST_CLIENT=y - CONFIG_BT_BAP_UNICAST_CLIENT=y
- CONFIG_BT_GATT_CLIENT=y
- CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
- CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
bluetooth.audio.ascs.test_stream_pair: bluetooth.audio.ascs.test_stream_pair:
type: unit type: unit
extra_configs: extra_configs:

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

@ -5,7 +5,10 @@ CONFIG_BT_SMP=y
CONFIG_BT_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BT_MAX_CONN=2 CONFIG_BT_MAX_CONN=2
CONFIG_BT_OBSERVER=y CONFIG_BT_OBSERVER=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
# Requirements for CAP commander # Requirements for CAP commander

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

@ -5,6 +5,9 @@ CONFIG_BT=y
CONFIG_BT_SMP=y CONFIG_BT_SMP=y
CONFIG_BT_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BT_ISO_CENTRAL=y CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
# Dependencies for CAP initiator unicast # Dependencies for CAP initiator unicast

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

@ -13,8 +13,11 @@ CONFIG_BT_CENTRAL=y
CONFIG_BT_ISO_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_GATT_CLIENT=y
CONFIG_BT_GATT_CACHING=y CONFIG_BT_GATT_CACHING=y
CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
CONFIG_BT_L2CAP_ECRED=y CONFIG_BT_L2CAP_ECRED=y
CONFIG_BT_SIGNING=y CONFIG_BT_SIGNING=y
CONFIG_BT_FIXED_PASSKEY=y CONFIG_BT_FIXED_PASSKEY=y

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

@ -1,8 +1,11 @@
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
CONFIG_BT_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_GATT_CACHING=y CONFIG_BT_GATT_CACHING=y
CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_ISO_PERIPHERAL=y
CONFIG_BT_ISO_CENTRAL=y CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_EXT_ADV=y CONFIG_BT_EXT_ADV=y

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

@ -14,8 +14,11 @@ CONFIG_BT_MAX_CONN=3
CONFIG_BT_MAX_PAIRED=3 CONFIG_BT_MAX_PAIRED=3
CONFIG_BT_EXT_ADV_MAX_ADV_SET=3 CONFIG_BT_EXT_ADV_MAX_ADV_SET=3
CONFIG_BT_OBSERVER=y CONFIG_BT_OBSERVER=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_GATT_CACHING=y CONFIG_BT_GATT_CACHING=y
CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
CONFIG_BT_SMP=y CONFIG_BT_SMP=y
CONFIG_BT_L2CAP_TX_MTU=128 CONFIG_BT_L2CAP_TX_MTU=128
CONFIG_BT_BUF_ACL_RX_SIZE=255 CONFIG_BT_BUF_ACL_RX_SIZE=255