Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
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 2/6] bap: Fix source+sink endpoint registration
Date:   Thu, 26 Oct 2023 17:50:43 +0300
Message-Id: <20231026145047.4637-3-silviu.barbulescu@nxp.com>
In-Reply-To: <20231026145047.4637-1-silviu.barbulescu@nxp.com>
References: <20231026145047.4637-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?aJe0GP0WkCPUklWK95yjbaggKnZ9ZuZDKr+KWrgoHhHyCGMiOcgb7bxAbQf/?=
 =?us-ascii?Q?cQ4bfJUivL93oIeZTkAAur9yK2089t7eAcQIddiT8C6N8Ojuib4XLT2DKvCX?=
 =?us-ascii?Q?5p8giiWocxM25Y5+ErXsJS686sPLK06kQ3TI6c/Egbe6A72LGnR+eQzvAlnm?=
 =?us-ascii?Q?PpeDK8f45tCd/OvUwqeSfvkB7COBB1/j8iMM+WArGrku6XXh1i1dW701ndDd?=
 =?us-ascii?Q?q23PqoCgAJsMRKAYjAcZsI0MbMDXvWszCZx4cyEFo2Ht43zGeYkTj7ipb0bM?=
 =?us-ascii?Q?I/lUWyRYe0PC37/4DzpegSf4YrV7TEwqRews+jkKjfzjofChbhaP4Te5OOqg?=
 =?us-ascii?Q?lItopfmNq3ynik0Mxu1afHS08GTOqTNNFZ0/ZyXMKVL3tpmhqj661dUCgj+x?=
 =?us-ascii?Q?t6FGyPOyGdXuZRZvP28wOedBFUnSJr9FtGzaDGUKDSz2rFrpl0X6iDYvjRax?=
 =?us-ascii?Q?ujihQ8vDZL9d2FXiXA/K8FchGUy/zysPS2JT/ro3uK3XbirH184x4yZPL+HA?=
 =?us-ascii?Q?YkRGhO5h/Y6nkmj6gNeWtWysclG1HUMmEP954YgimXTBMC2DDs5N5ZK5trtE?=
 =?us-ascii?Q?N+Tkl0GV8JawAQAIirB09f1njnou0y94VfZlVerfKGDxk5qTG48wh07tfZuU?=
 =?us-ascii?Q?EUcMNr88QQLR3l74aGuIgEKz2hXcniCqkWMb0nKGzMht0Vf5Fduct5Hzq2ZX?=
 =?us-ascii?Q?nlQzPBHAMvYD882f1odX7+Y4yThlC+tYr2DN/nDp2razjkGn9MC7u7OkJojB?=
 =?us-ascii?Q?Xfzu1R4KRjQYelbRLk6o/cms2CY54W5ZkAxqsfZ2WZqAtf+c3n615SALJh2T?=
 =?us-ascii?Q?xXcd4aSUHRbBprgYgsRwH0fHYFBCfgjC/A1MFCektvHoQfdEIe+C2vyaHdwC?=
 =?us-ascii?Q?mvmm5EPozwkbS40589lDUHFIK6fZBbe1qkOJ7NT+odXf8yaB+eS6Wtk3bcfC?=
 =?us-ascii?Q?rqlOVbL/MUrGSVJ6Rse6cVmOj037C88xakJM2pis34bmK+BeCU4WX7qq2jq3?=
 =?us-ascii?Q?1O/8j154hbSB7CJjRR+LOdl/M+gigyQDFunpAIcnv/+V+i6cVvCFCX6kwswa?=
 =?us-ascii?Q?E4Zpxrp1Uw0CJvsFEDOXAeKQ5lrpGyEkxSieff7g/W4YLGygvkTsxE8hAPQ2?=
 =?us-ascii?Q?LkHFySd/ikYSF87BVBewMY7abLJi8zPuhXkaAmEwLYDD8m7BHIUq6nCz8BGu?=
 =?us-ascii?Q?8OpBKi3m6op47H3O4scD82i9hMuEc4yV9dKCTvi0FnR7TKiS+8CG83FgRvyn?=
 =?us-ascii?Q?DHOtnEkfiIjuOTGUkGtXrFGZ5RLjWYBpHunMcVY+ZvnrhqHl2voLaOwaX3Us?=
 =?us-ascii?Q?m9e35iVMIyuSp6D4+KBqbrWfx2zMvOfAsC1Sz7W74vhoVkC2he/JBnO/xWt1?=
 =?us-ascii?Q?ER1L7HH+jBQ4PRAWtulLfl6SPbyqxnU3z1G44TdEq6pyXnJINsNMXiCTcOZO?=
 =?us-ascii?Q?iSwxhklCBuYHgkxlJXgGFlkwSRT903Meo8AUgMGDLuUgZVg16ZSctnruqLaM?=
 =?us-ascii?Q?c7ACLF9VRUEt+uSi5QemF0bTojrB3vtrdXb8JEiGcWCnX4EvxK8ViPy78W9y?=
 =?us-ascii?Q?H5uajfU1Mb68G35Sf5OuUdKLR1ta8QFmjcgBJDzsgl2KZmDOIui1fKij3U1z?=
 =?us-ascii?Q?ug=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8675c23c-e4b3-4612-2fa4-08dbd632faa5
