Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-1905-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: 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 v3 2/7] bap: Split bap_state and bap_connecting in two functions
Date: Thu, 15 Feb 2024 23:23:51 +0200
Message-Id: <20240215212356.310301-3-silviu.barbulescu@nxp.com>
In-Reply-To: <20240215212356.310301-1-silviu.barbulescu@nxp.com>
References: <20240215212356.310301-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?5OTOZLH937qV2W/pqoOdUmHwABrtPDB+8REQDwKIbdsju3JHxO0Q7PPqLijO?=
 =?us-ascii?Q?3DfM48ZOcOZ3ZqD9zt7N4hB+Ht0VaMd694IL4Mb+w3VUbApClMEWO3WNmPSM?=
 =?us-ascii?Q?Ac1ieoCq0HY1Y8FnND/qmC+rvufaiVf4dcnHbcoyjDmxgKZMDAq3B5YK4uMQ?=
 =?us-ascii?Q?SMY381/Pf3bMPKqIB9BWbKW8Pe/I+0womTVctq1dIAMLWNTv5kguasUxMN/f?=
 =?us-ascii?Q?6I8sdo3URa8tqdFIGC5k9dmv4gqSestmMCrX0EuG4aCrpESwpp94g2o2yutC?=
 =?us-ascii?Q?6kU9U5YfbXBWqCXskUB0rCfKNzbNYthSqGTJzAszAXE3+B9/rG57YUAtLAqt?=
 =?us-ascii?Q?gimlt7RdijauQGTSUaQVOqajYZNRFTdouIsN8rjKex9fQ2jcvqu6eY9d/unn?=
 =?us-ascii?Q?YVjRCk4Pysl3MAFYgHvgy5a5eocFM29dkCk1pZIornXHgJEBG1Eqzo4xpu9m?=
 =?us-ascii?Q?qEtD/ak8Xfeehdn1wDx15G0R0b3xIFEdNJkt9ff3SflI2V7oymqzTX7d+zDI?=
 =?us-ascii?Q?X9u28qhTZfJTjpzpvPM4zDsITqxWJfVZabYV6JO8fV/URiXTOfrJxzXDgOnN?=
 =?us-ascii?Q?3fYhZZ2V8vImMc81VjvsO6zd1SjlpIAFWST3LLGUC2g9bpPS4CtMu84kERvE?=
 =?us-ascii?Q?xbjLL4Pai4s14OpenxjShIrSe08x6456X3pmeDQ3C1s6A9PztF8+jiGGdVDO?=
 =?us-ascii?Q?LayOyDT/UFCxUcagtm5LoUHSBiwYAM+Ih1Jjz8RzM1GQvcxgTSoT9ZFuUeed?=
 =?us-ascii?Q?8wDK3GgcvpKsIP3mISdHcsEMRZctxehAkZGWWDS4w9tUS3bctzKDFccXNXxT?=
 =?us-ascii?Q?j52g1MAyEIT4/TiBfF0yLGArblSYq/E+ZEenyEj2q7bUtw2V4vDi03mqJntv?=
 =?us-ascii?Q?fGoQi7IYVHobVwXKt9HVxcMJpA4RHPv50f/ZNJeHdt6HolziVIn28Aat00Ck?=
 =?us-ascii?Q?hcs1s2fI4ZGzZjlUoauSxFNnMsaC6wPCzwVkpr/nVBU7p88Gtgrmy0Y6xNVY?=
 =?us-ascii?Q?sTvXOwvN2FgN4M5wZTzApdUpkFOX3+IHGX24O68aMydZcdHBBnjxT4P6PD6Q?=
 =?us-ascii?Q?oiGGln8AfK7eCvMhD9ATnPIhGu1EDIIiedDOjr6ylbuERqbrE6bf0puMXtHq?=
 =?us-ascii?Q?9gcExF/XdwbMoVKOCDtmmSmqO06knYxrSve7dXmwWaovICoHUOst0s0O0vBQ?=
 =?us-ascii?Q?833+7UdEHzjg170V+bkhG6Aw2CJMrv6fnzInOprvGYC9pLkpxNssJ1tZ3Z72?=
 =?us-ascii?Q?GqsL/LNWixLyZ9fWqrQW0mXjhmNynDxx4klMQCC2c8RbbR1yZe5VoQbIGW3v?=
 =?us-ascii?Q?oyx1XcVDS37PXACTCspc36uGbgQhs2ydHqD9pn5FEozOJ1ifZzkpbnxEwOLF?=
 =?us-ascii?Q?AmN57Y0q6A+E/boiW0ag7wCUIIgBbOY8DlzPD6p66UE+YpBnArH1raldbYA9?=
 =?us-ascii?Q?ycDNbKXn++2/4/StbH95ziLchBfno8a2SF2CyrZTChvO5jK3Yd0oJWCiVqK9?=
 =?us-ascii?Q?dterD5EvFbqc2qq4/sJrmJTZxp8rHYyxsnZuCjTNKeKJDhPuMytGru55PRm4?=
 =?us-ascii?Q?2BibAxszUvT7Gb9NPKRhWb328Sf+6j/Pr0JLWwDBOW3kicPf8j0IIvnHb0Ai?=
 =?us-ascii?Q?jg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1eae22b6-4da6-487d-5a43-08dc2e6c7106
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB10073.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2024 21:24:06.9078
 (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: LBmtyg73AnJIJBs2qnDdoREwsjPKOzxvDEIzSCDNwfauNnF3PUHDu7tD4KP7BLZyyASRpMeFlqk8U1TiyWX8h+TvK/frDvT6OZdVA+Sj6b4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9128

Split bap_state and bap_connecting in two specific functions
for unicast (bap_state, bap_connecting) and broadcast
(bap_state_bcast, bap_connecting_bcast).
---
 profiles/audio/bap.c | 157 +++++++++++++++++++++++++++++--------------
 1 file changed, 107 insertions(+), 50 deletions(-)

diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index 38ee42894..b4acdd9ef 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -2098,25 +2098,19 @@ static void bap_state(struct bt_bap_stream *stream, uint8_t old_state,
 				return;
 			}
 
-			if (bt_bap_stream_get_type(stream) ==
-					BT_BAP_STREAM_TYPE_UCAST) {
-				/* Wait QoS response to respond */
-				setup->id = bt_bap_stream_qos(stream,
-								&setup->qos,
-								qos_cb,	setup);
-				if (!setup->id) {
-					error("Failed to Configure QoS");
-					bt_bap_stream_release(stream,
-								NULL, NULL);
-				}
+			/* Wait QoS response to respond */
+			setup->id = bt_bap_stream_qos(stream,
+							&setup->qos,
+							qos_cb,	setup);
+			if (!setup->id) {
+				error("Failed to Configure QoS");
+				bt_bap_stream_release(stream,
+							NULL, NULL);
 			}
 		}
 		break;
 	case BT_BAP_STREAM_STATE_QOS:
-		if (bt_bap_stream_get_type(stream) ==
-					BT_BAP_STREAM_TYPE_UCAST) {
 			setup_create_io(data, setup, stream, true);
-		}
 		break;
 	case BT_BAP_STREAM_STATE_ENABLING:
 		if (setup)
@@ -2127,6 +2121,45 @@ static void bap_state(struct bt_bap_stream *stream, uint8_t old_state,
 	}
 }
 
