From c4fbe3821909d9309b21a70206d3e6c86f30b0a8 Mon Sep 17 00:00:00 2001 From: Emil Gydesen Date: Thu, 14 Nov 2024 10:55:07 +0100 Subject: [PATCH] Bluetooth: BAP: Depend on BT_PER_ADV_SYNC instead of select Change the select of BT_PER_ADV_SYNC and BT_EXT_ADV to depends on. This is an effort to reduce the use of select for Kconfig options. Signed-off-by: Emil Gydesen --- samples/bluetooth/bap_broadcast_assistant/prj.conf | 1 + samples/bluetooth/bap_broadcast_sink/prj.conf | 2 ++ samples/bluetooth/pbp_public_broadcast_sink/prj.conf | 2 ++ samples/bluetooth/tmap_bmr/prj.conf | 2 ++ subsys/bluetooth/audio/Kconfig.bap | 8 ++++---- tests/bluetooth/audio/bap_base/prj.conf | 2 ++ tests/bluetooth/audio/cap_commander/prj.conf | 2 ++ tests/bluetooth/shell/audio.conf | 2 ++ tests/bluetooth/tester/overlay-le-audio.conf | 1 + tests/bsim/bluetooth/audio/prj.conf | 2 ++ 10 files changed, 20 insertions(+), 4 deletions(-) diff --git a/samples/bluetooth/bap_broadcast_assistant/prj.conf b/samples/bluetooth/bap_broadcast_assistant/prj.conf index 79613fd0075..409683026cb 100644 --- a/samples/bluetooth/bap_broadcast_assistant/prj.conf +++ b/samples/bluetooth/bap_broadcast_assistant/prj.conf @@ -13,6 +13,7 @@ CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191 CONFIG_BT_TINYCRYPT_ECC=y CONFIG_BT_EXT_ADV=y +CONFIG_BT_PER_ADV_SYNC=y CONFIG_BT_BAP_BASS_MAX_SUBGROUPS=2 CONFIG_BT_ISO_SYNC_RECEIVER=y CONFIG_BT_BAP_BROADCAST_ASSISTANT=y diff --git a/samples/bluetooth/bap_broadcast_sink/prj.conf b/samples/bluetooth/bap_broadcast_sink/prj.conf index c4367d2c1e1..3e0b269e7cf 100644 --- a/samples/bluetooth/bap_broadcast_sink/prj.conf +++ b/samples/bluetooth/bap_broadcast_sink/prj.conf @@ -6,6 +6,8 @@ CONFIG_BT_PAC_SNK=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_OBSERVER=y CONFIG_BT_GATT_DYNAMIC_DB=y +CONFIG_BT_EXT_ADV=y +CONFIG_BT_PER_ADV_SYNC=y CONFIG_BT_ISO_SYNC_RECEIVER=y CONFIG_BT_BAP_BROADCAST_SINK=y CONFIG_BT_BAP_SCAN_DELEGATOR=y diff --git a/samples/bluetooth/pbp_public_broadcast_sink/prj.conf b/samples/bluetooth/pbp_public_broadcast_sink/prj.conf index e07be74d5c3..1cc458a4798 100644 --- a/samples/bluetooth/pbp_public_broadcast_sink/prj.conf +++ b/samples/bluetooth/pbp_public_broadcast_sink/prj.conf @@ -18,6 +18,8 @@ CONFIG_BT_CAP_ACCEPTOR=y # BAP support CONFIG_BT_ISO_SYNC_RECEIVER=y +CONFIG_BT_EXT_ADV=y +CONFIG_BT_PER_ADV_SYNC=y CONFIG_BT_BAP_SCAN_DELEGATOR=y CONFIG_BT_BAP_BROADCAST_SINK=y CONFIG_BT_BAP_BROADCAST_SNK_SUBGROUP_COUNT=1 diff --git a/samples/bluetooth/tmap_bmr/prj.conf b/samples/bluetooth/tmap_bmr/prj.conf index e2112109986..b9f693c7efd 100644 --- a/samples/bluetooth/tmap_bmr/prj.conf +++ b/samples/bluetooth/tmap_bmr/prj.conf @@ -18,6 +18,8 @@ CONFIG_BT_TMAP=y CONFIG_BT_CAP_ACCEPTOR=y # BAP support +CONFIG_BT_EXT_ADV=y +CONFIG_BT_PER_ADV_SYNC=y CONFIG_BT_ISO_SYNC_RECEIVER=y CONFIG_BT_BAP_SCAN_DELEGATOR=y CONFIG_BT_BAP_BROADCAST_SINK=y diff --git a/subsys/bluetooth/audio/Kconfig.bap b/subsys/bluetooth/audio/Kconfig.bap index c24849c6b2b..c370e0d4e30 100644 --- a/subsys/bluetooth/audio/Kconfig.bap +++ b/subsys/bluetooth/audio/Kconfig.bap @@ -201,8 +201,8 @@ endif # BT_BAP_BROADCAST_SINK config BT_BAP_SCAN_DELEGATOR bool "Basic Audio Profile Scan Delegator role support" - select BT_EXT_ADV - select BT_PER_ADV_SYNC + depends on BT_EXT_ADV + depends on BT_PER_ADV_SYNC depends on BT_ISO_SYNC_RECEIVER depends on BT_OBSERVER depends on BT_GATT_DYNAMIC_DB @@ -235,8 +235,8 @@ endif # BT_BAP_SCAN_DELEGATOR config BT_BAP_BROADCAST_ASSISTANT bool "Basic Audio Profile Broadcast Assistant role support" - select BT_EXT_ADV - select BT_PER_ADV_SYNC + depends on BT_EXT_ADV + depends on BT_PER_ADV_SYNC depends on BT_ISO_SYNC_RECEIVER depends on BT_GATT_CLIENT depends on BT_GATT_AUTO_DISCOVER_CCC diff --git a/tests/bluetooth/audio/bap_base/prj.conf b/tests/bluetooth/audio/bap_base/prj.conf index e93a7708e5d..6a009f22b50 100644 --- a/tests/bluetooth/audio/bap_base/prj.conf +++ b/tests/bluetooth/audio/bap_base/prj.conf @@ -7,6 +7,8 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_OBSERVER=y CONFIG_BT_GATT_DYNAMIC_DB=y # Need to enable one broadcast role to enable CONFIG_BT_BAP_BASE +CONFIG_BT_EXT_ADV=y +CONFIG_BT_PER_ADV_SYNC=y CONFIG_BT_ISO_SYNC_RECEIVER=y CONFIG_BT_BAP_SCAN_DELEGATOR=y diff --git a/tests/bluetooth/audio/cap_commander/prj.conf b/tests/bluetooth/audio/cap_commander/prj.conf index c7d53283c3f..5e4604dd8ab 100644 --- a/tests/bluetooth/audio/cap_commander/prj.conf +++ b/tests/bluetooth/audio/cap_commander/prj.conf @@ -22,6 +22,8 @@ CONFIG_BT_AICS_CLIENT_MAX_INSTANCE_COUNT=1 CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST=1 CONFIG_BT_CAP_COMMANDER=y +CONFIG_BT_EXT_ADV=y +CONFIG_BT_PER_ADV_SYNC=y CONFIG_BT_BAP_BROADCAST_ASSISTANT=y CONFIG_LOG=y CONFIG_BT_CAP_COMMANDER_LOG_LEVEL_DBG=y diff --git a/tests/bluetooth/shell/audio.conf b/tests/bluetooth/shell/audio.conf index b50446e99fc..5e4e57ff561 100644 --- a/tests/bluetooth/shell/audio.conf +++ b/tests/bluetooth/shell/audio.conf @@ -11,6 +11,8 @@ CONFIG_BT_SMP=y CONFIG_BT_TESTING=y CONFIG_BT_CENTRAL=y CONFIG_BT_ISO_CENTRAL=y +CONFIG_BT_EXT_ADV=y +CONFIG_BT_PER_ADV_SYNC=y CONFIG_BT_ISO_SYNC_RECEIVER=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y diff --git a/tests/bluetooth/tester/overlay-le-audio.conf b/tests/bluetooth/tester/overlay-le-audio.conf index 44d476f968e..ef061eb1d55 100644 --- a/tests/bluetooth/tester/overlay-le-audio.conf +++ b/tests/bluetooth/tester/overlay-le-audio.conf @@ -9,6 +9,7 @@ CONFIG_BT_GATT_AUTO_UPDATE_MTU=y CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_ISO_CENTRAL=y CONFIG_BT_ISO_BROADCASTER=y +CONFIG_BT_PER_ADV_SYNC=y CONFIG_BT_ISO_SYNC_RECEIVER=y CONFIG_BT_EXT_ADV=y CONFIG_BT_BAP_UNICAST_SERVER=y diff --git a/tests/bsim/bluetooth/audio/prj.conf b/tests/bsim/bluetooth/audio/prj.conf index 6372a21b877..4879749ef78 100644 --- a/tests/bsim/bluetooth/audio/prj.conf +++ b/tests/bsim/bluetooth/audio/prj.conf @@ -6,6 +6,8 @@ CONFIG_BT=y CONFIG_BT_CENTRAL=y CONFIG_BT_ISO_CENTRAL=y CONFIG_BT_ISO_BROADCASTER=y +CONFIG_BT_EXT_ADV=y +CONFIG_BT_PER_ADV_SYNC=y CONFIG_BT_ISO_SYNC_RECEIVER=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_DEVICE_NAME="bsim_test_audio"