Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-4809-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::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 1/2] shared/bap: Update BAP Broadcast Source state machine
Date: Mon, 20 May 2024 19:27:56 +0300
Message-Id: <20240520162757.78187-2-silviu.barbulescu@nxp.com>
In-Reply-To: <20240520162757.78187-1-silviu.barbulescu@nxp.com>
References: <20240520162757.78187-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?aY1C20WyPHWBgzs/PsipVxDimhU47heVIJtItLmTghNuO5WLbgmY/KJeRewT?=
 =?us-ascii?Q?oVR1ZCWxB7sP8Uhf88Bj1RsJc4nki2SV4klY7YLUETre1Sv6reRmys3T0Ge9?=
 =?us-ascii?Q?9KSevkEGJJGR5W+cVcgP7HfJsXR9sg7cMomfddTprwmfvoIrj2ighhL+Cq99?=
 =?us-ascii?Q?a2wZnu9gR7n4JkWvbel4QHpgZdYdW4pDOuOOWBmJTajeL73p04iVREIODWgz?=
 =?us-ascii?Q?dik15aXYOaPnE3oKkv0n25xK2+COpnOvgMZgxic1A9v3cT1JzQM0NXJYUBYV?=
 =?us-ascii?Q?fPI+XrTWilR/bUqkfvuo9w6h2F2SCAF453tl/k4TmARg7lRKyLIwx5MGSJRr?=
 =?us-ascii?Q?ikRJDWzeHE+T+cQrnc1l+qwrNPEGzb/d0gBlmsTTXdeVHApgP9YoOrdNrJ84?=
 =?us-ascii?Q?XAGc6oks98oD5nTLsmoLUoRl9smiLmxPde+K3J3OjHlseUjH0KQSK/C+Z48l?=
 =?us-ascii?Q?HPF6oUSOjQUFJ4B/+2RCk4vVe5W0dHo/XL7hALAoDA6kE7AdvkJ3LzWWCvio?=
 =?us-ascii?Q?twTPGTv1yCcq1RlYFYc9U5vDBNajYH9QPoxThMlWmX5NKmksE7dbKkrCKFr+?=
 =?us-ascii?Q?HR8hcLXsChwUGJTkY+w8iEe1VJdG8kyahIywPu6c3D8YwF8sjLpvEIdQdRJv?=
 =?us-ascii?Q?EYT06nB3N8LaNRuZIo/DbD4JszUYr2m0h9T/KXIgC4Em0MghSM4pNf4b/Bas?=
 =?us-ascii?Q?I8K+KN2Z1E6evL0KMJUEpr6/BGR/iYoqmAXKqjSTASAnvGnLr08fwsnTaZ14?=
 =?us-ascii?Q?UcNxUup4HkKe+g5CwZX7b/wTpgf1By/1QYvhEKJysqZLGe+cVOGwyG2AjItL?=
 =?us-ascii?Q?yr3LBedx8jMNokRLAWVDKGBfjWhOFw4vhrhmP0lXDFgmAr6KuYjjTOgjZK6X?=
 =?us-ascii?Q?zgG2WxEJiEATUvhfEpp2Bvlh8UPRJoHXwQrjE9WuCtYkxBj1HNSHkUppKaAw?=
 =?us-ascii?Q?u0G1HrlRBsBLjWK2yobKWSN8y8a6pN2TaDDD8aT0KMwHJJ1nrg3irPKXCkYy?=
 =?us-ascii?Q?+7WLUuk2vDpgmrhtJxRg+Wajpg4O0OL+JqsfBjsrNSbwzc/ChvNxDH9LuRqG?=
 =?us-ascii?Q?2o0TukY6G6lva1qjzRqXJtWuzT0cbXI/249xfpdEyk2Hj9O6wbP29jQ+s/Al?=
 =?us-ascii?Q?v5lmMui9YMVw67oK2g5L+/PfD/RpmfJEP1BVnQCuCXT2JjO67+sgIooV2xG3?=
 =?us-ascii?Q?tG7uITxVceAm6hqu7kn+o+B6igS0GiK4SpKpsYjgIz3GGkwKD4j4qywvybfy?=
 =?us-ascii?Q?JfeAWzoUwuZUgZixFWC7Nd2S84Yg9lDi028DiGBYlquP7URovv7+d2oJuotU?=
 =?us-ascii?Q?ZE3ipL0Jcyv9xWM04/bs1jNFkQwGOSn/k8LszymJPtDX/Lh3ylgXve/Evir/?=
 =?us-ascii?Q?Z2F1wPbH5KlPtjBZiFss+h4JGSTXEASjPskQLjlL90eX4/lVnNWzC/ErGHni?=
 =?us-ascii?Q?djn33weNoo3GPMtbQWs6I0CZcim0GUEOKO3O40m7SvEC8N6tNE2S0voEGZbC?=
 =?us-ascii?Q?KWzZPtLXgxJYh/dYnp8PId35xOoHti/zfIt42CfuFf+8VSoGxull5UWTvACi?=
 =?us-ascii?Q?bvJ/xDVScRNK4wxTLRPI49goZr2JGe2IpQHw1N0w89AEvJWHPpYLqYqF2scF?=
 =?us-ascii?Q?jA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 09a59d55-e8fd-461c-f469-08dc78e9d2f3
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB10073.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2024 16:28:04.2624
 (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: izzH3AeXGjKnMG+V2ovy37z/7eJJL6wt3prj+mlNGRyf4j3+tjqm+A6mQwJUToB1BPTGU0FOzE74RItnIEU1P174IRYht3RsD/gMzHvLxSY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9436

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 46ee0e4e5..10f9e348c 100644
--- a/unit/test-bap.c
+++ b/unit/test-bap.c
@@ -547,10 +547,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