Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bluetooth: Audio: Update BT_BAP_SCAN_DELEGATOR dependency to GATT_DYN… #79360

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions samples/bluetooth/bap_broadcast_sink/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ CONFIG_BT_AUDIO=y
CONFIG_BT_SMP=y
CONFIG_BT_PAC_SNK=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_OBSERVER=y
CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_BAP_BROADCAST_SINK=y
CONFIG_BT_BAP_SCAN_DELEGATOR=y
CONFIG_BT_ISO_MAX_CHAN=2
Expand Down
2 changes: 2 additions & 0 deletions samples/bluetooth/bap_unicast_server/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ CONFIG_BT_SMP=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_ISO_PERIPHERAL=y
CONFIG_BT_AUDIO=y
CONFIG_BT_GATT_CACHING=y
CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_BAP_UNICAST_SERVER=y
CONFIG_BT_ASCS=y
CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2
Expand Down
2 changes: 2 additions & 0 deletions samples/bluetooth/cap_acceptor/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ config SAMPLE_UNICAST
bool "Whether or not to search for CAP acceptors for unicast audio"
default y
select BT_BAP_UNICAST_SERVER
select BT_GATT_CACHING
select BT_ISO_PERIPHERAL
select BT_ASCS
select BT_PAC_SNK
Expand All @@ -23,6 +24,7 @@ config SAMPLE_BROADCAST
default y if !SAMPLE_UNICAST
select BT_ISO_SYNC_RECEIVER
select BT_BAP_SCAN_DELEGATOR
select BT_OBSERVER
select BT_BAP_BROADCAST_SINK
select BT_PAC_SNK
select BT_PAC_SNK_LOC
Expand Down
1 change: 1 addition & 0 deletions samples/bluetooth/cap_acceptor/prj.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CONFIG_BT=y
CONFIG_LOG=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_EXT_ADV=y
CONFIG_BT_DEVICE_NAME="CAP Acceptor"
Expand Down
2 changes: 2 additions & 0 deletions samples/bluetooth/cap_initiator/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT=2
CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT=2
CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SRC_COUNT=2

CONFIG_BT_BAP_BROADCAST_SOURCE=y

# Broadcast sources values if enabled by CONFIG_SAMPLE_BROADCAST
CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=2
CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT=1
1 change: 1 addition & 0 deletions samples/bluetooth/hap_ha/binaural.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CONFIG_BT_CSIP_SET_MEMBER=y
CONFIG_HAP_HA_HEARING_AID_BINAURAL=y
CONFIG_BT_CAP_ACCEPTOR_SET_MEMBER=y
CONFIG_BT_GATT_DYNAMIC_DB=y
2 changes: 2 additions & 0 deletions samples/bluetooth/hap_ha/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ CONFIG_BT=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_ISO_PERIPHERAL=y
CONFIG_BT_PRIVACY=y
CONFIG_BT_GATT_CACHING=y
CONFIG_BT_GATT_DYNAMIC_DB=y

CONFIG_BT_SMP=y
CONFIG_BT_SMP_SC_PAIR_ONLY=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512
CONFIG_HEAP_MEM_POOL_SIZE=8192

CONFIG_BT=y
CONFIG_BT_OBSERVER=y
CONFIG_BT_HCI_RAW=y
CONFIG_BT_MAX_CONN=2

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ CONFIG_BT_BUF_CMD_TX_SIZE=255

# Host features
CONFIG_BT_EXT_ADV=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_PER_ADV=n
CONFIG_BT_PER_ADV_SYNC=n

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
CONFIG_LTO=y

CONFIG_BT=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_HCI_RAW=y
CONFIG_BT_MAX_CONN=3

Expand Down
2 changes: 2 additions & 0 deletions samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_BT_EXT_ADV=y
CONFIG_BT_PER_ADV=y
CONFIG_BT_PER_ADV_SYNC=y
CONFIG_BT_PER_ADV_SYNC_MAX=2
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y

# Broadcast and Connected ISO
CONFIG_BT_ISO_BROADCASTER=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_BT_EXT_ADV=y
CONFIG_BT_PER_ADV=y
CONFIG_BT_PER_ADV_SYNC=y
CONFIG_BT_PER_ADV_SYNC_MAX=2
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y

