From 9001e259a80d4ee8a66e5c157efa9ed1d73ad33c Mon Sep 17 00:00:00 2001 From: Emil Gydesen Date: Fri, 13 Sep 2024 16:21:15 +0200 Subject: [PATCH] tests: bsim: Bluetooth: Audio: Fix minor things in source files Removed some unused variables and includes. Added missing includes. Fixed duplicated variable names. Signed-off-by: Emil Gydesen --- tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c | 1 + tests/bsim/bluetooth/audio/src/bap_common.c | 1 - tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c | 1 - tests/bsim/bluetooth/audio/src/cap_acceptor_test.c | 2 +- tests/bsim/bluetooth/audio/src/cap_commander_test.c | 6 +++++- tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c | 2 +- tests/bsim/bluetooth/audio/src/common.c | 3 ++- tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c | 1 - tests/bsim/bluetooth/audio/src/gmap_ugg_test.c | 1 + tests/bsim/bluetooth/audio/src/tbs_test.c | 1 - tests/bsim/bluetooth/audio/src/vcp_vol_rend_test.c | 1 + 11 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c b/tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c index 3508d74efb4..5d7cc171720 100644 --- a/tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c +++ b/tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include "bap_common.h" diff --git a/tests/bsim/bluetooth/audio/src/bap_common.c b/tests/bsim/bluetooth/audio/src/bap_common.c index 3e19b66e992..0c39db4c68a 100644 --- a/tests/bsim/bluetooth/audio/src/bap_common.c +++ b/tests/bsim/bluetooth/audio/src/bap_common.c @@ -15,7 +15,6 @@ #include #include -#include "common.h" #include "bap_common.h" void print_hex(const uint8_t *ptr, size_t len) diff --git a/tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c b/tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c index 0b8d47c6941..134df428ab8 100644 --- a/tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c +++ b/tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c @@ -44,7 +44,6 @@ NET_BUF_POOL_FIXED_DEFINE(tx_pool, TOTAL_BUF_NEEDED, BT_ISO_SDU_BUF_SIZE(CONFIG_ extern enum bst_result_t bst_result; -static volatile size_t sent_count; static struct audio_test_stream test_streams[CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT]; static struct bt_bap_ep *g_sinks[CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT]; static struct bt_bap_ep *g_sources[CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SRC_COUNT]; diff --git a/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c b/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c index dbbc308718e..c4012a58397 100644 --- a/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c +++ b/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c @@ -1045,7 +1045,7 @@ static void test_cap_acceptor_broadcast_reception(void) sink_wait_for_data(); /* Since we are re-using the BAP broadcast source test - * we get a metadata udate, and we need to send an extra + * we get a metadata update, and we need to send an extra * backchannel sync */ base_wait_for_metadata_update(); diff --git a/tests/bsim/bluetooth/audio/src/cap_commander_test.c b/tests/bsim/bluetooth/audio/src/cap_commander_test.c index 11e37bc4591..7a849fc1912 100644 --- a/tests/bsim/bluetooth/audio/src/cap_commander_test.c +++ b/tests/bsim/bluetooth/audio/src/cap_commander_test.c @@ -6,9 +6,12 @@ #include #include #include +#include #include #include +#include +#include #include #include #include @@ -20,15 +23,16 @@ #include #include #include +#include #include #include #include #include +#include #include #include "bstests.h" #include "common.h" -#include "bap_common.h" #if defined(CONFIG_BT_CAP_COMMANDER) diff --git a/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c b/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c index 24c697e0339..c6299135a3c 100644 --- a/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c +++ b/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c @@ -176,7 +176,7 @@ static void unicast_stream_disabled(struct bt_bap_stream *stream) static void unicast_stream_stopped(struct bt_bap_stream *stream, uint8_t reason) { - printk("Stopped stream with reason 0x%02X%p\n", stream, reason); + printk("Stopped stream %p with reason 0x%02X\n", stream, reason); } static void unicast_stream_released(struct bt_bap_stream *stream) diff --git a/tests/bsim/bluetooth/audio/src/common.c b/tests/bsim/bluetooth/audio/src/common.c index 9a8e41a5dcd..ea4f781dda4 100644 --- a/tests/bsim/bluetooth/audio/src/common.c +++ b/tests/bsim/bluetooth/audio/src/common.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -40,7 +41,7 @@ const struct bt_data ad[AD_SIZE] = { BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)) }; -static void device_found(const struct bt_le_scan_recv_info *info, struct net_buf_simple *ad) +static void device_found(const struct bt_le_scan_recv_info *info, struct net_buf_simple *ad_buf) { char addr_str[BT_ADDR_LE_STR_LEN]; int err; diff --git a/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c b/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c index 37910d2ad25..f312fe44b7e 100644 --- a/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c +++ b/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c @@ -32,7 +32,6 @@ static bool expect_lockable = true; extern enum bst_result_t bst_result; static volatile bool discovered; -static volatile bool members_discovered; static volatile bool discover_timed_out; static volatile bool set_locked; static volatile bool set_unlocked; diff --git a/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c b/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c index be16111858e..312dfbf5aab 100644 --- a/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c +++ b/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c @@ -6,6 +6,7 @@ #include #include +#include #include #include diff --git a/tests/bsim/bluetooth/audio/src/tbs_test.c b/tests/bsim/bluetooth/audio/src/tbs_test.c index 8f2d1a1a3c6..e76d1ab4234 100644 --- a/tests/bsim/bluetooth/audio/src/tbs_test.c +++ b/tests/bsim/bluetooth/audio/src/tbs_test.c @@ -22,7 +22,6 @@ #ifdef CONFIG_BT_TBS extern enum bst_result_t bst_result; static uint8_t g_call_index; -static volatile uint8_t call_state; CREATE_FLAG(is_connected); CREATE_FLAG(call_placed); diff --git a/tests/bsim/bluetooth/audio/src/vcp_vol_rend_test.c b/tests/bsim/bluetooth/audio/src/vcp_vol_rend_test.c index f6d2ae41bba..dde6bc3ca07 100644 --- a/tests/bsim/bluetooth/audio/src/vcp_vol_rend_test.c +++ b/tests/bsim/bluetooth/audio/src/vcp_vol_rend_test.c @@ -6,6 +6,7 @@ */ #include #include +#include #include #include