From:   Iulia Tanasescu <iulia.tanasescu@nxp.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     Iulia Tanasescu <iulia.tanasescu@nxp.com>
Subject: [PATCH BlueZ 5/8] profiles/audio/bap: Use unicast structure for ISO QoS options
Date:   Mon, 20 Mar 2023 16:37:10 +0200
Message-Id: <20230320143713.25449-6-iulia.tanasescu@nxp.com>
In-Reply-To: <20230320143713.25449-1-iulia.tanasescu@nxp.com>
References: <20230320143713.25449-1-iulia.tanasescu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/ootdZmeK3ORveHf8Qy7QBn+O9oWZJqVR3ceu1engWBMN2p3PLTF3EJgoXQV?=
 =?us-ascii?Q?iWh+sALToIyzezLrxG9W1o4xayxlockBCRg9D6C6wAWIDE3lw4KQvNGoRoWv?=
 =?us-ascii?Q?rKjDJjChlpGObCrrRE/Xk2g0vt56CYuNcdex5wd+JIT9et41CGJKW21A92ea?=
 =?us-ascii?Q?2VHtVijOn1e9wsmnq+Qs5zXELTZUnzUZPmIPt8sjX3KjUJWmaebCSvsciMp6?=
 =?us-ascii?Q?mVqvDNCVks7E2kwPdsQXX+XeLzEZ9T4utXEik4LpHihDv30/tI9MfIxod8D9?=
 =?us-ascii?Q?iYUB4MoarZeFk5GmMMqsk1/xbp0Ff1ZoDyQo3j/U2b9TaPS7O0bprYehEwse?=
 =?us-ascii?Q?Zi1vqXkKGFcWgUrMq7RP3T/N4Ac72TZcNGcQ9oonDE4hJsDouWtwGU/vaqJA?=
 =?us-ascii?Q?W+ze4Mzz8Ue7nCY5sRmeGzpZ52FzCPI3OjR4dPzEvnYMpPCE2vSVsd9iL4Dz?=
 =?us-ascii?Q?KeMFxpRDVcW/SDfAvu0NnW6PA7qdonzuRshdsCt3o4vlv01DVwQyYrDNzfM5?=
 =?us-ascii?Q?fW+WU8VUBpATfe48nlels64ELwgr7Jsi2rSX6TB3LxwU4O3E4aYCWEdob5gA?=
 =?us-ascii?Q?5FmdgfXJaj6hZDJ5DI/g7ajd64zDa5aoUVbZqPj3FV2Fpe66uVP1UOpJKZ7S?=
 =?us-ascii?Q?fk81kz44EbIgStZLae6nEI92pu6z7oGaS99haM5OU4V+AjIvI5PUz3A5yy5K?=
 =?us-ascii?Q?l6HLyTvxxHc8tovjniWTrRjkJMlk0CV69tF2QUo/onOal8pLyOStI0OPmPsJ?=
 =?us-ascii?Q?wNU+/z6Dzuq6IT1J4sOFBqH6SrpnKX/6zQ6O7GaheNWyjHLPQuIqGJyjTU3s?=
 =?us-ascii?Q?gUkx+aL87GdLdu4ebk3fK3UHnHPfMcuXm3INyu/kHFL1uFzJrB++b4IMkMt4?=
 =?us-ascii?Q?wLak4PXzQ/2Wl6BN4Z32VMxSzycOndciNQjq4hQbbaCZyFOOB/0ah8shY2KL?=
 =?us-ascii?Q?VgFVjHoUfdCe2ZZjZKnAj3XQ5FiSc6QZgg1G7GO/SaOieEIV+e716IICDg0Q?=
 =?us-ascii?Q?YwOvWVgjw80FjHsEz+SuxeVmbi7RIlr182aluNSo+0EizbOV+YcPz/NMMlZh?=
 =?us-ascii?Q?7w9MgLuENWSTaKphQQOa6IvUZo6UtC/wxbxit+C0wg7XMXz+vAmg2L8QW27q?=
 =?us-ascii?Q?qroh3OW05bQ9ys/POu1kwprMNsnsDSqZpGUHdADWDy6T8A2u13xRkWPo+VbE?=
 =?us-ascii?Q?dJpJh6X29kNEIspRRwRogLLiM2UzjtldJua5g+qVe3xzBwW+Xt6zHXYdGL5y?=
 =?us-ascii?Q?TnibETCV4lW3LC+i3cwKjEr9ju8IoMh8J1KHwj8Eef1Ejl0EyZ20tAFKDhh1?=
 =?us-ascii?Q?J+7d4/iWxs/f8p/IOwoulgEc5tnISS1Gc+8hslxgvp0GM1Ru8t0Grw/W0+oa?=
 =?us-ascii?Q?6YGiEIZUM6YHezthwBdDGsMJRcWGEoOUZ+2Vqna6CXFkD3dDZ0Gglj3SOWDv?=
 =?us-ascii?Q?euvG4U6/v5hlE2feTn+46V26OikbBZDg5MKBE5cNDOc3lPyTY3I+eXQc9eqb?=
 =?us-ascii?Q?iZA0AjhYveib4iCEvHKXW6T3DuYDv+o73var+lHDHup7yZNnpW4i9v1zfiR3?=
 =?us-ascii?Q?T7WKyBO3SCkXsCrl9H7rlPbCFr+JtDhEmoLySEq3+fGdgKE4rOvPw1App79a?=
 =?us-ascii?Q?kg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1b1128bf-a51b-4a8c-d243-08db2950a797
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2023 14:37:38.9549
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: v4V/qjY/KFoPt1bTVwIjup8qIO08LGNrc5+hJE8Gu1+Q7ZOpXvD9EiQGmGLdPh2qKOVX8n2QUrUDjZJoDNqwXw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7231
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

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(-)

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,
-- 
2.34.1