# Broadcast and Connected ISO
CONFIG_BT_ISO_BROADCASTER=y
Expand Down
1 change: 1 addition & 0 deletions samples/bluetooth/iso_central/prj.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CONFIG_BT=y
CONFIG_LOG=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_ISO_CENTRAL=y
2 changes: 2 additions & 0 deletions samples/bluetooth/iso_connected_benchmark/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ CONFIG_CONSOLE_GETCHAR=y

CONFIG_BT_DEVICE_NAME="ISO Connected Throughput"
CONFIG_BT=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_ISO_PERIPHERAL=y
CONFIG_BT_ISO_MAX_CHAN=2
Expand Down
1 change: 1 addition & 0 deletions samples/bluetooth/iso_peripheral/prj.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CONFIG_BT=y
CONFIG_BT_PERIPHERAL=y
CONFIG_LOG=y
CONFIG_BT_DEVICE_NAME="Zephyr ISO server"
CONFIG_BT_ISO_PERIPHERAL=y
Expand Down
1 change: 1 addition & 0 deletions samples/bluetooth/iso_receive/prj.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CONFIG_BT=y
CONFIG_BT_OBSERVER=y
CONFIG_BT_ISO_SYNC_RECEIVER=y
CONFIG_LOG=y
CONFIG_BT_DEVICE_NAME="Test ISO Receive"
Expand Down
2 changes: 2 additions & 0 deletions samples/bluetooth/pbp_public_broadcast_sink/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ CONFIG_BT=y
CONFIG_LOG=y
CONFIG_BT_PAC_SNK=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_OBSERVER=y
CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_AUDIO=y
CONFIG_UTF8=y

Expand Down
1 change: 1 addition & 0 deletions samples/bluetooth/tmap_bmr/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CONFIG_LOG=y
CONFIG_BT_PAC_SNK=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_PRIVACY=y
CONFIG_BT_OBSERVER=y
CONFIG_BT_AUDIO=y
CONFIG_UTF8=y

Expand Down
1 change: 1 addition & 0 deletions samples/bluetooth/tmap_peripheral/duo.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CONFIG_BT_CSIP_SET_MEMBER=y
CONFIG_TMAP_PERIPHERAL_DUO=y
CONFIG_BT_CAP_ACCEPTOR_SET_MEMBER=y
CONFIG_BT_GATT_DYNAMIC_DB=y
1 change: 1 addition & 0 deletions samples/bluetooth/tmap_peripheral/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ CONFIG_BT_TBS_CLIENT_TERMINATE_CALL=y
CONFIG_BT_TBS_CLIENT_BEARER_URI_SCHEMES_SUPPORTED_LIST=y

# Generic config
CONFIG_BT_GATT_CACHING=y
CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_EXT_ADV=y
Expand Down
6 changes: 3 additions & 3 deletions subsys/bluetooth/Kconfig.iso
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ config BT_ISO_UNICAST
config BT_ISO_PERIPHERAL
bool "Bluetooth Isochronous Channel Unicast Peripheral Support"
depends on !BT_CTLR || BT_CTLR_PERIPHERAL_ISO_SUPPORT
select BT_PERIPHERAL
depends on BT_PERIPHERAL
select BT_ISO_UNICAST
help
This option enables support for Bluetooth Unicast
Expand All @@ -36,7 +36,7 @@ config BT_ISO_PERIPHERAL
config BT_ISO_CENTRAL
bool "Bluetooth Isochronous Channel Unicast Central Support"
depends on !BT_CTLR || BT_CTLR_CENTRAL_ISO_SUPPORT
select BT_CENTRAL
depends on BT_CENTRAL
select BT_ISO_UNICAST
help
This option enables support for Bluetooth Broadcast
Expand All @@ -60,9 +60,9 @@ config BT_ISO_BROADCASTER
config BT_ISO_SYNC_RECEIVER
bool "Bluetooth Isochronous Synchronized Receiver Support"
depends on !BT_CTLR || BT_CTLR_SYNC_ISO_SUPPORT
depends on BT_OBSERVER
select BT_ISO_BROADCAST
select BT_ISO_RX
select BT_OBSERVER
select BT_PER_ADV_SYNC
help
This option enables support for the Bluetooth Isochronous
Expand Down
2 changes: 1 addition & 1 deletion subsys/bluetooth/audio/Kconfig.aics
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ config BT_AICS_MAX_INSTANCE_COUNT
config BT_AICS
bool # hidden
default y if BT_AICS_MAX_INSTANCE_COUNT > 0
select BT_GATT_DYNAMIC_DB
depends on BT_GATT_DYNAMIC_DB
help
This hidden option enables support for Audio Input Control Service.

