Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-191-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Silviu Florian Barbulescu <silviu.barbulescu@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@nxp.com
Subject: [PATCH BlueZ v5 4/5] audio/transport.c: Add support for multiple BISes
Date: Thu, 23 Nov 2023 17:10:32 +0200
Message-Id: <20231123151033.22898-5-silviu.barbulescu@nxp.com>
In-Reply-To: <20231123151033.22898-1-silviu.barbulescu@nxp.com>
References: <20231123151033.22898-1-silviu.barbulescu@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?MmPPYILk6xPABzUcqshVk8XQudzP4PAkgHs27Tmc5R57Gv3Ph0IDJH9gXHqO?=
 =?us-ascii?Q?ezKed8TZ335H8toh1b4T8gzzGD/l1fC3eHc46kKJHAr+PfRbI+w9b6GA+/+7?=
 =?us-ascii?Q?DNG5HZn/+tjrWGIocha4B1wTURayMQjDTAsxvX3GVR1uszvHMtHO+nZNEz4u?=
 =?us-ascii?Q?tMMYPQNIWhl5lg4WsSCMbasSYUe2uxgOMrp58KVFhx0AgNRCP2lTo76gRYx7?=
 =?us-ascii?Q?ovQkzy4Jj/C9ORW/7/cvkyyYLxd3nhUn5MIaT/+Hra7JqhE+DiSgOqFXvNNt?=
 =?us-ascii?Q?oUe6QPrZmPQphvTfGY1jkdhs441XCkd87jItKe88+xQLskX7L97KxD7KjHO0?=
 =?us-ascii?Q?PWUiNsBLOIliKt0lsI8w6gM2N6zp2GtqwJO4Pj+lRVszOmYvvdcZJas3PL6n?=
 =?us-ascii?Q?92BrStaAP10pKiaVAWUVszTprA5zjMytHdW/imSVfxKnhPOb/4gITBTrzRAK?=
 =?us-ascii?Q?+YvM35/eSqBLa2+OLkeKd9D52BNmxxq5pG7tuatcagnLu0FXx0oCdCY0Gay/?=
 =?us-ascii?Q?02F3HACBlF67EtNS4n2hukD8RB7JIRbnrzhjXbpiVysMgCZUCzEk1yYbyF/S?=
 =?us-ascii?Q?HCs5Lq9dM6niwrax/Dq1TMupRUcHJT4ljqpmEdUXTLMFjTOEPRcv8MvgCLht?=
 =?us-ascii?Q?5RmIMmylkAG3pj6ls7reX5EDmYsmwyL/drkNtwU3uIgeVebu/eRfFmV8b79x?=
 =?us-ascii?Q?t9H2/mLA9ofUxkKWGuQ7Pxf2ek9uhoTs5Et9pdqGciMrBagzYAWpiCVN7ktv?=
 =?us-ascii?Q?80bsIupL0jqxpajX8TQ8Fldnzz2/q210YEBZl3Iclg9hXwPPqSxYKbzW0bIr?=
 =?us-ascii?Q?+MZW1u/PQMBOTai+WKiqG4DZk3xLd6C7WSKTrWGEJv07SgF1EgpNDRnuF4vK?=
 =?us-ascii?Q?3VHIePjQKfl13KmYLnUYAqwppzaMNfLmqeKd1qOkxPGobWwxXNGHQiXnyDUg?=
 =?us-ascii?Q?YOTwY5g3nHUhddgZU7eggCrSV+uxHy48/tT6vEVyjU81Pex2VAXsbOB3SPsg?=
 =?us-ascii?Q?xZt5BS5sJSVIrnXo0cgPOJwqJ3BGKAjDHhhEYDpPQHk0TYAYR4Br8CFkuaAX?=
 =?us-ascii?Q?vN1OaNCsk4btFrJ8hs3Ji+9Uudt3xW4WDLSjI6MBqnBlop74WrXsZ3fwUxRV?=
 =?us-ascii?Q?wZ4zDuyQQ7bjosi1Z3SoKu3r/dPlp3bb0wZZpVcPTQUjV/NIFOs5AmaJcAug?=
 =?us-ascii?Q?17dNqr7jNPE37xX23tpHh10Qd2n6JT2Unsp7CPgKYPy3hdiWHPstHKcBSWct?=
 =?us-ascii?Q?TlOaL3wGGHmO+ZD//i62/kAhAiLNuJ+/aQmYhS/BehLEF2lOMB8zoy//1+bn?=
 =?us-ascii?Q?kcDeFezoWNtLlYbzoldNuUf0EQkxoFRqWnDMw5OTuLyhLfRIJFIkxABMBvJv?=
 =?us-ascii?Q?ZnCcQjbeVmifaehmNo49r8jLLxQ5oCNSqcFkLhJDbvjNSCNuyOgm1gDgkGWx?=
 =?us-ascii?Q?YlKXtpnNiL5SLcmk0s0j3ZLCAKkAMAMVlxkxmYKAM70DhaROXvtMNSOHgha3?=
 =?us-ascii?Q?CEVfrlSjVJTJTC3ztxixw3UySERVFVWNZ33jtTkWktgfWZiKR8mjarTjZJI4?=
 =?us-ascii?Q?Ahj66NoergZXSqnWKqa3zkRmODBf9jjWFdh9nQTyA+Skh5bHG8gzAwygBQNz?=
 =?us-ascii?Q?VQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c827ceb4-376b-416b-8395-08dbec366050
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB10073.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2023 15:10:49.2758
 (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: dMsxTiLd+kBpQ4ds7p4RA1OhWxPWIDd64e6XZtg21nclrragMvMHJxGCoGzfC7OGkUuVpXd+y9DtCwSD3qrJEpXfTDYfaMq6hU2fjqMPpfY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6928

Add support for bcast multiple BISes in profiles/audio/transport.c

---
 profiles/audio/transport.c | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index 23ea267f6..6f3dd68be 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -163,7 +163,9 @@ find_transport_by_bap_stream(const struct bt_bap_stream *stream)
 		struct bap_transport *bap;
 
 		if (strcasecmp(uuid, PAC_SINK_UUID) &&
-				strcasecmp(uuid, PAC_SOURCE_UUID))
+				strcasecmp(uuid, PAC_SOURCE_UUID) &&
+				strcasecmp(uuid, BCAA_SERVICE_UUID) &&
+				strcasecmp(uuid, BAA_SERVICE_UUID))
 			continue;
 
 		bap = transport->data;