X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6331.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2023 14:51:04.6370
 (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: MlwkjxzrHQH/2F3Lp/jDMsyKPk9c92pak8g4qgyZiC9xTTrPM0f5mI/Z34G5ug39z2OYIFWLI2q4yiEecaILKJsEOMY7EJiNnl+GWukWGj8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9939
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Thu, 26 Oct 2023 07:51:23 -0700 (PDT)

From: Claudia Draghicescu <claudia.rosu@nxp.com>

When registering both sink and source endpoints,

the register endpoint method call results in 2 remote endpoints for each

scanned broadcast source
---
 profiles/audio/bap.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index b74498c4c..a84181e1a 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -1050,7 +1050,7 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data,
 	const char *suffix;
 	struct match_ep match = { lpac, rpac };
 
-	switch (bt_bap_pac_get_type(rpac)) {
+	switch (bt_bap_pac_get_type(lpac)) {
 	case BT_BAP_BCAST_SOURCE:
 	case BT_BAP_BCAST_SINK:
 		queue = data->bcast;
@@ -1073,13 +1073,13 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data,
 	if (device)
 		ep->data->device = device;
 
-	switch (bt_bap_pac_get_type(rpac)) {
-	case BT_BAP_BCAST_SINK:
+	switch (bt_bap_pac_get_type(lpac)) {
+	case BT_BAP_BCAST_SOURCE:
 		err = asprintf(&ep->path, "%s/pac_%s%d",
 				adapter_get_path(adapter), suffix, i);
 		ep->base = new0(struct iovec, 1);
 		break;
-	case BT_BAP_BCAST_SOURCE:
+	case BT_BAP_BCAST_SINK:
 		err = asprintf(&ep->path, "%s/pac_%s%d",
 				device_get_path(device), suffix, i);
 		ep->base = new0(struct iovec, 1);
@@ -1101,7 +1101,10 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data,
 		ep_free(ep);
 		return NULL;
 	}
-	bt_bap_pac_set_user_data(rpac, ep->path);
+	if (rpac)
+		bt_bap_pac_set_user_data(rpac, ep->path);
+	else
+		bt_bap_pac_set_user_data(lpac, ep->path);
 
 	DBG("ep %p lpac %p rpac %p path %s", ep, ep->lpac, ep->rpac, ep->path);
 
@@ -1792,7 +1795,7 @@ static void bap_listen_io_broadcast(struct bap_data *data, struct bap_ep *ep,
 		error("%s", err->message);
 		g_error_free(err);
 	}
-
+	ep->io = io;
 	ep->data->listen_io = io;
 
 }
@@ -1958,12 +1961,12 @@ static void pac_added_broadcast(struct bt_bap_pac *pac, void *user_data)
 {
 	struct bap_data *data = user_data;
 
-	if (bt_bap_pac_get_type(pac) == BT_BAP_BCAST_SOURCE)
-		bt_bap_foreach_pac(data->bap, BT_BAP_BCAST_SOURCE,
-						pac_found_bcast, data);
-	else if (bt_bap_pac_get_type(pac) == BT_BAP_BCAST_SINK)
-		bt_bap_foreach_pac(data->bap, BT_BAP_BCAST_SINK,
-						pac_found_bcast, data);
+	if (bt_bap_pac_bcast_is_local(data->bap, pac) &&
+		(bt_bap_pac_get_type(pac) == BT_BAP_BCAST_SOURCE))
+		pac_found_bcast(pac, NULL, user_data);
+	else
+		bt_bap_foreach_pac(data->bap, bt_bap_pac_get_type(pac),
+					pac_found_bcast, data);
 }
 
 static bool ep_match_pac(const void *data, const void *match_data)
-- 
2.39.2