Expand Down
10 changes: 5 additions & 5 deletions subsys/bluetooth/audio/Kconfig.bap
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ config BT_BAP_UNICAST
config BT_BAP_UNICAST_SERVER
bool "Bluetooth Unicast Audio Server Support"
select BT_BAP_UNICAST
select BT_GATT_DYNAMIC_DB
select BT_GATT_CACHING
depends on BT_GATT_DYNAMIC_DB
depends on BT_GATT_CACHING
depends on BT_PERIPHERAL
depends on BT_ISO_PERIPHERAL
depends on BT_ASCS
Expand Down Expand Up @@ -207,11 +207,11 @@ endif # BT_BAP_BROADCAST_SINK

config BT_BAP_SCAN_DELEGATOR
bool "Basic Audio Profile Scan Delegator role support"
select BT_OBSERVER
select BT_EXT_ADV
select BT_PER_ADV_SYNC
select BT_ISO_SYNC_RECEIVER
select BT_GATT_DYNAMIC_DB
depends on BT_OBSERVER
depends on BT_GATT_DYNAMIC_DB
depends on BT_BONDABLE
help
This option enables support for the Scan Delegator role and the
Expand Down Expand Up @@ -241,13 +241,13 @@ endif # BT_BAP_SCAN_DELEGATOR

config BT_BAP_BROADCAST_ASSISTANT
bool "Basic Audio Profile Broadcast Assistant role support"
select BT_OBSERVER
select BT_EXT_ADV
select BT_PER_ADV_SYNC
select BT_ISO_SYNC_RECEIVER
select BT_GATT_CLIENT
select BT_GATT_AUTO_DISCOVER_CCC
select BT_GATT_AUTO_UPDATE_MTU
depends on BT_OBSERVER
depends on BT_BONDABLE
help
This option enables support for the Broadcast Assistant role.
Expand Down
2 changes: 1 addition & 1 deletion subsys/bluetooth/audio/Kconfig.cap
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ config BT_CAP_ACCEPTOR_SET_MEMBER
bool "Common Audio Profile Acceptor Role Set Member support"
depends on BT_CAP_ACCEPTOR
depends on BT_CSIP_SET_MEMBER
select BT_GATT_DYNAMIC_DB
depends on BT_GATT_DYNAMIC_DB
help
Enabling this will allow a CAP acceptor to be a set member.
Enabling this will require a manual register of the CAS service.
Expand Down
2 changes: 1 addition & 1 deletion subsys/bluetooth/audio/Kconfig.has
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
menuconfig BT_HAS
bool "Hearing Access Service support"
select UTF8
select BT_GATT_DYNAMIC_DB
depends on BT_GATT_DYNAMIC_DB
depends on BT_BAP_UNICAST_SERVER
help
This option enables support for Hearing Access Service.
Expand Down
2 changes: 1 addition & 1 deletion subsys/bluetooth/audio/Kconfig.mcs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ config BT_MCS
bool "Media Control Service Support"
depends on MCTL_LOCAL_PLAYER_REMOTE_CONTROL
depends on UTF8
select BT_GATT_DYNAMIC_DB
depends on BT_GATT_DYNAMIC_DB
help
This option enables support for the Media Control Service.

Expand Down
2 changes: 1 addition & 1 deletion subsys/bluetooth/audio/Kconfig.micp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

config BT_MICP_MIC_DEV
bool "Microphone Control Profile Microphone Device Support"
select BT_GATT_DYNAMIC_DB
depends on BT_GATT_DYNAMIC_DB
depends on BT_BONDABLE
help
This option enables support for Microphone Control Profile
Expand Down
2 changes: 1 addition & 1 deletion subsys/bluetooth/audio/Kconfig.tbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if BT_AUDIO

