diff --git a/subsys/bluetooth/audio/audio.c b/subsys/bluetooth/audio/audio.c index f38ec14c001..72fac3e8cb2 100644 --- a/subsys/bluetooth/audio/audio.c +++ b/subsys/bluetooth/audio/audio.c @@ -97,6 +97,17 @@ uint8_t bt_audio_get_chan_count(enum bt_audio_location chan_allocation) #endif } +static bool valid_ltv_cb(struct bt_data *data, void *user_data) +{ + /* just return true to continue parsing as bt_data_parse will validate for us */ + return true; +} + +bool bt_audio_valid_ltv(const uint8_t *data, uint8_t data_len) +{ + return bt_audio_data_parse(data, data_len, valid_ltv_cb, NULL) == 0; +} + #if defined(CONFIG_BT_CONN) static uint8_t bt_audio_security_check(const struct bt_conn *conn) diff --git a/subsys/bluetooth/audio/audio_internal.h b/subsys/bluetooth/audio/audio_internal.h index b6fde6118f4..4336b8ede06 100644 --- a/subsys/bluetooth/audio/audio_internal.h +++ b/subsys/bluetooth/audio/audio_internal.h @@ -77,3 +77,5 @@ static inline const char *bt_audio_dir_str(enum bt_audio_dir dir) return "Unknown"; } + +bool bt_audio_valid_ltv(const uint8_t *data, uint8_t data_len); diff --git a/subsys/bluetooth/audio/bap_broadcast_source.c b/subsys/bluetooth/audio/bap_broadcast_source.c index 4f11e247ceb..b75bdc39429 100644 --- a/subsys/bluetooth/audio/bap_broadcast_source.c +++ b/subsys/bluetooth/audio/bap_broadcast_source.c @@ -33,6 +33,7 @@ LOG_MODULE_REGISTER(bt_bap_broadcast_source, CONFIG_BT_BAP_BROADCAST_SOURCE_LOG_LEVEL); +#include "audio_internal.h" #include "bap_iso.h" #include "bap_endpoint.h" #include "bap_stream.h" diff --git a/subsys/bluetooth/audio/bap_stream.c b/subsys/bluetooth/audio/bap_stream.c index fa17e2d138e..1d082eae1b1 100644 --- a/subsys/bluetooth/audio/bap_stream.c +++ b/subsys/bluetooth/audio/bap_stream.c @@ -208,17 +208,6 @@ enum bt_bap_ascs_reason bt_audio_verify_qos(const struct bt_audio_codec_qos *qos return BT_BAP_ASCS_REASON_NONE; } -static bool valid_ltv_cb(struct bt_data *data, void *user_data) -{ - /* just return true to continue parsing as bt_data_parse will validate for us */ - return true; -} - -bool bt_audio_valid_ltv(const uint8_t *data, uint8_t data_len) -{ - return bt_audio_data_parse(data, data_len, valid_ltv_cb, NULL) == 0; -} - bool bt_audio_valid_codec_cfg(const struct bt_audio_codec_cfg *codec_cfg) { if (codec_cfg == NULL) { diff --git a/subsys/bluetooth/audio/bap_stream.h b/subsys/bluetooth/audio/bap_stream.h index 597bf80d94c..56c5e221dc2 100644 --- a/subsys/bluetooth/audio/bap_stream.h +++ b/subsys/bluetooth/audio/bap_stream.h @@ -31,7 +31,6 @@ void bt_audio_codec_qos_to_iso_qos(struct bt_iso_chan_io_qos *io, void bt_bap_stream_detach(struct bt_bap_stream *stream); enum bt_bap_ascs_reason bt_audio_verify_qos(const struct bt_audio_codec_qos *qos); -bool bt_audio_valid_ltv(const uint8_t *data, uint8_t data_len); bool bt_audio_valid_codec_cfg(const struct bt_audio_codec_cfg *codec_cfg); bool bt_bap_stream_can_disconnect(const struct bt_bap_stream *stream); diff --git a/subsys/bluetooth/audio/cap_commander.c b/subsys/bluetooth/audio/cap_commander.c index 8468fbc2b21..70dea22f24b 100644 --- a/subsys/bluetooth/audio/cap_commander.c +++ b/subsys/bluetooth/audio/cap_commander.c @@ -28,6 +28,7 @@ #include #include +#include "audio_internal.h" #include "bap_endpoint.h" #include "bap_internal.h" #include "cap_internal.h" diff --git a/tests/bluetooth/audio/cap_commander/Kconfig b/tests/bluetooth/audio/cap_commander/Kconfig deleted file mode 100644 index 1493bd1a3d1..00000000000 --- a/tests/bluetooth/audio/cap_commander/Kconfig +++ /dev/null @@ -1,14 +0,0 @@ -# Temporary override -# -# Copyright (c) 2024 Nordic Semiconductor ASA - -# SPDX-License-Identifier: Apache-2.0 -# - -config BT_BAP_STREAM - # Override until someone fixes the UT build system - bool - default y - -# Include Zephyr's Kconfig. -source "Kconfig.zephyr" diff --git a/tests/bluetooth/audio/cap_commander/uut/CMakeLists.txt b/tests/bluetooth/audio/cap_commander/uut/CMakeLists.txt index 80508263d6a..244be9e921c 100644 --- a/tests/bluetooth/audio/cap_commander/uut/CMakeLists.txt +++ b/tests/bluetooth/audio/cap_commander/uut/CMakeLists.txt @@ -8,8 +8,6 @@ add_library(uut STATIC ${ZEPHYR_BASE}/subsys/bluetooth/audio/audio.c - ${ZEPHYR_BASE}/subsys/bluetooth/audio/bap_iso.c - ${ZEPHYR_BASE}/subsys/bluetooth/audio/bap_stream.c ${ZEPHYR_BASE}/subsys/bluetooth/audio/cap_commander.c ${ZEPHYR_BASE}/subsys/bluetooth/audio/cap_common.c ${ZEPHYR_BASE}/subsys/logging/log_minimal.c