Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-1202-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Iulia Tanasescu <iulia.tanasescu@nxp.com>
To: linux-bluetooth@vger.kernel.org
Cc: claudia.rosu@nxp.com,
	mihai-octavian.urzica@nxp.com,
	silviu.barbulescu@nxp.com,
	vlad.pruteanu@nxp.com,
	andrei.istodorescu@nxp.com,
	luiz.dentz@gmail.com,
	Iulia Tanasescu <iulia.tanasescu@nxp.com>
Subject: [PATCH BlueZ 1/1] bap: Fix bcast endpoint config
Date: Fri, 19 Jan 2024 17:04:43 +0200
Message-Id: <20240119150443.3163-2-iulia.tanasescu@nxp.com>
In-Reply-To: <20240119150443.3163-1-iulia.tanasescu@nxp.com>
References: <20240119150443.3163-1-iulia.tanasescu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?hk+xkUpZ+oYKUggaguTaM86Ozif+iaJfvlG0LYVgvZo7Wqg26qAqpuFRf5yq?=
 =?us-ascii?Q?NpA8uMO3DRioTL6KTHEcdwGk/eUjB8MGPgnzTtrTzKTwl2QyH/safUdLuT2i?=
 =?us-ascii?Q?1DqktlJbwGJ2dnfdjMxHwUBM5PkwrE14BMyWIRVC256/Ov1GYav0PPU1ROJW?=
 =?us-ascii?Q?B3wMDgpcuwUpMUwLTlcDk6wEC5Bs58HpvLSj5vmnkj2v+a8QRkfKdyIFMwr2?=
 =?us-ascii?Q?36s+NBRyp2HNIKRQZK1e/uXZGEeKDZNojj/itpbV9bEWU5/TTzLVJQLqIUre?=
 =?us-ascii?Q?/gBmNjryhg/29FbZg66KSHPAebdJWSdTHdBXRzo4kfqQRIoBJ5emjdD7tcUd?=
 =?us-ascii?Q?SgobI3uizH2y0qLGC4/QBtIOmlEoXsB7OE+9MUkUrHSiJXPh+Uxu6WwWi7SJ?=
 =?us-ascii?Q?9lH6h9zoiwYnsmF45OSO+umfyMadGkowK5J1TX8/suRj1XbF9CmJWmXa0n1Y?=
 =?us-ascii?Q?xzxTvJBrE7vsdI2Npy51kkFOlBHzVNj6O4BR6KF35eX+gvR1alII9BNwew6e?=
 =?us-ascii?Q?ELPhFib1ltpiWAajEesyRGu6jiiDrNZ+taxkn9N+QSbAumZgi8ckzmvOwdH0?=
 =?us-ascii?Q?br1yoxh4DBkLjf4VJjdlOCK95dzhk1LYJjsJAkZWuKBmM4voUDQQy1n270Z3?=
 =?us-ascii?Q?I9akmSJNXOjiU24ZAL88Iks9hFrjVHPyhOXsJdbEf2wBuWxS1dc33GkgCvje?=
 =?us-ascii?Q?zeyMahh9CEOJRcZcDqo99AxqW31mqJwiPv7YT6H6snPeMiazK/x4KGSGjbs5?=
 =?us-ascii?Q?l7j/BKJ2wtHH/w5g9DQ32+mg3oFDaBCyp77KB79MCMP6BDLaJNDNLlpCIf7l?=
 =?us-ascii?Q?py62o31DlJXr1pu4e82xxmvY0hlvYkaFZYcENbcmuQh5NaVEF80scB/0dxId?=
 =?us-ascii?Q?LthDzuH+jR+Otv2it6s99ESXfuX5dBKFoJqRaMo6UKhlPaeCCoHNPzfYfG2f?=
 =?us-ascii?Q?IiVfqHS0qvyfjRrOqkN59CaVqklgp7RRrcPZFMPe9CD0JiVYH60PwmJ8wTxT?=
 =?us-ascii?Q?6tIVTCrW8i+SnFprT1JPs6gsICpIYX0MwdjxkmILzOWmeLXrhO1+5Op5j3w2?=
 =?us-ascii?Q?uUdtwXiEZqTqk8hfVqqkGKetgTXiI3q5TP78ZyL1LSv//Rf/jwCz9t/xzm3s?=
 =?us-ascii?Q?DIqWou0EVZONR1N1Di4l4I1nKBM/vM5z1QcabvpUwwvBeRZbKxXXpkAHMqQc?=
 =?us-ascii?Q?76ac7TdJVyKuqr3xQlzP34PlKaTmaLYxgC8fJEyuaKMjbRh5TUY284DyHoGA?=
 =?us-ascii?Q?UDfb0acCUB0vcXzfz+znzR1s+I9WabnRA1w7chvoUxsmAFNmQig1s7UXztWu?=
 =?us-ascii?Q?LMhwRjXu5TGe1w9O0N6cAO7pk0AFM/B3DpFY++aVDC5eUMrpBQtFr6eye0rS?=
 =?us-ascii?Q?LqRbmnYuNaIpa14VtiJ5cKpkutxpOsPCRs3K6DAzclK8MfU9ZCyS9ark5V/t?=
 =?us-ascii?Q?vjjZtgmKnaP7FutYD4bIOU1CRa2oJSlSEo+xMC0qDHW35tweExsyK4XwakYd?=
 =?us-ascii?Q?mGT/TVgI6amhAvui5qjJq/BInfcv295jrXyNCEl12CWdCJ+cdVI9z3DmJbUS?=
 =?us-ascii?Q?dVDnmTQprQTHVHdhsny2qfCSGpmrXvGQBRg1UEZ3KJbGvdsV5x971D7EHMAF?=
 =?us-ascii?Q?Hg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1ece56bc-62d6-4ce3-bb19-08dc18fffcf8
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 15:04:52.0632
 (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: ec+9zf+u4RSX+XSM/Ecc6Oi95qkWv+zYQFpCSHNzcthUeGxNTV6xVIMfHT7odjom2oXg4wlFJ5AwAUyxXHzFug==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9126

This updates the way broadcast is differentiated from unicast
at endpoint configuration: Instead of checking if setup->base
is allocated, check lpac type.

---
 profiles/audio/bap.c | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index b88876485..137ed7d39 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -4,7 +4,7 @@
  *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2022  Intel Corporation. All rights reserved.
- *  Copyright 2023 NXP
+ *  Copyright 2023-2024 NXP
  *
  *
  */
@@ -617,15 +617,16 @@ static int parse_bcast_qos(const char *key, int var, DBusMessageIter *iter,
 	return 0;
 }
 
-static int parse_qos(DBusMessageIter *iter, struct bt_bap_qos *qos,
-			struct iovec **base)
+static int parse_qos(DBusMessageIter *iter, uint8_t pac_type,
+				struct bt_bap_qos *qos)
 {
 	DBusMessageIter array;
 	const char *key;
 	int (*parser)(const char *key, int var, DBusMessageIter *iter,
 			struct bt_bap_qos *qos);
 
-	if (*base)
+	if ((pac_type == BT_BAP_BCAST_SOURCE) ||
+		(pac_type == BT_BAP_BCAST_SINK))
 		parser = parse_bcast_qos;
 	else
 		parser = parse_ucast_qos;
@@ -656,9 +657,9 @@ static int parse_qos(DBusMessageIter *iter, struct bt_bap_qos *qos,
 	return 0;
 }
 
-static int parse_configuration(DBusMessageIter *props, struct iovec **caps,
-				struct iovec **metadata, struct iovec **base,
-				struct bt_bap_qos *qos)
+static int parse_configuration(DBusMessageIter *props, uint8_t pac_type,
+				struct iovec **caps, struct iovec **metadata,
+				struct iovec **base, struct bt_bap_qos *qos)
 {
 	const char *key;
 	struct iovec iov;
@@ -686,6 +687,12 @@ static int parse_configuration(DBusMessageIter *props, struct iovec **caps,
 
 			util_iov_free(*caps, 1);
 			*caps = util_iov_dup(&iov, 1);
+
+			/* Currently, the base iovec only duplicates
+			 * setup->caps. TODO: Dynamically generate
+			 * base using received caps.
+			 */
+			*base = util_iov_dup(*caps, 1);
 		} else if (!strcasecmp(key, "Metadata")) {
 			if (var != DBUS_TYPE_ARRAY)
 				goto fail;
@@ -699,24 +706,13 @@ static int parse_configuration(DBusMessageIter *props, struct iovec **caps,
 			if (var != DBUS_TYPE_ARRAY)
 				goto fail;
 
-			if (parse_qos(&value, qos, base))
+			if (parse_qos(&value, pac_type, qos))
 				goto fail;
 		}
 
 		dbus_message_iter_next(props);
 	}
 
-	if (*base) {
-		uint32_t presDelay;
-		uint8_t numSubgroups, numBis;
-		struct bt_bap_codec codec;
-
-		util_iov_memcpy(*base, (*caps)->iov_base, (*caps)->iov_len);
-		parse_base((*caps)->iov_base, (*caps)->iov_len, bap_debug,
-			&presDelay, &numSubgroups, &numBis, &codec,
-			caps, NULL);
-	}
-
 	return 0;
 
 fail:
@@ -882,8 +878,9 @@ static DBusMessage *set_configuration(DBusConnection *conn, DBusMessage *msg,
 		setup->qos.ucast.cis_id = BT_ISO_QOS_CIS_UNSET;
 	}
 
-	if (parse_configuration(&props, &setup->caps, &setup->metadata,
-				&setup->base, &setup->qos) < 0) {
+	if (parse_configuration(&props, bt_bap_pac_get_type(ep->lpac),
+				&setup->caps, &setup->metadata, &setup->base,
+				&setup->qos) < 0) {
 		DBG("Unable to parse configuration");
 		setup_free(setup);
 		return btd_error_invalid_args(msg);
-- 
2.39.2