Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-1907-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 v3 4/7] shared/bap: Add state in stream struct for bcast source
Date: Thu, 15 Feb 2024 23:23:53 +0200
Message-Id: <20240215212356.310301-5-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?tCrXL4MnawwYTbBTGECnnmeHvlop9RmT/5Pj8+oKpeMcW4PtNuoDkvDw0hcl?=
 =?us-ascii?Q?3Kqnv3rL008G+O3HoNyg0zsmOtgt5FUkKNiSr72ELII05/F2fsbJNf1qh0cJ?=
 =?us-ascii?Q?GB9fu0tMb5WNG1DYrN6wyMovsRbJTFyR2Kk3fj2y+BL4PHg6wxTwWgdWWnJr?=
 =?us-ascii?Q?bdul024piD+Ez73cD7rO8P2iPj4rrPl9gRuZVrW2IS5xVjr2tGo6vuS/CSgE?=
 =?us-ascii?Q?TNkXnEOLJ8lPup+JZ/0nUmc5s5PT2kSpJ2gwsajUhYmRdQIjrLC1gv3mbX6K?=
 =?us-ascii?Q?bDgvVITStoOdCmCucUEyu5OAFnoGar0V5H+0eBUdgW7qDPR1sov/S32Z2J26?=
 =?us-ascii?Q?9Z5qpH1DwXHTRSJKmTx/SD2ami0cJCO6EsCJL+NON5rERKkk15LDzZcXhSYp?=
 =?us-ascii?Q?J8eatQeh3lAKNqkvS+b6G6zpMedsRsId3LqvInX6dJUerDjy1PHS/xsevXDM?=
 =?us-ascii?Q?3VRtU5Pt6ibIxixo0c6ct3z+rv16SofTV1UMyzq35+ZaWmOUGqGFNm5ubHWX?=
 =?us-ascii?Q?rYgLbLwtZEs1mxTFuFqHzMr69iiDJS5WLFbHMENrRLGMbafAc1JoutHGbX9z?=
 =?us-ascii?Q?qbaw++Y8EQTb3urjUljNwSZ8oEOaInrMFz+DJZdZ6ODb6QBrlJyphi5my2se?=
 =?us-ascii?Q?EKE39yEpwl5WXy1DmT+lhS0TeONEWhQfmmP9Lw2+vaRdShrm7nx4ruz56J2g?=
 =?us-ascii?Q?w9h5VP3RWdSb8AIlW1an7sK7Z6ekZh5lHOlw3c94KgoxKZleV1QPfl+4ERXk?=
 =?us-ascii?Q?NYPwdmR5AePx0pXh9oOpmW0tZ65PBjCCK0ctvdcTwoBUKmS4Ddsd/b6Xtb3c?=
 =?us-ascii?Q?QAt/pkgtNClWynMiKT0gomYV/HPMBl2JeiYoN7gOjkPRoyfqid0LmhVBamFd?=
 =?us-ascii?Q?50bzdk3TDbRx0oMvmxz++U8jKL076/OL1u8H0S0/16+MNXPwmTLDGkMTYKro?=
 =?us-ascii?Q?+mdcUasEg4xbnqnQBkGUKRaZbZ/h5I0ojgocnDxOyS2fJbjSKbX26p4bHeIO?=
 =?us-ascii?Q?NERCKRJuWqWgYsrccGU0tzTkQhtQ7RAeCh3MLaTqrCBYc4n5kNZQPABDl48Q?=
 =?us-ascii?Q?cmPiS4k+5alZtId34le4wT3IM9LfS3DnD5wdj3x2dkbiqok0l3EZjecDrIFx?=
 =?us-ascii?Q?ZnKbxLp2VXY0j8lZr8bl21kJsxDy5bdmU7NUPv/9NPhyYVdw48Q36tk1+wRa?=
 =?us-ascii?Q?8fKBZMU0FXPMtuJ/22Hq4XCBvHN6YvGZ8NLlVYJIRrvCbLE1OoTzBx2Xv1L9?=
 =?us-ascii?Q?4zgRoId7+4vkdLeRX6xkKHrEQqHATuanRK9m+4bONuqKlYt2QdQjPoqZRcrN?=
 =?us-ascii?Q?WQ32zFIexJIDx983amXY9ethxfcsLlFtMKQSoME21cTSgGzJJIRjW9c/0az1?=
 =?us-ascii?Q?hQY45xP599kjNjF4c0WyGnOdt5ykewZXRMDqi2w4jCoBzC8b+WBvku8vYGna?=
 =?us-ascii?Q?Ly4HvcBkJAkXEljGZuCKh1IRoigfTNp6qlJ4CcYjwQB8XmkNWQnOeC0Cw/TK?=
 =?us-ascii?Q?KupvtKEbu+/+efcipIfNS6r5SucAseflNVSEL91TDr3jDyqHxYASxO1pFQMk?=
 =?us-ascii?Q?o/OvI4TVXhDfOFbs3kctqdIoAf6cah1ujq5tlOpI9zZnNwUWRCWCGlaiOFkA?=
 =?us-ascii?Q?Ig=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 59a536c5-e261-4681-df41-08dc2e6c74c1
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:13.1208
 (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: RwYLX0U9dbqBMe/CM2gMys5JsUshg71ulOCi2uhglscwX/SpSF9OtBt8TQpt8GjM6Z4dwnGnhEsvop6j9buF6tC8jJKot2+34n7TpbBLc6M=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9128

Add state support in the stream struct for broadcast source.
---
 src/shared/bap.c | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/shared/bap.c b/src/shared/bap.c
index a39b95407..524bfa058 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -251,6 +251,8 @@ struct bt_bap_stream {
 	struct bt_bap_stream *link;
 	struct bt_bap_stream_io *io;
 	const struct bt_bap_stream_ops *ops;
+	uint8_t bcast_old_state;
+	uint8_t bcast_state;
 	bool client;
 	void *user_data;
 };
@@ -1271,7 +1273,6 @@ static void bap_stream_state_changed(struct bt_bap_stream *stream)
 
 static void stream_set_state(struct bt_bap_stream *stream, uint8_t state)
 {
-	struct bt_bap_endpoint *ep = stream->ep;
 	struct bt_bap *bap = stream->bap;
 
 	/* Check if ref_count is already 0 which means detaching is in
@@ -1283,14 +1284,6 @@ static void stream_set_state(struct bt_bap_stream *stream, uint8_t state)
 		return;
 	}
 
-	ep->old_state = ep->state;
-	ep->state = state;
-
-	DBG(bap, "stream %p dir 0x%02x: %s -> %s", stream,
-			bt_bap_stream_get_dir(stream),
-			bt_bap_stream_statestr(stream->ep->old_state),
-			bt_bap_stream_statestr(stream->ep->state));
-
 	if (stream->ops && stream->ops->set_state)
 		stream->ops->set_state(stream, state);
 
@@ -1527,6 +1520,14 @@ static void bap_ucast_set_state(struct bt_bap_stream *stream, uint8_t state)
 {
 	struct bt_bap_endpoint *ep = stream->ep;
 
+	ep->old_state = ep->state;
+	ep->state = state;
+
+	DBG(stream->bap, "stream %p dir 0x%02x: %s -> %s", stream,
+			bt_bap_stream_get_dir(stream),
+			bt_bap_stream_statestr(stream->ep->old_state),
+			bt_bap_stream_statestr(stream->ep->state));
+
 	if (stream->lpac->type == BT_BAP_BCAST_SINK || stream->client)
 		goto done;
 
@@ -1942,22 +1943,25 @@ static void bap_bcast_set_state(struct bt_bap_stream *stream, uint8_t state)
 	struct bt_bap *bap = stream->bap;
 	const struct queue_entry *entry;
 
+	stream->bcast_old_state = stream->bcast_state;
+	stream->bcast_state = state;
+
 	DBG(bap, "stream %p dir 0x%02x: %s -> %s", stream,
 			bt_bap_stream_get_dir(stream),
-			bt_bap_stream_statestr(stream->ep->old_state),
-			bt_bap_stream_statestr(stream->ep->state));
+			bt_bap_stream_statestr(stream->bcast_old_state),
+			bt_bap_stream_statestr(stream->bcast_state));
 
 	for (entry = queue_get_entries(bap->state_cbs); entry;
 							entry = entry->next) {
 		struct bt_bap_state *state = entry->data;
 
 		if (state->func)
-			state->func(stream, stream->ep->old_state,
-					stream->ep->state, state->data);
+			state->func(stream, stream->bcast_old_state,
+					stream->bcast_state, state->data);
 	}
 
 	/* Post notification updates */
-	switch (stream->ep->state) {
+	switch (stream->bcast_state) {
 	case BT_ASCS_ASE_STATE_IDLE:
 		bap_stream_detach(stream);
 		break;
-- 
2.39.2