[BlueZ,5/8] profiles/audio/bap: Use unicast structure for ISO QoS options

Commit Message

Iulia Tanasescu March 20, 2023, 2:37 p.m. UTC

Convert the generic bt_iso_qos structure into the dedicated unicast
structure for ISO QoS options.

---
 profiles/audio/bap.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Patch

diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index dfdf87255..49003d351 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
  *
  *
  */
@@ -741,7 +742,7 @@  static void bap_iso_qos(struct bt_bap_qos *qos, struct bt_iso_io_qos *io)
 static bool match_stream_qos(const void *data, const void *user_data)
 {
 	const struct bt_bap_stream *stream = data;
-	const struct bt_iso_qos *iso_qos = user_data;
+	const struct bt_iso_unicast_qos *iso_qos = user_data;
 	struct bt_bap_qos *qos;
 
 	qos = bt_bap_stream_get_qos((void *)stream);
@@ -756,7 +757,7 @@  static void iso_confirm_cb(GIOChannel *io, void *user_data)
 {
 	struct bap_data *data = user_data;
 	struct bt_bap_stream *stream;
-	struct bt_iso_qos qos;
+	struct bt_iso_unicast_qos qos;
 	char address[18];
 	GError *err = NULL;
 
@@ -882,7 +883,7 @@  static void bap_connect_io_cb(GIOChannel *chan, GError *err, gpointer user_data)
 
 static void bap_connect_io(struct bap_data *data, struct bap_ep *ep,
 				struct bt_bap_stream *stream,
-				struct bt_iso_qos *qos, int defer)
+				struct bt_iso_unicast_qos *qos, int defer)
 {
 	struct btd_adapter *adapter = device_get_adapter(data->device);
 	GIOChannel *io;
@@ -939,7 +940,7 @@  static void bap_connect_io(struct bap_data *data, struct bap_ep *ep,
 }
 
 static void bap_listen_io(struct bap_data *data, struct bt_bap_stream *stream,
-						struct bt_iso_qos *qos)
+						struct bt_iso_unicast_qos *qos)
 {
 	struct btd_adapter *adapter = device_get_adapter(data->device);
 	GIOChannel *io;
@@ -974,7 +975,7 @@  static void bap_create_io(struct bap_data *data, struct bap_ep *ep,
 				struct bt_bap_stream *stream, int defer)
 {
 	struct bt_bap_qos *qos[2] = {};
-	struct bt_iso_qos iso_qos;
+	struct bt_iso_unicast_qos iso_qos;
 
 	DBG("ep %p stream %p defer %s", ep, stream, defer ? "true" : "false");
 
@@ -1178,7 +1179,7 @@  static void bap_connecting(struct bt_bap_stream *stream, bool state, int fd,
 	/* Attempt to get CIG/CIS if they have not been set */
 	if (ep->qos.cig_id == BT_ISO_QOS_CIG_UNSET ||
 				ep->qos.cis_id == BT_ISO_QOS_CIS_UNSET) {
-		struct bt_iso_qos qos;
+		struct bt_iso_unicast_qos qos;
 		GError *err = NULL;
 
 		if (!bt_io_get(io, &err, BT_IO_OPT_QOS, &qos,