Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
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 v3 4/5] profiles/audio/transport.c: Add support multiple BIS
Date:   Thu,  2 Nov 2023 17:58:26 +0200
Message-Id: <20231102155827.4219-5-silviu.barbulescu@nxp.com>
In-Reply-To: <20231102155827.4219-1-silviu.barbulescu@nxp.com>
References: <20231102155827.4219-1-silviu.barbulescu@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?P5MjFvXeToxfcyaAnQDNmxSyDXV8BgxmpoAJszIw4XrdQTu3YKqDzjW4GWfd?=
 =?us-ascii?Q?FtikWNWvqK/iR56oJnvWIyXH9iooBmTJ70A2LyNiIyOZVrTU3Dh2+tiHANoS?=
 =?us-ascii?Q?JF4d98Io5tw5VGcxe0UqI+dQSbHwwdBR8VxlCycWGG3XsFCRZMS4XOT/jQdJ?=
 =?us-ascii?Q?W5CANcCacl81oc2kb//NVpeL7wJ5o+5j0BK6sr46jhS8ZnhJriWAgk1ljp/Q?=
 =?us-ascii?Q?aDoLA/kZtQSfOoz+dy3io5jDZVOVlIqKH8r25QMQaNdtRCzWpjba6G/CVDRP?=
 =?us-ascii?Q?svwCCZBTFL0zKD9pqdKTCCk9n7k2xxPW7LQJg1f8azzI2H6ZaY19P2hWBCg0?=
 =?us-ascii?Q?/ZZ+d5D1+SG36k06nLjSkyrV3fUg+ykyVpSIQlcUqGZrzXI4f25o6G1dnrPu?=
 =?us-ascii?Q?uBAgmPyzd7smdnV/g/F4TDh5RlJE875gCcC3LTTKH5LJN3sUGEElH64bbJoO?=
 =?us-ascii?Q?4tm3TKroDTjboJ7o5ytuyIO0HaaEbT5dL62j4moBfqPY2XghFmkR3xDrch+2?=
 =?us-ascii?Q?9jrdM9jJfWQrruvxNiF4Qv0/Git6OKCBE+ZXNP/8zEfwKDrPhFWVrgIfd0Uq?=
 =?us-ascii?Q?f7vSD7ZZ+U7AF3VNzoTKWi21myIAALZaAoQGtf/CYRRjjmsR1VEhiyYI9S8D?=
 =?us-ascii?Q?fXmniGJPnNo2u8NhfsdZQt+/MRDzd93bdmbFh1n4okvCjeOcJbng3O+yWNZn?=
 =?us-ascii?Q?DoAUAIKl2w1efM0w4OLf0/n5+IMm8IL5GM0q8mp0ie8AsSbi5bCoPT52//R2?=
 =?us-ascii?Q?GpusO8Reeh+aebkYucAnO1EAJzZ+Lcrok2DP/LYpVL037QIsUWtT+yNWqtl4?=
 =?us-ascii?Q?PvAbkK8UrbJ7f5OnJ5FyFD2tEqF8N0yIT9ufNjzWBSybYGQCtcoYQdZpOfwm?=
 =?us-ascii?Q?qTv8csJFHdjIzqC46w+b7rUbKmhXk4oZhan3KHkqH7Y9tsGw85ZSCCcpOTp0?=
 =?us-ascii?Q?/paw7dVAE1FFlQrkJjvXbIZ4D+vkHZGj83RuHsT08ZVNoxI3X0ujTX93sAtn?=
 =?us-ascii?Q?26ZoxPGMrxSYHn8/YivT7OyXr1Dn+0yo1eR4DJmibqstIVNXTsaccvDAzCnc?=
 =?us-ascii?Q?UDpBpOtUbHm4aUwCxAefFE6SGsCA7111P1nJzAKvLBIMwAWwnVlXCJZzUTbu?=
 =?us-ascii?Q?+E5MvZ43T3itKWO80fgdlhDr+gJC1eiHUWGnSUpXsWd5iBdo6ar2vquRwWeu?=
 =?us-ascii?Q?m4TKWUrNS1bpWBS1s5Zo0Y46+nQ7uKeAaPvlTTbqiaBu5p2r+wAhbeEXztLw?=
 =?us-ascii?Q?o2h8Y2b9ZN1diiLscp850uJqKxGK589xeFrm12g9IemnHPxYwyX1XU7ewNeD?=
 =?us-ascii?Q?1JCL9N8d3bnKIofGw5I2vpNTcTex9QJR83jL6KQEnmZWC3fSP2owuLa0vB5k?=
 =?us-ascii?Q?Ry0ueNxHFE+r4jmqAKH5bUs59w9TagCbwu1EaAAr67E7dfqKkQd++tj52Zfx?=
 =?us-ascii?Q?QTwHR3giAhZJiD5xj9ZzLPiGU6hIRlrZiEiyi4h/wVXKG6SLWsocJ9aXo3K/?=
 =?us-ascii?Q?5e/LEA1bxBSrOvpoO+XiCbzGSrH2n3jERs61N3logpaFk6lQDs5mDTjTdvsI?=
 =?us-ascii?Q?T1N+7WjQBl+Nkwq0bHfcxT6sm4zfZkgdz6jpRdgqx87FrR1r0DzuPlE+GtTW?=
 =?us-ascii?Q?uw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3008d46c-f8ac-4d7a-8839-08dbdbbc963c
