michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: BAP: Depend on BT_PAC_{SNK,SRC} instead of select

Browse source 
Modify ASCS and BAP Broadcast sink to depend on the PAC options
instead of selecting them.

Since Kconfig does not support "depends on X if Y",
a select for PAC_{SRC,SNK} is used depending on
ASCS_ASE_{SRC,SNK}.

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

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

@ -8,7 +8,9 @@ CONFIG_BT_GATT_CACHING=y
CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_BAP_UNICAST_SERVER=y CONFIG_BT_BAP_UNICAST_SERVER=y
CONFIG_BT_ASCS=y CONFIG_BT_ASCS=y
CONFIG_BT_PAC_SNK=y
CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2 CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2
CONFIG_BT_PAC_SRC=y
CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=1 CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=1
CONFIG_BT_ISO_TX_BUF_COUNT=2 CONFIG_BT_ISO_TX_BUF_COUNT=2
# Support an ISO channel per ASE # Support an ISO channel per ASE

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

@ -17,7 +17,9 @@ CONFIG_BT_ATT_PREPARE_COUNT=1
# Support an ISO channel per ASE # Support an ISO channel per ASE
CONFIG_BT_ASCS=y CONFIG_BT_ASCS=y
CONFIG_BT_PAC_SNK=y
CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=1 CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=1
CONFIG_BT_PAC_SRC=y
CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=1 CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=1
# Support an ISO channel per ASE # Support an ISO channel per ASE

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

@ -22,7 +22,9 @@ CONFIG_BT_ATT_PREPARE_COUNT=1
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
CONFIG_BT_BAP_UNICAST_SERVER=y CONFIG_BT_BAP_UNICAST_SERVER=y
CONFIG_BT_ASCS=y CONFIG_BT_ASCS=y
CONFIG_BT_PAC_SNK=y
CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=1 CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=1
CONFIG_BT_PAC_SRC=y
CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=1 CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=1
# Support an ISO channel per ASE # Support an ISO channel per ASE
CONFIG_BT_ISO_MAX_CHAN=2 CONFIG_BT_ISO_MAX_CHAN=2

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

@ -31,7 +31,9 @@ CONFIG_BT_MCC=y
# Support an ISO channel per ASE # Support an ISO channel per ASE
CONFIG_BT_ASCS=y CONFIG_BT_ASCS=y
CONFIG_BT_PAC_SNK=y
CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=1 CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=1
CONFIG_BT_PAC_SRC=y
CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=1 CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=1
# Support an ISO channel per ASE # Support an ISO channel per ASE
CONFIG_BT_ISO_MAX_CHAN=2 CONFIG_BT_ISO_MAX_CHAN=2

2
subsys/bluetooth/audio/Kconfig.ascs
View file

@ -30,11 +30,9 @@ config BT_ASCS_MAX_ASE_SRC_COUNT
config BT_ASCS_ASE_SNK config BT_ASCS_ASE_SNK
def_bool BT_ASCS_MAX_ASE_SNK_COUNT > 0 def_bool BT_ASCS_MAX_ASE_SNK_COUNT > 0
select BT_PAC_SNK
config BT_ASCS_ASE_SRC config BT_ASCS_ASE_SRC
def_bool BT_ASCS_MAX_ASE_SRC_COUNT > 0 def_bool BT_ASCS_MAX_ASE_SRC_COUNT > 0
select BT_PAC_SRC
config BT_ASCS_MAX_ACTIVE_ASES config BT_ASCS_MAX_ACTIVE_ASES
int "Number of simultaneously supported ASE sessions" int "Number of simultaneously supported ASE sessions"

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

@ -16,8 +16,9 @@ config BT_BAP_UNICAST_SERVER
depends on BT_PERIPHERAL depends on BT_PERIPHERAL
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_BONDABLE depends on BT_BONDABLE
select BT_PAC_SRC if BT_ASCS_ASE_SNK
select BT_PAC_SNK if BT_ASCS_ASE_SRC
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.
@ -159,7 +160,7 @@ endif # BT_BAP_BROADCAST_SOURCE
config BT_BAP_BROADCAST_SINK config BT_BAP_BROADCAST_SINK
bool "Bluetooth Broadcast Sink Audio Support" bool "Bluetooth Broadcast Sink Audio Support"
depends on BT_ISO_SYNC_RECEIVER depends on BT_ISO_SYNC_RECEIVER
select BT_PAC_SNK depends on BT_PAC_SNK
depends on BT_PERIPHERAL depends on BT_PERIPHERAL
depends on BT_BAP_SCAN_DELEGATOR depends on BT_BAP_SCAN_DELEGATOR
help help

6
subsys/bluetooth/audio/shell/audio.h
View file

@ -196,9 +196,9 @@ struct broadcast_sink {
#if defined(CONFIG_BT_BAP_UNICAST) #if defined(CONFIG_BT_BAP_UNICAST)
#define UNICAST_SERVER_STREAM_COUNT \ #define UNICAST_SERVER_STREAM_COUNT \
COND_CODE_1(CONFIG_BT_ASCS, \ COND_CODE_1(CONFIG_BT_ASCS_ASE_SRC, (CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT), (0)) + \
(CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT + CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT), \ COND_CODE_1(CONFIG_BT_ASCS_ASE_SNK, (CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT), (0))
(0))
#define UNICAST_CLIENT_STREAM_COUNT \ #define UNICAST_CLIENT_STREAM_COUNT \
COND_CODE_1(CONFIG_BT_BAP_UNICAST_CLIENT, \ COND_CODE_1(CONFIG_BT_BAP_UNICAST_CLIENT, \
(CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT + \ (CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT + \

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

@ -10,7 +10,9 @@ CONFIG_BT_GATT_CACHING=y
CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
CONFIG_BT_ASCS=y CONFIG_BT_ASCS=y
CONFIG_BT_PAC_SNK=y
CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2 CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2
CONFIG_BT_PAC_SRC=y
CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=2 CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=2
CONFIG_BT_ASCS_MAX_ACTIVE_ASES=1 CONFIG_BT_ASCS_MAX_ACTIVE_ASES=1
CONFIG_BT_BAP_UNICAST_SERVER=y CONFIG_BT_BAP_UNICAST_SERVER=y

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

@ -67,8 +67,6 @@ CONFIG_BT_ISO_RX_MTU=310
CONFIG_BT_AUDIO=y CONFIG_BT_AUDIO=y
CONFIG_BT_BAP_UNICAST_SERVER=y CONFIG_BT_BAP_UNICAST_SERVER=y
CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2
CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=2
CONFIG_BT_BAP_UNICAST_CLIENT=y CONFIG_BT_BAP_UNICAST_CLIENT=y
CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT=4 CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT=4
@ -79,7 +77,9 @@ CONFIG_BT_AUDIO_CODEC_CFG_MAX_METADATA_SIZE=255
CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_SIZE=255 CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_SIZE=255
CONFIG_BT_ASCS=y CONFIG_BT_ASCS=y
CONFIG_BT_PAC_SNK=y
CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2 CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2
CONFIG_BT_PAC_SRC=y
CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=2 CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=2
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

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

@ -69,7 +69,9 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
# ASCS # ASCS
CONFIG_BT_ASCS=y CONFIG_BT_ASCS=y
CONFIG_BT_PAC_SNK=y
CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2 CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2
CONFIG_BT_PAC_SRC=y
CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=2 CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT=2
# Support an ISO channel per ASE # Support an ISO channel per ASE