config BT_TBS
bool "Telephone Bearer Service Support"
select BT_GATT_DYNAMIC_DB
depends on BT_GATT_DYNAMIC_DB
depends on UTF8
help
This option enables support for Telephone Bearer Service. By default this only
Expand Down
2 changes: 1 addition & 1 deletion subsys/bluetooth/audio/Kconfig.vcp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

config BT_VCP_VOL_REND
bool "Volume Control Profile Volume Renderer Support"
select BT_GATT_DYNAMIC_DB
depends on BT_GATT_DYNAMIC_DB
help
This option enables support for Volume Control Profile Volume Renderer
role and the Volume Control Service.
Expand Down
2 changes: 2 additions & 0 deletions tests/bluetooth/audio/ascs/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ CONFIG_BT_MAX_CONN=1
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_ISO_PERIPHERAL=y
CONFIG_BT_ISO_MAX_CHAN=1
CONFIG_BT_GATT_CACHING=y
CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_AUDIO=y
CONFIG_BT_ASCS=y
CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT=2
Expand Down
2 changes: 2 additions & 0 deletions tests/bluetooth/audio/bap_base/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ CONFIG_BT=y
CONFIG_BT_SMP=y
CONFIG_BT_AUDIO=y
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_BAP_SCAN_DELEGATOR=y

Expand Down
2 changes: 2 additions & 0 deletions tests/bluetooth/audio/cap_commander/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ CONFIG_BT=y
CONFIG_BT_SMP=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_MAX_CONN=2
CONFIG_BT_OBSERVER=y
CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_AUDIO=y

# Requirements for CAP commander
Expand Down
2 changes: 2 additions & 0 deletions tests/bluetooth/audio/codec/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ CONFIG_BT_SMP=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_ISO_PERIPHERAL=y
CONFIG_BT_AUDIO=y
CONFIG_BT_GATT_CACHING=y
CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_BAP_UNICAST_SERVER=y
CONFIG_BT_ASCS=y

Expand Down
2 changes: 2 additions & 0 deletions tests/bluetooth/shell/audio.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ CONFIG_BT_CENTRAL=y
CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_PRIVACY=y
CONFIG_BT_GATT_CACHING=y
CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_L2CAP_ECRED=y
CONFIG_BT_SIGNING=y
CONFIG_BT_FIXED_PASSKEY=y
Expand Down
3 changes: 3 additions & 0 deletions tests/bluetooth/tester/overlay-le-audio.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
CONFIG_BT_AUDIO=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_GATT_CACHING=y
CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_ISO_PERIPHERAL=y
CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_EXT_ADV=y
Expand Down
2 changes: 2 additions & 0 deletions tests/bsim/bluetooth/audio/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ CONFIG_BT_ATT_PREPARE_COUNT=5
CONFIG_BT_MAX_CONN=3
CONFIG_BT_MAX_PAIRED=3
CONFIG_BT_EXT_ADV_MAX_ADV_SET=3
CONFIG_BT_OBSERVER=y
CONFIG_BT_GATT_CACHING=y
CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_SMP=y
CONFIG_BT_L2CAP_TX_MTU=128
Expand Down
1 change: 1 addition & 0 deletions tests/bsim/bluetooth/host/iso/bis/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CONFIG_ASSERT=y
CONFIG_BT_EXT_ADV=y
CONFIG_BT_PER_ADV=y
CONFIG_BT_PER_ADV_SYNC=y
CONFIG_BT_OBSERVER=y

CONFIG_BT_DEVICE_NAME="BIS test"

Expand Down
2 changes: 2 additions & 0 deletions tests/bsim/bluetooth/host/iso/cis/prj.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
CONFIG_BT=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y
CONFIG_LOG=y
CONFIG_ASSERT=y
CONFIG_BT_SMP=y
Expand Down
2 changes: 2 additions & 0 deletions tests/bsim/bluetooth/ll/cis/prj.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
CONFIG_TEST_CONNECT_ACL_FIRST=n

CONFIG_BT=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_EXT_ADV=y
CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_ISO_PERIPHERAL=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
CONFIG_CBPRINTF_REDUCED_INTEGRAL=y

CONFIG_BT=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_HCI_RAW=y
CONFIG_BT_MAX_CONN=4

Expand Down
Loading