michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: Bluetooth: remove dup pointer in broadcast_audio_sink

Browse source 
In the broadcast_audio_sink sample there are two pointers defined,
both referencing the same address. We reduce this to one pointer

Signed-off-by: Andries Kruithof <andries.kruithof@nordicsemi.no>
This commit is contained in:
Andries Kruithof 2023-10-05 14:58:26 +02:00 • committed by Johan Hedberg
commit 125e65a976
1 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
samples/bluetooth/broadcast_audio_sink/src/main.c
View file

@ -40,7 +40,7 @@ static K_SEM_DEFINE(sem_bis_sync_requested, 0U, 1U);
static K_SEM_DEFINE(sem_bis_synced, 0U, CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT); static K_SEM_DEFINE(sem_bis_synced, 0U, CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT);
/* Sample assumes that we only have a single Scan Delegator receive state */ /* Sample assumes that we only have a single Scan Delegator receive state */
static const struct bt_bap_scan_delegator_recv_state *sink_recv_state; static const struct bt_bap_scan_delegator_recv_state *req_recv_state;
static struct bt_bap_broadcast_sink *broadcast_sink; static struct bt_bap_broadcast_sink *broadcast_sink;
static struct bt_le_scan_recv_info broadcaster_info; static struct bt_le_scan_recv_info broadcaster_info;
static bt_addr_le_t broadcaster_addr; static bt_addr_le_t broadcaster_addr;
@ -158,20 +158,18 @@ static struct bt_bap_broadcast_sink_cb broadcast_sink_cbs = {
.syncable = syncable_cb, .syncable = syncable_cb,
}; };
const struct bt_bap_scan_delegator_recv_state *broadcast_recv_state;
static void pa_timer_handler(struct k_work *work) static void pa_timer_handler(struct k_work *work)
{ {
if (broadcast_recv_state != NULL) { if (req_recv_state != NULL) {
enum bt_bap_pa_state pa_state; enum bt_bap_pa_state pa_state;
if (broadcast_recv_state->pa_sync_state == BT_BAP_PA_STATE_INFO_REQ) { if (req_recv_state->pa_sync_state == BT_BAP_PA_STATE_INFO_REQ) {
pa_state = BT_BAP_PA_STATE_NO_PAST; pa_state = BT_BAP_PA_STATE_NO_PAST;
} else { } else {
pa_state = BT_BAP_PA_STATE_FAILED; pa_state = BT_BAP_PA_STATE_FAILED;
} }
bt_bap_scan_delegator_set_pa_state(broadcast_recv_state->src_id, bt_bap_scan_delegator_set_pa_state(req_recv_state->src_id,
pa_state); pa_state);
} }
@ -228,9 +226,7 @@ static int pa_sync_req_cb(struct bt_conn *conn,
{ {
int err; int err;
sink_recv_state = recv_state; req_recv_state = recv_state;
broadcast_recv_state = recv_state;
if (recv_state->pa_sync_state == BT_BAP_PA_STATE_SYNCED || if (recv_state->pa_sync_state == BT_BAP_PA_STATE_SYNCED ||
recv_state->pa_sync_state == BT_BAP_PA_STATE_INFO_REQ) { recv_state->pa_sync_state == BT_BAP_PA_STATE_INFO_REQ) {
@ -257,7 +253,7 @@ static int pa_sync_term_req_cb(struct bt_conn *conn,
{ {
int err; int err;
sink_recv_state = recv_state; req_recv_state = recv_state;
err = bt_bap_broadcast_sink_delete(broadcast_sink); err = bt_bap_broadcast_sink_delete(broadcast_sink);
if (err != 0) { if (err != 0) {
@ -275,7 +271,7 @@ static void broadcast_code_cb(struct bt_conn *conn,
{ {
printk("Broadcast code received for %p\n", recv_state); printk("Broadcast code received for %p\n", recv_state);
sink_recv_state = recv_state; req_recv_state = recv_state;
(void)memcpy(sink_broadcast_code, broadcast_code, BT_AUDIO_BROADCAST_CODE_SIZE); (void)memcpy(sink_broadcast_code, broadcast_code, BT_AUDIO_BROADCAST_CODE_SIZE);
@ -408,9 +404,10 @@ static bool scan_check_and_sync_broadcast(struct bt_data *data, void *user_data)
if (broadcast_assistant_conn == NULL) { if (broadcast_assistant_conn == NULL) {
/* Not requested by Broadcast Assistant */ /* Not requested by Broadcast Assistant */
k_sem_give(&sem_broadcaster_found); k_sem_give(&sem_broadcaster_found);
} else if (sink_recv_state != NULL && bt_addr_le_eq(info->addr, &sink_recv_state->addr) && } else if (req_recv_state != NULL &&
info->sid == sink_recv_state->adv_sid && bt_addr_le_eq(info->addr, &req_recv_state->addr) &&
broadcast_id == sink_recv_state->broadcast_id) { info->sid == req_recv_state->adv_sid &&
broadcast_id == req_recv_state->broadcast_id) {
k_sem_give(&sem_broadcaster_found); k_sem_give(&sem_broadcaster_found);
} }
@ -497,7 +494,7 @@ static int reset(void)
bis_index_bitfield = 0U; bis_index_bitfield = 0U;
requested_bis_sync = 0U; requested_bis_sync = 0U;
sink_recv_state = NULL; req_recv_state = NULL;
(void)memset(sink_broadcast_code, 0, sizeof(sink_broadcast_code)); (void)memset(sink_broadcast_code, 0, sizeof(sink_broadcast_code));
(void)memset(&broadcaster_info, 0, sizeof(broadcaster_info)); (void)memset(&broadcaster_info, 0, sizeof(broadcaster_info));
(void)memset(&broadcaster_addr, 0, sizeof(broadcaster_addr)); (void)memset(&broadcaster_addr, 0, sizeof(broadcaster_addr));