+static void bap_state_bcast(struct bt_bap_stream *stream, uint8_t old_state,
+				uint8_t new_state, void *user_data)
+{
+	struct bap_data *data = user_data;
+	struct bap_setup *setup;
+
+	DBG("stream %p: %s(%u) -> %s(%u)", stream,
+			bt_bap_stream_statestr(old_state), old_state,
+			bt_bap_stream_statestr(new_state), new_state);
+
+	/* Ignore transitions back to same state */
+	if (new_state == old_state)
+		return;
+
+	setup = bap_find_setup_by_stream(data, stream);
+
+	switch (new_state) {
+	case BT_BAP_STREAM_STATE_IDLE:
+		/* Release stream if idle */
+		if (setup)
+			setup_free(setup);
+		else
+			queue_remove(data->streams, stream);
+		break;
+	case BT_BAP_STREAM_STATE_CONFIG:
+		if (setup && !setup->id) {
+			setup_create_io(data, setup, stream, true);
+			if (!setup->io) {
+				error("Unable to create io");
+				if (old_state != BT_BAP_STREAM_STATE_RELEASING)
+					bt_bap_stream_release(stream, NULL,
+								NULL);
+				return;
+			}
+		}
+		break;
+	}
+}
+
 static void pac_added(struct bt_bap_pac *pac, void *user_data)
 {
 	struct btd_service *service = user_data;
@@ -2320,45 +2353,69 @@ static void bap_connecting(struct bt_bap_stream *stream, bool state, int fd,
 
 	g_io_channel_set_close_on_unref(io, FALSE);
 
-	switch (bt_bap_stream_get_type(setup->stream)) {
-	case BT_BAP_STREAM_TYPE_UCAST:
-		/* Attempt to get CIG/CIS if they have not been set */
-		if (qos->ucast.cig_id == BT_ISO_QOS_CIG_UNSET ||
-				qos->ucast.cis_id == BT_ISO_QOS_CIS_UNSET) {
-			struct bt_iso_qos iso_qos;
+	/* Attempt to get CIG/CIS if they have not been set */
+	if (qos->ucast.cig_id == BT_ISO_QOS_CIG_UNSET ||
+			qos->ucast.cis_id == BT_ISO_QOS_CIS_UNSET) {
+		struct bt_iso_qos iso_qos;
 
-			if (!io_get_qos(io, &iso_qos)) {
-				g_io_channel_unref(io);
-				return;
-			}
-
-			qos->ucast.cig_id = iso_qos.ucast.cig;
-			qos->ucast.cis_id = iso_qos.ucast.cis;
+		if (!io_get_qos(io, &iso_qos)) {
+			g_io_channel_unref(io);
+			return;
 		}
 
-		DBG("stream %p fd %d: CIG 0x%02x CIS 0x%02x", stream, fd,
-				qos->ucast.cig_id, qos->ucast.cis_id);
-		break;
-	case BT_BAP_STREAM_TYPE_BCAST:
-		/* Attempt to get BIG/BIS if they have not been set */
-		if (setup->qos.bcast.big == BT_ISO_QOS_BIG_UNSET ||
-				setup->qos.bcast.bis == BT_ISO_QOS_BIS_UNSET) {
-			struct bt_iso_qos iso_qos;
+		qos->ucast.cig_id = iso_qos.ucast.cig;
+		qos->ucast.cis_id = iso_qos.ucast.cis;
+	}
 
-			if (!io_get_qos(io, &iso_qos)) {
-				g_io_channel_unref(io);
-				return;
-			}
+	DBG("stream %p fd %d: CIG 0x%02x CIS 0x%02x", stream, fd,
+			qos->ucast.cig_id, qos->ucast.cis_id);
+}
 
-			qos->bcast.big = iso_qos.bcast.big;
-			qos->bcast.bis = iso_qos.bcast.bis;
-			bt_bap_stream_config(setup->stream, qos, setup->caps,
-								NULL, NULL);
+static void bap_connecting_bcast(struct bt_bap_stream *stream, bool state,
+							int fd, void *user_data)
+{
+	struct bap_data *data = user_data;
+	struct bap_setup *setup;
+	GIOChannel *io;
+
+	if (!state)
+		return;
+
+	setup = bap_find_setup_by_stream(data, stream);
+	if (!setup)
+		return;
+
+	setup->recreate = false;
+
+	if (!setup->io) {
+		io = g_io_channel_unix_new(fd);
+		setup->io_id = g_io_add_watch(io,
+				G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+				setup_io_disconnected, setup);
+		setup->io = io;
+	} else
+		io = setup->io;
+
+	g_io_channel_set_close_on_unref(io, FALSE);
+
+	/* Attempt to get BIG/BIS if they have not been set */
+	if (setup->qos.bcast.big == BT_ISO_QOS_BIG_UNSET ||
+			setup->qos.bcast.bis == BT_ISO_QOS_BIS_UNSET) {
+		struct bt_iso_qos iso_qos;
+
+		if (!io_get_qos(io, &iso_qos)) {
+			g_io_channel_unref(io);
+			return;
 		}
 
-		DBG("stream %p fd %d: BIG 0x%02x BIS 0x%02x", stream, fd,
-				qos->bcast.big, qos->bcast.bis);
+		setup->qos.bcast.big = iso_qos.bcast.big;
+		setup->qos.bcast.bis = iso_qos.bcast.bis;
+		bt_bap_stream_config(setup->stream, &setup->qos, setup->caps,
+							NULL, NULL);
 	}
+
+	DBG("stream %p fd %d: BIG 0x%02x BIS 0x%02x", stream, fd,
+			setup->qos.bcast.big, setup->qos.bcast.bis);
 }
 
 static void bap_attached(struct bt_bap *bap, void *user_data)
@@ -2456,10 +2513,10 @@ static int bap_bcast_probe(struct btd_service *service)
 
 	data->ready_id = bt_bap_ready_register(data->bap, bap_ready, service,
 								NULL);
-	data->state_id = bt_bap_state_register(data->bap, bap_state,
-						bap_connecting, data, NULL);
+	data->state_id = bt_bap_state_register(data->bap, bap_state_bcast,
+					bap_connecting_bcast, data, NULL);
 	data->pac_id = bt_bap_pac_register(data->bap, pac_added_broadcast,
-				 pac_removed_broadcast, data, NULL);
+				pac_removed_broadcast, data, NULL);
 
 	bt_bap_set_user_data(data->bap, service);
 
@@ -2611,8 +2668,8 @@ static int bap_adapter_probe(struct btd_profile *p,
 		return -EINVAL;
 	}
 
-	data->state_id = bt_bap_state_register(data->bap, bap_state,
-						bap_connecting, data, NULL);
+	data->state_id = bt_bap_state_register(data->bap, bap_state_bcast,
+					bap_connecting_bcast, data, NULL);
 	data->pac_id = bt_bap_pac_register(data->bap, pac_added_broadcast,
 					pac_removed_broadcast, data, NULL);
 
-- 
2.39.2