diff options
| author | Iulia Tanasescu <iulia.tanasescu@nxp.com> | 2023-03-31 18:39:27 +0300 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2023-03-31 14:33:28 -0700 |
| commit | c4d9b99db5a6b8efb7b710818a5261634086824b (patch) | |
| tree | ba8278bc514e5a02e2e8fbe7ac035d8a9a08da18 /profiles | |
| parent | f54299a850676d92c3dafd83e9174fcfe420ccc9 (diff) | |
| download | bluez-c4d9b99db5a6b8efb7b710818a5261634086824b.tar.gz | |
Split bt_iso_qos into dedicated structures
Split bt_iso_qos into dedicated unicast and broadcast
structures and add additional broadcast parameters.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/audio/bap.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c index 464f365a9..8f12fc410 100644 --- a/profiles/audio/bap.c +++ b/profiles/audio/bap.c @@ -4,6 +4,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2022 Intel Corporation. All rights reserved. + * Copyright 2023 NXP * * */ @@ -748,10 +749,10 @@ static bool match_stream_qos(const void *data, const void *user_data) qos = bt_bap_stream_get_qos((void *)stream); - if (iso_qos->cig != qos->cig_id) + if (iso_qos->ucast.cig != qos->cig_id) return false; - return iso_qos->cis == qos->cis_id; + return iso_qos->ucast.cis == qos->cis_id; } static void iso_confirm_cb(GIOChannel *io, void *user_data) @@ -773,7 +774,7 @@ static void iso_confirm_cb(GIOChannel *io, void *user_data) } DBG("ISO: incoming connect from %s (CIG 0x%02x CIS 0x%02x)", - address, qos.cig, qos.cis); + address, qos.ucast.cig, qos.ucast.cis); stream = queue_remove_if(data->streams, match_stream_qos, &qos); if (!stream) { @@ -992,11 +993,11 @@ static void bap_create_io(struct bap_data *data, struct bap_ep *ep, } memset(&iso_qos, 0, sizeof(iso_qos)); - iso_qos.cig = qos[0] ? qos[0]->cig_id : qos[1]->cig_id; - iso_qos.cis = qos[0] ? qos[0]->cis_id : qos[1]->cis_id; + iso_qos.ucast.cig = qos[0] ? qos[0]->cig_id : qos[1]->cig_id; + iso_qos.ucast.cis = qos[0] ? qos[0]->cis_id : qos[1]->cis_id; - bap_iso_qos(qos[0], &iso_qos.in); - bap_iso_qos(qos[1], &iso_qos.out); + bap_iso_qos(qos[0], &iso_qos.ucast.in); + bap_iso_qos(qos[1], &iso_qos.ucast.out); if (ep) bap_connect_io(data, ep, stream, &iso_qos, defer); @@ -1191,8 +1192,8 @@ static void bap_connecting(struct bt_bap_stream *stream, bool state, int fd, return; } - ep->qos.cig_id = qos.cig; - ep->qos.cis_id = qos.cis; + ep->qos.cig_id = qos.ucast.cig; + ep->qos.cis_id = qos.ucast.cis; } DBG("stream %p fd %d: CIG 0x%02x CIS 0x%02x", stream, fd, |