Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-4898-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
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 v2 1/2] shared/bap: Update BAP Broadcast Source state machine
Date: Thu, 23 May 2024 18:47:53 +0300
Message-Id: <20240523154754.39451-2-silviu.barbulescu@nxp.com>
In-Reply-To: <20240523154754.39451-1-silviu.barbulescu@nxp.com>
References: <20240523154754.39451-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?AF4CGfbeZnOODrqViV8ZxRxZFQBDehLzK46QPftMqVBmaZ+jCsuv5Lte6ZtV?=
 =?us-ascii?Q?Nobv8AjhMsk+19zTrNzBndifHVf485vkNfdix4Dv8ZYaApBqEw1AtfDuT8en?=
 =?us-ascii?Q?honQhDj6ZZcLojc0bM4XEwTtsWLhyDsoYJqaDxIzpxP6Py6WVL2rJu9M6Igz?=
 =?us-ascii?Q?JmFxszZRCTEepurJQuK75hSF5Beuo+Vozy4Gx55nmGAwtGEH3vxo17EXFOyJ?=
 =?us-ascii?Q?rBjgIkmKlEbmawfP7bBllEvJHGShhkG/NTP/Au3RIAf6u+93PQrG57dOQHwl?=
 =?us-ascii?Q?Ynrc/bAFrty63NgSwP0bezXFLQbepZtZm7J3jCyzQyq/UhY9MQ9aofvDFjiP?=
 =?us-ascii?Q?bgnU80X6iY/Yp7Qd233oIqTZnjLf44wolatIYmExeM9KPSWsgJn/WmlTppg3?=
 =?us-ascii?Q?ZyXqAQXxTTqzZUkxm2uzyR8sx/tukAYurfrK+qt+pwOfvYW+UEUmh0FFGf96?=
 =?us-ascii?Q?9kqk/vdoPng3KLO9fQdMUk2riaxJGAq5SPrPmTHiT33yCvCn5u11LdU7iIeQ?=
 =?us-ascii?Q?Ky0KQNaHK0cKkGnbiPE4dpFpNH2omn01u5RthZ311G+eI4LBjUBZvoqWa0/V?=
 =?us-ascii?Q?THSx8UecOclAOUOqne/szwhWlMXlGfeKMRrMVHrgOGjmEz39vGlrfbMUfYTi?=
 =?us-ascii?Q?wDTFDhvIxx/X6RHcdGDpm0IDiv6u97WVQZ97V0riA/MHix42ZgmD7R6ReaPX?=
 =?us-ascii?Q?PPs+LpXBCBEEYxZQm1xiuNwhBaL4NDYIilheoC8rlS2B9jw21v+zTh20Ei/O?=
 =?us-ascii?Q?XXrltvg7rKWHJWMPx+GSYCtFjzHHChBCKC5uLratOeqHztFf2snFnchRwbwl?=
 =?us-ascii?Q?tWLFpSihGUZ0mBL47rZ1M9gaTCpVoZNuyu12w4jed2WU3gFoeE7cOJ0UhVoY?=
 =?us-ascii?Q?8xO8iA0qIRTsceX49JWwrK1gdEzYfrNBZJupNaGbv791uIcSJmg9rjaBxFF0?=
 =?us-ascii?Q?4TPsSpWNg2IBeG7hWoIeMwtf5ipIU8RUUmSBiwmdOhs03oq/eWMRvu5F24RZ?=
 =?us-ascii?Q?DkufC3RSpDG/7IPtKR6dtH0KvketiTpkjy4h2eF0oEOxlK1CfVK/fLkhhTqg?=
 =?us-ascii?Q?keHsEXzc3NlaF1eN/e6ahz1JruFPX0QfBiorDHW6pB91YJpcH57KYp7aDgyd?=
 =?us-ascii?Q?2l4MKP1at1tvg68lfGkX3V28WYm3fKauwSOcPQ6s5er5HyrYx8Gnxz8MohzF?=
 =?us-ascii?Q?7Z22Wm7CqXd3f8ZDKhqilvJDPf/rcHV3DLHX96UAmoLJJMQstXZUzh/9c9cX?=
 =?us-ascii?Q?U79yAa7QiGVfpLWQdfLEISfAsUzsIJA5tGQd2gfyFEomkXMMk2v7c71fVILV?=
 =?us-ascii?Q?HaaD5dPMBuPPoZXzqXGHj2TDy94MEjchfaCOIKhZlICx1dpvvdt8OQoxajfd?=
 =?us-ascii?Q?alri+uqBUZ155PcMz+7TDowXVDE7m3+X27gK27Q/CgVpP4kJpRkpJyPB8sbW?=
 =?us-ascii?Q?5b2u2M6p0jP2SkgTjS1e58JcOhiex2Bea7JEknmtdqyM1fs4NX6WZlRWWHJK?=
 =?us-ascii?Q?VV2vA+zCt/hPZ6tmFRYpgy5KDif1HxT5MvLvD/yYlX+UXxwI2Sm4bi/kjT/C?=
 =?us-ascii?Q?hJbBufmUlkEy7aE+DaLJznDYMuKW+mt2UqT7KpjTypETfbwuFZdlEYlHSLpI?=
 =?us-ascii?Q?tw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8ca53a24-d7c8-4f87-bec1-08dc7b3fb883
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB10073.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2024 15:47:58.9560
 (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: PgfbZdioaAQdbYANPDqhiCWH4WpktLt/R0w2yjjasdYrR2JpDAezznOrS01kkrni+J2v8v0+j6sSVpXSGvr2npzMnXUZqYFwNsW2Tr1WFjY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR04MB10658

Update BAP Broadcast Source state machine states to use BAP define states
 for source Idle, Config, Streaming, and an intermediary state enabling.

Updated test-bap too.

---
 src/shared/bap.c | 39 ++++++++++++++++++++-------------------
 unit/test-bap.c  |  4 ++--
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/shared/bap.c b/src/shared/bap.c
index 6572ef1d1..639149520 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -1361,14 +1361,6 @@ static void ep_config_cb(struct bt_bap_stream *stream, int err)
 	if (err)
 		return;
 
-	if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BCAST) {
-		if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SINK)
-			stream_set_state(stream, BT_BAP_STREAM_STATE_QOS);
-		else if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SOURCE)
-			stream_set_state(stream, BT_BAP_STREAM_STATE_CONFIG);
-		return;
-	}
-
 	stream_set_state(stream, BT_BAP_STREAM_STATE_CONFIG);
 }
 