@@ -312,8 +314,9 @@ static void media_transport_remove_owner(struct media_transport *transport)
 		media_request_reply(owner->pending, EIO);
 
 	transport->owner = NULL;
+
 	if (bap->linked)
-		queue_foreach(bt_bap_stream_io_get_links(bap->stream),
+		bt_bap_stream_foreach_link(bap->stream,
 				linked_transport_remove_owner, owner);
 
 	if (owner->watch)
@@ -497,7 +500,7 @@ static void media_transport_set_owner(struct media_transport *transport,
 	transport->owner = owner;
 
 	if (bap->linked)
-		queue_foreach(bt_bap_stream_io_get_links(bap->stream),
+		bt_bap_stream_foreach_link(bap->stream,
 				linked_transport_set_owner, owner);
 
 	owner->transport = transport;
@@ -641,6 +644,7 @@ static DBusMessage *release(DBusConnection *conn, DBusMessage *msg,
 	const char *sender;
 	struct media_request *req;
 	guint id;
+	const char *uuid;
 
 	sender = dbus_message_get_sender(msg);
 
@@ -669,9 +673,12 @@ static DBusMessage *release(DBusConnection *conn, DBusMessage *msg,
 	req = media_request_create(msg, id);
 	media_owner_add(owner, req);
 
-	if (bt_bap_stream_get_type(bap->stream) ==
-			BT_BAP_STREAM_TYPE_BCAST) {
-		bap_disable_complete(bap->stream, 0x00, 0x00, owner);
+	uuid = media_endpoint_get_uuid(transport->endpoint);
+	if (!strcasecmp(uuid, BCAA_SERVICE_UUID) ||
+				!strcasecmp(uuid, BAA_SERVICE_UUID)) {
+		if (bt_bap_stream_get_type(bap->stream) ==
+						BT_BAP_STREAM_TYPE_BCAST)
+			bap_disable_complete(bap->stream, 0x00, 0x00, owner);
 	}
 
 	return NULL;
@@ -686,7 +693,11 @@ static gboolean get_device(const GDBusPropertyTable *property,
 	if (transport->device)
 		path = device_get_path(transport->device);
 	else
-		path = adapter_get_path(transport->adapter);
+		/*
+		 *Use remote endpoint path as fake device path
+		 *for broadcast source transport
+		 */
+		path = transport->remote_endpoint;
 
 	dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &path);
 
@@ -1282,6 +1293,10 @@ static void bap_update_links(const struct media_transport *transport)
 	struct bap_transport *bap = transport->data;
 	struct queue *links = bt_bap_stream_io_get_links(bap->stream);
 
+	if (bt_bap_stream_get_type(bap->stream) !=
+					BT_BAP_STREAM_TYPE_UCAST)
+		return;
+
 	if (bap->linked == !queue_isempty(links))
 		return;
 
@@ -1491,9 +1506,10 @@ static void bap_state_changed(struct bt_bap_stream *stream, uint8_t old_state,
 		/* If a request is pending wait it to complete */
 		if (owner && owner->pending)
 			return;
-		bap_update_links(transport);
-		if (!media_endpoint_is_broadcast(transport->endpoint))
+		if (!media_endpoint_is_broadcast(transport->endpoint)) {
+			bap_update_links(transport);
 			bap_update_qos(transport);
+		}
 		else if (bt_bap_stream_io_dir(stream) != BT_BAP_BCAST_SOURCE)
 			bap_update_bcast_qos(transport);
 		transport_update_playing(transport, FALSE);
@@ -1510,7 +1526,7 @@ static void bap_state_changed(struct bt_bap_stream *stream, uint8_t old_state,
 			bap_update_bcast_qos(transport);
 		break;
 	case BT_BAP_STREAM_STATE_RELEASING:
-		if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SINK)
+		if (!bt_bap_stream_io_dir(stream))
 			return;
 		break;
 	}
-- 
2.39.2