X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6331.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2023 15:58:42.7526
 (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: tNbSi1Dy6pEc/fHZwSsAIVF52O/x9ET1e9uklXq7kzUbclgJ8wxZAKnzcnCaBfZn4k7RyuzYnUUECGdG1eQfNNDfnr54l7NIDoajbqhqEUg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9005
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED
	autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 02 Nov 2023 08:59:05 -0700 (PDT)

Add support for bcast multiple BISes

---
 profiles/audio/transport.c | 59 ++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index 23ea267f6..eaafd8a35 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,9 +314,11 @@ 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),
-				linked_transport_remove_owner, owner);
+	if (bt_bap_stream_get_type(bap->stream) ==
+					BT_BAP_STREAM_TYPE_UCAST)
+		if (bap->linked)
+			queue_foreach(bt_bap_stream_io_get_links(bap->stream),
+					linked_transport_remove_owner, owner);
 
 	if (owner->watch)
 		g_dbus_remove_watch(btd_get_dbus_connection(), owner->watch);
@@ -496,9 +500,11 @@ static void media_transport_set_owner(struct media_transport *transport,
 	DBG("Transport %s Owner %s", transport->path, owner->name);
 	transport->owner = owner;
 
-	if (bap->linked)
-		queue_foreach(bt_bap_stream_io_get_links(bap->stream),
-				linked_transport_set_owner, owner);
+	if (bt_bap_stream_get_type(bap->stream) ==
+					BT_BAP_STREAM_TYPE_UCAST)
+		if (bap->linked)
+			queue_foreach(bt_bap_stream_io_get_links(bap->stream),
+					linked_transport_set_owner, owner);
 
 	owner->transport = transport;
 	owner->watch = g_dbus_add_disconnect_watch(btd_get_dbus_connection(),
@@ -641,6 +647,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 +676,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 +696,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);
 
@@ -1272,7 +1286,9 @@ static bool match_link_transport(const void *data, const void *user_data)
 	if (!transport)
 		return false;
 
-	bap_update_links(transport);
+	if (bt_bap_stream_get_type((struct bt_bap_stream *)stream) ==
+						BT_BAP_STREAM_TYPE_UCAST)
+		bap_update_links(transport);
 
 	return true;
 }
@@ -1378,7 +1394,9 @@ static guint resume_bap(struct media_transport *transport,
 	if (bap->resume_id)
 		return 0;
 
-	bap_update_links(transport);
+	if (bt_bap_stream_get_type(bap->stream) ==
+					BT_BAP_STREAM_TYPE_UCAST)
+		bap_update_links(transport);
 
 	switch (bt_bap_stream_get_state(bap->stream)) {
 	case BT_BAP_STREAM_STATE_ENABLING:
@@ -1416,7 +1434,9 @@ static guint suspend_bap(struct media_transport *transport,
 	else
 		transport_set_state(transport, TRANSPORT_STATE_IDLE);
 
-	bap_update_links(transport);
+	if (bt_bap_stream_get_type(bap->stream) ==
+					BT_BAP_STREAM_TYPE_UCAST)
+		bap_update_links(transport);
 
 	return bt_bap_stream_disable(bap->stream, bap->linked, func, owner);
 }
@@ -1491,9 +1511,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 +1531,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;
 	}
@@ -1555,7 +1576,9 @@ static void bap_connecting(struct bt_bap_stream *stream, bool state, int fd,
 	if (bap->stream != stream)
 		return;
 
-	bap_update_links(transport);
+	if (bt_bap_stream_get_type(bap->stream) ==
+					BT_BAP_STREAM_TYPE_UCAST)
+		bap_update_links(transport);
 }
 
 static void free_bap(void *data)
-- 
2.39.2