@@ -1759,6 +1751,15 @@ static unsigned int bap_stream_metadata(struct bt_bap_stream *stream,
 	return req->id;
 }
 
+static unsigned int bap_bcast_qos(struct bt_bap_stream *stream,
+					struct bt_bap_qos *data,
+					bt_bap_stream_func_t func,
+					void *user_data)
+{
+	stream->qos = *data;
+	return 1;
+}
+
 static unsigned int bap_bcast_config(struct bt_bap_stream *stream,
 				     struct bt_bap_qos *qos, struct iovec *data,
 				     bt_bap_stream_func_t func, void *user_data)
@@ -2071,7 +2072,7 @@ static unsigned int bap_bcast_get_state(struct bt_bap_stream *stream)
 	return stream->state;
 }
 
-static unsigned int bap_bcast_enable(struct bt_bap_stream *stream,
+static unsigned int bap_bcast_sink_enable(struct bt_bap_stream *stream,
 					bool enable_links, struct iovec *data,
 					bt_bap_stream_func_t func,
 					void *user_data)
@@ -2081,22 +2082,21 @@ static unsigned int bap_bcast_enable(struct bt_bap_stream *stream,
 	return 1;
 }
 
-static unsigned int bap_bcast_start(struct bt_bap_stream *stream,
+static unsigned int bap_bcast_src_enable(struct bt_bap_stream *stream,
+					bool enable_links, struct iovec *data,
 					bt_bap_stream_func_t func,
 					void *user_data)
 {
-	stream_set_state(stream, BT_BAP_STREAM_STATE_STREAMING);
+	stream_set_state(stream, BT_BAP_STREAM_STATE_ENABLING);
 
 	return 1;
 }
 
-static unsigned int bap_bcast_sink_disable(struct bt_bap_stream *stream,
-					bool disable_links,
+static unsigned int bap_bcast_start(struct bt_bap_stream *stream,
 					bt_bap_stream_func_t func,
 					void *user_data)
 {
-	bap_stream_io_detach(stream);
-	stream_set_state(stream, BT_BAP_STREAM_STATE_CONFIG);
+	stream_set_state(stream, BT_BAP_STREAM_STATE_STREAMING);
 
 	return 1;
 }
@@ -2106,7 +2106,8 @@ static unsigned int bap_bcast_disable(struct bt_bap_stream *stream,
 					bt_bap_stream_func_t func,
 					void *user_data)
 {
-	stream_set_state(stream, BT_BAP_STREAM_STATE_DISABLING);
+	bap_stream_io_detach(stream);
+	stream_set_state(stream, BT_BAP_STREAM_STATE_CONFIG);
 
 	return 1;
 }
@@ -2205,14 +2206,14 @@ static const struct bt_bap_stream_ops stream_ops[] = {
 			bap_ucast_release, bap_ucast_detach),
 	STREAM_OPS(BT_BAP_BCAST_SINK, bap_bcast_set_state,
 			bap_bcast_get_state,
-			bap_bcast_config, NULL, bap_bcast_enable,
-			bap_bcast_start, bap_bcast_sink_disable, NULL,
+			bap_bcast_config, NULL, bap_bcast_sink_enable,
+			bap_bcast_start, bap_bcast_disable, NULL,
 			bap_bcast_metadata, bap_bcast_sink_get_dir,
 			bap_bcast_get_location,
 			bap_bcast_release, bap_bcast_sink_detach),
 	STREAM_OPS(BT_BAP_BCAST_SOURCE, bap_bcast_set_state,
 			bap_bcast_get_state,
-			bap_bcast_config, NULL, bap_bcast_enable,
+			bap_bcast_config, bap_bcast_qos, bap_bcast_src_enable,
 			bap_bcast_start, bap_bcast_disable, NULL,
 			bap_bcast_metadata, bap_bcast_src_get_dir,
 			bap_bcast_get_location,
diff --git a/unit/test-bap.c b/unit/test-bap.c
index ad2bbfb16..b59f642ca 100644
--- a/unit/test-bap.c
+++ b/unit/test-bap.c
@@ -555,10 +555,10 @@ static void bsrc_state(struct bt_bap_stream *stream, uint8_t old_state,
 	struct test_data *data = user_data;
 
 	switch (new_state) {
-	case BT_BAP_STREAM_STATE_QOS:
+	case BT_BAP_STREAM_STATE_CONFIG:
 		bt_bap_stream_enable(stream, true, NULL, NULL, NULL);
 		break;
-	case BT_BAP_STREAM_STATE_CONFIG:
+	case BT_BAP_STREAM_STATE_ENABLING:
 		data->base = bt_bap_stream_get_base(stream);
 
 		g_assert(data->base);
-- 
2.40.1