michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Audio: Add TBS client TX buffer count requirement

Browse source 
After removing the high default for MCS, it was discovered that
the TBS client requires a significant amount of buffers to work
properly as well. Added the requirement as a build assert that
depends on which optional TBS client features are enabled.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2023-05-24 11:39:09 +02:00 • committed by Anas Nashif
commit 5109c941f2
4 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,6 +52,7 @@ CONFIG_BT_BAS=y
CONFIG_BT_IAS=y CONFIG_BT_IAS=y
CONFIG_BT_TBS_CLIENT=y CONFIG_BT_TBS_CLIENT=y
CONFIG_BT_TBS_CLIENT_MINIMAL=y
CONFIG_BT_TBS_CLIENT_GTBS=y CONFIG_BT_TBS_CLIENT_GTBS=y
CONFIG_BT_TBS_CLIENT_MAX_TBS_INSTANCES=0 CONFIG_BT_TBS_CLIENT_MAX_TBS_INSTANCES=0
CONFIG_BT_TBS_CLIENT_CCID=y CONFIG_BT_TBS_CLIENT_CCID=y

18
subsys/bluetooth/audio/tbs_client.c
View file

@ -24,6 +24,24 @@
#include <zephyr/logging/log.h> #include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(bt_tbs_client, CONFIG_BT_TBS_CLIENT_LOG_LEVEL); LOG_MODULE_REGISTER(bt_tbs_client, CONFIG_BT_TBS_CLIENT_LOG_LEVEL);
/* TODO TBS client attempts to subscribe to all characteristics at once if the MTU is large enough.
* This requires a significant amount of buffers, and should be optimized.
*/
/* Calculate the requiered buffers for TBS Client discovery */
#define TBS_CLIENT_BUF_COUNT \
(1 /* Discover buffer */ + 1 /* terminate reason */ + \
IS_ENABLED(CONFIG_BT_TBS_CLIENT_BEARER_PROVIDER_NAME) + \
IS_ENABLED(CONFIG_BT_TBS_CLIENT_BEARER_TECHNOLOGY) + \
IS_ENABLED(CONFIG_BT_TBS_CLIENT_BEARER_SIGNAL_STRENGTH) + \
IS_ENABLED(CONFIG_BT_TBS_CLIENT_BEARER_LIST_CURRENT_CALLS) + \
IS_ENABLED(CONFIG_BT_TBS_CLIENT_INCOMING_URI) + \
IS_ENABLED(CONFIG_BT_TBS_CLIENT_STATUS_FLAGS) + \
IS_ENABLED(CONFIG_BT_TBS_CLIENT_CP_PROCEDURES) + \
IS_ENABLED(CONFIG_BT_TBS_CLIENT_CALL_FRIENDLY_NAME) + \
IS_ENABLED(CONFIG_BT_TBS_CLIENT_INCOMING_CALL))
BUILD_ASSERT(CONFIG_BT_L2CAP_TX_BUF_COUNT >= TBS_CLIENT_BUF_COUNT, "Too few L2CAP buffers");
#include "common/bt_str.h" #include "common/bt_str.h"

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

@ -20,6 +20,8 @@ CONFIG_BT_ATT_PREPARE_COUNT=2
CONFIG_BT_SHELL=y CONFIG_BT_SHELL=y
CONFIG_BT_DEVICE_NAME="audio test shell" CONFIG_BT_DEVICE_NAME="audio test shell"
CONFIG_BT_DEVICE_NAME_DYNAMIC=y CONFIG_BT_DEVICE_NAME_DYNAMIC=y
# TBS Client may require up to 12 buffers
CONFIG_BT_L2CAP_TX_BUF_COUNT=12
CONFIG_BT_ID_MAX=2 CONFIG_BT_ID_MAX=2
CONFIG_BT_HRS=y CONFIG_BT_HRS=y
CONFIG_BT_FILTER_ACCEPT_LIST=y CONFIG_BT_FILTER_ACCEPT_LIST=y

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

@ -6,6 +6,8 @@ CONFIG_BT=y
CONFIG_BT_CENTRAL=y CONFIG_BT_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
CONFIG_BT_L2CAP_TX_BUF_COUNT=12
CONFIG_BT_MAX_CONN=5 CONFIG_BT_MAX_CONN=5
CONFIG_BT_MAX_PAIRED=5 CONFIG_BT_MAX_PAIRED=5
CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_GATT_DYNAMIC_DB=y