From patchwork Fri Mar 7 15:44:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iulia Tanasescu X-Patchwork-Id: 871322 Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2077.outbound.protection.outlook.com [40.107.103.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C714121D008 for ; Fri, 7 Mar 2025 15:45:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.103.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741362326; cv=fail; b=ts4dF38NCvWI8CFvx7WdcFISbf6LKgVoLqjEriJnxf6ug6Xy8EHvD0uWy3d2UemQawMy500sJzO8yTNH4kwrmnPaxsGRgUIyYJ3BiGOVXMiG1fX+bwU0MA32N7lQOm3cv9AJsXfBv78yY9W5pOYPXeqf5vFd3ICy1UDoLwAhIgA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741362326; c=relaxed/simple; bh=j9YJDX7hfGxfzwydgZjC7TKkh23hFPa82LeJ3BB9ybc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=TDVt3tXpYhTnzRTSpEwKziLxr9JO0pKGdSm/pKLbRfYG2SuHG/Sqdqr5xCbMvwxQBhNbJzvk/lTV6cMd60J7JcFxRJfVbxybnlFR0VvJYjKGLKHFlGdN7D0WDp6Sy+5nBstoo4mBs4fLPWymPvqgLGThiMgxVtRCu0GR+h4EaII= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=Vn/PWBIp; arc=fail smtp.client-ip=40.107.103.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="Vn/PWBIp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=N3aXXH3kfRu7y9TeQ2Ho4eMZOR/M8nNXwfT4QM6o3PdPs1/n4AyC3KyxE6z+/Fysg8hNtlquspjFLQAZiao/DD69Trr68LjOCBRh81TlP5Q/8bjS/qUcqL8t2P9F7DzRsV1MUzswnVt+DMiNKm/Qf0YWiRfCuAL2miek5TWmWig/B8NuVUMOySO/kpRzRbA93FvuDnz0tfQ4/SDgDljXc6IUspwU73UT4EhppSsgnZuCVzzRXK5bIrkkv9HLptmTpT9oJyL38+DTRfNGyg2qMyH2lIEB+hUhY+OLUri7qc3u2dEuUFLFgddrPzKAdZU3AhpOoY7NkDqhJH7bUF/oIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=n38O1BSfYK40c5UF3/4WtPYdpFlyEpnMHAGtIhHQ3ws=; b=dk74otCI2/NkQr4Ke5F4OEcLFs3fOxHCuIHuMqcsSbvl5dt5WkuRdxXLx9AxUAso2nhuyjb6K9EVuSHyGEu6Bh3jwdJF61/ZsBjMmmov6Kui+HFxPlXtMl7IqMeDrxTZgzDJq80KiS2V8ScynOvBK6Y7AoZfs55oXWbI1XW82zmmwp6B24kb39JcTu7dMu03fK967hBo1UWxFHTvELC7I0ENzD+UXBs20Qoil5lbzB1NJzrUrWCYnhfgoiF+OF4HDtFBncO8C/tpK3deq/gV2cL2W6vGDTWaal4EqbrQR3+U9CqsYnDxGdZpksndxj0XxeNSdsHwPheYjBCuRl57rg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=n38O1BSfYK40c5UF3/4WtPYdpFlyEpnMHAGtIhHQ3ws=; b=Vn/PWBIphv8r58FToGJr0aSVR5xUOs9NMdk+vQF5LspgtONCYKaNjSxtMH44p/oP6AH31TSRGAWhjub2XozOIFNfMo6vogyhpX/YfT5tCbZO7B5TdtePhq5ALX39HgFfHnq7eVZowx2HTVVYHe6rezTX8Z0YlhfQONIeOA582R4SfdPsxi9O/h6z12yYmGcCkddX1LAmTX7AnpvWWfaHFmOZCz7QQBfWh0mROPFXE2tcuikw7A4UvFjfeq9A8HxGME3GmIjxDK+Q3jOf+aBxYNWMhf7rJGMIK/kOusRm5Qv2WFbu0XIrhE6UzUuMPB0wYkAmicZi6bZlD2SRkdKYhw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8898.eurprd04.prod.outlook.com (2603:10a6:20b:42d::15) by PA4PR04MB7727.eurprd04.prod.outlook.com (2603:10a6:102:e0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.17; Fri, 7 Mar 2025 15:45:19 +0000 Received: from AS8PR04MB8898.eurprd04.prod.outlook.com ([fe80::5e22:869c:33c:9654]) by AS8PR04MB8898.eurprd04.prod.outlook.com ([fe80::5e22:869c:33c:9654%4]) with mapi id 15.20.8511.019; Fri, 7 Mar 2025 15:45:19 +0000 From: Iulia Tanasescu To: linux-bluetooth@vger.kernel.org Cc: claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com, andrei.istodorescu@nxp.com, luiz.dentz@gmail.com, Iulia Tanasescu Subject: [PATCH BlueZ 1/6] shared/bap: Make bap_get_session public Date: Fri, 7 Mar 2025 17:44:52 +0200 Message-ID: <20250307154457.85751-2-iulia.tanasescu@nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250307154457.85751-1-iulia.tanasescu@nxp.com> References: <20250307154457.85751-1-iulia.tanasescu@nxp.com> X-ClientProxiedBy: LO2P265CA0118.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:c::34) To AS8PR04MB8898.eurprd04.prod.outlook.com (2603:10a6:20b:42d::15) Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8898:EE_|PA4PR04MB7727:EE_ X-MS-Office365-Filtering-Correlation-Id: 02ca616b-4244-43ba-944f-08dd5d8f102f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: KeopAjU5Y8TswzcD5Ve1klMhAyiLYkT3V8bqGK6hxU0eZecEeP6iekoTb0+bI90LgkebtIT4wNAGO84oGo5Oe/StF/pqKJ3fblLalgMJQaFCb9w5XshQSyxwGJhlmSftuR0DbiUdCsVmL5oyvMVOvzX2SmR9qUWB+4TjET5xAXUZ5mh9gwecj3t9mdzf4Xaa0S98r3M3I2grP4l4M/M+4dUpQDxpUN8hnBdFTInUHFqHyHG8d/91WpdhtXvZP1wT6lEglKcfGbLTfNRosImPohdVV0asymH8r+Ig1ZfswO184hDM1Kb29YvcF6MJ6EQm3+wxVYTJ/R9kmefhosdgByHYVlnTae1Iy8+WqsCq4j8T819JZJ67YCWqBsxkd0Ooxwx5HwRjkMCP8jtrPp6QbpRrf5146NfBhHFdxEpBUrzvWgnYJeAF7CUI3cIJxGOhlTCJX2ULmp9hrgNkfbwRxan2Gh7TRI1d+ha55KYVGleA68u0Y8Dm+SuKODuExU4d/lwENk/BmzVz8HiL0y9NMLtBXUXmvsdd/UKjNfsvMjP1lluD5NRHyk+apapjN4ALto5hbT0AyWALFRoPiyBEU5ZirS2qfG0ifxwm66UKGSwfa7Ub3s2dy9LPyG/IAqCOn4E9gLjAg5eRW0/Sl1tD/HCcGZ24zlFfmY2L5oCl31ms6tfwE0d5PMV1zewcM2upleM0hw90r9R2FhrIXiHesfd5QvWI7KhKkF4YqdXjgNzCzjzS08f0xEtF8QUgJ2MmzuVzulkcyJtbV+BtXCB4irAh41z+K03qcUl3BFOMugY9WQ2GIo82LvBQ5p3/pgRAGZghx4vMKkC4nM2ZHa+/5HJJp/czHao5Z6QvIRLUp5ZfjgNFdtjjdGo5MVmMBjk5vo8uVvkXv9vNk77R2gQ2Wylu6/peLWvUPIec2qVWL8y1CkACdpF28eDXD8yQ60mqdOcmc5t20vKEbLst1SWuydmyT4QY1nJf3K33xGxA+tL8LueAO8yXcqFzr3esslbf627CG0/+Te9KQYelIWWnqyZzGoaKGofAx01Dh3D9Tz9GVZiuOZ2OatHNDlQauOJQ9Bp6pkbxcj6JukoUo/sO4Nix6eANOIwldeFokgPYdaxi6LlbobgSfu/W9Ngn8s1+iXKRO2eOt1f9Wz3YbTTV6Fd12masRAW/kMj1cERXpWvPZYHYyW8+rjw7I6nYmCjuBpKMacEP7Z4r0rbLuBc2vAAWBameJxoRmnNJritMYEVaQV+pFiBpbRHA8L3z10fJVUbuxhc9z5O6LpOUBhNF1P2zsqSX9WwNPeCg9Sf9fv5d7E5z4cjjOAJw73ErHQpHYxBBh1o7oF1V34ch+N6VcrqFnkJgFVXNxWv+l+jxEWfYMHX+MWfTAFL8fu4dwQjs X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8898.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2qhCX+XYxWJyoOxPAsOVGy5rDA2ie+MI6M/F8Q9Bf+fgzFmxhpgvi3M3munSUZ4pRyGM822yzV990qQjkrTA8CFYzSfv+h/kftwyAtq7PqX7KYuuedeD6/9toP4tUuyt6OEGGRN1ovneECjf4I7HPP3dfyn9uorKSWPt6hjeX7JfcdjBz4QiBvbYgT1mtKzIBIPRHtB96LZ2+4qFSEuGFV0XMgCpGTFv4C1bITZVYaBF1hqLqYdkIgNsZjPcqFMtMPPugKlSPPBIdvq+rwTu1PrxnTRQchBRuCUfgAVNDk8J9xYPpovACgWWZ9MgLTTKpbxzpG/9zxSFPIOQ0kQI3YTmVpdJLuB2iqUu/VuFpmcQSreWPF1wNaRcyIAeaUwV1m9kCkIwueVJB0J9YwIKypFyoSp+ChduIhS2yHvdXQJFzCEsn89lr2QfWTgwpksun7hX+R/xV4PkPDkXBzgN9936s05EoLT2iJae+OafTWHrODwkHtzc7lfkyRtbe0pHB3TeAtG/dYuruigRVq3Aa4+4dRDLHK1VEbGmVQoWVhku7ekl8UVKMs9724zAN70BgbO9wwlW8f+U8eHyDyD7/vkiCYwpKhppLFrBsNQN5Y1huGPnDTXoCPa1dCec3U5PQPgguQs5HP9DKHWgyE854HRI69Cs4DzlZ+IVamPiGDthwek3wEhVufS69pl6QST2Q4AK3LIHiLT7hlZ3Kq9Rnh6l0h6B/um2KCQuUk7NKtFOz/EYpjh5tnFPr7GqAQVh5f4tHJZ618+WMAc0Rl3xFu+DsxV1HfTHrMxY1W4rNLWRK0qaopjGIDmjgpGTSSlMCN5QKXuyt1Q7jxvKXwDazTggWpTpOdSKsH/KQ+bEjuboZRMUiweLnHuUstHVbR/kjWnjvfkvKkI5YpH9PqqbjYwZjW2M+5tUDTtBM/ylFMh7J+a4P37m6IrHjihVfuQpYHBO+2qudme+hRwFBUwWt+80bHrpvfcMuJYYNO3ob5L9HSZK3KdqtyqmZyKMifOCatOvi8pAbsICfBY2tV+q20FKAxlBCkcBGSUBb7ElVm1J1uIj3HikXYfNVYcpA+M5H1eFkwhDfXQ1DRnsFvVd8fqlvnk9NlqJejq9Cs1wBzez0VGQY8OwTFThTDJ4gAxJ+bA5hemwf2T4PorxTl+SPWAjIVPGe/WDUQatWOKv84Qll9GFOdQsfyzAvREZ69jaWAP5DSOymIeB0TSqAzzj24P3yDkBf7A8JR63JjlcZBiJCKwYxMpr1tQb+HA0wn4H61TiBGC/ZSxl6qE3oqD+pgBPomd3c8lL1g+gY3hMdKlOrxEcZGVtKmTpU7/vn6iU/qNRjcJWdDlUAGuo+s0C3bf+rwqraNksND7CiYDiPrAo6PpPsXqOzuVWY8cii+KEVSMEj749jfdh9ic107ugP4vNWU07j6I/ma0fci3BeBTt2pLmex7rMFlRkrvHb3h79waOVtaoRSu2nmwk3ie+mq5IHKPLpudBiV1ooJ4OPjlFdpX7h798xyPC1hYKv1GunXtkIW7z/BTOFOzGdR3pCgn2+5RIMfc7OQLHW+H/Up0kZBHwRcwlzAndZCk9+0iDWaM69qs/EvPcDTFkYdK68Q== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02ca616b-4244-43ba-944f-08dd5d8f102f X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2025 15:45:19.1146 (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: aMXffuW6boPeAf+u9elKqzkmmEW1bSyqUy+Rs25jjKYj1VHnvSKxe77TJAE9ZmbXgSHo/pCP+qFoZa+lCqnJnA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7727 This makes bap_get_session public, so that a reference to the bap session can be obtained and processed from the BASS plugin, for the Broadcast Assistant implementation. In case a session is not found, this commit also adds a NULL check for the new bap that is created, in case the provided db reference is NULL and therefore a session fails to be added, to avoid any invalid memory access. --- src/shared/bap.c | 9 ++++++--- src/shared/bap.h | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/shared/bap.c b/src/shared/bap.c index 4dce32efc..63c4c05c7 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -662,7 +662,7 @@ static void bap_disconnected(int err, void *user_data) bt_bap_detach(bap); } -static struct bt_bap *bap_get_session(struct bt_att *att, struct gatt_db *db) +struct bt_bap *bt_bap_get_session(struct bt_att *att, struct gatt_db *db) { const struct queue_entry *entry; struct bt_bap *bap; @@ -675,6 +675,9 @@ static struct bt_bap *bap_get_session(struct bt_att *att, struct gatt_db *db) } bap = bt_bap_new(db, NULL); + if (!bap) + return NULL; + bap->att = att; bt_bap_attach(bap, NULL); @@ -845,7 +848,7 @@ static void ascs_ase_read(struct gatt_db_attribute *attrib, struct bt_ascs_ase_status rsp; if (ase) - bap = bap_get_session(att, ase->ascs->bdb->db); + bap = bt_bap_get_session(att, ase->ascs->bdb->db); if (bap) ep = bap_get_endpoint(bap->local_eps, bap->ldb, attrib); @@ -3437,7 +3440,7 @@ static void ascs_ase_cp_write(struct gatt_db_attribute *attrib, void *user_data) { struct bt_ascs *ascs = user_data; - struct bt_bap *bap = bap_get_session(att, ascs->bdb->db); + struct bt_bap *bap = bt_bap_get_session(att, ascs->bdb->db); struct iovec iov = { .iov_base = (void *) value, .iov_len = len, diff --git a/src/shared/bap.h b/src/shared/bap.h index 359147b69..198ae50c5 100644 --- a/src/shared/bap.h +++ b/src/shared/bap.h @@ -296,3 +296,5 @@ unsigned int bt_bap_bcode_cb_register(struct bt_bap *bap, bt_bap_destroy_func_t destroy); bool bt_bap_bcode_cb_unregister(struct bt_bap *bap, unsigned int id); + +struct bt_bap *bt_bap_get_session(struct bt_att *att, struct gatt_db *db); From patchwork Fri Mar 7 15:44:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iulia Tanasescu X-Patchwork-Id: 871714 Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2077.outbound.protection.outlook.com [40.107.103.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8B7C21CFF6 for ; Fri, 7 Mar 2025 15:45:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.103.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741362328; cv=fail; b=VlCq/yN9wcdUoPZu3uUhrbuZ9ZMyXmn6VJ2ylIi4mce308sw/0ZdMSKiFAv0ihmn89/roc4HMHGELn4hwjHkbR7csp2goSoo9eGqpZef+O+mKPsGpH23nB8ItNVtIX9cJHvdAxGfTo8VUJeEp80YEZ5aCMSKh4uVgGxIQETsWLs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741362328; c=relaxed/simple; bh=NBe5WR+yHTyjIBQN8P8nebp7Y0EDMlyxKMhS69zUoM8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=m63o00V1VTigAF7/NrBlY+fbIAcjc+x05LbBEHhOr9azCAyzu8INeBalId42jHhLDL7/xbzeG+voAn7UdZM1PNoHUxoBSn+qFZClo+KCSOFmxQIBslfRDalqb5KZSjIjWo6wjBeXB5CtQcgI3Y2s4K6K0LT9aewPtNzmMYJiOWk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=nCPeJY17; arc=fail smtp.client-ip=40.107.103.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="nCPeJY17" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ud+99hxC60a72FblKxquG7vk4CSt/1fU6jQJCGZVX6bYcLi+21TIJy8U8lflzCnWHoMySmJ1lOjl0m2KbvZtdo3jhza5fNyOd7kK7pSAYNqLpPr/Kp1DfY1+96K83Q3Zvha8QBltQVzKYCQNtZTh3n9W3j3Ff9SGcKHSbAhHBvsXD5CxhhgdYikaTLxL78/0TUfvakdU1I6pjV+Dwyn+203VXik5lFsdxLw4naIt6K2nAcbeyVmJ9z603GeokZR66kshO4BCNmKfTdOfquwph8FAj2HwvjHtkDovSX4/yil1p0VHNAZaGzc9ugEzhZ9c+mBFmuvJ4dV/F7xoxYKx/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=klzS54mPzDu5VtpSQKpaLaDymBA6DTOaeg36c55yhvE=; b=FknDL7yuLv8LUrLmMC0sgY3Oo9P1PiMLvKMSodghe5GedUKPxsLh/qu7DH5yyn7qUgIPlOjNXeApTP/w19nqx8oA3ScU56DWcvGFPv/zkjBy34buI/D2OWBoR/JR2MZHUvbnxpLPBCcIsSJ35eAL630GySBqxcLqnzMP2/hWYSPsa13BXgmfWKJjn0zu/H50RhCzxdAYPKkqypJbJszWIzCdWdaa7yj07LkTEo4HTAFHPtFm4nBm5NEC/FVWHOomNrlzCUswN6De/nG1R/PcVSnLcwyvGCKv3oNorVuqIZ32RtgkNAnNmjtG9+Clmco80EpT86cFbqRgQ4uJbhETEg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=klzS54mPzDu5VtpSQKpaLaDymBA6DTOaeg36c55yhvE=; b=nCPeJY17B3KNOJ+0h5D48KaI6wylDdYUnLsPQZf2xCwnYC4uhY7KBoiwF7wwMyelFEmx0vguNKooX2ID+0Xw1aENDFONxxMT+sxaHZmWuILVbc7i8ukLmqWeBfy0uOaR+qwfC/BLwgc7hbIl9M/frJwXnj9CE9aR7xSTa/i8AqYBcPTir8KstiEdnblrEpFsRCMdc8EvDRmFZ2X4wE5AutxuASqoHE9O03aKz0urnXxCW03bNGpmFMEElLSyU/6zPk93bgIjFEVkb948bQOe3sG6asWFnI2nnTJrScGR5PXcT1P1bld/iAiUWjyI7C31yfxfVuik5T5sa7VNZ4X7Wg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8898.eurprd04.prod.outlook.com (2603:10a6:20b:42d::15) by PA4PR04MB7727.eurprd04.prod.outlook.com (2603:10a6:102:e0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.17; Fri, 7 Mar 2025 15:45:22 +0000 Received: from AS8PR04MB8898.eurprd04.prod.outlook.com ([fe80::5e22:869c:33c:9654]) by AS8PR04MB8898.eurprd04.prod.outlook.com ([fe80::5e22:869c:33c:9654%4]) with mapi id 15.20.8511.019; Fri, 7 Mar 2025 15:45:22 +0000 From: Iulia Tanasescu To: linux-bluetooth@vger.kernel.org Cc: claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com, andrei.istodorescu@nxp.com, luiz.dentz@gmail.com, Iulia Tanasescu Subject: [PATCH BlueZ 2/6] bap: Remove bap_get_session Date: Fri, 7 Mar 2025 17:44:53 +0200 Message-ID: <20250307154457.85751-3-iulia.tanasescu@nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250307154457.85751-1-iulia.tanasescu@nxp.com> References: <20250307154457.85751-1-iulia.tanasescu@nxp.com> X-ClientProxiedBy: PAZP264CA0117.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1ef::8) To AS8PR04MB8898.eurprd04.prod.outlook.com (2603:10a6:20b:42d::15) Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8898:EE_|PA4PR04MB7727:EE_ X-MS-Office365-Filtering-Correlation-Id: 82ae9d02-cb36-465f-33c4-08dd5d8f11f0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: 9/N+1KcbdGz0irXZ2ka2W+G6QOQXFWG3GDiTqzHGStIQyQ1hzsd1M8YDpAwkdTnjPOdawr3DbDyOeyAY/1gI3uhRW6UtZg4WbuosmXnlIDTeHW/RO1CJPJ1/LecNj9/0uqAMIKKr2uHQ5/PtrrlxuuKR5qALymVDPCgkJsz6qdibEAh5Owu/rw79XO0Hcr9NyqxTCBPaEbG5MZaB/KdrrLGSjuU+nDyuAzonRW+bIN+4AaUi+pzB4rr5RjLA830Bfk4vV7MrI7Tt2uoMXiilJUdndRqbv4y0G7KENYf18NA+j8QLQmZGjAxhq8iIRMtrTlRff8sok++SPSgpCI4v+FtUxGOWs25bLj1LwGSpapZnQv1jbKBm0hc7h779o7F5D0ZP+WZKVbocL0jFV8WR7ktUGZdswOL3Oo0d2g3jb+79SWUDx53aVW3bNbAWHn+gYOsASAnopCPy7U1KuzW9wVhqCW6TdYqFEM+T1r9NfoqC907zxmPZ9sCHRoT/HEuPqtsiayvTteHStTCDjZy/bIUtV9+GUXhwlwg1f0WfV7mezIaj+tLmAbj55SRwF1alG+ZAEOfbDcysxtLPTPBnSpXDZum6b9ZKtOnjsFKmuyxUMo03l7/7W/7Y6PYRPf9Mcr1LaBvUQItjdm5xd7r+8vDo8c0Gt0sSa+F6HqeJbd/7JpuS9dgbVlPrXdPOOlgBAoWXwI4SPLssqRi5s0ACrQYniJPZIUZF/ihRxMqdP0hZBcMHEtX9e0b9KqYjcLe80l4Xvkzp1XKJOk/o2Teq/23aWm9FRVGfI3/m5dr8KwH0D8dRBIMohqtZKonipNVO/8vQnq1CdYMeP/19A4T8TKKy/5lsckOSN/ktxwJHafzrGBUgub/uWu+hNf74BqbMfGbWXOkDgYfkPJ3GzJRWGppcYpdHlWR0EYurqqLd5hFKw7pVDxAVHdkDqHYemPPp9/HG/tJN+ngslL/0PVO8KE4s2VRcgOX75BJq+rWmK3mFhH4rICUB27Gbn/gWhnvDpk5guM8GQja6StWT4cBc8tcacxChcgDcntzlcgxluEi5HsysdVvzNmyuZoPXQyTYM9rZKbeZ0Vewssw3JcAofR9vhD8TRUSbtf0NxSSSPBsZI1yE0iVL/Eynol5qts5Y88GVEHfvpS5i3Qv/IYv8xzl3g9HXNgaQWcWuFj5cKTiIKNAPctTa5FTwt6EZnGwgWOzJr81wkJJa5GEg5oDc1bP8+uVsgaNOlaBlNvu25m04ut3BQLjRoGon3xUDwVsniYfVC/L+sJvTDPaggFjB1mKhvig6aG9gAVxX3U8ZGa5bp46EBlQ+iKklMbbz01Pq5hR18GQGIq2UxvMPFol9gNdltHPD5XM3amm/hW5ASfK9Nvtu0kZIYwqIxhMbAAjh X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8898.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WDbuEDxSyGT3p6RV5Es9v4CaoJtD3XQTSDYB7KCmyHBvrE5dUwOOBmSAlnOQtwtdrR4Y5aFu9Fa1TDIFnNdZFkCUB869qVJ48ruI16w1EylQiNfHqSFS31EPCgChH6g7WPBFeDB+RjKwmNMYjpJt1HmC78a8baZDQCue71SqeMQi1iObfjT+Xf6sx0t6J8KppuNGWiCroNg2NmKKW5pmfd0AuG+xcrPwSc1mpOPvbX8boj3Ph9bZmUsEahoiIZzmyc+tZ/2kzu6RIwzbFZ1QOg/uB1HzmsIUGUSULqJde4FIvZLOVK7iV1jkRXLsWpJD8vjiR/ESs4xh8Y442fRy5qjkxNiE5G511TH56JuzcgwyJn/aqKuwqE75nLzvPpC9VNZdhr2boQVLQq+QyyhczmBAP++aBqljagXQiOBE5NPNyRHUfTuSU2eusbQXjZ/kEJb3xDnsFa9W+ttdPsH0qzn+4T0toyG+pnzlvoun2UZ+9XFh+kKpYa4e6jV9ltN0OJuuI/v+iQAOI2voJ106PfeP+y+HVUdfYnJatDiLnjUV34W4Ro2raje8UN3QZQedNV5Gyr+Gi5Ie3eLFJdoA/suQJi5g8Jjs9097vOpTTKw7aD/DV4pmdA7Zrq3jviVedZwbZjiqWzKyg34kAb/NXfDCFwMkp2+1w2Qzw3XoKJ1jSgX5Afm9sHBSiE+Ti2LdZc/xp1J0B/RICt3KLSheWSeQY37/H3HqkZ8uBP7tD8J4gb5zRPSfr/xd8a4AZ0zontxTxgioal5rFDmr6UISGe2EUAa+ik0j98vpPlSn0FqhJF+DrYkLJAXsESJ65/yNZObHVIpbtpqLera2iaO9gaOUwV9v84+F8Z5W8XReMF5okCbOogoCZFEFZ3VagVXxKNiL4gexcO5js6NCY4cFbNcdU+VcjSHvkZyjBR9gsb1/GVey7I/YfsodS4UFchbq4gU41RpUChKxzFmxegCtns90jrEiPzC1cweCxCg0QFYSf1136hERRd8SSc94wncoPQ95TE3DHlE8pbzlLo6wScrxRYiOHgh9ztFLZwfV/wmW5LDcixMqaKBwOrIQJp2zxWMBHaJi0R5Phxd3iLCHuyRNX07ju14suaY804JzMYzFJY1djaOtP4SBqsesU3mjN6/xgRYq/d2d69FUHwJ72hG7irtB2eHdN9UWoDsesKGgrjuu8W0IKnm/v4EOzs71al2EJKeWV/+vK5ohPN6D4lN568Zpjxh2DJkMyWjE34QyXFBqq3pTHbaVgoohlEZWALzndgjaSsmVf1Gbl/UGzbWaErL4bsOg1ZztYgnvPWLyX9+GwZeTf8dGdjWZP8HvEcOqL4ocQYn3U4ncQcz9QMkGavAXZoJat8gX0yvelcAtwQ2Z4PEQvXnm/63SciNSF8Sa+Ll1IfrMIvjOeyJ3fOV44Mrpz3xohLX1dHAzDLlwb9DyOhtCvdWmYzOD76SSS6MRG12BcAZltj7V7b/+2kBnEjZhEgozEtkCMLcN2h7MPeQZK86VmGAOS1mMgXo4yQHNCY+wK4kCiv4pa0vtj+SbXAxK2RNWG/hGyw/FPI1GHpBqdXEQqiNY1MXvCaPCE+N2uE1WtVtwsa7RbaQFcw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82ae9d02-cb36-465f-33c4-08dd5d8f11f0 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2025 15:45:22.0124 (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: 2n7B2iviPDNgkolWzwxagL9A0lcAru+wHatO5N36OvW8rtKSrEBYTlY+fgBSaMJrxaapx8DsMW91nt/vZpgAUg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7727 This removes the bap_get_session API from the BAP plugin interface and replaces the call inside BASS with the shared/bap API. --- profiles/audio/bap.c | 11 ----------- profiles/audio/bap.h | 2 -- profiles/audio/bass.c | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c index 0489f6655..0dc5b4004 100644 --- a/profiles/audio/bap.c +++ b/profiles/audio/bap.c @@ -2708,17 +2708,6 @@ static bool match_device(const void *data, const void *match_data) return bdata->device == device; } -struct bt_bap *bap_get_session(struct btd_device *device) -{ - struct bap_data *data; - - data = queue_find(sessions, match_device, device); - if (!data) - return NULL; - - return data->bap; -} - static struct bap_data *bap_data_new(struct btd_device *device) { struct bap_data *data; diff --git a/profiles/audio/bap.h b/profiles/audio/bap.h index 522072340..554670d4a 100644 --- a/profiles/audio/bap.h +++ b/profiles/audio/bap.h @@ -9,8 +9,6 @@ extern struct bt_iso_qos bap_sink_pa_qos; -struct bt_bap *bap_get_session(struct btd_device *device); - void bap_iso_qos_to_bap_qos(struct bt_iso_qos *iso_qos, struct bt_bap_qos *bap_qos); void bap_qos_to_iso_qos(struct bt_bap_qos *bap_qos, diff --git a/profiles/audio/bass.c b/profiles/audio/bass.c index 44320a78a..6f68b80f3 100644 --- a/profiles/audio/bass.c +++ b/profiles/audio/bass.c @@ -1113,7 +1113,7 @@ static void bis_probe(uint8_t bis, uint8_t sgrp, struct iovec *caps, /* Only client sessions must be handled */ continue; - bap = bap_get_session(data->device); + bap = bt_bap_get_session(bt_bass_get_att(data->bass), NULL); if (!bap) continue; From patchwork Fri Mar 7 15:44:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iulia Tanasescu X-Patchwork-Id: 871321 Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2077.outbound.protection.outlook.com [40.107.103.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A1FD21D58C for ; Fri, 7 Mar 2025 15:45:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.103.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741362331; cv=fail; b=gz4qrscs0A57HmA7Es/Oqxz6/hJVMqfwcKuThWynHS2eGn52kBCHZj4y2tGgJWdqcF0CvR8EfbHL+ashnrUNjArXI4EUCqLzY/+m9Umz749Fp8u6pwMhmk0WEiFRixEGi0q9uCrsJMQZtHjOOd/f0HBWu6PEDVKQcSd9vECJkyE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741362331; c=relaxed/simple; bh=HIPqziQ8qlFgoZTLx9P8+jQRLqpiKJGlG7WkjCW9FRg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=QHAGYP5L28mkeVoAcLSIRcfQM/COL2wpwqzYBIdlLw5BcKIrt7V+54kO0C2F98W3qHqGwlQmj/Jj+kWm5BqBSGl/cMgWstB+a6R+oHL8i/ZEkykib8q8wUEmby7OGEdJIZgNjm9sbJXAVj25Guj6Og+KVtVS3AKVnJVH3BrHKg8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=fjvIPLOk; arc=fail smtp.client-ip=40.107.103.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="fjvIPLOk" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ISUjfDlKf+4BIVhIDYfk2q+S+KTPNNYSDx8VcAgfprqdZ53tZmyk1itwsqoTqWaKTgz8CgsAXSChdX7v6alJCKqeAmpMypPpl10WLCaGZunU85GDiuIqZslGFheSOS+UqAGfCHxGqhpt91NLPs9HT9OzyWiMG6DMkokzA4CRIwSW0b4t0Npc/wInWdpHyzNw6UJy0hLW9gOMHtutM7GV+S+vdh6DQaAcfRV54VaVFCznka+dfpvy8sf8xOL/zmgeT8X4rk/IcE5TTZ7WAojMncw/T/OZKupHR21uy0SeSycv9mFCF+chVfmLjWxTx0JUd5CAW7qs2/YufHwvr1Ovxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sw5nJcV/Qj4rYvZjXxQEsiv0BUgoESCtR2fefkpOqpo=; b=VyyPQFNPU5EzC7Infi1ISeSIJLyOnxfgF/Xux2jdijEzJRmARvlLeMuJeWzvBlMn1lfalEPdxHQcrS/FvLv8EW+h1mSY7YCO8Ks/YwxUWJNylfd/gcoLM1E/LNZT2fsdW2tkxr+M/E4CSpS59gLb6zQtGd1URPWjd/DFCD+tTQphKsohMmLMp0T/0j4hYBzDJmy+mtHvN2agj+cMtGq+YMSzmKbGSbkfSdN2UiXdZp7NHmYy0HRx6CY1sCM1DrhXQvONP5QCkUM1ONd9VBd6GV1Ctx+ICyhygvGMKM3NVYGq/TFYQgHDzTXr9W7Ul2rCQBU2frDC8YbKnQMc3Ujikg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sw5nJcV/Qj4rYvZjXxQEsiv0BUgoESCtR2fefkpOqpo=; b=fjvIPLOkQl1NDueNNIw98b830dsmSSuaba0d+RdPgVJq6jKh2j5KeuOeUEOuHdRm0l+cqDTfBiv4eM26gY+pkfIF/0Vw0vt/nj3xfKrD9PrBuXrzY8qFBvkA8ohg4JrwuzsnnQv7BGzE6p/+eKlotuush04vCuy4kz9zdngTvMEDNSm+xnelEqJooT82frOOFxzqKOOveok0LcQMIa4nnSdsllWyTz6dfOIOomhPemVAukYhOk88WIdn0KXIZhmrcyixomCpNbULD0S9uYqYSK+75jjL93q3cMJ+rWOU3Z+z4H8smZLujYOgM1PXzV73LCo1Y5g26EfmFSAw4FurWA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8898.eurprd04.prod.outlook.com (2603:10a6:20b:42d::15) by PA4PR04MB7727.eurprd04.prod.outlook.com (2603:10a6:102:e0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.17; Fri, 7 Mar 2025 15:45:25 +0000 Received: from AS8PR04MB8898.eurprd04.prod.outlook.com ([fe80::5e22:869c:33c:9654]) by AS8PR04MB8898.eurprd04.prod.outlook.com ([fe80::5e22:869c:33c:9654%4]) with mapi id 15.20.8511.019; Fri, 7 Mar 2025 15:45:25 +0000 From: Iulia Tanasescu To: linux-bluetooth@vger.kernel.org Cc: claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com, andrei.istodorescu@nxp.com, luiz.dentz@gmail.com, Iulia Tanasescu Subject: [PATCH BlueZ 3/6] bap: Move default qos to shared/bap Date: Fri, 7 Mar 2025 17:44:54 +0200 Message-ID: <20250307154457.85751-4-iulia.tanasescu@nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250307154457.85751-1-iulia.tanasescu@nxp.com> References: <20250307154457.85751-1-iulia.tanasescu@nxp.com> X-ClientProxiedBy: PAZP264CA0124.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1ef::21) To AS8PR04MB8898.eurprd04.prod.outlook.com (2603:10a6:20b:42d::15) Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8898:EE_|PA4PR04MB7727:EE_ X-MS-Office365-Filtering-Correlation-Id: bb830ecb-f45b-411a-2e7d-08dd5d8f13a5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: auEiFt/Pnndg4/T5ZnkWPz4Jx9goMkSEudoMdQ1NiMT8B4MMdSNWuo6tVaG0jy9MKNdKVf9PlGPLQ6aE8gygjP7hUZdYAGia1LXdOrTObk023YZRrpXNCEJlGbGrNGmLqP1B4qoEWAd4viFn1bPwQ5+vhGJrT38P8+na/dVsU9y8ET/Te8m2m5NEA84fP4jZt40wcZW6kfb7bRXiS0TuW9C55CdPkLqwZ9QwO45PwLtjdmDJgiCbjqe+p2JAKCzzLrNWFUTohTDYL3tRA0dKzXEuCrbAxJk0OANq/lWhtpYIKQ/RG+Mne9sHmzCde/0P3FOnIXGvB3i2er8ELJVdpFHibdSfGTClVIszwy4dJYBdPyIE/VWImTlHDxVA7xqT/S8vuTP50Yj5YiqrrWTbS0AUMOsqUHLDOpAlYqCxDY+66uQpVRhxB0HmMwzL8KWf7qpmKHhLUYtct1PwwLVOP2w5240a3h/lF62/0GUjayXFoJXD+nHDomU5l6ZC4D8y/5JG9P4TwTtvOBHKpcfPMjoVenyhDdiQ5EhCKdUHdtBg/urpyPd3y2NrmciAGnnooXMfH9GswPrQt67jukbeb+xdxFjAJI9cMVRVDYofFXBgWL+Isr3mWnXsU/v6vMoPAfWlda5PNanINtgheLq5AWCb7W8IPOMcbo/2yK5ShxHWMGfiD/xdfcTN68YUJVPPIgk+JKXPmzMnxaWN2G9qRE0cl/Tm9KwjgagQQWSJDPQEVocBLK2P8XSaBHdQcNtyTLh0vpZr0j96TkI6K8wPNO297qrCU4Pdu+Z3tYvjmSuSmCTJqrehrW4zwLvKgVyqArx9TxAIDHlfoVjuYudyIbgX72IVjJxNu1s4BW8sURg0Ma2Hdt9Yi9jKQwRmFFJcrVc6Kas+vJkTcwlg82rcqr36DrC/Ez7XsgsC+agYe7Js6YQoieei7o2yICXHJItQ10LXRU+poQADfyzdK1sjpwNNfkYNI23OxzidZ2wIm4+XD/tCDwnSOJqdva9wbLUTa64WTY8R44vtUNdgSJQ4cP0WQvl82uXapMtb1dfZJng9XB09sklTKV227zBBHvpRbp6bFJz7UH3pb+dwhrkZsK1AP+ASTxdEpyW95Ijj5MyM4mRFesOne3WYLJffJWU8CkxA5lYgjjg5VgV+UXvYVcKEdr6UVbsqLjq5TxTsudRoR9RLLlMSKvnOgSkhFcO9cq19IyYS0j/JjaglYqpXTT+7RKqBVqaPR1e9y4faXkx2XnBwevy7QLNfdO81CKHFD/SBuBY/LpYWQx4kOoXo6zlDHBv/QbwulsHlKMXd6ypxbtPQFwFey8sumL0L7U1n+IwyXODut86PHxktgzr/xegB/UDRme4XSEhWbNFn1Uu7pbPs1QzJIbeDgNd7akeT X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8898.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OOktwMaMWoKxwBS1OVA041QvxjUR92YOyUNE2N69IAu9hhCWoRMUjGaKfL0PzgGmXwqvjJDIvoLDGE0bzTgVb09A4TNywuF63u5M4TtYU3Hz17QQk3S/eow6ZAbO/WiHlsr4N7QHe7p0pqJqDw1BESVgUk1vfZQjRb59rTrvZktQiciD22hqO8cxpPnZgfWzURVjLNSAZAgL6UL0gasAzCn3wv0jV50pC6DZIiYQi9ojY/Ew1kb4RQY7+UFECTRei4VTasX3W3MCR4g3mXmMOZFeLVvFuHT6kx0CH8wRWm/+oOIdTLO8QJ9srbD4GnH7rq1SG6VTb59E4gQlm6WahcklVkI8+f5np36emGcMvAbv525oUyU0baqdXlroYS89mNNn0NaXMMSYNZHr7GPje3pK4q44rWO3SG6a4ZF2jabZFIo1DCcmuMCnr/Zc7hiGgzLPbQjLQF7uRNDjaXKBTukvd1menko/feps4FuB7slcz9+zDDf7iYjtGr3ipUDPxD4VJ3J4DRLe1Smd+Nb8nM5qXMa3mbIaGv8/BJ2XVLqnFAcOYshahRKVq015Ut/oFuLrGgpuLp5tOokYUEelhFUpdZpQEGKJbS2JlO2+8kC1Ezu4fEScn6vOzTPvJwA8/KmI9gSoo10qT8SmtLvge9hHc8xsA3PlnJ9JYkU/T7/BrI3yCaFQoWgW6rORtQyofiKurw7Tq+CsIFu/axk0C2tAF9HrMeoRQJyvP7UlFgYgizH95Pqlib09A/wvtviZodkwO1Mmy5Ho8XDrHHxOF1pKj1SqBi2FiyJy4KY0YJ3PvhjGBSdjdXLEl+gbON3QE/DDa48m1W5fw0A6RssBTVl3rUNr4gE+535hW087qtOn6FMoNhBswMhAL/KvPXYSZtb1qIoo9hSQ+6nt/0aEkedCkgXnLouKWhirENY4HD6zhd3KIxYY5WMuMYXnTASPAUsShAfnwM5vUOWBDqGNdM7vbFqXLZ9eEHnlNrMH2hfRzSoTF7nnNzijnWiVBe7r6fvj97TKIcVouRINa8SULH11vcl6r4ZlvkUAd37D1hBA8VgWElT1/OIiKpH7ck9M2Bi40lCfNpLKlXWFhNexBE8+4GuOgtmuubtfPiecaaIwYHG+cwM3/HCko4HETtIU7CDG7Rh4qzUOTmm1+yYOGKOtVLQMHG/UlsvJ3CmhdQgekJ+36ifjkU+Mml8H8qP4/6WgbUKeXYv8q0bpr6LpkzJ17RsxYo46tNy3Pqju+MRz9N+tcJOZfdi408HYghqvkrmTiF71ox205Qn16wLU8HXOuOz9CyMdwlz8whrVVyeuwfCAujyBsjWM9IN7uzvne5m9XUrHl9UpTF2fZ/lfJq2EseDN+BzH0MFTEJV9Upfh2dnxpju6rjbdRmS8NpRZ6miyGPimKPztfI9tPKm7sm9/TRJ1/i0thFPl/2lGjrmQdAWXLF3cAKG/9B43BYeAp3mHQf7Jd2nQT85XK1JmOqyUZRegSn3QIXKL/gN9XTVjZN08qfa69yW7X6R82Z4tRor7XmqN+0mpMOy+a/WORkKAgq+lgV4T/QErusGa0kz40dr3P4nODjdTBPfyd4sObUaeXJRsSwMj4e5yNbqPzg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bb830ecb-f45b-411a-2e7d-08dd5d8f13a5 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2025 15:45:24.9933 (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: WbJnt0Z1nv4Dmtj25O2h2xGS3lZvNfIl+w5va4gEkBEOOnHsLSusx0ybZX0gbifIIQ38H2FJ5ZJLdDrAZpd23A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7727 This moves the default BAP QoS structure to shared/bap, to be accessible from other plugins without involving the BAP plugin. --- profiles/audio/bap.c | 39 --------------------------------------- profiles/audio/bap.h | 2 -- src/shared/bap.c | 39 +++++++++++++++++++++++++++++++++++++++ src/shared/bap.h | 2 ++ 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c index 0dc5b4004..1889e1a1e 100644 --- a/profiles/audio/bap.c +++ b/profiles/audio/bap.c @@ -115,45 +115,6 @@ struct bap_data { static struct queue *sessions; -/* Structure holding the parameters for Periodic Advertisement create sync. - * The full QOS is populated at the time the user selects and endpoint and - * configures it using SetConfiguration. - */ -struct bt_iso_qos bap_sink_pa_qos = { - .bcast = { - .options = 0x00, - .skip = 0x0000, - .sync_timeout = BT_ISO_SYNC_TIMEOUT, - .sync_cte_type = 0x00, - /* TODO: The following parameters are not needed for PA Sync. - * They will be removed when the kernel checks will be removed. - */ - .big = BT_ISO_QOS_BIG_UNSET, - .bis = BT_ISO_QOS_BIS_UNSET, - .encryption = 0x00, - .bcode = {0x00}, - .mse = 0x00, - .timeout = BT_ISO_SYNC_TIMEOUT, - .sync_factor = 0x07, - .packing = 0x00, - .framing = 0x00, - .in = { - .interval = 10000, - .latency = 10, - .sdu = 40, - .phy = 0x02, - .rtn = 2, - }, - .out = { - .interval = 10000, - .latency = 10, - .sdu = 40, - .phy = 0x02, - .rtn = 2, - } - } -}; - static bool bap_data_set_user_data(struct bap_data *data, void *user_data) { if (!data) diff --git a/profiles/audio/bap.h b/profiles/audio/bap.h index 554670d4a..2bf93dd93 100644 --- a/profiles/audio/bap.h +++ b/profiles/audio/bap.h @@ -7,8 +7,6 @@ * */ -extern struct bt_iso_qos bap_sink_pa_qos; - void bap_iso_qos_to_bap_qos(struct bt_iso_qos *iso_qos, struct bt_bap_qos *bap_qos); void bap_qos_to_iso_qos(struct bt_bap_qos *bap_qos, diff --git a/src/shared/bap.c b/src/shared/bap.c index 63c4c05c7..ce579e171 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -349,6 +349,45 @@ static struct queue *bap_db; static struct queue *bap_cbs; static struct queue *sessions; +/* Structure holding the parameters for Periodic Advertisement create sync. + * The full QOS is populated at the time the user selects and endpoint and + * configures it using SetConfiguration. + */ +struct bt_iso_qos bap_sink_pa_qos = { + .bcast = { + .options = 0x00, + .skip = 0x0000, + .sync_timeout = BT_ISO_SYNC_TIMEOUT, + .sync_cte_type = 0x00, + /* TODO: The following parameters are not needed for PA Sync. + * They will be removed when the kernel checks will be removed. + */ + .big = BT_ISO_QOS_BIG_UNSET, + .bis = BT_ISO_QOS_BIS_UNSET, + .encryption = 0x00, + .bcode = {0x00}, + .mse = 0x00, + .timeout = BT_ISO_SYNC_TIMEOUT, + .sync_factor = 0x07, + .packing = 0x00, + .framing = 0x00, + .in = { + .interval = 10000, + .latency = 10, + .sdu = 40, + .phy = 0x02, + .rtn = 2, + }, + .out = { + .interval = 10000, + .latency = 10, + .sdu = 40, + .phy = 0x02, + .rtn = 2, + } + } +}; + static void bap_stream_set_io(void *data, void *user_data); static void stream_find_io(void *data, void *user_data); static void bap_stream_get_dir(void *data, void *user_data); diff --git a/src/shared/bap.h b/src/shared/bap.h index 198ae50c5..248871b12 100644 --- a/src/shared/bap.h +++ b/src/shared/bap.h @@ -50,6 +50,8 @@ typedef void (*bt_bap_bcode_func_t)(struct bt_bap_stream *stream, bt_bap_bcode_reply_t reply, void *reply_data, void *user_data); +extern struct bt_iso_qos bap_sink_pa_qos; + /* Local PAC related functions */ struct bt_bap_pac_qos { uint8_t framing; From patchwork Fri Mar 7 15:44:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iulia Tanasescu X-Patchwork-Id: 871713 Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2077.outbound.protection.outlook.com [40.107.103.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB61321D3C0 for ; Fri, 7 Mar 2025 15:45:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.103.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741362333; cv=fail; b=hEufm2kMmVf7qGH06iiA7Jf+hFrWVf2LLmTUtnG6ZVde3cOr4jZLKkjhKmDWUo2Ji9WoJ1nU1yib/WlIOY1k7eX8fKfPWNqfnHBhRQS5Ih6BLzutAHbDGj/luq9D697iL27yGFW9gIPwRsDKraJSIS/qsH482eQeLOF2IvcjXrE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741362333; c=relaxed/simple; bh=Mpe37zfNXA/FZJOmY6Y866lKE6DaSZYY15kILyStegY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=TR9cu2RJp+ZTy4G0ZN+i6R6xZgbQO3Rl9wi+BahMb8sZ3it7w35sd0yWpENQP9qnNv3VwlgY2DJoqzfvgTjjra5C/SFc3syVtNKnIe/Ki3rEQziqkyGt9J5eeQELQ7LbG0P9A9tgGZqRwxzJ5LfhTCWsRsMweYROBBl6wDnSu/U= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=SJoX0y9J; arc=fail smtp.client-ip=40.107.103.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="SJoX0y9J" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NvaosL2egttuRZUluANb2DZ5+cIq0bJU5SgxmpMGkT7kGneUFVQDhYcbqoLw6yjwsAQmFmSqCtlS4Sq+0yftEew/T1t3BzimadclZbG6SqRG7Y6IXGJrNLGMcWrhnn4TwdtjWAUpiePrk0d1HnjpZc0wPnZyxd6JxZ1aKtrFgCh3LYtOtvoZcd7iO6lIOjC2gZA4rDexhA7vItGELBp9GahvTlt7AbcaT8Szdvjn1zOnjw3lxc/gAEcvndu/69eKX+ffebEpqp9yEcETz65rYA/fg1QsHjwoVwFf3ORrixN6vqpC2Tf4mr+JIRH7wAbmLWRzB/c4BK4MrXXcVjJ1eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=r+6+C1tXXujow540VHnocEXndskLrz8dmMB9t88v8/8=; b=eUOoeGUrOl2YGkxkSItetfw15uyJJjm06hzeTo6yILw7xthTLmC0l56p4oyJNcefBJPRD7IAlfwDzyrza527JAD+ZJziXGFhJf59NXJ4JQ/xpJr10FO+SyJmSZ04i11qefEY/MXZ9B+lH8YLWjaTVyjaD/QDPYJX/om4qSl3H+IMrhA+jM0rmR2Nta/WBSYp60IX7Niul+DcjDzqYu1NF9L1F8VUsUgvAKH+N7hekJlPlyGE+sL++gRyaGUdlHUNtq86DwQblulA5ea5LkWfEaVvp/MngETZAnRw/wa0J4zpfL2T27p4fVFXT6oLFcu+nWmxEy81f4ZRuKlEu9/Y5g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=r+6+C1tXXujow540VHnocEXndskLrz8dmMB9t88v8/8=; b=SJoX0y9JEIGRhaIcOmD6Q8PHEnrfRjp4Ej8aICQxV2VUVAKuHoZel6ZVKoGXoQvOSKy5R8CWCcXFfe7zx96DGdM2tq2x+h3TdTuOUpq7O8yqdihg+zex4Fnyvv785YmVJkbFcU4eCIjQ4YdSL+liqU7t0G2uFxgX5B1Vl3yTw/ocZHqXfoKha+KLWEe/Bwfj5HtZMEtMEgeosMAq724xiBvUTdlHXF6DQmqDrOc8mjWcRzNoUboXffePtpS6/y75RwQ5buqb+JvP9v0+uAqtLUH+zxf7PNUmo96VEov+RyqIGvBlvU6Q2lbkiiRgHdT8GHStpwepz9VB/c8bYNdi5w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8898.eurprd04.prod.outlook.com (2603:10a6:20b:42d::15) by PA4PR04MB7727.eurprd04.prod.outlook.com (2603:10a6:102:e0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.17; Fri, 7 Mar 2025 15:45:29 +0000 Received: from AS8PR04MB8898.eurprd04.prod.outlook.com ([fe80::5e22:869c:33c:9654]) by AS8PR04MB8898.eurprd04.prod.outlook.com ([fe80::5e22:869c:33c:9654%4]) with mapi id 15.20.8511.019; Fri, 7 Mar 2025 15:45:28 +0000 From: Iulia Tanasescu To: linux-bluetooth@vger.kernel.org Cc: claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com, andrei.istodorescu@nxp.com, luiz.dentz@gmail.com, Iulia Tanasescu Subject: [PATCH BlueZ 4/6] shared/bap: Add APIs to convert iso_qos to bap_qos Date: Fri, 7 Mar 2025 17:44:55 +0200 Message-ID: <20250307154457.85751-5-iulia.tanasescu@nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250307154457.85751-1-iulia.tanasescu@nxp.com> References: <20250307154457.85751-1-iulia.tanasescu@nxp.com> X-ClientProxiedBy: AM6P195CA0088.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::29) To AS8PR04MB8898.eurprd04.prod.outlook.com (2603:10a6:20b:42d::15) Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8898:EE_|PA4PR04MB7727:EE_ X-MS-Office365-Filtering-Correlation-Id: e79ec087-a113-40bc-5aad-08dd5d8f159c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: b11u9yk2Ogrir4800V4WQf00DZ3PgPS/M87LEt34Qa5Jb0rH2UaIFwrUHDCx3igCCqqp6ujqLhwUzsYuE4tq7zL1t8h62/Po6Y8+QiLtbJanyw9dLT13L+qbtJjaSfQ7GEZ9vyRetfZxCnWiRy+CKwxLC/s0OjYBNuBLuQrWny12UBK1dmyf1sPAPXWI4mKmgF6nIf5Hl4sNwpItVFZZY5Nf+E6vdIJudB0Ora8+jdCuZa5jOlFHYkraoVvPBTkLS1O14I0NF/x2hdAn0jdZCFvaV43t/KkuKnubnJW3C9l90UJWdK+mLL4OFno6LdfWfghEePYd2sJOqCUkufoZPx/4YnmZUEOd48iKJE6ks2McK56M/uhDGsZRTlQ0ZECd4XbvqBQTi58mFGIYmgo0Zhmardwy9yOI/fvU1ulywrhYm8OyEnBorivrgM44RbNgjNhM+z9Wcw+n3291noHizbswCWZoB54EyW9SNVS9Z2x7Tfih0DD5iUrFvDKAuj3sOw+DRmxVOOdmHz8AIE4Man+xJAqb7XvU6lo11t65myWYFV7cNPO8gj6xdjFwsMXQsvaWdU+mjiK0Gn2A0MIw/8CkbAE+17+3ekFNp66L3SxFX3w9HaxYnVmNkv3OfVxx8vVry0jzeodVMQO+K3JTZut2Gdmky/O6AHVXFJVVz709de3tsDkth/K1fWO3YdIYOOLVArEOK49ry91QGjNKKAYG3StcDj7k+9AB2Ajteb/LUb7kzioZzFt0RD2A16l4opJIfeVDEq6JTAzawzORlvQHbeHan00PDwJ5XjUVK/XJ75PvTIk4nDlxwobuts9jmk9uY8W3B7jizMtMwJUnJnzQW377A8+clS29RRyvPqlSgeBcil1HMD/1lnUMBuNP6LvTkdImbu7FwzNgWCb6xRuuUEvjCzlATf6D0AOUq/IeN3IiKnm8G4BOf7tuxZh2574eTfU0AYWwyyoSWZfRS0qZ2SlzoCU5IT3tGYs52NlHw4u7cjX5CPlpcDDnrKRcktp5HzpB15ieBWl65q32mZ3Rl+A3lN9cMirJHH/ctyo/z9ZbieKenRd2FIG6xOs7lA20DIwWMWVcxVrvTXzWXCCVPkYvrvXhWaXCtlLRVYg5A4zuzXOcxL1VQKDJ+SdV2wCUaeX4BPaEzSDjmryGCE4XoA5SenuYVQ1jTquiQcedepQ6lMNKoa8d5f30TPJ59hsMjXh4yBSZPIwcSouptpi06Jm9AWZcH2t45Eo6MAlqUIQMR+fs2lKpG3THq0Ul6DWpIoNJRJtjR8V8JQef6JiI1kuyK1By6+jkS9OHUOYvSNsJ6AezoOBxbJJNMr06bqMXODxC7Qis/Ur1mN8VshnaEOzLq3oSH5XQ/VddNjOElKs7FCVcyI/UO0ljSbNr X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8898.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WoBKoFY2GxvqRxj6JhTPVK2OKPNCS9Pw1AK1ig9VRkYovSyH6kOQB16v+H69bSQ8xrPOPO3kL0fP0aOFZ5IIprs67KlRx9osa+IzVPDrYVwNhGttzanMCkbYyrUGEd2vyYgp+aeldnUJWuEd5Zh2KWFxBSK9PwiGmZoWSMvDKUaETjmBX91GuxF4DsFd+lVbfZQc+jOldGDtpuG0fngKC+pgoYxOg1yVyxnYRiUB6KtR8ynpzal+djaNs8ZJGJyL1Hr8IBgcitv4wYK0PXFlD78H56KQugbKpW32ZprO8Z9N1E8X0PN01kPuoaHeTyJTObgPbtLl2rJt8FqzelnxCRXbz/fS9T2SMgeNw8N7L2tDgX54nJ5nYMuxo5m1RYJ0pJvfeZH/DBZJhWpWWEOGKpJuLGkwpIEpejTvp4Ly/M5XWJGkWueYGFFr++g+UyZqWNh6fIEt09+Iipb5mHhzQ2AvbwD5B/H0MBZl+8Ru6iLhWi2/1Xl37H2bfk4VpAllJaqJOIuGSuKXQFw7BQoRaDmsd1qpvr9SolO4Mcr55du5NdvN7Ie9PY1WcWPbH4il/eSKN8PgPYYKofeC+CWe1IoakrH0YncDxX5Qh/N3Dygba7javq/1EnxiGrmnx9cg4z2uGg2TVoKRAoWboAS/TsGxcXrtcymBKKdC4DKZiwG0RF4LazrHekdtrsk3uleMFsllF+pzsL5aPKXEPDk4uQ/j6R90e3mNDVBcD1oBAvUGqjVw7UPbGqD3DU8xCDcG12NUC/DBJLRWbs4x2qdA4tyjOKicWlOx3duZYHE/0cRCcoiGMbHJaP6ScY0sbWfCzfFiPTXDyqDJo1gRPYg0zTj3Yy9pwtIRuwUm/ryrFsvqv4+WXQXN8GSZaTVM2IfJS4oblk6YpbjWY3OgkgbpdXK2HcRXVp01fKVEJyBQLYaSyyuq7GQ5pVK1pPcUpGREVKXiqiep/O04HT9o6IqWYDi2hlIk1ctxDOMso/bSsgfkJnxN5qrLdh2XiS4E+idSKyj97zuMM+mBDff2MVPYZs/kYCy48MlL4/0X9OHr/C4EbIqQuLyOQw5+Q3t/9swfgRVf+OYlztNxNCMOoXtaL6jbCLU5Nqx0jNwSecKtF5Q6AsnWJO08FQnE2mMjVIPRiDIjczeIDwqjxBVA5u8B3fgbrTYDcbrKWNutBsmzK/hgN0/AykO+9dws9ECTZWC0SqwS4zk8L4y/TcGvKYUS1+UaQ6HaodN86gYWNv1b+SrcAA8BVVMg0oeLDZ90TYJwv2TqcQHlUbj3FT+mQ+gEnc53p1GPthDg7ICOXx0394a/PZ72pyMkOVgCmM2cB7h2UbUPkxR5oTLlEacFngKRRVtm79rhKeQuhIWV3Ih3/frQfd6OKtF9JAONQgiWhnBSflr3cjvOXoDm4CFgQhFMESSG3pOhqwYd7Gi3FiwNWE1pxcYLx2K1BLdZxtH0oJsTZeMbGUx0CDdT0DzfdpqUKBl+3SYnLSWLvoKENDzx7JHHNs91ZBCwNsYwUg2s0Mqst+7hUsUsc0fushHqLGbUdTD12yNXjwjItiJs0tzJOHwXgu6/jod4ODOb6fWXd6jVgQHTm/l77coPJHpNbyDVRA== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e79ec087-a113-40bc-5aad-08dd5d8f159c X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2025 15:45:28.1765 (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: Du4zI1O9XZ1dyUS4RYmGPDHI6vdu8zcLUZ0RzKCO2Y4lw/O32EeqiFBMtUDb+LBTfe89OjBEr9vSRZgsijzD6g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7727 This adds APIs to convert iso_qos to bap_qos and reversed. --- src/shared/bap.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ src/shared/bap.h | 5 +++++ 2 files changed, 56 insertions(+) diff --git a/src/shared/bap.c b/src/shared/bap.c index ce579e171..1cf0fcfb9 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -7505,3 +7505,54 @@ bool bt_bap_bcode_cb_unregister(struct bt_bap *bap, unsigned int id) return false; } + +void bt_bap_iso_qos_to_bap_qos(struct bt_iso_qos *iso_qos, + struct bt_bap_qos *bap_qos) +{ + bap_qos->bcast.big = iso_qos->bcast.big; + bap_qos->bcast.bis = iso_qos->bcast.bis; + bap_qos->bcast.sync_factor = iso_qos->bcast.sync_factor; + bap_qos->bcast.packing = iso_qos->bcast.packing; + bap_qos->bcast.framing = iso_qos->bcast.framing; + bap_qos->bcast.encryption = iso_qos->bcast.encryption; + if (bap_qos->bcast.encryption) + bap_qos->bcast.bcode = util_iov_new(iso_qos->bcast.bcode, + sizeof(iso_qos->bcast.bcode)); + bap_qos->bcast.options = iso_qos->bcast.options; + bap_qos->bcast.skip = iso_qos->bcast.skip; + bap_qos->bcast.sync_timeout = iso_qos->bcast.sync_timeout; + bap_qos->bcast.sync_cte_type = + iso_qos->bcast.sync_cte_type; + bap_qos->bcast.mse = iso_qos->bcast.mse; + bap_qos->bcast.timeout = iso_qos->bcast.timeout; + bap_qos->bcast.io_qos.interval = + iso_qos->bcast.in.interval; + bap_qos->bcast.io_qos.latency = iso_qos->bcast.in.latency; + bap_qos->bcast.io_qos.phy = iso_qos->bcast.in.phy; + bap_qos->bcast.io_qos.rtn = iso_qos->bcast.in.rtn; + bap_qos->bcast.io_qos.sdu = iso_qos->bcast.in.sdu; +} + +void bt_bap_qos_to_iso_qos(struct bt_bap_qos *bap_qos, + struct bt_iso_qos *iso_qos) +{ + memset(iso_qos, 0, sizeof(*iso_qos)); + + iso_qos->bcast.big = bap_qos->bcast.big; + iso_qos->bcast.bis = bap_qos->bcast.bis; + iso_qos->bcast.sync_factor = bap_qos->bcast.sync_factor; + iso_qos->bcast.packing = bap_qos->bcast.packing; + iso_qos->bcast.framing = bap_qos->bcast.framing; + iso_qos->bcast.encryption = bap_qos->bcast.encryption; + if (bap_qos->bcast.bcode && bap_qos->bcast.bcode->iov_base) + memcpy(iso_qos->bcast.bcode, bap_qos->bcast.bcode->iov_base, + bap_qos->bcast.bcode->iov_len); + iso_qos->bcast.options = bap_qos->bcast.options; + iso_qos->bcast.skip = bap_qos->bcast.skip; + iso_qos->bcast.sync_timeout = bap_qos->bcast.sync_timeout; + iso_qos->bcast.sync_cte_type = bap_qos->bcast.sync_cte_type; + iso_qos->bcast.mse = bap_qos->bcast.mse; + iso_qos->bcast.timeout = bap_qos->bcast.timeout; + memcpy(&iso_qos->bcast.out, &bap_qos->bcast.io_qos, + sizeof(struct bt_iso_io_qos)); +} diff --git a/src/shared/bap.h b/src/shared/bap.h index 248871b12..dfd169980 100644 --- a/src/shared/bap.h +++ b/src/shared/bap.h @@ -300,3 +300,8 @@ unsigned int bt_bap_bcode_cb_register(struct bt_bap *bap, bool bt_bap_bcode_cb_unregister(struct bt_bap *bap, unsigned int id); struct bt_bap *bt_bap_get_session(struct bt_att *att, struct gatt_db *db); + +void bt_bap_iso_qos_to_bap_qos(struct bt_iso_qos *iso_qos, + struct bt_bap_qos *bap_qos); +void bt_bap_qos_to_iso_qos(struct bt_bap_qos *bap_qos, + struct bt_iso_qos *iso_qos); From patchwork Fri Mar 7 15:44:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iulia Tanasescu X-Patchwork-Id: 871320 Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2077.outbound.protection.outlook.com [40.107.103.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF94F21D5A9 for ; Fri, 7 Mar 2025 15:45:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.103.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741362336; cv=fail; b=CvLb8DLhde/xmTqvHt0sq2DhZko2z8de5kDN5Kyuh+wa0SVyTm3Y5PAlnkEP3z6Asfb+6FllGUTLDWRnGF0s3iead99CIbx8ZyqSLNFrK1bNDGF6j8HJnTPup9dujE9dkzw+qG9DucZqJmGqxl9RAq2ES3V18J0hTLlC3kvnXtw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741362336; c=relaxed/simple; bh=Tmevk1YolWsT8QaOmitiyYwl1MqlJ0ovl3B5dHe4gWY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=AAaPSsZLcK4SO+JO5dPcEVe6n3hIYR2HIr9iHsMOojsSj3h4SCKQDhGJzgEMQxlnSFFnk6hJ5Bs1nlGcepGyNFpo30TVhViSEX8Bfp7JNiRUzIGZ5P8PcznUB2sIZkmigJYg15yNM3mpSwcdKyV+DHGqBwo+pDtz03ZeUxTHw+c= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=Q4ISkK0F; arc=fail smtp.client-ip=40.107.103.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="Q4ISkK0F" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=As7XsX1uVd+u9G6o1TS7pfplALI4xqI+MXMQ8KPxhjJa04gqTCO8N5Qn8K8up1RJK0eevgC6rDLc+piWjjuMuBKIx/V1UuEeeJ5deO+Pm8MQVy7WtDAwSQAI9LFhNCNtEPp6Xs1DcDcZYpvCwt5yGr0nrExfx2wRhodMEwSIbSaA/WCqcL8YZCcxwNLSBCkMmWMRsTIpanlZHPF0hafrIbKEdZlqwcXWfHFz+Z3vkvD6KWq4md5mAYVq/J/xOTlsX9CfMYT6l+aHHAg79xlekdmZLcLFniz3BRLxCvhBsSd6sJwu46DL+P4YSW1LdQFOve8JVunk+I4L9n8cTR0OHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+VL+pIp/IkPBnR3q5a1IHiSg2MNEMlJSyz/azogNn2Q=; b=OXujSXDl8tiqnpcf4YcqsNe5wKGvAXiXvHPng+oS6QCD15xtbGvGNRIL0QxHSod+yLCI2kh9PvaqxWAgbO4TDtgl/cvIFJD25onum3c+GraGRkmmudsSzAj0yEI4hc/pnaJyTWqve2rathy33noiKqw67Bgh+XIjzPosltmOr4nffthOuAZqCf1W9+XUPJb3deDf1dpIk3iBGnywSVrlKD1RPy5Ndv20T0AhixU29WmwPuQvosmaVBWQHWxKLMOS7FXTfG1wBsDuECZZGJYyFx2Pybe+Wgq08TxfkX6exlahPo9N6+lO5BwfKvpwgl3eSf6dR3RbGDu3BvnPW0SaAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+VL+pIp/IkPBnR3q5a1IHiSg2MNEMlJSyz/azogNn2Q=; b=Q4ISkK0FefqRNo5uixvYxnTJwnJAYhvMJWU+gfhBl+c3P5aK/Je0u21693DN74FbcXZKikmLF4YSJyAXWtpe3PUmxjwynhOFwgw7oa9sftNBXsk9aUQqzl6p3FbveMRPOpRj0l5ELqcaiC/ohmkS9QcqRn9AWpl6Ulb7HOBzzPU2GXdxYsvbh6v0zGZIFEmqTLDS3GxnxBpoLSW7QsVlGpfRZQHzFV23aigYBtFuEIDegTAS/xGdtwyXvgkt+0kni7tCnVlr0WLI2FpXNYgaYljPHtCyZhknY1wLTHNeXjBS+SxxZVcFaVMG0ErPhMgelrzBNsuM7P6APp81hQCOcQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8898.eurprd04.prod.outlook.com (2603:10a6:20b:42d::15) by PA4PR04MB7727.eurprd04.prod.outlook.com (2603:10a6:102:e0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.17; Fri, 7 Mar 2025 15:45:32 +0000 Received: from AS8PR04MB8898.eurprd04.prod.outlook.com ([fe80::5e22:869c:33c:9654]) by AS8PR04MB8898.eurprd04.prod.outlook.com ([fe80::5e22:869c:33c:9654%4]) with mapi id 15.20.8511.019; Fri, 7 Mar 2025 15:45:32 +0000 From: Iulia Tanasescu To: linux-bluetooth@vger.kernel.org Cc: claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com, andrei.istodorescu@nxp.com, luiz.dentz@gmail.com, Iulia Tanasescu Subject: [PATCH BlueZ 5/6] bap: Remove interface Date: Fri, 7 Mar 2025 17:44:56 +0200 Message-ID: <20250307154457.85751-6-iulia.tanasescu@nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250307154457.85751-1-iulia.tanasescu@nxp.com> References: <20250307154457.85751-1-iulia.tanasescu@nxp.com> X-ClientProxiedBy: LO4P123CA0187.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1a4::12) To AS8PR04MB8898.eurprd04.prod.outlook.com (2603:10a6:20b:42d::15) Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8898:EE_|PA4PR04MB7727:EE_ X-MS-Office365-Filtering-Correlation-Id: 03cfad3a-539a-4d7c-e33a-08dd5d8f17d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: EfOGPuyiBECCjI9kz1skIVhOOOCCtt6a0o3Vzsl892ZCFn60DWbjKGo6Gn28gjK/SaF/3Re0yGklvf1EC+4WAuBLO4x6LjhUfKtbWvvt4miDnDY4ZID/8GAecPcgBAZWnNcWVAafwpPcKmGFJIjGuI+uwNwHoi3wi2pUdDK/nsIVMfKGil+OJ1LkAyqdcMQi6tLHtW3pHTbxcgMpDMY81gsF3Ha5nsqk8L/eyi/1qnHqzuWYAvbZ8NwrOtSbrHRrk/dhVWPUPSxy+/yME/iV8YRY1+9queQVeSi8lLRQyVy0+mqRsx+w3uGDmLd69ppRAevgqT9fipfekcK3QSFGyu1WYCFgJ6amTjra1vHyPOcDcuqdYaKr+9SHQTRyzQxUNx8Cao9G7yDCvEn+ScOb/e/7oNL0WszHxeilBHOWS9ies64kmzbDWAcjT0d4j1jdwjRyTcwPjQUTZ87ZC2OpFprlWz6TiEkTQxws1SK4ew8pZFEHxEHZlsgqdoUapPbpY9ERQylqjUHzvLA2FqS179fIKchKM94V6sw6wYmT20RPeoAPqqeQcLKOBIC+1bXF4SV8mux09WDQrg1t2SH9GczcFM65ijlwBzl50R00h0iB/+yM1IT1NUMTu9rym/igWzsF8/LY8yE6Rv82tHIPuHi/B7uNj2h/0a0eyW0kQNEmqmUC+I+pdI8XxxCp8gu43FyOhh1AiW0ZVF5lJOaHqsjdwVnoS3Prw679v3B0x03tbsmT60t3lZaHaFSUcQPMDujcIlzynUHFvSOBMjrke+4QR5MKAMabrizve/3XMv+kT9H2TCFQuh/aI+iFtcQs74+lLE8ozzqhSVqkvitW5JA11bdG/7l8a/KYmAcZb9HGO523gZRGh8dqy+cVh3plLRrniUvuHch3udYZi/8ZF1UZBP7xS9lLH92lclGEqHZL6GLTh5JeWSJs7jZ1/8WyZQ7YgnAuhN6cCQeODYw2UdlUz20UxrmTxxsOd9+Wsoubq1sdXTyDfRnxSIvUkCoK5ZPiEpNKFUWt6lO5JRuoMOGbkjaH4+/x6xtuZsUXGVq7eQ4j+025uahFgI7KvhRf094x+eijcKUc87fcf93kDz6sq2HtfRudm0Mt2I+QSGctP0AqpnGlnNKK9e4zONOLbH8yegOrlSB7lgv/G0l8Gsr/e9X3mLLUAcaoLntO4UVp59uY229a6saWx+NBDJZpl0qKsAsJmUqQDSeBs2NxMEDTwr5XHKmcDu5iBEcjeZaBQ35j4YKNnnRIlAa0NcBDiD9uKzZOPf/dLBY2f+QW4SXbHSkk8ncqt5q6U/8Yy9bBr3zgKRf9qnwwTwjxITKRtf1FJ83I4cBX15X/tR8r+ApbzLzwLc6Rgf7eRGEox6bZeoBLvqxj0Vctd0tOcVqr X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8898.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 16Fr4ZjM+zdAXWsJWx3BowAk+/vLQx/w6NeE6D1H9y9tvGhnLrOnDmS7regbckcOdjogEBvr7K+Ho1xTAdZYTJtS0AJYRkmPgwQhvvhSdNFDJoO6YqzwLXI7vU2R4mOwSjDPJNrAN3mfh9QaPUit/ohJZ5nHPLUPuPPKDVD4xVtYpf0UQsJ0vmlRU6ygiZTJT2xXJjZZ9ozPXdl0Oe8zG+omLhRNN2IKHWmzTEQMQVUMNPXSggMi8sJ/a8FMIFe+h68B0n+19tpszn+pbVkY8l28p7xl/S2xzsgCqDFWk8tBY0v9pxHTKbAe/uz/puQxKTJ7rNaRgdcc8q58Sg+AjDfyzodQzkfQmTzq1ZGXrAhldpv2bMjRqgM27DXJQIl3Wc2wVJ5t3lT3D2Fz/RRlDlhEwiABba8BVX5K7oE3mcmnk/uC+WHFWG6dypmVUWesm7+2BHX/iQpsLwmxNsrXXAOTDz1mVBamgwJN8XQ14Mp7lf7QADYQAWVPBMTbnpV5LLUz5c2YVISYo+GrXxn4U1oTWldnd47I+xljmcLYgf3e1qCsLSdsPelAgk33qrmPrrxNZFw5syBU/WCmunl4qAkg+BmiXzcBujfkfrO0SQi2fs8uD8fp1pim2J3zXDHfevdeuv5fzfte4KInCYeOETb7MmIKcqeSNWNdoSX3QXEQR55czTPUENXNmQRUNV67djtXCdvJC8X+SgByH0MUek3BjJbuuLQkYL0ecz7L97JeUQOKL60Jb1wsK7FgY+hPfjCMBSBAOKGDv2xfhGEMDAw9zLyzujvYm5B0jZ4cMFe/y1IyHWM9yxKZDL6n67GpY6zmqIFHBor7nZVjsmCJB6pFpJceFat4DDckPXpLlyohjZkCVni6gUXGbiHtHNdQGxNecJ5lcCy+LBv88SoQcfwXll/iFbsye1Z2Nl8V8BlTffUSnNNBqvzP5W/TzHRhQOM22wY8OUsEGYwGd8M+BpxN+sUeT8PvjktwRETsfqsXSqBReewB6wb+qkUB/BywBDqRYyfw2u6sQ9t5ClyzOmnWWYnUSL6MVgRkY77lDXpgj+4KbNr2nNkewf8TkQ27e/7J/gZGL7zxKjvchlY9+Bqmxchkk5ijuU1aD4RPzY6NB0am8t9SCd/fUjcgwJLaWTonokz1Ay6qYI0GolK53Q6GvP+A/9XfLxiB2s/cRlrHw2NJ/S3YSlMR36rUDeyP4LQP7U1dD9DfnFFLN22hAcFQ+COsjACGLUyx/mbu+3LbyKlp6qcgF0aIxQ/YBo0NaNJl7GHkNO5cpDugQWTMCBQeh2oR1Ayh81vDzttrsrxcJCmAlhX7MrmA8Ut3DJ6mj2ULNOhnNJzS+PyRjwc0GYMb50apBxplbrdDCGhvJw9p8mOzr9NdwAfHkrwGUurJZCzM/m3UDxo+U06zkgWPJlrgf0MsWrrwAWVc2YnvFrh+VnlkE2OT9G55sSd90AlAtvHESgX4YvQykvQWsC2ByTh/3HjcXd0iAYOytUum5v70hfdSBST2aj4qQRrDtOdu+9O/0IxGsvxTGv4C6hpQRMXkCvep1hsdP16gDn4r1PTPEeRWw+oyUcyx3z20pqa8Ldl8LI8JV2k9Y/R010UfZw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03cfad3a-539a-4d7c-e33a-08dd5d8f17d8 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2025 15:45:31.9370 (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: s/P4bqaOe2dCJ6YP0RoL5xBVeEwDTBMcgttaqdJuvuAqoEE7hGe9gmVIEa5Lcokmhx8onYZhXpLVxj3DUkVdRQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7727 This removes the BAP plugin interface and updates the BAP and BASS plugins to use shared/bap APIs. --- Makefile.plugins | 2 +- profiles/audio/bap.c | 57 ++----------------------------------------- profiles/audio/bap.h | 13 ---------- profiles/audio/bass.c | 6 ++--- 4 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 profiles/audio/bap.h diff --git a/Makefile.plugins b/Makefile.plugins index 43e665432..bae4363d0 100644 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -113,7 +113,7 @@ endif if BAP builtin_modules += bap -builtin_sources += profiles/audio/bap.h profiles/audio/bap.c +builtin_sources += profiles/audio/bap.c endif if BASS diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c index 1889e1a1e..a37e62f76 100644 --- a/profiles/audio/bap.c +++ b/profiles/audio/bap.c @@ -56,8 +56,6 @@ #include "src/log.h" #include "src/error.h" -#include "bap.h" - #define ISO_SOCKET_UUID "6fbaf188-05e0-496a-9885-d6ddfdb4e03e" #define PACS_UUID_STR "00001850-0000-1000-8000-00805f9b34fb" #define BCAAS_UUID_STR "00001852-0000-1000-8000-00805f9b34fb" @@ -1053,57 +1051,6 @@ static void iso_bcast_confirm_cb(GIOChannel *io, GError *err, void *user_data) } } -void bap_qos_to_iso_qos(struct bt_bap_qos *bap_qos, - struct bt_iso_qos *iso_qos) -{ - memset(iso_qos, 0, sizeof(*iso_qos)); - - iso_qos->bcast.big = bap_qos->bcast.big; - iso_qos->bcast.bis = bap_qos->bcast.bis; - iso_qos->bcast.sync_factor = bap_qos->bcast.sync_factor; - iso_qos->bcast.packing = bap_qos->bcast.packing; - iso_qos->bcast.framing = bap_qos->bcast.framing; - iso_qos->bcast.encryption = bap_qos->bcast.encryption; - if (bap_qos->bcast.bcode && bap_qos->bcast.bcode->iov_base) - memcpy(iso_qos->bcast.bcode, bap_qos->bcast.bcode->iov_base, - bap_qos->bcast.bcode->iov_len); - iso_qos->bcast.options = bap_qos->bcast.options; - iso_qos->bcast.skip = bap_qos->bcast.skip; - iso_qos->bcast.sync_timeout = bap_qos->bcast.sync_timeout; - iso_qos->bcast.sync_cte_type = bap_qos->bcast.sync_cte_type; - iso_qos->bcast.mse = bap_qos->bcast.mse; - iso_qos->bcast.timeout = bap_qos->bcast.timeout; - memcpy(&iso_qos->bcast.out, &bap_qos->bcast.io_qos, - sizeof(struct bt_iso_io_qos)); -} - -void bap_iso_qos_to_bap_qos(struct bt_iso_qos *iso_qos, - struct bt_bap_qos *bap_qos) -{ - bap_qos->bcast.big = iso_qos->bcast.big; - bap_qos->bcast.bis = iso_qos->bcast.bis; - bap_qos->bcast.sync_factor = iso_qos->bcast.sync_factor; - bap_qos->bcast.packing = iso_qos->bcast.packing; - bap_qos->bcast.framing = iso_qos->bcast.framing; - bap_qos->bcast.encryption = iso_qos->bcast.encryption; - if (bap_qos->bcast.encryption) - bap_qos->bcast.bcode = util_iov_new(iso_qos->bcast.bcode, - sizeof(iso_qos->bcast.bcode)); - bap_qos->bcast.options = iso_qos->bcast.options; - bap_qos->bcast.skip = iso_qos->bcast.skip; - bap_qos->bcast.sync_timeout = iso_qos->bcast.sync_timeout; - bap_qos->bcast.sync_cte_type = - iso_qos->bcast.sync_cte_type; - bap_qos->bcast.mse = iso_qos->bcast.mse; - bap_qos->bcast.timeout = iso_qos->bcast.timeout; - bap_qos->bcast.io_qos.interval = - iso_qos->bcast.in.interval; - bap_qos->bcast.io_qos.latency = iso_qos->bcast.in.latency; - bap_qos->bcast.io_qos.phy = iso_qos->bcast.in.phy; - bap_qos->bcast.io_qos.rtn = iso_qos->bcast.in.rtn; - bap_qos->bcast.io_qos.sdu = iso_qos->bcast.in.sdu; -} - static void create_stream_for_bis(struct bap_data *bap_data, struct bt_bap_pac *lpac, struct bt_bap_qos *qos, struct iovec *caps, struct iovec *meta, char *path) @@ -1197,7 +1144,7 @@ static gboolean big_info_report_cb(GIOChannel *io, GIOCondition cond, iov.iov_len = base.base_len; /* Create BAP QoS structure */ - bap_iso_qos_to_bap_qos(&qos, &bap_qos); + bt_bap_iso_qos_to_bap_qos(&qos, &bap_qos); bt_bap_parse_base(&iov, &bap_qos, bap_debug, bis_handler, data); @@ -2962,7 +2909,7 @@ static void iso_do_big_sync(GIOChannel *io, void *user_data) queue_foreach(links, setup_refresh_qos, data); /* Set the user requested QOS */ - bap_qos_to_iso_qos(&setup->qos, &qos); + bt_bap_qos_to_iso_qos(&setup->qos, &qos); if (!bt_io_set(io, &err, BT_IO_OPT_QOS, &qos, diff --git a/profiles/audio/bap.h b/profiles/audio/bap.h deleted file mode 100644 index 2bf93dd93..000000000 --- a/profiles/audio/bap.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * - * BlueZ - Bluetooth protocol stack for Linux - * - * Copyright 2024 NXP - * - */ - -void bap_iso_qos_to_bap_qos(struct bt_iso_qos *iso_qos, - struct bt_bap_qos *bap_qos); -void bap_qos_to_iso_qos(struct bt_bap_qos *bap_qos, - struct bt_iso_qos *iso_qos); diff --git a/profiles/audio/bass.c b/profiles/audio/bass.c index 6f68b80f3..d987987ff 100644 --- a/profiles/audio/bass.c +++ b/profiles/audio/bass.c @@ -52,8 +52,6 @@ #include "src/log.h" #include "src/error.h" -#include "bap.h" - #define BASS_UUID_STR "0000184f-0000-1000-8000-00805f9b34fb" #define BCAAS_UUID_STR "00001852-0000-1000-8000-00805f9b34fb" @@ -370,7 +368,7 @@ static void bap_state_changed(struct bt_bap_stream *stream, uint8_t old_state, queue_foreach(links, append_stream, &iso_bc_addr); - bap_qos_to_iso_qos(bap_qos, &qos); + bt_bap_qos_to_iso_qos(bap_qos, &qos); if (!bt_io_set(dg->io, &gerr, BT_IO_OPT_QOS, &qos, @@ -532,7 +530,7 @@ static gboolean big_info_cb(GIOChannel *io, GIOCondition cond, iov.iov_len = base.base_len; /* Create BAP QoS structure */ - bap_iso_qos_to_bap_qos(&qos, &bap_qos); + bt_bap_iso_qos_to_bap_qos(&qos, &bap_qos); bt_bap_parse_base(&iov, &bap_qos, bass_debug, bis_handler, dg); From patchwork Fri Mar 7 15:44:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iulia Tanasescu X-Patchwork-Id: 871712 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2065.outbound.protection.outlook.com [40.107.104.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC83CDF71 for ; Fri, 7 Mar 2025 15:45:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.104.65 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741362345; cv=fail; b=mN0baKSVvbYkFGqDfGJ05A5gH0jlDXDC++mJr7t8HbXbzBu1Ic4tOLrOwasaB+J3sEvNfwCQwyNA2yBrVTmj+F0wFFsSlMfXZHive5wcg7pUy32nOTLOr5nmYbppBpk4uDSSlPKcdjdryePSDB14Bt7JYUtRlVrGb2l2bRo+li8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741362345; c=relaxed/simple; bh=YGJWSjtVHWtv4esQ0I4xf4GUbiumxBIl1zsRMbSFEt0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=dHaLeZAsAaKDvjBbxTs3jc//R0ZC+6uPYwqcaGI5FESboKS96hMRxF2KK1MeByW4Bkmhm9AyARuzQ6Q65RsJW177onY1z6z+DeFsCHVyk9AZwDOLantPJo+5KzRnpqQOACc3QkwTD6AVf1LhmBv962O10eY8LGEkq3kuda5nJJQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=dT4QLAaQ; arc=fail smtp.client-ip=40.107.104.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="dT4QLAaQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QVerPidNDwg/fiXdreOOafCFK9+3tOgbf2LW3TQtIxhS0lm0mFM8Jte7gO3/vOry8ZwZanRDqIypTZKhX/C8hRyI6Kjx+fEXoy/ekVRSprd2EjtOsdWVxgJZd1VNAc+ywS/BmMALIcAN09AK3TmjSSwXXWKNEoCvyKPKB/bnp+kptT8HdyEyNQUxdWuMNvW4TTkFHflP4S5Ugbl60jDdD1yWKRhJUiM3GVaJ/I5G11yLdMRIwGFkuX+xpneLv0o+LeK/ZG0FpRkjbC/axofHZc7zsz55/e3Ceyi05n7G+dKC7J4515Nel/NzNmtnpgRGZKFMSC1j+a5Gk00xcf4TVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=blQfwpCL43xe6W4TqD46dHMHQrBULxWpAF/xp+f3I/0=; b=hUwVQD79lyhjQeQbvjDZwFRDsBhsSoMVXJ//AvK2Y5Yv/esodrF+UN5TwBPlpW4Ke+zQJpWeTjoHMvvfowXQwG341+b7HEWzGZdSvVdKfMfyFrrhe+E5NXZ+ZyQC3naaTsV+uWNhD4fwnsAxKp3LL+imhurCafEvinTFrI1OwrdK6QYrH2IMpbAKdrp/gXxX0ltc7aBLc62oBz2z84vuqAkBqsBULSBqu6IedDkNhbv6s9/ECUy8JQDyDYzRP7SiE7Ua5cRjDQ2pDzRaDI55wxzZmH4gvGCbczgtL2x4K+js6d4/2MIO08F1Jm4YSunmTNxuSsfWL19Dz5Glt0mOpw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=blQfwpCL43xe6W4TqD46dHMHQrBULxWpAF/xp+f3I/0=; b=dT4QLAaQNd2N7bi0NyfUHRG0cwt3GrOQOqmccvpbra175A+haGW4gQ/ugEynEqKM/D4E95W+0sZbsNE6eL/s/GIHRD2clvCBUyHrc7kOagMoSArF+XXwrWmbzyoHPVyq4gvq7t1TsROWM0yM47Gp3oc6VfeySZV65vnJcLgbTyF5BQisTwggRk2P+mzW2lcEbGYZHy5ZoaVtE9e1Z265omgKcEhhpU7gm12E2yhx3x78oL2p8jdyIUzgUt006ar8C4U+kGNhRf3TrlOiLhcoF4/qIg2B9y9Xx0ptVQKrr7EYLAzdlQd9ZSjYX9B5P3T6znEpznlN/jQzqzJMuto+Ug== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8898.eurprd04.prod.outlook.com (2603:10a6:20b:42d::15) by PA4PR04MB7727.eurprd04.prod.outlook.com (2603:10a6:102:e0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.17; Fri, 7 Mar 2025 15:45:40 +0000 Received: from AS8PR04MB8898.eurprd04.prod.outlook.com ([fe80::5e22:869c:33c:9654]) by AS8PR04MB8898.eurprd04.prod.outlook.com ([fe80::5e22:869c:33c:9654%4]) with mapi id 15.20.8511.019; Fri, 7 Mar 2025 15:45:40 +0000 From: Iulia Tanasescu To: linux-bluetooth@vger.kernel.org Cc: claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com, andrei.istodorescu@nxp.com, luiz.dentz@gmail.com, Iulia Tanasescu Subject: [PATCH BlueZ 6/6] bass: Free stream path Date: Fri, 7 Mar 2025 17:44:57 +0200 Message-ID: <20250307154457.85751-7-iulia.tanasescu@nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250307154457.85751-1-iulia.tanasescu@nxp.com> References: <20250307154457.85751-1-iulia.tanasescu@nxp.com> X-ClientProxiedBy: JNAP275CA0021.ZAFP275.PROD.OUTLOOK.COM (2603:1086:0:4d::12) To AS8PR04MB8898.eurprd04.prod.outlook.com (2603:10a6:20b:42d::15) Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8898:EE_|PA4PR04MB7727:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d1812f7-d61b-43b9-744d-08dd5d8f1cdb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: T5BdWVEsHLimF7sqof69S8K39L16ykZo4s1oWg3rCtpfZlwO9F2A7BXZgguTqtVFIBoQXERfZh+vCaqps4jscQX3eliG1Io8cHFS5HQsdOz2Rem7pzcKlR2x1DxEarwFFV8MTpJtL3dxsSGUXPzJ+3SLWocehhxCSfP024nmI2sHC45vXNeTYC62r1kdVR46HABMh/il+It2mB4dgg6l5C3ysN9baNWu0c5InV7Ky9qXsHdThUbFiLH4DG40nqUeFv1RrKf7HO5kr1s4HANe+iVKwILf6EeVDHMiLTUIQC4CKwl4ZAWK8L3OkfWWybnJ8YzSvJJ3iNEEnVo90XFXq4HW34wTNjOnwdi6kCqwY6tVlhlKPfrDG3Pfc/Mw7FrIwolWWBh0DvJ/O5KcmBH7UtT+TgWmZ7+d2XgOsEgQOKU50iWqrWdVE0VIDR+iVLULk1CWH1H9kGdyuAWMxliw6MtoZqKtVif2n1RBT1TfrDt+vYrrqE03ACntZbabw5K/WTQuDpEYUEi2pPaUKvVHR9sEIB1YhTIAhstOep+v94JnPnavrSqWG2YLXO2ZPG8WRqiVcsBIf2k5vCa39zksMHapg8hi7aykvZeqb4vkUdD1PCRWUrmhk9CIRAWD7XaGCsRjYLynG70sH7PZVfxVKQe95/ZCZDmEf5Ptx0qAIvmYugLuSIEw3fy30afc2W0gPbMH38/uG6VgS3oeLRpQbIMeUShz/8E39mi8CMv0FQAj6VcnLXvQ+m4WEceU8EPllQg3b9eF+nfs0+mgGndoeC/i1Nzy3zD/YclJFMPj0yn9FL0DAVMOWAo0ZO5FFAvBqrq4LdPLIip4IqblgXvYDm1CYcik7N6EWp8/8WzcwNFoPdp/BgqNH4h142z4l5aUwjiBsYk4vytBsqlPWJZIKljnMBTT9bAHO40xsALDpYaRaGEvFEACMKRK1I02IQcvXzr0oZbUVqoL4yiV2uAOACMzW5ujwqvHc3dMJ/IoGUIZecD5Lvw4Sa9irZF6ytjCYezuYGZNzZraAO8c77xDwzR6D6RkJk4PCerbonyfZ830j5o7HamRtERSXdXEbAi4Vh9kLFIPaE/SSnhrhjdS02uGWBugCkU5ZQyPQYxEHkF5SC/5cAZTQs2Zn6MiFXQ9RNEePNLY1lpD9ex5JDeBcwAxZk2Il5X7vOGQxIPukk/3u3rIzxM6SkwztHGjnJOigM+KkqTE8Qi18HxM7La1W7i4kvUYYdAqI4g9R12rZlm/vkPOjHUPrNVpE/ct8lKAE60LfxrYO+BS9CJROYcsyeErm7m4bv8XbXDnPfSQaoGjE+V0zuGagZ/tslzGEVEHK/iDbgBRMQtBnZwyV/VlmhPub5O0c4AJLYwyjjwss7+0ZXAhqpnfgbAS9MqcLAxO X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8898.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zRDfR2MnKIIC5hAmGa4suKusDudZfFQ7VDha+PqVAQw7kzDI7HzDp0Ag9MuiFSadpQuvMcxng3ae24EwdvrMBvAx+JMJbVjpKp+wGAZk1YzurzmIL2Abs8RV5pOQCbK8drIdJ9jankWJLhLOYYaluy07NAWDOVENNnDGAWUxyfurWUgq358WYm+NSwN4wTiN6iJNsqUAoZHE1bkNmp/UMgtV8ou21ZKSeyI7ygK6FNomPXtk4oY56TPaa3Vo+su+9Pt/0ZHPp0fUiz6yL4GKt7ladr2SvB2mcR7k7qeTGZgM24YJPSYhMmB4VXfwPVXXZDWCHE20pn4DA5ZVlpH2W/FOsHYc+hRmxJwvzEvFzP8hPOv0hea/CR/ruxQ6sJbfOPQffcpZrIsRnfEia/8weujY/4GKCu/XeO0Q2vbPg3/wHo7dmGgT9xxhiN454ogAPz03ywzZmoIpZ+nvRCxIiSHSSKCohWeBsUSPjhupaFREBoON79R9aKpHeL+6eS1CfuCq/8taLhHazE2odTiA8r61jB++p0oX0PTskjjgOrAU+uMMuQZuf4eJGizr6HM9/aEllZR+9EAgVkLyixh6ERYQPPBSc7zoB/k/8+WRPF6oIuThppNBo7EAcP8MET6clN/z1PR6qVSjM57ascKfxoSVaNCJpsul7bTAYcMri9FqcfNr4Xv3jM6L87WxBjORSkf9uHP8CD0V1IxP3lpYgKFIVeztQDTSGFCFZnrlSZkL21+GuLbh04kHr16SV0QwlnVXZbmemyHBn1SgnjNyPCPgX0cmM8SVG0qiZ9XnwPojwzKMtVwLK3upQx5Pr3uJkThFkRXhD4r557QaPTYiEwjH1gyBWMy62rxJ/mdHTpmua9E+ol4tB4qa94L/8+W4CFSczZ6GCIJuqKJYDoWJxWBjvLvysQP5pg4zllWwcdz2QrXMMcktPnMdWyXDUWybj1JUgZcdU0XqZtBDj5HB3jK4dSySOcmjpLHzJ/JUYJXuph8RPpsnyI/48rAeOwLh225oAYaHY92oB0t2Fi7BG5z7g85T86M69JQwrqb+eTTWyNW9lcBuBkpupGK0JOe1T3egQ8RIVAqalZMcpD9b5UYXvP461bSlh2fibXA3xoKVH+mH3LJ2FMKOaRotzZ3lvNxcAjBlhyGyDSJboKsnFrm9c4cEbjatAJUcF+VHVfnhv3avAl5xUmhKfaRBkT5ZYyPotBVn1kd4ofwTCk3qGE32ZvUCO2Prs7Xtf5XxHpuUmfNE+PrXQ29nPFVyvSSGDIlnKnzwzSz0sKwgvwCLaq9SaQmW4ngwaHg+QYL8gW4LwFIDT4zBbSfBtwYh5vGaWkkYJBrYhinxxFIYM/IHlPXMxRc0Wvx6jrW+jH1TDP+kbs1vZcP7dEbrHzbWRZXjt9tXv4LPs7JdTyji6yOppK5USE2av5vigp/G2gqSZPiRviRsAgmlRr/pVJe7SN0CXLEJfDHko8uRUXw2bW5qv1UgeT9S3GH6ylyvivbyC5ZFMpYlwia0TKN5+nPGOUTBPvzwAc/Hr/jrf82g7vnaPYkHqYpvEkib27Dpi/FvLs1cxVoWHwhOcb8QXHxHoV7n4Ab8qmOUtBeSOLHRRBmEEA== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d1812f7-d61b-43b9-744d-08dd5d8f1cdb X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2025 15:45:40.4901 (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: x+gVFOdrPoIO+cqs/naMa3EtngAbpodEwDBMzEVioUhFAWhNTHbYtat8a4sipbc/q4PWAzwLrgjGT037RJmYbA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7727 This frees BASS setup paths, to avoid memory leaks like below: ==5877==ERROR: LeakSanitizer: detected memory leaks Direct leak of 43 byte(s) in 1 object(s) allocated from: 0x7ab1adefd9c7 in malloc ../../../../src/libsanitizer/asan/ asan_malloc_linux.cpp:69 0x7ab1ad08f937 in __vasprintf_internal libio/vasprintf.c:116 0x7ab1ad135d62 in ___asprintf_chk debug/asprintf_chk.c:34 0x5c2197401338 in asprintf /usr/include/x86_64-linux-gnu/bits/ stdio2.h:137 0x5c2197401338 in setup_configure_stream profiles/audio/bass.c:420 --- profiles/audio/bass.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/profiles/audio/bass.c b/profiles/audio/bass.c index d987987ff..d299791c8 100644 --- a/profiles/audio/bass.c +++ b/profiles/audio/bass.c @@ -116,6 +116,7 @@ struct bass_delegator { struct bass_setup { struct bass_delegator *dg; + char *path; struct bt_bap_stream *stream; uint8_t bis; struct bt_bap_qos qos; @@ -411,19 +412,17 @@ static void bap_state_changed(struct bt_bap_stream *stream, uint8_t old_state, static void setup_configure_stream(struct bass_setup *setup) { - char *path; - setup->stream = bt_bap_stream_new(setup->dg->bap, setup->lpac, NULL, &setup->qos, setup->config); if (!setup->stream) return; - if (asprintf(&path, "%s/bis%d", + if (asprintf(&setup->path, "%s/bis%d", device_get_path(setup->dg->device), setup->bis) < 0) return; - bt_bap_stream_set_user_data(setup->stream, path); + bt_bap_stream_set_user_data(setup->stream, setup->path); bt_bap_stream_config(setup->stream, &setup->qos, setup->config, NULL, NULL); @@ -649,6 +648,7 @@ static void setup_free(void *data) util_iov_free(setup->qos.bcast.bcode, 1); util_iov_free(setup->meta, 1); util_iov_free(setup->config, 1); + free(setup->path); /* Clear bis index from the bis sync bitmask, if it * has been previously set.