From patchwork Thu May 25 15:34:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silviu Florian Barbulescu X-Patchwork-Id: 686133 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F03FC77B7E for ; Thu, 25 May 2023 15:35:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241575AbjEYPfS (ORCPT ); Thu, 25 May 2023 11:35:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241195AbjEYPfR (ORCPT ); Thu, 25 May 2023 11:35:17 -0400 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2070.outbound.protection.outlook.com [40.107.14.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0738499 for ; Thu, 25 May 2023 08:35:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FYQX4YlxFaKP3eL9c03R7D0LCX5D27KrXY2v1KBRTMyNx6id4TdGRobXmDcNHfT9mLgBSb9IAf5miB6rWRLUYmlkzPkBL/C8IMbvcwOyPU1MNf9LyoreraFiZkX0etXeTfL2L7JGpBVOC2vbyHoNlZt854lZuOF6bd5dpSbc+TjgYhHhOZBPkZ4a4BzEeceehFFFu2JLaMluCeZdPRDXcjXsxgBLWXaqO+CaJVYiExlt/BnCv1V+RrKKfaZ2p1FErpvZrKMRQQgj/2xGamXlkV7fDPoVhqPGJps4s06BapnIw7NSjf1PfeECRA5B06BqRZH/3PG3sSEeAU0cUFXyjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=hkZaV4L7uO6NcYDFxKpuSJE1t07Jl3x/OBFt6mQeLf8=; b=kflAZsshl9bz8/Nljjmd6N6uQdomiatLhsPEGAEsblBjrW4JLLSluM61CvitaksscEMKYT+DsnuQwSITMGZFqmWR8/xgrxYEZ8zax8cFzm5TXQwberLFIH54mRPzzygH+S5ZLX/iT2Fm0OlDCqh3a+nP2qzgaCad2ehIEl34QAHZcxyVFby9Mo8wgnoz10AQoobF6SDBZw9Hn4SG1NouETK7VhgqNEhl0zljhLRnICiH54do7MRbMoXP7ZV/AObNxM520E/ihie9DfRDwPKyNq9TYyURbhnL29qEXyykDfqHI2xlW15gBN8MwTDUZmRkrXNS0OZnM8z4fxzRZ/4Cmw== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hkZaV4L7uO6NcYDFxKpuSJE1t07Jl3x/OBFt6mQeLf8=; b=rNL8pHa/4su2/e/+5pxPfsA0ejQO1JNg73Qrdzbmuo8hKwDj4NhTsy0a3lrCFBsTg2uE0YekCD1JrR92q8duKoUqm27qVT2iT4LPHcCb+WJ+kmXjt7JjHfvBcKvhyX12QyqDs3MnqFZyIAhVdsvhxI77C724/5gtWprZflWcoR0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5344.eurprd04.prod.outlook.com (2603:10a6:803:4b::31) by AS8PR04MB7848.eurprd04.prod.outlook.com (2603:10a6:20b:288::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.29; Thu, 25 May 2023 15:35:13 +0000 Received: from VI1PR04MB5344.eurprd04.prod.outlook.com ([fe80::981d:d04a:5851:1578]) by VI1PR04MB5344.eurprd04.prod.outlook.com ([fe80::981d:d04a:5851:1578%4]) with mapi id 15.20.6411.029; Thu, 25 May 2023 15:35:13 +0000 From: Silviu Florian Barbulescu To: linux-bluetooth@vger.kernel.org Cc: Silviu Florian Barbulescu Subject: [PATCH v2 1/6] Update Docs for BAP broadcast source Date: Thu, 25 May 2023 18:34:47 +0300 Message-Id: <20230525153452.125789-2-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230525153452.125789-1-silviu.barbulescu@nxp.com> References: <20230525153452.125789-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: AS4P192CA0001.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:5da::15) To VI1PR04MB5344.eurprd04.prod.outlook.com (2603:10a6:803:4b::31) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5344:EE_|AS8PR04MB7848:EE_ X-MS-Office365-Filtering-Correlation-Id: ec291cf5-70cc-4407-9606-08db5d35a193 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kF/d7GGG7T+ETKkDG4q8rxe3ImbOstdOedoMY4JCTiGqKoRtK5x8ko99vFzmD8zrus/zmHtHg+1bL4KWv7kFdX/FMgALVjsbbolZz2hNAbWI22Ig77bR3n/7CsAwL2yJrUzNa3zSdMjKertuizjFjKvqfRKdCWor1wAXSrJTldBQVjSQ2Oi/JMgqQbABho5ARHXF7DcH6p8uVlqU6g7zVDn9eM8Tu6PdFRvxXz0VzLpE5sMSHrATyNthZiEUcXZBMdljPS/Yo/620XqnDVujbaLr7pJw4EyhWVEfudrfw8jIWeTNd4Ph+62+vEOuhQU/+xOP4Y8chKzrxNIyx8e6FgMUq7IsF+s3Ez6v7SkX2sd+JEa84tvET7hpLrSzHtpd8DhHMwauSbjPKz0f0hRBjS2dJQas8yXU5zlLNVJAHDPLVFTMO/BDFrb7+LmocjSMuw2jczcN/26ELfP77xrKWs9vTmzZyZaBwDZDEDbvSzz+WAEwCyzdbEVBd85Jga3pnOGqojKpgk7MnpjlFFF6Q0VRMFsTrJq29JMOl+6/gHzURB2HXMzhI6/R+rTnSq/UdVuhrBn4f0VX6pLHJOn3MQSidg1nn85oTNCsjfGt/G1ffh5F/rWSsSoLzfZ22YPA X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5344.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(346002)(39860400002)(366004)(136003)(376002)(396003)(451199021)(5660300002)(36756003)(186003)(2906002)(2616005)(8936002)(6512007)(1076003)(6506007)(26005)(55236004)(478600001)(66946007)(66556008)(66476007)(6916009)(86362001)(4326008)(8676002)(38350700002)(38100700002)(41300700001)(83380400001)(316002)(52116002)(6486002)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: j1qcKUWldVGc1cQvJjoZ3Yiv7nmw5AAjhJSAuyr5Qq4XVrz1ILvnE4MNR+0BVDOlEwJnnIdNLxva1IVut9Hluymn7PxDLjmTuGciFra519/DVO/nBlM5uQjkLlydRwi1za0LYUJe3oXHzeOSDTtb6DMpEg2TucY9q9b9ISjaMWZqnTa1Mj9ZQq8haGQTrEVafGZOR+OHT70Sjymde/x50o/VXzNXpXPko3gDDfnPyhxhJTa+ko4+YgzZEnnYQ725xYBtAKmSgBkVEfxjRBbNHYcB6nqpEDSHrUGVf6g6CpfhGlVBTulK17HVjPZRHoU5HBbBlbj8o6nN+w0QaEgSOvjj8cwwobVzBPAW3tkzCPqYZMXxy7wbavZbzWr9aRyqvNUeGnWYF0WwxhMKjwO1HB9yJRaVLJ6gik5u7qIWTnyinDUPh92BhFpEo0YWPbFTeRfNR4Zo7rXEjR/c/Wbx9TPg7tddI9cZ4QjHD20AA8S6tHG97aiLCHSdLDDKEdMCoIMl3Z+sfUVvXsYkquxlFAVrWKk8QAFv/ax+MGZAgzdUe/Y/Fer1lTLpYqGSNl8EPfNUy8CREUg9jjdVvgHR0e8U3RTxtTkACQm8EJNMOoeh3+k6cmKiV7B/NpTol9vXYutlFCAY0bJrRgjtbN97bFFezd31QWgsS5LGtkrQzrx06rYZr7KiR60qGH6B1pxU9hFTNmfJcwKtj+SM6lgrko39merC4FhtBXGb+S3oIirQU2WJnidPyHv5sWM4/sQfpncTvz5XqvW2KxQBq8+O6fmRdk98GBwf77402JvTTQl8hawGTsOkzvDY6xuQjm6E/Rf1r0kyu7sHydTBEFgXZpy6P+qKJJ+Dlu8jKO9VBmotxXDy7yxFYavJBffniq+b99Yww14kO749j2fKgG2e+dW1JQfbOYKpIdLIwtJCSxaUp7cgRYE1LId3nEUMPjfJz9w2KC0xOsYGi4yibX6r7DRm0haLziwIxQ8kEp6Bmh872fCY/ztqx2a750VMdHuj7d26BqoI3Q4P6pHNPb7edDvs3J/RlTjg2PGeKdaFruE6RwXpMI3jnZ0rsFIqQOHK096JqJ7rzWqk/h1qfvDoyuJdj7X7RrfWsl+h4Bi9dqNcCKKe3/fqpE6DwIS5c3XT3rammxLhsL0MqZjInc8QBQxyX0reHnYJGjiH+wQoine6UXyNJyNYB/xgQuzDL8xKCk19dMK2a+bOPCUAuuFzMYiltkILitZxhr8v3LUTE4ceP8VRqb5nL7Am7qhPsaAfy1YW1pBbQni9hRO9rD6+ww0xk5NjFCx2JgKzARtp0tGJspUXbG6CWFMqdzfL6RDg5mUX69Ex3Qpfy6jSSth3c5y8P9vS1d1NDHg8VyC57v4K/PX/FCj7gjjAhHXw0Iqs60iwuLTSXvFR6WtcW5btoSDhQ1qfq1eou9tUBCWnRSN+n9aNCpFbhn/gIWe0Pw11YwJNUl91Q8lQ986IyJ7WVD03Wv36FvvRGL03A13NeejYy4fnQEPqWcdt8kQDD37jgz+sOqz+q0+U+hlhLHtkQqy+cpp80i0/wfR7NkLJ9NA6J48DQ31eMcRm/2hmmCG4ZJQQ897MMJ5zO35WYtaVFA== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec291cf5-70cc-4407-9606-08db5d35a193 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5344.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2023 15:35:13.0171 (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: Olj7Yf9Kk1O6kSaoFtJPydFHgaB57skmUrZZiQOukgPiJl937lGK3N3h9ktDHthjST6fMwyz9Au1TafvjIzJgmPmuL2BBDYis87pmjlItUE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7848 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds broadcast properties to the SetConfiguration method and bits for Broadcast support to the Supported_Settings bitmask. --- doc/media-api.txt | 11 +++++++++++ doc/mgmt-api.txt | 2 ++ 2 files changed, 13 insertions(+) diff --git a/doc/media-api.txt b/doc/media-api.txt index 3746ccd55..3a0ec38e2 100644 --- a/doc/media-api.txt +++ b/doc/media-api.txt @@ -599,6 +599,17 @@ Methods void SetConfiguration(object transport, dict properties) uint16 Latency [ISO only] uint32 Delay [ISO only] uint8 TargetLatency [ISO Latency] + byte BIG [ISO broadcast only] + byte BIS [ISO broadcast only] + byte SyncInterval [ISO broadcast only] + byte Encryption [ISO broadcast only] + byte Options [ISO broadcast only] + uint16 Skip [ISO broadcast only] + uint16 SyncTimeout [ISO broadcast only] + byte SyncCteType [ISO broadcast only] + byte MSE [ISO broadcast only] + uint16 Timeout [ISO broadcast only] + array{byte} BroadcastCode [ISO broadcast only] array{byte} SelectConfiguration(array{byte} capabilities) diff --git a/doc/mgmt-api.txt b/doc/mgmt-api.txt index 58395dc90..c7191a028 100644 --- a/doc/mgmt-api.txt +++ b/doc/mgmt-api.txt @@ -334,6 +334,8 @@ Read Controller Information Command 17 Wideband Speech 18 Connected Isochronous Stream - Central 19 Connected Isochronous Stream - Peripheral + 20 Isochronous Broadcaster + 21 Synchronized Receiver This command generates a Command Complete event on success or a Command Status event on failure. From patchwork Thu May 25 15:34:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silviu Florian Barbulescu X-Patchwork-Id: 685702 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7609AC77B7E for ; Thu, 25 May 2023 15:35:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241738AbjEYPfT (ORCPT ); Thu, 25 May 2023 11:35:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241667AbjEYPfS (ORCPT ); Thu, 25 May 2023 11:35:18 -0400 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2070.outbound.protection.outlook.com [40.107.14.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 488D0A3 for ; Thu, 25 May 2023 08:35:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gx+r2ORI7sGQ2+c/TxsY5B3X0FWWCuXmsl4JB74SEUv+0f9P1ommlNp93EskX71hpicjKP9HLMhgSTIBY69T0adCPWLOxHXad5H2TGZulwahmPRAYXPW6NOYHS7RbuHOGaaSRDToyaEdmA+pKgCEV/yAqiJUSlCth0HraknAVXTRFf0zphueYyz2EQz9+8esICi8z3g6m/aQKp/UA0O9W2i4PaJTo9xVlaasuIxSPtoJ+SbGNflbeKTfrT3ZAX43BVdu2UCPZjI5cPScyt9GNn5JB5J9b48Q8FU8B1pc+Dd3vgLZyM8yLKlOpknRDMzqDpV8tiwRTrbPoc2kMS0KHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=pWdnifu10Bn4XueLkGix6CSkZc7Tcs8J+s1YoDDeSro=; b=SfCFFocg9yaGshNrMCH6kxBvfznrMzxFu16+kncA2lf8nsa5THYeSsO2sDSHYfp+CpzQkmbk9S/Dq9kR6dGRgRp3djctASuF1NIh+RHX5NOtSzWGjLBlOfaA7vy4TZf62zqPngRR5BE7I5zYI9aC38ok1/H/FHepm5ntJ2Npi0gKKOJkIgCLlj+HCR0Bp6u+izSRRVSUSjOnt09VJco6LcspUZumVHkXSMSRRUVxzR6qfwaiutMY6f0+z+pD6LAdkEQE83QOeST9bR4TTjorMAjOTgOPK1EgabZmOjRJ1HWadDGI/7y7gN0b1xz1sNsqu0U+dtRPU/UlixSF887CMg== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pWdnifu10Bn4XueLkGix6CSkZc7Tcs8J+s1YoDDeSro=; b=HKt3KMWtwcr6weGdEox/PfvRyjoDzja0MTgjt+sBm2SCYiSZWC50nAMyR0vMFXfnnvtQVMPVWd3ulVBjyQWWuv64TdbDiftHUnOw7wFl6u6oqlvfbQd97foUkfDG9YhzfCaz9COnCH8dAPr2oOKol+stjnFle+N5RUi7cQoiIog= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5344.eurprd04.prod.outlook.com (2603:10a6:803:4b::31) by AS8PR04MB7848.eurprd04.prod.outlook.com (2603:10a6:20b:288::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.29; Thu, 25 May 2023 15:35:14 +0000 Received: from VI1PR04MB5344.eurprd04.prod.outlook.com ([fe80::981d:d04a:5851:1578]) by VI1PR04MB5344.eurprd04.prod.outlook.com ([fe80::981d:d04a:5851:1578%4]) with mapi id 15.20.6411.029; Thu, 25 May 2023 15:35:14 +0000 From: Silviu Florian Barbulescu To: linux-bluetooth@vger.kernel.org Cc: Silviu Florian Barbulescu Subject: [PATCH v2 2/6] Add macro definitions for BAP broadcast source support Date: Thu, 25 May 2023 18:34:48 +0300 Message-Id: <20230525153452.125789-3-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230525153452.125789-1-silviu.barbulescu@nxp.com> References: <20230525153452.125789-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: AS4P192CA0001.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:5da::15) To VI1PR04MB5344.eurprd04.prod.outlook.com (2603:10a6:803:4b::31) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5344:EE_|AS8PR04MB7848:EE_ X-MS-Office365-Filtering-Correlation-Id: 95cfa44c-6842-4ea1-ea94-08db5d35a26e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d0gB+834iDlzsemo+SSmTZx8ueZ8/6yz1o2omG7Fx5ytjFKwvQKkEmsdRuDedsdYEzREQCLZDQzfy/cmR0bu15N0Q3coBk62ULrtIRRZowqpiUyYuflD+Vk5xsII9adi7RfgW/V3i7AfE5R7aLC6uGTv6Owhs+lh8JFvxer+5U0z9xdvGUu2T/jN8cLw1PimDTqnW/RiDUDHoKvHgj4EZxaOW3J+iBNM5dPK3GrpgZmqjLZQalIL0vQpGzz+ZySvnNaCsz+w1KMWPEbf0uA7KaHPzsOY5g7ktw0YO+A7TXYySVyBY6KpgLb+5SI+Z0ZJzB7N2plwGgIaimDTDIBIM1K+kQcgynrOim1N3pooZsFYFKn+l3DdEzN8VSo95Zpt3YKNHnY4poVslO4oyGkcUBL0QpkQgfCxO3V+2rojwrvgvjUMZLT0AERVrINEA22egvWqJ7VvtWrwqLE5nIrOIlZeF7E6/yOdV4Aw5tyB94e1QqxeefHcgGzq2dzhQtpG/UF2ip51OtBC1wkcpBWG1/KlVBf04vNarAKxbfN35QY5zWBb8/wRkZXC7zpu9aPXtP7KPhGNsjLrsCsXKwhyC/ifBrTTj5ejl1XrlWC7NXSNPdP/KXzDriz0zUBROfSB X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5344.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(346002)(39860400002)(366004)(136003)(376002)(396003)(451199021)(5660300002)(36756003)(186003)(2906002)(2616005)(8936002)(6512007)(1076003)(6506007)(26005)(55236004)(478600001)(66946007)(66556008)(66476007)(6916009)(86362001)(4326008)(8676002)(38350700002)(38100700002)(41300700001)(316002)(52116002)(6486002)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pPH0NFHZnkq7HYkLqkrJDkc658gVUjbeJMfnVEU6+yNXJhEqPgW8TyufeukrO5zaimKzGJrMZdRZGjdyY54bBadSVqtxhNgPYZTDphTxpaL4lSjo2oe0n8hHtfs22UPY+HT3hqE/IP/cYGXKESmaElEjLNymXFX3S0UjLdq3TUKHLhy3fGnX+IBS6B8ch39T9S4BBfie495nd/eBWRGb0wG+BowROO97LVHf99V/ZT7joYIZe0mewE7LTgg9TM892IwiYZm+tgr8/Yyv4gM6ay8u2rB/F7bdZsHb3RUgJ/92D7cFW1cMmr8U6GdsXBcs362U/8GHQejb+/C7EnVwrKsOZILbZgHCgYYc6IcTEVroMFN32DhYVijw7kSfa1kZUCnimrfZSIpPnh+pEo3t1i4ySkdnmNWiEWu5iv/ccRS30dxUt9wFWG4bjoMNC6Kl72Qk7LaJsLeo7K+3PGSZlKcAlLJpzWUleerQYlcO93syjKKXS3y04aBYGKjF3yhlP1Q4tjU7/DCPHXMDxwwT8W9Xga9Bp0Ab6doplHMvQ3Ulwx2sKVJw5aUhagyYuQ+1wISpd27oEREHf+s28q6fkkI8lFfViV8d7Cg25W4w4S+it9gdch/AT6PVmT7LLsRTmJ7zO0HpSw22Lop8wkGM+q0Y4MHvDMKVVwzp5oQdCQWs/zuv3spHdwr+Y0ZoTok2S0nKUqUc0QaKe566aiH+9qLBsj3GUoYtQ4smQR+JM3/RIW41E48WNO41dEg+nKnV5iThSoW75+xKR6MltaFBxBk4LmPm9T2aiLtksi3Ut3UTZ/08DXigYd4rMqGjRtJoEiKtbRGepxk90MbXMJ4zDLBZYe1coxJ2/EQdu5asYW6kxNLjjy2B6RPaG4Kw1Y7bZDSH7cidjBXl+ZQFEwQp9SLm8/fQyieKVGeoMfn0PP8EZpkQ8ikO8JVTCzXh5WphDO/ez7GPj5AYj0s9DXlMmctviTliMRUqbfUx3lD3HtjDTaEAdl083n6msMzqMPh5UZ8S2hJgpEbAooUCgJVOin3+bwf6wlvzGiw1pFuJy15bIcyFhNImhA3suTwTDIKElrQGXMznU3poTvE2QKRO7Akvbqg7z9r2p7v+WVHwf+LSZqZS9b+XqD++5UfIYSqu36I+Wvd6umQibm9JQENn9g7MkhunLD4kpX02bZw5ZsZn5Jz8Qq3DL3nodhbwkBk2U69BTQKFEdNanmeb4FaswGr7gkqVpbhsTmovVsUTxCFpHH8eQSfHUDfFReFeVyi7eszN0MWSiQtZzDBmybv9qDT7LgzlpUdVPFISg+yrworkYMdy4oVuz0ynBODSRaP4whOSbSO9W+MqB1sI+rvv7y9OySoaSWnmzS8XDdpgHDbHBLtNzgQ801/SQVfjdQxNLVIysaoDElC8ESNuxY6jD8o8/8N6S4I5lNWnh1+hepAMfrmnh+TTsarBUv7BZOGLWNkCQiOqsWPb8y6EepjmzQZM2/uslmTZpiqVieIas9OJmgTjFJ+Ua9L5nL78BKMzthLVUDRxoSG1GDdax6bPwU/rKJSgg/xnxd4FUaYWqVv6HeKkv6qoRjGG8GFIMs3GXEkD3GjZoc69lv823J8SAg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95cfa44c-6842-4ea1-ea94-08db5d35a26e X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5344.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2023 15:35:14.4402 (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: LNlH+a8JyobmJJkYvLDRVN8zN7EOWgObfVmvg/TyCpMItJxGBIfASpQ1gJk5YhONilVPV9LTYT8TXZhF7t9u8gVPQNE0zEDpeSfOCDcMD6k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7848 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds macro definitions for BAP broadcast source support. --- lib/bluetooth.h | 9 +++++++++ lib/mgmt.h | 2 ++ lib/uuid.h | 3 +++ 3 files changed, 14 insertions(+) diff --git a/lib/bluetooth.h b/lib/bluetooth.h index b4bb6748f..ca4b0115b 100644 --- a/lib/bluetooth.h +++ b/lib/bluetooth.h @@ -150,6 +150,9 @@ struct bt_voice { #define BT_ISO_QOS_BIG_UNSET 0xff #define BT_ISO_QOS_BIS_UNSET 0xff +#define BT_ISO_QOS_GROUP_UNSET 0xff +#define BT_ISO_QOS_STREAM_UNSET 0xff + struct bt_iso_io_qos { uint32_t interval; uint16_t latency; @@ -186,6 +189,12 @@ struct bt_iso_bcast_qos { uint16_t timeout; }; +#define BASE_MAX_LENGTH 248 /* (HCI_MAX_PER_AD_LENGTH - EIR_SERVICE_DATA_LENGTH) */ +struct bt_iso_base { + uint8_t base_len; + uint8_t base[BASE_MAX_LENGTH]; +}; + struct bt_iso_qos { union { struct bt_iso_ucast_qos ucast; diff --git a/lib/mgmt.h b/lib/mgmt.h index 59273c85a..c3c905232 100644 --- a/lib/mgmt.h +++ b/lib/mgmt.h @@ -102,6 +102,8 @@ struct mgmt_rp_read_index_list { #define MGMT_SETTING_WIDEBAND_SPEECH BIT(17) #define MGMT_SETTING_CIS_CENTRAL BIT(18) #define MGMT_SETTING_CIS_PERIPHERAL BIT(19) +#define MGMT_SETTING_ISO_BROADCASTER BIT(20) +#define MGMT_SETTING_ISO_SYNC_RECEIVER BIT(21) #define MGMT_OP_READ_INFO 0x0004 struct mgmt_rp_read_info { diff --git a/lib/uuid.h b/lib/uuid.h index ddde4bfa3..5cdfedb4b 100644 --- a/lib/uuid.h +++ b/lib/uuid.h @@ -157,6 +157,9 @@ extern "C" { #define PAC_SOURCE_UUID "00002bcb-0000-1000-8000-00805f9b34fb" #define PAC_SOURCE_LOC_CHRC_UUID 0x2bcc +#define BAA_SERVICE 0x1852 +#define BAA_SERVICE_UUID "00001852-0000-1000-8000-00805f9b34fb" + #define PAC_CONTEXT 0x2bcd #define PAC_SUPPORTED_CONTEXT 0x2bce From patchwork Thu May 25 15:34:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silviu Florian Barbulescu X-Patchwork-Id: 686132 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3745CC7EE2D for ; Thu, 25 May 2023 15:35:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241753AbjEYPfV (ORCPT ); Thu, 25 May 2023 11:35:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241727AbjEYPfT (ORCPT ); Thu, 25 May 2023 11:35:19 -0400 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2070.outbound.protection.outlook.com [40.107.14.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DC73195 for ; Thu, 25 May 2023 08:35:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iHdf18jPaytTciWXRsr3GgX0MA3xtzWi0KqhVFyN2DlL4G0EW4g4UZ8xQTSafz2AFLpnbe3BPrXJMeQ3zdCip2UkOTpcAQ75mxOz6O3RzRxm2A7zXqGyKqEgvVDlIZsd0RP+KZPE7fo5fiTKg0HOXGkiT59iXOHH8xkrxSDB3dMBg2E2zfdZFrlTXpgb0GRIOy50BJL5IajFTnjJDbo8DvmfHmfgKpXoNC/GF6SjauIRLww9CARqY0qGz9pbnpuivmC/mVcmtcHHfRpJX+shxwO7vMgcYqQrMDZTiLxv/lmiKDSwelCOCsPvaPmXTZWJxTdnx6Av6HKXVgLIiPJXPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=nwsghK4GbbCtstfoKwoYB1ei7+mnLVU5TUDPQWncwL4=; b=aiQxt5K8KwAvl+21Q+YedZBT1yeu0srOnsVO2vSBzs0sCopoZLDksN789/TEqwOmfCooV0m9BGdnrmbTo0cEjSwGkuSf0CVB9XQzq1N8FXbDuErFw0QTwsRYyUCt/J8IKHnRfr9xhWPX4rg5LO6HpnGuRXD0AQMFaEQTGe+oSEv8oAZ+FsitWhB2llJvCAcynhmr78h/+fJFdTr1tfUTtKSkevBkU8vBeMPiyg08qkFRJb7w6XFz1kJ1h+GLpfobV/CVsI+pHVJ0loDl2TT88cpqJjLSLnEv2eewvoZWhLYWJsg7bywjnY9s01uzcUeBeDENekcLMg+vk0qhuuRY3Q== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nwsghK4GbbCtstfoKwoYB1ei7+mnLVU5TUDPQWncwL4=; b=fD4517wDLdnpY93HBYplvi6sG4zwreDr/uR6WGey2GUwCLoBMw1tDZ6GJm8jL6AEzJUe3BYuJ6HpNd38VlRiI5HCxduF84IFIME/Okuj+uw4zD5pWi5eQf4YxoHQ2voWT4jM2OO0jYEsrDfybTkQnJMW9fUcpLHhHLcBG7+C5/0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5344.eurprd04.prod.outlook.com (2603:10a6:803:4b::31) by AS8PR04MB7848.eurprd04.prod.outlook.com (2603:10a6:20b:288::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.29; Thu, 25 May 2023 15:35:15 +0000 Received: from VI1PR04MB5344.eurprd04.prod.outlook.com ([fe80::981d:d04a:5851:1578]) by VI1PR04MB5344.eurprd04.prod.outlook.com ([fe80::981d:d04a:5851:1578%4]) with mapi id 15.20.6411.029; Thu, 25 May 2023 15:35:15 +0000 From: Silviu Florian Barbulescu To: linux-bluetooth@vger.kernel.org Cc: Silviu Florian Barbulescu Subject: [PATCH v2 3/6] Check for ISO broadcast support in controller Date: Thu, 25 May 2023 18:34:49 +0300 Message-Id: <20230525153452.125789-4-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230525153452.125789-1-silviu.barbulescu@nxp.com> References: <20230525153452.125789-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: AS4P192CA0001.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:5da::15) To VI1PR04MB5344.eurprd04.prod.outlook.com (2603:10a6:803:4b::31) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5344:EE_|AS8PR04MB7848:EE_ X-MS-Office365-Filtering-Correlation-Id: 29f32ff9-553c-4c89-7c82-08db5d35a326 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5SDpspk9F71issvkBN7lUSx70EQNKYzoc6O+Aat4MiFPNeQwHY+x5ZQzonosOITLE8iF9492m0vJ5uQ1rk9aoYD6AYqrNJZiCkb/qU41VBX0+Ab5AYiTq+eue9gYNA3nORN5zFYQpFkcSLVsTxDJwTn1WbcTYaGSFe5XhgVEW38AMBMOQWFjSfreVhuUtMEqkyDdjB5NVtDjkOzNB9cINhFlKhFFxjGjsd9Htg5vc7KxufQ4XAlNRlkIZdkOdyAesxn1ZQqm0/CYvkNIAGt1bo8XvsXm49pPoYyJvi0BDWEEyeUwpKzNfsFS+kRTsUtuSd6zUB7AQiQzziSgpXDAWtJ36YzZwhvm78XXpx9aw6jQRuISqJVMEuaZWWs7ydg8ycIu/LWEJJkxGRx9lspsa9RmUtHGILHGyYHDOMiE12UVK4bt/YC13fZCZD2jXK22e1ScaaybrnFie+8a8AzppP/si5J0D0Qo+d3kYXTWhIwRfyGnyWTcpN5ZdIkkl4kkCWXqJklqQw7j4JOr6b3rjHi0q3PGC5V7eXcNM8/CJ3YP4rPG9wkVXiRarHJVD/pJO1oynrYKULInH7/qeSr/yFNmMBDwPY/I5hS5FhHaxSjJh4TXEli5coec7AZ6zoyb X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5344.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(346002)(39860400002)(366004)(136003)(376002)(396003)(451199021)(5660300002)(36756003)(186003)(2906002)(2616005)(4744005)(8936002)(6512007)(1076003)(6506007)(26005)(55236004)(478600001)(66946007)(66556008)(66476007)(6916009)(86362001)(4326008)(8676002)(38350700002)(38100700002)(41300700001)(83380400001)(316002)(52116002)(6486002)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QyAZBen3qA+d2nJwBSXVUp2NQrq555qd6ATBrFqK2zAcfK87hjTs8gZ5q23eadw1aZnQxaakr3rBvheAZsX+XeeoHlTezbHFd2v6EwxjL7PNbdd4xUNpXwmYbwAwK3xyZp9l/vZ3QccMksS1MB7TKNi1uwtmkGZ1T/M9f2+EMC6nVZEvTCy/2MmOYzAfCyxBQNhSFZwzSLMM5nQRaE19UyyHBrgMqBQAOBigx0dYIO53XyuoN3Z6Iby9yjiq0JQ9e7F/bOMo45JaFLiIcLlGYGn8AqcCF6sNLMHeMiemwLMB4nM1pzl0Gj3PrRBO/o/t1UV9NxzOqZBmFKGzCqzRNU2xYRrQHLthIvHyqdCIcHPhouVI0cRTDKCxKKjQrpYcXNQq35NY6ghrXFalkp6gWs+QPNi6BSSd/C+q2iuhBNFOlRvlabkvKgeXga8Fbvs+ZKB0+HWS8UqPCW877a+Be0Jk0Hb972Hiqeyh2Ik70OjAheCv7polzFdWy7v2NC9QPC0RADEvpSq7KNgyTCfTsdbE1vB9Ij5Q8QnwSLgNfH794RJF8j6beEbgzg2eE9RfPAZVK7SBzn/uqQAtYqtS+Ixo9N9CHslPXDSuHJf5jbYv2nS62W64w7aMjKO1zO/1hNBDSMc5XC3Jrhv/Yyw/oad7hRvbCXdt4QYE4FDAXidmfzFImjXWqYWTu9jbSMUzsaa5f8jbOF/qkDUJZ3c2kQigTMXVkZMC68C6HzIt/aNt37Xj3cyBkEdVZpnz2iaJ49q6dgDLi4CmPD1X9xF/8tgT3ZUSmxH4fLM0iCgamE4B3Sk/eWypcsHjq9qKP0oMXG2fsqFvXi3v5ATxPUJxHUQWQBNgQn/VUmda20CwqnqnzCx6veET9owbUbC6at+CRIclDkmwOo6mk+ZlBbXVMEwqKmBkjW6VtpVrd5k9sCgObroENUdCTGZb0dyPc8u28rEDvb+BnQgyyUU1B2nroHEMdyn+MHASpJ5GjVC3h+NpnPPFcd1anNa1tttBwNaS7/caNRtHMUQnMh1V+AtMg+l5XLKX5uX7zUIhtn759qQp+YS7ZXkmQ4vqhuOJkyV/MMG5/XJGFq+DCiTVRnPzZAkEcqATKPV2NqEx+cnk+Jxyxg9ngIUvjEXvig8diExQ1U+Z4BdgRyIpU3yUeKp4lv11VI60LMnWThrFvC+kAydvoY0vd3GF2PUESr73ZDx9KXp0lQHWnwe+S5bm1vlGcqzZUh2EBQvkS4gw3nqOc+L72TcOobSFdw8ZkCCWkclH7p5qJldsdB4xydIYoLtlGJ05NuuHJuf7Gy02nsRbj2C75Sf31sdoqkM8SHxHreVZM5ilXuBQa61RbxiUTHkg38cBNJV52EFsAyymp80NOPAzlXI8kZWJDetPE3vfVciXvXnMTxC9y9f6V1BM9A3j8GBMkPKWdG/amzm0tgBwHWBhi/kwKSGUH6ACGdeW62ANIOcrAcNKdNsqeKQ/L9mbT/cd3fdbKMhtB96zVYmdK7S+yfN7TmgfDpzhiIh/if5jeJ0bSPJeBij7dUuQex1kuJM2c81xtjhjnArmt/fjFKb8mS4rpO6x/iB3wLxJTp8mKtcfBp2m2YO51JHivhw/Fg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 29f32ff9-553c-4c89-7c82-08db5d35a326 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5344.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2023 15:35:15.7060 (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: 5Oi3iNvjNbk5hN8hA8uag2vbqHmJSQ0DFgClTykaRubLjLROC5qKSTfFP8c3Nzim6GIE3sqFhwIrjXhHPsb0L35uC403oyzWHvoeh47kYKE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7848 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds bits for broadcast support to mgmt_settings_table. --- monitor/packet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/monitor/packet.c b/monitor/packet.c index b492b8a75..429df79f1 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -12796,7 +12796,9 @@ static const struct bitfield_data mgmt_settings_table[] = { { 17, "Wideband Speech" }, { 18, "CIS Central" }, { 19, "CIS Peripheral" }, - { } + { 20, "ISO Broadcaster" }, + { 21, "Sync Receiver" }, + {} }; static void mgmt_print_settings(const char *label, uint32_t settings) From patchwork Thu May 25 15:34:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silviu Florian Barbulescu X-Patchwork-Id: 685701 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C53BBC7EE29 for ; Thu, 25 May 2023 15:35:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241770AbjEYPfW (ORCPT ); Thu, 25 May 2023 11:35:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241667AbjEYPfU (ORCPT ); Thu, 25 May 2023 11:35:20 -0400 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2070.outbound.protection.outlook.com [40.107.14.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3E3AA3 for ; Thu, 25 May 2023 08:35:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JuuWsZgJakNtkhEZlelQpyFOcmEyBr4xD3/1riEDJ7nxgC9j1nrrATJ4Wnc9esof8vvqMlUSg9523UvobBfsInO0Ee25gzqdo8Oj8QFrxvw/0J/BUUWMnsAMXQ4yyTXMRxsnELjbaskKZUcJMvLDJvGJItSwMzyQdf7stI6qZfgKrwP7reg3xdSKje7yNYYFg9W80sd1Uf/6fHS7Fg8eRUX1sWUObvsjq1gJxSwVcKAf/nrkvmXS9PSxDdeUR8SX52tVJmetcW7Uvu8IhoPmOjgZDhcsaxIyJYiZhjU9UfV8CPtPQBJ5x8nzt+iuKlqqQziZ2b5oS4gJIBNbP1/hFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=BWAbnU0yLDxbBNkvU+VKimZnO3gf4rlVIppyt59m+Iw=; b=QMp8icvVGFfNzHE/S+dZi/bpXpUTND916YUSNRb6X1A6mhbrhmmUzezNGcWcM9A8NYF7yFqw037rPsWwJORDPP4/71YNfcgUUMkM+UCvb/DwI1b2Ij3CIdkVgD1Ob5yjFcudRGwIs/849NjY1jm9j6iO1sV+UwY+x0T+wAU207VWtGkIeijq7Q0HbIaSnQAAPGKbh/RFiTI7r/g77CadkqbaM4cslrnwXVMl389OE2qaZ2irXQMV1jFjuCfYXwwVH3z5071+Nj1FpsAgIn6pkuhUd4Djx7ueiqgkLA+CbFnhPXzxKo2bcgD3jYiJwA0jLBjqfZ9/vPlcCRkyuw/E5A== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BWAbnU0yLDxbBNkvU+VKimZnO3gf4rlVIppyt59m+Iw=; b=LAZ7g4I1xIGrDTOYnPDdyv4ourCI1b1V9M6xvcZjTDYonsuGItwDGhy9OrdCG/O+m+NDuq+7aSM1Rt7JCOGOkqRe/8uFPeRIqWFVQ5kSiPuhQnUXN2QtHdBcUOqJ5iMe+LFp44aQhJXMfBsG2LnISY9i7vu1XVR6yYsBK0y/kR8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5344.eurprd04.prod.outlook.com (2603:10a6:803:4b::31) by AS8PR04MB7848.eurprd04.prod.outlook.com (2603:10a6:20b:288::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.29; Thu, 25 May 2023 15:35:17 +0000 Received: from VI1PR04MB5344.eurprd04.prod.outlook.com ([fe80::981d:d04a:5851:1578]) by VI1PR04MB5344.eurprd04.prod.outlook.com ([fe80::981d:d04a:5851:1578%4]) with mapi id 15.20.6411.029; Thu, 25 May 2023 15:35:17 +0000 From: Silviu Florian Barbulescu To: linux-bluetooth@vger.kernel.org Cc: Silviu Florian Barbulescu Subject: [PATCH v2 4/6] Add support for setsockopt (BT_IO_OPT_BASE) Date: Thu, 25 May 2023 18:34:50 +0300 Message-Id: <20230525153452.125789-5-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230525153452.125789-1-silviu.barbulescu@nxp.com> References: <20230525153452.125789-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: AS4P192CA0001.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:5da::15) To VI1PR04MB5344.eurprd04.prod.outlook.com (2603:10a6:803:4b::31) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5344:EE_|AS8PR04MB7848:EE_ X-MS-Office365-Filtering-Correlation-Id: ecbca499-3167-4e0b-47f1-08db5d35a3f8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mz9l+BAfQ7ncrun4jadWzuWCtxwik6UJQMD//FPqEwxIA07tyDBNfGdNV+byCr5kHG8W/49mVrciCi0gAMBiEg0rSJ8ablj8z++uzhLo1XcgQ4UabzAPBmi/ERbUd3Qz0oUG27kLq6ruxi8G2gyQjbaqkH+O4Y3FrtSe/0trmYhv/RVudpUsk5Qk1vV6Z8+L7LxEwhuQv8wHrQIH6asi2GPBHbuW0CZvgSWZ6UxLblxtOWRG3JqmOA2RmdNJATXUeA3Mou6sh0XYqgubBNcja5yrNHixxIjPZd1p7kDcQmRl2TmZdLePv7gaztzhjrFLmjOXwQeKWk0vTkn+ZlLht7LD0PWiK3gCzr5bbsm8B6/FyQWoSDDbGmeKnDu9YQBHu45WU9BLP4fiZ8Wb4HHWh5rsi6UaDIqVx962FKiZQ06U8rm8VfJt/qv2AVEi8A0W3yIsMO3hDbGedp7UKp7IlSYECG0ZEp3MRTeBmwA1YFmNT4aRPcORNQ3ZFOyiT3VRZDHA59ZYoY/q0N0U9v4bHHbcWp4nETckMjDIqSIpuS5LocTfBpUSBM+e1rB+wf9rYlPFWS11bXGYDgFjgTZ7K5n++Pjkwy9KZpF2gqnPmQ45TVrFA7VsUShdxvQiXof2 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5344.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(346002)(39860400002)(366004)(136003)(376002)(396003)(451199021)(5660300002)(36756003)(186003)(2906002)(2616005)(8936002)(6512007)(1076003)(6506007)(26005)(55236004)(478600001)(66946007)(66556008)(66476007)(6916009)(86362001)(4326008)(8676002)(38350700002)(38100700002)(41300700001)(83380400001)(316002)(52116002)(6486002)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: utSGgVAFOa4QAgwXIYf/Frlp5AU5D5h3jHXZ8Z56kZMHFDD7SgC8mUYJVM6HZvwBh4/aSJ2VDhAGH/NreUaFhTds/J50UY4Oss28YMEUit6rRBksJcdCXXALJh8CW5n6jg01JgofDoLqBQy2oCsK32+adn6Qsuz0AVTYntxGHnQHgROR3WhRQzoL3Rp679lw/9CnTsZKwnYtpi/Cuu27kYl+eOfXm2rz4fWOMrBtlglc3HV02867y+afmYv/ZVh3rUia/X7jtoQRe+pKwpXUK7duwOod0Hj6DRIK107sH2FXD4QpnClAmBx2//qhOQB/BCbJomUDgCa78P+jmoXtVBjEKyzbcfYw88gaReHuDXzdJ0KNbCkyS4lvbYtKt9VGOL6BVblrXI4LidO+ZubTUht+emU3yAxXUC6Td1A1q7fnvkaJnnpSiY1jLvMa2Lk+A+Ikewdl01QiYU2ZBEb/ffhf/00eMGZifKGWAejye+qwMI9q2WkzEOZODB359BtlqtDm5bIEfVAEODnw0qFNwsG3V49LnIj8eVXKHfHxuwpD/mlV1Zr4knaOrWoPBDIHJVAlN02OHED/QFeYRhfE2w3ALAExrDSYud4J6vF2lwtHpdU0kT5uat5CGa7P8VQKjqqZvW2tbQKfN0A3LZRRVthrt5DJr7nMLefwv8BX6YBGe//qRxC1xpz3Jf3KsuLaYLh4VhEQZlXY5bWfwHkbT1NvJ33JPldHmXQmi1/21gzTc/6zVLw5BJMLy+mXxUuxlDeL2WpCjyYeGKkeealRmVOWV8G9i6WDiveTUkHSN8mM5gT1pxiSvDvJnGLd8D2y6aklY570Wk1sG3z977C/Tg3nfGSfhr1as3xSDOsmbRSNOYF2955GSK2laWoqMSZQjhxvsFjjD+62qI3Bgnq/6N+k/C1zSFF4wLJNnSIP/6rvVUqSWg04/XIm3EP60JfWnPxAe2nheQCPzjhgaLFESZlSsSXzWp9V5altNoLrw+i1repkxyvRW3bcYcbi53G+7NELofSB9+G/dk8C34Nze5QyfqrWQk+rnXrATsXeA70pYHn/Gm6Rf833QEm82NpxMkEtNt5YLQmD5GingPnlFiZGV+/co2J6V5LHmc1UkYSRRf5Gfvt47vg1rR7md6rejKswtatPkqKmtTeP9SNn1dy0qP3kpIZp/dVo+hvGkRR3jYzX2GCUgr+gEWJUFnKnMbKNIa+IWZsorH4qLkV1ITQFgqF3b4XyYxSXn7uc8qy6tdmwL1JTyHMQzuiYA3Y7Uyrc+LnAdhpE74n4Xy5EwddeE62OBUg864GZD3Ne14J8Keruwy+fWo+OLDAAzjEK3830+1HbU0i2ouEhUSK9haG9ub91eI1VHeKpiNA56uKfn+sFJhy2Fy5vlsIQ1ZBYLPTbcS9FmQtue7/6+dhpPAX63ida2X9R2npNJKmcLAqP6vtzWoBUeDnlSMK9dCMZJBcUKzo2jENdBTiC1jbM3on+SfQqsEJY1FomrgG/g1prSPW5JjizsOvDFaDUuFZ/CusxyGBPnajgeVeuweAB0nb86w2U1/AMJuo82IW4ep/URbCv4dOZhna0TDw52SFZnAc+J66OTQ3eLKNzmIvoaQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ecbca499-3167-4e0b-47f1-08db5d35a3f8 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5344.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2023 15:35:17.0460 (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: 7HdmAu2cUdXGiCbDvl4mwPW6zqyzJDsnm/oRwSNEljLYzj4noOZD3wLqnP6DNtihIo6w8DHPfXoTE5vSEr3PY6jB3UjmlY/EaaYKnBS6Uh0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7848 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds btio support for setting the BT_IO_OPT_BASE socket option. --- btio/btio.c | 26 +++++++++++++++++++++++--- btio/btio.h | 2 ++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/btio/btio.c b/btio/btio.c index 6f6d76dc8..b68bfb14c 100644 --- a/btio/btio.c +++ b/btio/btio.c @@ -70,6 +70,7 @@ struct set_opts { uint32_t priority; uint16_t voice; struct bt_iso_qos qos; + struct bt_iso_base base; }; struct connect { @@ -858,7 +859,7 @@ voice: return TRUE; } -static gboolean iso_set(int sock, struct bt_iso_qos *qos, GError **err) +static gboolean iso_set_qos(int sock, struct bt_iso_qos *qos, GError **err) { if (setsockopt(sock, SOL_BLUETOOTH, BT_ISO_QOS, qos, sizeof(*qos)) < 0) { @@ -869,6 +870,16 @@ static gboolean iso_set(int sock, struct bt_iso_qos *qos, GError **err) return TRUE; } +static gboolean iso_set_base(int sock, struct bt_iso_base *base, GError **err) +{ + if (setsockopt(sock, SOL_BLUETOOTH, BT_ISO_BASE, base->base, + base->base_len) < 0) { + ERROR_FAILED(err, "setsockopt(BT_ISO_BASE)", errno); + return FALSE; + } + + return TRUE; +} static gboolean parse_set_opts(struct set_opts *opts, GError **err, BtIOOption opt1, va_list args) { @@ -966,6 +977,9 @@ static gboolean parse_set_opts(struct set_opts *opts, GError **err, case BT_IO_OPT_QOS: opts->qos = *va_arg(args, struct bt_iso_qos *); break; + case BT_IO_OPT_BASE: + opts->base = *va_arg(args, struct bt_iso_base *); + break; case BT_IO_OPT_INVALID: case BT_IO_OPT_KEY_SIZE: case BT_IO_OPT_SOURCE_CHANNEL: @@ -1290,6 +1304,7 @@ parse_opts: case BT_IO_OPT_MTU: case BT_IO_OPT_VOICE: case BT_IO_OPT_QOS: + case BT_IO_OPT_BASE: default: g_set_error(err, BT_IO_ERROR, EINVAL, "Unknown option %d", opt); @@ -1444,6 +1459,7 @@ static gboolean rfcomm_get(int sock, GError **err, BtIOOption opt1, case BT_IO_OPT_PRIORITY: case BT_IO_OPT_VOICE: case BT_IO_OPT_QOS: + case BT_IO_OPT_BASE: case BT_IO_OPT_INVALID: default: g_set_error(err, BT_IO_ERROR, EINVAL, @@ -1554,6 +1570,7 @@ static gboolean sco_get(int sock, GError **err, BtIOOption opt1, va_list args) case BT_IO_OPT_PRIORITY: case BT_IO_OPT_VOICE: case BT_IO_OPT_QOS: + case BT_IO_OPT_BASE: case BT_IO_OPT_INVALID: default: g_set_error(err, BT_IO_ERROR, EINVAL, @@ -1627,6 +1644,7 @@ static gboolean iso_get(int sock, GError **err, BtIOOption opt1, va_list args) case BT_IO_OPT_QOS: *(va_arg(args, struct bt_iso_qos *)) = qos; break; + case BT_IO_OPT_BASE: case BT_IO_OPT_HANDLE: case BT_IO_OPT_CLASS: case BT_IO_OPT_DEFER_TIMEOUT: @@ -1740,7 +1758,7 @@ gboolean bt_io_set(GIOChannel *io, GError **err, BtIOOption opt1, ...) case BT_IO_SCO: return sco_set(sock, opts.mtu, opts.voice, err); case BT_IO_ISO: - return iso_set(sock, &opts.qos, err); + return iso_set_qos(sock, &opts.qos, err); case BT_IO_INVALID: default: g_set_error(err, BT_IO_ERROR, EINVAL, @@ -1820,7 +1838,9 @@ static GIOChannel *create_io(gboolean server, struct set_opts *opts, } if (iso_bind(sock, &opts->src, opts->src_type, err) < 0) goto failed; - if (!iso_set(sock, &opts->qos, err)) + if (!iso_set_qos(sock, &opts->qos, err)) + goto failed; + if (!iso_set_base(sock, &opts->base, err)) goto failed; break; case BT_IO_INVALID: diff --git a/btio/btio.h b/btio/btio.h index 9636fd467..e9a8a01a3 100644 --- a/btio/btio.h +++ b/btio/btio.h @@ -5,6 +5,7 @@ * * Copyright (C) 2009-2010 Marcel Holtmann * Copyright (C) 2009-2010 Nokia Corporation + * Copyright 2023 NXP * * */ @@ -45,6 +46,7 @@ typedef enum { BT_IO_OPT_VOICE, BT_IO_OPT_PHY, BT_IO_OPT_QOS, + BT_IO_OPT_BASE } BtIOOption; typedef enum { From patchwork Thu May 25 15:34:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silviu Florian Barbulescu X-Patchwork-Id: 686131 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F40E4C77B7E for ; Thu, 25 May 2023 15:35:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241776AbjEYPfY (ORCPT ); Thu, 25 May 2023 11:35:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241727AbjEYPfX (ORCPT ); Thu, 25 May 2023 11:35:23 -0400 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2070.outbound.protection.outlook.com [40.107.14.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1403718D for ; Thu, 25 May 2023 08:35:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IKFFkrzl5QDgCfzkoB7bdpN01vaTIBdPlu538UZk17pKTq3yYVeWXXsEppfXzlQzoxqG/newp2UuBx1XbqkTB2P9FUPDDioF3wLPwJgTTda9eRCxRJOXS3iBe74s6997EC0DP5BLj4zlkp3BeKsYq+bxjJV4QuiUB25CwczDJXYWUkMIu/QeukeXau4lCWhOs1/6VWC7Wo/grFn/EPTDiUV5NbDQkyKg6arUKGfHb1TYWObt4/m6jW2I71XjLKnAcsFok/HsIzxV3CdkU6vofDVswhR3oopCIW+20B3PSSzLTNnFzjv/a5FPoKuzuY0XEg0MBrt8Joh5b/HggpYi5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=kQbYIRTkxw37VSnatKWXNe812iiKSwLGWfDfC2poVcg=; b=douF0x1YOtCaj18LA9b2zGIIuXA+fQaAPTxu4YZ/Fn+yG5W7OTxou+nod/Rr+ZJEAGAsKPcU1OZkpj6ACZtEx7Bp4eRBTp3RA5BqGbnqncywcG4sdSsZasLLWM2+gEYniMeLEzWk6SCeCRz/kUKnf1wSzTZGkvfASJJ9AEvnsruzbpTtdh5PvvFyQNw7hPvwHbP2mBbkXGqDVIH/VQjdvOMV9sItkVfTGWyxwBkIZP3TwiNiMcNRiNKl3avgxKj8PMrnPdMeaL2e7QCyguphPaGR4PrNxSYsd2/b46gcxKox+vwNzx6GbYpD5ihReFMaZ1ViK8J5ViQnKXKdbREtsQ== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kQbYIRTkxw37VSnatKWXNe812iiKSwLGWfDfC2poVcg=; b=QR1p6S2VDXOzzu9TLFtFjWeiK8Rx8BEtV0H4m8SHn+lEKBVNkwrbl06NsIrN7+biG5cVW3PYkxGP88x876hj/ljgigO1Yh8Xof++0u4l97py5tpnJl5GUAPgNM1XZn8T0KlmbMxSKhMWy/5VRgaQaD5Mfd4z7jC/IP5ZQxbhlkY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5344.eurprd04.prod.outlook.com (2603:10a6:803:4b::31) by AS8PR04MB7848.eurprd04.prod.outlook.com (2603:10a6:20b:288::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.29; Thu, 25 May 2023 15:35:18 +0000 Received: from VI1PR04MB5344.eurprd04.prod.outlook.com ([fe80::981d:d04a:5851:1578]) by VI1PR04MB5344.eurprd04.prod.outlook.com ([fe80::981d:d04a:5851:1578%4]) with mapi id 15.20.6411.029; Thu, 25 May 2023 15:35:18 +0000 From: Silviu Florian Barbulescu To: linux-bluetooth@vger.kernel.org Cc: Silviu Florian Barbulescu Subject: [PATCH v2 5/6] Update bluetoothctl with support for broadcast source Date: Thu, 25 May 2023 18:34:51 +0300 Message-Id: <20230525153452.125789-6-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230525153452.125789-1-silviu.barbulescu@nxp.com> References: <20230525153452.125789-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: AS4P192CA0001.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:5da::15) To VI1PR04MB5344.eurprd04.prod.outlook.com (2603:10a6:803:4b::31) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5344:EE_|AS8PR04MB7848:EE_ X-MS-Office365-Filtering-Correlation-Id: bc3e5e08-8ad7-4573-ec5f-08db5d35a4c2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: novrgXT5CoFWhL0Gu6g2Cvk+0n4JNrFcP0xvhZ2wgf7MaZrSGpCGEyNrludmfteEPE/L06sFmDzQEvlDW9E/fNU5h+YK6dhh92JPoTYMNTkh3J6ot+ZmQs4US+XefgEabi9XXdvRJmY6J16MlImPahdQvEodIxbtWn3ZJ8ylFiuOEPo3/gCIjKnL6QJXlFPP0qfqYG3+mGVJajMji9/YtRsDMyYCzNJ6AVEklXmH+k5h7U8ht2VAQOttpyQkjksLaZVOsunQF3YdNa4oe5PaFv2/aCmyEpM42chfU+oRiR+hAOJ8vy1T5iSGFILNj5ruUvk8HFKMhJYQ1d7LnjXeF36lKS3q9LG9yp1YweikjLjSGqkwC9yUhvogFrHjYBIFhw7YNl1+ZTPeRt66WmGOUo6cMeBfovqqCCmzodmdeN/BQBRM3MUv0TZt2g6Bd80b5mp4nGdX8xldx/3ivibvQnMsNUtSrWyDaeW/XdVDp2Zy97BfMZaGdEQXS6WTCEdZQeTHodroQ/sgMA8Tz5za3cBb+wBSQOkaDWqZk9DHpKp1HFpkO+I/kpk686dRAbhnXoqovNktyKz1T2UaQfvs1DGe5WfXWlZYWBDJSXH2VkUGMJaQUMKI9w6Q4Y5K7j77 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5344.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(346002)(39860400002)(366004)(136003)(376002)(396003)(451199021)(5660300002)(36756003)(186003)(2906002)(2616005)(30864003)(8936002)(6512007)(1076003)(6506007)(26005)(55236004)(478600001)(66946007)(66556008)(66476007)(6916009)(86362001)(4326008)(8676002)(38350700002)(38100700002)(41300700001)(83380400001)(316002)(52116002)(6486002)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LVxi0SWTK4H32RIvJdZcAkYOnlVIG9bSG4f7vvUgde1wE6lMPuNx82uyY4AeMirrWOfURA1KWCfPDe0CJWxAeLpknwfDzs0sz6cmHC4ryp0+B9f2JLYbYGRoDOhvLunV6ArGvLpWtr2uktILtjQ4YFyTZnriIIW3mI1Q09SHqWb4MOwsL5JKN50+zs4Rir9Htz2VG73VMLecwiJUjHreft8f0VK04ZQu2aVZ8MHZocJc6j4jJVM68o6eab/xdzUhNFooqFYgjyvkwfNH5lz0ns6lK74C9Q4ipwnD0sz9z5bI58T7WsRoC5PlMu1jCtHqmoROyyv51V2yPDvJWW6UntjtEXTPQ0TEjLGagqiRxqnbNOFwkzrrue+ET5MuDNCYnUJbCU0wg8iB3KjJ8BefzuckzdKnBc1qH8nW82I/CALeH5D8K2E2A5OtqggmVKGDOTRrMcJjseN0XhMhY6ipPKckPY+F2VinXj2LReIsNw4X8XkSwyKgjaGty2m8bhdnEJS3tFvjFd7IGFJGrNL0/4xJdQr/J9SGhEhVMC1lWamNNtF6InIY+kwx2ppQLxHuI1LCXuY4qrPJ76DHicqOya9ZM9bCjivtPEk4McU5KpteCC5U+DSYqTEg089Vm6qsAl2xCVjIXSwjFA5g8llEDkXPagTNz+ye/glNUp09nNhMFabGPQx8lp/+EWTEz9YhOf3a2ilCyB037oXu/nUnJdRGq5CPUAHDm0sYOsye5K0EDplc7/gNwXirQqzDsIK18OdJMDiCU0A8h3qFNNA5o5cC/CC3EFuCyz19v0ALnW9D3GH44LHGbEZN9VGB9HDNzYcNR55DPFPFTAyT03LzeHsgyNlYWsJpl0cP/7at1O3BgkIYrXplkFElSjMh3TAUTvyAClLIxnEjoh+EDeQUh0S1tsd++rsMazFLyO8QvfTAefoetcE4b0X2FghRFb7T34N0g64g30qj7s66CwT0/lzvK2l9B7SsfgUxTdYnU4vwu/XQfQ+EtRVt27aST/m7F5bXEzAs6Kt9escByUQrIoiPdaF3RJoHggkA6sqU7vsaVmKjV9NCY0fAAdvA+JtxMjdjNWQTh0Dq+JKKJvKhCHXdD2wngIS8BPPuDieg7TmUKO3ZTZq3e11XP5bE7RW1qFk8FhALxoJ0OPP0ERR9zPh4Vrf8lynKSxuwM4GgkXrmXmPzmsin5onrH2TaX5btAsEoUQUR6YgQShZt8eMC3jSu2kL1P/z9bQB+vPTLTgYK+kXD6APqRafkddI1eCf97gp53iA7wgdWKQmSitHtxRhnm2WIQlAOnaVjejlUtD5nOBgi1UysZ6Rctil1whaWWU7N3XdZMegMCdrdavH9QVntcCeTEDlkoY7YjDSfIPa/GN4u1ED7nccBv2Y0h8xmOZSN7xwTwVDYyNF9t61WBi5n9nD2KQzpDDALsUkxSM77Ws3qYdgb3ei/hMMxY7NZlfVgiRIawUHX7Tuxs4SslyGCSD2DV6nOSdE+4VURk9mGcqPntYVa1mo8oZ7IVUxNgjAUIVjMit/Z2vvlj/FIlkg9fkskVwIuisZFXxk8ioD1Y0BwFPkLfH4BR7L0LurZ1D1WwyJs9Y6X5yC9KZ4Inw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc3e5e08-8ad7-4573-ec5f-08db5d35a4c2 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5344.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2023 15:35:18.3912 (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: cm4CbX9j3yRAonCZsx97FfiaDlKtowpkWnWLhmDkRVfkfVYhukyME2qJldmKQegz4LR36dVfmRuyKctKVSmaTXcVknC+g93Ezt1RxLtd6Lk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7848 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds bluetoothctl support for broadcast source. --- client/player.c | 209 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 185 insertions(+), 24 deletions(-) diff --git a/client/player.c b/client/player.c index a9f56fb94..408118fca 100644 --- a/client/player.c +++ b/client/player.c @@ -74,11 +74,13 @@ struct endpoint { bool auto_accept; bool acquiring; uint8_t max_transports; - uint8_t cig; - uint8_t cis; + uint8_t iso_group; + uint8_t iso_stream; char *transport; DBusMessage *msg; struct preset *preset; + bool broadcast; + struct iovec *bcode; }; static DBusConnection *dbus_conn; @@ -104,6 +106,22 @@ struct transport { struct io *timer_io; }; +static const uint8_t base_lc3_16_2_1[] = { + 0x28, 0x00, 0x00, /* Presentation Delay */ + 0x01, /* Number of Subgroups */ + 0x01, /* Number of BIS */ + 0x06, 0x00, 0x00, 0x00, 0x00, /* Code ID = LC3 (0x06) */ + 0x11, /* Codec Specific Configuration */ + 0x02, 0x01, 0x03, /* 16 KHZ */ + 0x02, 0x02, 0x01, /* 10 ms */ + 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, /* Front Left */ + 0x03, 0x04, 0x28, 0x00, /* Frame Length 40 bytes */ + 0x04, /* Metadata */ + 0x03, 0x02, 0x02, 0x00, /* Audio Context: Convertional */ + 0x01, /* BIS */ + 0x00, /* Codec Specific Configuration */ +}; + static void endpoint_unregister(void *data) { struct endpoint *ep = data; @@ -1154,6 +1172,16 @@ static const struct capabilities { CODEC_CAPABILITIES(PAC_SOURCE_UUID, LC3_ID, LC3_DATA(LC3_FREQ_ANY, LC3_DURATION_ANY, 3u, 30, 240)), + /* Broadcast LC3 Source: + * + * Frequencies: 8Khz 11Khz 16Khz 22Khz 24Khz 32Khz 44.1Khz 48Khz + * Duration: 7.5 ms 10 ms + * Channel count: 3 + * Frame length: 30-240 + */ + CODEC_CAPABILITIES(BAA_SERVICE_UUID, LC3_ID, + LC3_DATA(LC3_FREQ_ANY, LC3_DURATION_ANY, + 3u, 30, 240)), }; struct codec_qos { @@ -1435,6 +1463,7 @@ static struct preset { PRESET(A2DP_SINK_UUID, A2DP_CODEC_SBC, sbc_presets, 6), PRESET(PAC_SINK_UUID, LC3_ID, lc3_presets, 3), PRESET(PAC_SOURCE_UUID, LC3_ID, lc3_presets, 3), + PRESET(BAA_SERVICE_UUID, LC3_ID, lc3_presets, 3), }; static void parse_vendor_codec(const char *codec, uint16_t *vid, uint16_t *cid) @@ -1707,6 +1736,27 @@ struct endpoint_config { const struct codec_qos *qos; }; +#define BCODE {0x01, 0x02, 0x68, 0x05, 0x53, 0xf1, 0x41, 0x5a, \ + 0xa2, 0x65, 0xbb, 0xaf, 0xc6, 0xea, 0x03, 0xb8} + +static struct bt_iso_qos bcast_qos = { + .bcast = { + .big = BT_ISO_QOS_BIG_UNSET, + .bis = BT_ISO_QOS_BIS_UNSET, + .sync_interval = 0x07, + .packing = 0x00, + .framing = 0x00, + .encryption = 0x00, + .bcode = BCODE, + .options = 0x00, + .skip = 0x0000, + .sync_timeout = 0x4000, + .sync_cte_type = 0x00, + .mse = 0x00, + .timeout = 0x4000, + } + }; + static void append_properties(DBusMessageIter *iter, struct endpoint_config *cfg) { @@ -1714,6 +1764,7 @@ static void append_properties(DBusMessageIter *iter, struct codec_qos *qos = (void *)cfg->qos; const char *key = "Capabilities"; const char *meta = "Metadata"; + const char *keyBCode = "BroadcastCode"; dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, "{sv}", &dict); @@ -1742,16 +1793,25 @@ static void append_properties(DBusMessageIter *iter, DBUS_TYPE_BYTE, &cfg->target_latency); } - if (cfg->ep->cig != BT_ISO_QOS_CIG_UNSET) { - bt_shell_printf("CIG 0x%2.2x\n", cfg->ep->cig); + if ((!cfg->ep->broadcast) && (cfg->ep->iso_group != BT_ISO_QOS_GROUP_UNSET)) { + bt_shell_printf("CIG 0x%2.2x\n", cfg->ep->iso_group); g_dbus_dict_append_entry(&dict, "CIG", DBUS_TYPE_BYTE, - &cfg->ep->cig); + &cfg->ep->iso_group); + } else { + bt_shell_printf("BIG 0x%2.2x\n", bcast_qos.bcast.big); + g_dbus_dict_append_entry(&dict, "BIG", DBUS_TYPE_BYTE, + &bcast_qos.bcast.big); } - if (cfg->ep->cis != BT_ISO_QOS_CIS_UNSET) { - bt_shell_printf("CIS 0x%2.2x\n", cfg->ep->cis); + if ((!cfg->ep->broadcast) && (cfg->ep->iso_stream != BT_ISO_QOS_STREAM_UNSET)) { + bt_shell_printf("CIS 0x%2.2x\n", cfg->ep->iso_stream); g_dbus_dict_append_entry(&dict, "CIS", DBUS_TYPE_BYTE, - &cfg->ep->cis); + &cfg->ep->iso_stream); + + } else { + bt_shell_printf("BIS 0x%2.2x\n", bcast_qos.bcast.bis); + g_dbus_dict_append_entry(&dict, "BIS", DBUS_TYPE_BYTE, + &bcast_qos.bcast.bis); } bt_shell_printf("Interval %u\n", qos->interval); @@ -1759,10 +1819,17 @@ static void append_properties(DBusMessageIter *iter, g_dbus_dict_append_entry(&dict, "Interval", DBUS_TYPE_UINT32, &qos->interval); - bt_shell_printf("Framing %s\n", qos->framing ? "true" : "false"); + if (!cfg->ep->broadcast) { + bt_shell_printf("Framing %s\n", qos->framing ? "true" : "false"); - g_dbus_dict_append_entry(&dict, "Framing", DBUS_TYPE_BOOLEAN, - &qos->framing); + g_dbus_dict_append_entry(&dict, "Framing", DBUS_TYPE_BOOLEAN, + &qos->framing); + } else { + bt_shell_printf("Framing %s\n", bcast_qos.bcast.framing ? "true" : "false"); + + g_dbus_dict_append_entry(&dict, "Framing", DBUS_TYPE_BOOLEAN, + &bcast_qos.bcast.framing); + } bt_shell_printf("PHY %s\n", qos->phy); @@ -1787,6 +1854,56 @@ static void append_properties(DBusMessageIter *iter, g_dbus_dict_append_entry(&dict, "Delay", DBUS_TYPE_UINT32, &qos->delay); + if (!cfg->ep->broadcast) + goto done; + + bt_shell_printf("SyncInterval %u\n", bcast_qos.bcast.sync_interval); + + g_dbus_dict_append_entry(&dict, "SyncInterval", DBUS_TYPE_BYTE, + &bcast_qos.bcast.sync_interval); + + bt_shell_printf("Encryption %u\n", bcast_qos.bcast.encryption); + + g_dbus_dict_append_entry(&dict, "Encryption", DBUS_TYPE_BYTE, + &bcast_qos.bcast.encryption); + + bt_shell_printf("Options %u\n", bcast_qos.bcast.options); + + g_dbus_dict_append_entry(&dict, "Options", DBUS_TYPE_BYTE, + &bcast_qos.bcast.options); + + bt_shell_printf("Skip %u\n", bcast_qos.bcast.skip); + + g_dbus_dict_append_entry(&dict, "Skip", DBUS_TYPE_UINT16, + &bcast_qos.bcast.skip); + + bt_shell_printf("SyncTimeout %u\n", bcast_qos.bcast.sync_timeout); + + g_dbus_dict_append_entry(&dict, "SyncTimeout", DBUS_TYPE_UINT16, + &bcast_qos.bcast.sync_timeout); + + bt_shell_printf("SyncCteType %u\n", bcast_qos.bcast.sync_cte_type); + + g_dbus_dict_append_entry(&dict, "SyncCteType", DBUS_TYPE_BYTE, + &bcast_qos.bcast.sync_cte_type); + + bt_shell_printf("MSE %u\n", bcast_qos.bcast.mse); + + g_dbus_dict_append_entry(&dict, "MSE", DBUS_TYPE_BYTE, + &bcast_qos.bcast.mse); + + bt_shell_printf("Timeout %u\n", bcast_qos.bcast.timeout); + + g_dbus_dict_append_entry(&dict, "Timeout", DBUS_TYPE_UINT16, + &bcast_qos.bcast.timeout); + + bt_shell_printf("BroadcastCode:\n"); + bt_shell_hexdump(cfg->ep->bcode->iov_base, cfg->ep->bcode->iov_len); + + g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &keyBCode, + DBUS_TYPE_BYTE, &cfg->ep->bcode->iov_base, + cfg->ep->bcode->iov_len); + done: dbus_message_iter_close_container(iter, &dict); } @@ -1826,8 +1943,15 @@ static DBusMessage *endpoint_select_properties_reply(struct endpoint *ep, cfg = new0(struct endpoint_config, 1); cfg->ep = ep; - /* Copy capabilities */ - iov_append(&cfg->caps, preset->data.iov_base, preset->data.iov_len); + if (ep->broadcast) { + iov_append(&cfg->ep->bcode, bcast_qos.bcast.bcode, sizeof(bcast_qos.bcast.bcode)); + /* Copy capabilities for broadcast*/ + iov_append(&cfg->caps, base_lc3_16_2_1, sizeof(base_lc3_16_2_1)); + } else { + /* Copy capabilities */ + iov_append(&cfg->caps, preset->data.iov_base, preset->data.iov_len); + } + cfg->target_latency = preset->target_latency; /* Copy metadata */ @@ -2239,14 +2363,14 @@ fail: } -static void endpoint_cis(const char *input, void *user_data) +static void endpoint_iso_stream(const char *input, void *user_data) { struct endpoint *ep = user_data; char *endptr = NULL; int value; if (!strcasecmp(input, "a") || !strcasecmp(input, "auto")) { - ep->cis = BT_ISO_QOS_CIS_UNSET; + ep->iso_stream = BT_ISO_QOS_STREAM_UNSET; } else { value = strtol(input, &endptr, 0); @@ -2255,20 +2379,20 @@ static void endpoint_cis(const char *input, void *user_data) return bt_shell_noninteractive_quit(EXIT_FAILURE); } - ep->cis = value; + ep->iso_stream = value; } endpoint_register(ep); } -static void endpoint_cig(const char *input, void *user_data) +static void endpoint_iso_group(const char *input, void *user_data) { struct endpoint *ep = user_data; char *endptr = NULL; int value; if (!strcasecmp(input, "a") || !strcasecmp(input, "auto")) { - ep->cig = BT_ISO_QOS_CIG_UNSET; + ep->iso_group = BT_ISO_QOS_GROUP_UNSET; } else { value = strtol(input, &endptr, 0); @@ -2277,10 +2401,13 @@ static void endpoint_cig(const char *input, void *user_data) return bt_shell_noninteractive_quit(EXIT_FAILURE); } - ep->cig = value; + ep->iso_group = value; } - bt_shell_prompt_input(ep->path, "CIS (auto/value):", endpoint_cis, ep); + if (!ep->broadcast) + bt_shell_prompt_input(ep->path, "CIS (auto/value):", endpoint_iso_stream, ep); + else + bt_shell_prompt_input(ep->path, "BIS (auto/value):", endpoint_iso_stream, ep); } static void endpoint_max_transports(const char *input, void *user_data) @@ -2302,13 +2429,22 @@ static void endpoint_max_transports(const char *input, void *user_data) ep->max_transports = value; } - bt_shell_prompt_input(ep->path, "CIG (auto/value):", endpoint_cig, ep); + if (ep->broadcast) + bt_shell_prompt_input(ep->path, "BIG (auto/value):", endpoint_iso_group, ep); + else + bt_shell_prompt_input(ep->path, "CIG (auto/value):", endpoint_iso_group, ep); } static void endpoint_auto_accept(const char *input, void *user_data) { struct endpoint *ep = user_data; + if (!strcmp(ep->uuid, BAA_SERVICE_UUID)) { + ep->broadcast = true; + } else { + ep->broadcast = false; + } + if (!strcasecmp(input, "y") || !strcasecmp(input, "yes")) { ep->auto_accept = true; bt_shell_prompt_input(ep->path, "Max Transports (auto/value):", @@ -2321,7 +2457,10 @@ static void endpoint_auto_accept(const char *input, void *user_data) return bt_shell_noninteractive_quit(EXIT_FAILURE); } - bt_shell_prompt_input(ep->path, "CIG (auto/value):", endpoint_cig, ep); + if (ep->broadcast) + bt_shell_prompt_input(ep->path, "BIG (auto/value):", endpoint_iso_group, ep); + else + bt_shell_prompt_input(ep->path, "CIG (auto/value):", endpoint_iso_group, ep); } static void endpoint_set_metadata(const char *input, void *user_data) @@ -3050,8 +3189,8 @@ static void register_endpoints(GDBusProxy *proxy) ep->cid); ep->max_transports = UINT8_MAX; ep->auto_accept = true; - ep->cig = BT_ISO_QOS_CIG_UNSET; - ep->cis = BT_ISO_QOS_CIS_UNSET; + ep->iso_group = BT_ISO_QOS_GROUP_UNSET; + ep->iso_stream = BT_ISO_QOS_STREAM_UNSET; endpoint_register(ep); } } @@ -3595,6 +3734,7 @@ static void cmd_acquire_transport(int argc, char *argv[]) { GDBusProxy *proxy; int i; + struct endpoint *ep, *link; for (i = 1; i < argc; i++) { proxy = g_dbus_proxy_lookup(transports, NULL, argv[i], @@ -3610,6 +3750,27 @@ static void cmd_acquire_transport(int argc, char *argv[]) return bt_shell_noninteractive_quit(EXIT_FAILURE); } + ep = find_ep_by_transport(g_dbus_proxy_get_path(proxy)); + if (!ep || ep->acquiring) { + bt_shell_printf("Transport %s already in acquiring process\n", + argv[i]); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + ep->acquiring = true; + + link = find_link_by_proxy(proxy); + if (link) { + bt_shell_printf("Link %s found\n", link->transport); + /* If link already acquiring wait it to be complete */ + if (link->acquiring) { + bt_shell_printf("Link %s already in acquiring process\n", + argv[i]); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + link->acquiring = true; + } + if (!g_dbus_proxy_method_call(proxy, "Acquire", NULL, acquire_reply, proxy, NULL)) { bt_shell_printf("Failed acquire transport\n"); From patchwork Thu May 25 15:34:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silviu Florian Barbulescu X-Patchwork-Id: 685700 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 607DCC77B7E for ; Thu, 25 May 2023 15:35:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241800AbjEYPfe (ORCPT ); Thu, 25 May 2023 11:35:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234743AbjEYPfc (ORCPT ); Thu, 25 May 2023 11:35:32 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2071.outbound.protection.outlook.com [40.107.7.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2756DA3 for ; Thu, 25 May 2023 08:35:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PDi5zhcl3Y0L54nUnauADhy99YHPyPN9z7/Jsup1eLy3kk2zAzQHNRNFpenXOProbXY45y5Xy5727Kx/casxUKASvWA7CjkF1WoyHScSzeY5dfmiKvVKJW5v/wSYvCqeK+cDfxazAP1rXdWT8CfOKXcbKAV8h5PPZvLPlHZKNXIl0EFzvj/cVfrCfU6BIy5Ar1dikne0K4VTaDzBAULSDILjW2I96Jp9ru9qMf3CcDfqR7tjCfYwhtv9pKQd74t2VwQWZVjVxNcuA9b21RpKSHjbDHD7V8wI/l/QDjYmSKSJhceZcjvFXbRNhJnbI2/AFyLMYa+PAGvPRzujsIBAQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=vmgMQA9oj4RXQcVCKFu6lcU+808Hljd9ICtoYhHjwKw=; b=PViqnCIF6AkNgc1uGBxZyE7oUjVDgSh+QXcsgaIEpRRHvZZylmDXIeFMijvWUop1eytj6cllPbh78kFvTSctFvDJXymNGl1hRFmPF3eTGN7tQC2bPziD0oAolDpbbCdlPzkb5s1tkffDNJBYnCL2hzCWo9JhcK0aSLUUJIDsJJXvAzzJpOMo0tCyDKxLnjXavBQyne4iKsjlNhthd7MtOwW/RFV9IJeVFJ3KyGYDZZ/IaUUpY1K/kbSnX2JcDZmfWQUA8UoDHCyZemCiBUe3Xywm32lWKJ1eu8yp21556QeB1F8qN/aL/IRsjH43q+HjFVaQgm/yEYRKHLttRfBvdw== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vmgMQA9oj4RXQcVCKFu6lcU+808Hljd9ICtoYhHjwKw=; b=lUf/SYergp6ShIZv+tWTwfIc0I1k+sa3cdHR1lQJTwTQi1YiNvah50WIxayHQ3N3cE8QZhgXObX6F+mYTOhh4XPLJlFDnLSz4ZxH/nHG7a4g5wzSkVgyTHTG5racAUtDCaVRnQ3dOp0Gt6x/H4DEJWyIoXyXfMRMCUwl7vxy7x8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5344.eurprd04.prod.outlook.com (2603:10a6:803:4b::31) by DU2PR04MB8613.eurprd04.prod.outlook.com (2603:10a6:10:2d8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.15; Thu, 25 May 2023 15:35:20 +0000 Received: from VI1PR04MB5344.eurprd04.prod.outlook.com ([fe80::981d:d04a:5851:1578]) by VI1PR04MB5344.eurprd04.prod.outlook.com ([fe80::981d:d04a:5851:1578%4]) with mapi id 15.20.6411.029; Thu, 25 May 2023 15:35:20 +0000 From: Silviu Florian Barbulescu To: linux-bluetooth@vger.kernel.org Cc: Silviu Florian Barbulescu Subject: [PATCH v2 6/6] Add initial support for BAP broadcast source Date: Thu, 25 May 2023 18:34:52 +0300 Message-Id: <20230525153452.125789-7-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230525153452.125789-1-silviu.barbulescu@nxp.com> References: <20230525153452.125789-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: AS4P192CA0001.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:5da::15) To VI1PR04MB5344.eurprd04.prod.outlook.com (2603:10a6:803:4b::31) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5344:EE_|DU2PR04MB8613:EE_ X-MS-Office365-Filtering-Correlation-Id: 3449761d-50cf-48de-1a22-08db5d35a597 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GSjVJ1AM2FWbaxQaS6bWL4FqJeGuAIr6gflHdbuz8iWMvNzE8tM7tEkfa9EEjEX+e+Xe4pj+VBSJG6cocDw28k2GtsRVMgApjGhAvTAWcXNxj7Q6BA1sYStL6roRYst6Ywm/o8BYQpS6wGQP7UTzUK3KhMmpDmjsIDHnq0rFk6oV2G5TahilG7X85iAm8ceizLTYW2Hr4n6N22K0DlO6gYZoVGqVf8ez6+UI1iSNhohlweXlo0aDzvVjicQUNaSZcHmF5QZysSDqdrihrBQQqYTztLFMYARz1/HDq/xS3ouri3DeMMaz4AZfignuWqnshdupTCGsEJfguYxnKGCmmtplkCNT36OeXSGVTrMWqDVVojf+8UQjwP/7SjYslCc3Hnog+7cdBY2AWmBsg9B8SqS7lJxmcg99oGGYZEPd+6KOssyfxbuAYNqkNjQCueMFHupCJ8DFIej1wCV2j99wab2t64t3R0NTv5NYfuE06wpKWfJxFbAAoiZidXaBmPhlHtMvpoOZG/NZuQ+RmLim5jkXLVn8up6/NuLEQXPAXRGHUfosMrH5eUOSzIpOYhU0g0BOwiVTHByLr3eVEtSixJF9VwtF7TAYQe65trnMSuCXFZLS8iTRqskmwosJJRah X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5344.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(376002)(39860400002)(396003)(346002)(136003)(451199021)(5660300002)(36756003)(316002)(41300700001)(38100700002)(38350700002)(66946007)(52116002)(66476007)(66556008)(83380400001)(4326008)(6916009)(478600001)(55236004)(86362001)(186003)(2906002)(6486002)(30864003)(8936002)(6666004)(8676002)(2616005)(6512007)(1076003)(26005)(6506007)(579004)(559001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FRm0PiM+LT7ffFJkkOy/xp2h8WfMK/zTXYxIpQSvmKbIUX5ZATFIuO6iBgfdvkW19+tmmrLjwBj+DjkdBywZ+l3hpgySytxEJoQvxgmylAZnUKMgPL/+mfpaHlXEZI2rb0PtoK34aSInt15eg73PEX0E6mAROilGp+EFXTxeJceUqyBh4035+7Rvew+zvOxDnvJlrzAVP7wNsJ2/XMyzUG934aJ/0WU3DhckToNxK15jk7Te6V54tNobsGYITCN9HfV/5rP2ISkAqPudjb/znQkw/IYM0NYLXIOLa1KIZ7/oQxgoHj4D4AdWxrjSvt+u0UeyIkEavscnu3x3PLCj9i532zpIvHaG/LP0Sxntsckpna72lGhUFgN8OaMUyibN3b3qejxWXs+m+FaEITZNzc1XCisiutoY6fqNu8hkzJ1eD2CyxzRxrhG8HaW4HqsJJbj6iaUJ53sps3w/4Z7wHhhMNjCpcbI6W8HHXYG8c55CL5iTom2LlZMxj1W1lqygUWQ0fo4JToMJQOIOvqNCtlWwiBB9TWt/xz/cWeQR09qqXVGEFMxzxMTGUonNpkZ26Uu7aJVo7873Ho5DxA7fTfZ5x9l1w9EtnSG+RF+RHqFmetOs/T3ctOADEbh7umwdeh470dtTSa6e3OPce7+pXNAG8PspZsl8RMv8y5yWDQ/R+BKa3mJwwc/xjMHM8+cx79JCyT2qkxqOSr+Aab0pftk0A2k8h3ozs7bLOLx7lx2TVF5MfSUJYk/vGQh38Zblz6N5iUVJlC/4CMO00YlOH2rCtrm8JEDhaQgCRfOFWBlBeilfQmOJDh1hRM7Xp2FYvOCcwX0iOrYGCR5HifsoBe9+N+1znHXb2Mv5UGW19tew40aEQV9RGFrqEh5Rmrl05GvkKcOCLPKebCvxR+nvDgzQRAogJ2A8GtDC2YBrlsIIXGkZePqRAEt1XOXUr1/IL19tjvB6/sSa3rD1skNdjwWfwq6uYd8i+XxyzSUNH1oYMAYsnEVG8pO8QQuAVKMNf9/8/r7LNU89GJQCOphni445lEcLOaCPyK1+FNm2SYR7uFZAvTNTwTbNzIWLqqK2FrM+/ka5KuWp2dH3bCmijwZu80cKEJfv6RQ/v4ZyDU0oLgPaifu42+vOL1nxPokocJKQgK8KaNGqa/uMHlzsVH3o5+oCDG09q9nXkuJsgrhkre5lgSq55Zc8ELPYW1fA2okp2h6yTB0p7rYjvmCtuJTD0klgUVe+u5uB0oZePTM5G2QwtedwATqW+F7AUj6d0jKaKBn9WHCxQBvA9eNkGTKHiTyJM/0nXkmM4hsehc3DqVp1Ic1s2rZOkUav35OmqEiFe24sFOm24TwuI2mpjUFTk3W7l1LEIaObCSE4HJLctKigm/fkLLG+Dc5B4+XH+BbXxfcm3VmNVm7UvCa1KFXubK8qSuUrfqBWj02Z/t6pHKcuc2mKJtdn48PUYnh4EyyM3V+dlYk3jMFft3NfWqXFW1EWjjPwNO4WMatqZDBBk26BWRswmJfRM1/4TiDO8Nro+hOkgfw6WhaxKqZywhehtmIzaKFsR41/toLpYpwW+0MiUqjP7dvMFyHmf+3GBRh3qJ4NC0pCuAt4IeWnRA== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3449761d-50cf-48de-1a22-08db5d35a597 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5344.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2023 15:35:20.0079 (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: BmSaxwopVSY9Bp+p3Aj9GDtLVqnNrjbImkbdXyk0fWaowalVAFso17kfuEH38rX6i90Kh9+XXtVTkSK2Mh8oK8n4h8EqCANxm10qixLFfWM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8613 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds initial support for BAP broadcast source. --- profiles/audio/bap.c | 455 ++++++++++++++++++++++++++++++++----- profiles/audio/media.c | 129 +++++++++-- profiles/audio/transport.c | 51 +++-- src/shared/bap.c | 324 +++++++++++++++++++------- src/shared/bap.h | 81 +++++-- unit/test-bap.c | 83 +++---- 6 files changed, 881 insertions(+), 242 deletions(-) diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c index 1a543a9ce..2b281f58c 100644 --- a/profiles/audio/bap.c +++ b/profiles/audio/bap.c @@ -82,13 +82,25 @@ struct bap_data { unsigned int pac_id; struct queue *srcs; struct queue *snks; + struct queue *bcast; struct queue *streams; GIOChannel *listen_io; int selecting; + void *user_data; }; static struct queue *sessions; +static bool bap_data_set_user_data(struct bap_data *data, void *user_data) +{ + if (!data) + return false; + + data->user_data = user_data; + + return true; +} + static void bap_debug(const char *str, void *user_data) { DBG_IDX(0xffff, "%s", str); @@ -167,8 +179,10 @@ static gboolean get_uuid(const GDBusPropertyTable *property, if (queue_find(ep->data->snks, NULL, ep)) uuid = PAC_SINK_UUID; - else + if (queue_find(ep->data->srcs, NULL, ep)) uuid = PAC_SOURCE_UUID; + else + uuid = BAA_SERVICE_UUID; dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &uuid); @@ -253,6 +267,8 @@ static int parse_properties(DBusMessageIter *props, struct iovec **caps, struct iovec **metadata, struct bt_bap_qos *qos) { const char *key; + struct bt_bap_io_qos io_qos; + bool broadcast = false; while (dbus_message_iter_get_arg_type(props) == DBUS_TYPE_DICT_ENTRY) { DBusMessageIter value, entry; @@ -282,17 +298,27 @@ static int parse_properties(DBusMessageIter *props, struct iovec **caps, if (var != DBUS_TYPE_BYTE) goto fail; - dbus_message_iter_get_basic(&value, &qos->cig_id); + dbus_message_iter_get_basic(&value, &qos->ucast.cig_id); + } else if (!strcasecmp(key, "BIG")) { + if (var != DBUS_TYPE_BYTE) + goto fail; + + dbus_message_iter_get_basic(&value, &qos->bcast.big); } else if (!strcasecmp(key, "CIS")) { if (var != DBUS_TYPE_BYTE) goto fail; - dbus_message_iter_get_basic(&value, &qos->cis_id); + dbus_message_iter_get_basic(&value, &qos->ucast.cis_id); + } else if (!strcasecmp(key, "BIS")) { + if (var != DBUS_TYPE_BYTE) + goto fail; + + dbus_message_iter_get_basic(&value, &qos->bcast.bis); } else if (!strcasecmp(key, "Interval")) { if (var != DBUS_TYPE_UINT32) goto fail; - dbus_message_iter_get_basic(&value, &qos->interval); + dbus_message_iter_get_basic(&value, &io_qos.interval); } else if (!strcasecmp(key, "Framing")) { dbus_bool_t val; @@ -301,7 +327,7 @@ static int parse_properties(DBusMessageIter *props, struct iovec **caps, dbus_message_iter_get_basic(&value, &val); - qos->framing = val; + qos->ucast.framing = val; } else if (!strcasecmp(key, "PHY")) { const char *str; @@ -311,42 +337,91 @@ static int parse_properties(DBusMessageIter *props, struct iovec **caps, dbus_message_iter_get_basic(&value, &str); if (!strcasecmp(str, "1M")) - qos->phy = 0x01; + io_qos.phy = 0x01; else if (!strcasecmp(str, "2M")) - qos->phy = 0x02; + io_qos.phy = 0x02; else goto fail; } else if (!strcasecmp(key, "SDU")) { if (var != DBUS_TYPE_UINT16) goto fail; - dbus_message_iter_get_basic(&value, &qos->sdu); + dbus_message_iter_get_basic(&value, &io_qos.sdu); } else if (!strcasecmp(key, "Retransmissions")) { if (var != DBUS_TYPE_BYTE) goto fail; - dbus_message_iter_get_basic(&value, &qos->rtn); + dbus_message_iter_get_basic(&value, &io_qos.rtn); } else if (!strcasecmp(key, "Latency")) { if (var != DBUS_TYPE_UINT16) goto fail; - dbus_message_iter_get_basic(&value, &qos->latency); + dbus_message_iter_get_basic(&value, &io_qos.latency); } else if (!strcasecmp(key, "Delay")) { if (var != DBUS_TYPE_UINT32) goto fail; - dbus_message_iter_get_basic(&value, &qos->delay); + dbus_message_iter_get_basic(&value, &qos->ucast.delay); } else if (!strcasecmp(key, "TargetLatency")) { if (var != DBUS_TYPE_BYTE) goto fail; dbus_message_iter_get_basic(&value, - &qos->target_latency); + &qos->ucast.target_latency); + } else if (!strcasecmp(key, "Encryption")) { + if (var != DBUS_TYPE_BYTE) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.encryption); + DBG("Got Encryption for bcast"); + broadcast = true; + } else if (!strcasecmp(key, "Options")) { + if (var != DBUS_TYPE_BYTE) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.options); + } else if (!strcasecmp(key, "Skip")) { + if (var != DBUS_TYPE_UINT16) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.skip); + } else if (!strcasecmp(key, "SyncTimeout")) { + if (var != DBUS_TYPE_UINT16) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.sync_timeout); + } else if (!strcasecmp(key, "SyncCteType")) { + if (var != DBUS_TYPE_BYTE) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.sync_cte_type); + } else if (!strcasecmp(key, "MSE")) { + if (var != DBUS_TYPE_BYTE) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.mse); + } else if (!strcasecmp(key, "Timeout")) { + if (var != DBUS_TYPE_UINT16) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.timeout); } dbus_message_iter_next(props); } + if (broadcast) + memcpy(&qos->bcast.io_qos, &io_qos, sizeof(io_qos)); + else + memcpy(&qos->ucast.io_qos, &io_qos, sizeof(io_qos)); + return 0; fail: @@ -456,8 +531,8 @@ static DBusMessage *set_configuration(DBusConnection *conn, DBusMessage *msg, } /* Mark CIG and CIS to be auto assigned */ - ep->qos.cig_id = BT_ISO_QOS_CIG_UNSET; - ep->qos.cis_id = BT_ISO_QOS_CIS_UNSET; + ep->qos.ucast.cig_id = BT_ISO_QOS_CIG_UNSET; + ep->qos.ucast.cis_id = BT_ISO_QOS_CIS_UNSET; if (parse_properties(&props, &ep->caps, &ep->metadata, &ep->qos) < 0) { DBG("Unable to parse properties"); @@ -508,6 +583,8 @@ static void ep_free(void *data) util_iov_free(ep->caps, 1); util_iov_free(ep->metadata, 1); + if (bt_bap_stream_get_type(ep->stream) == BT_BAP_STREAM_TYPE_BROADCAST) + util_iov_free(&ep->qos.bcast.bcode, 1); free(ep->path); free(ep); } @@ -551,6 +628,11 @@ static struct bap_ep *ep_register(struct btd_service *service, i = queue_length(data->srcs); suffix = "source"; break; + case BT_BAP_BROADCAST_SOURCE: + queue = data->bcast; + i = queue_length(data->bcast); + suffix = "broadcast"; + break; default: return NULL; } @@ -609,12 +691,14 @@ static void bap_config(void *data, void *user_data) ep->id = bt_bap_stream_config(ep->stream, &ep->qos, ep->caps, config_cb, ep); - if (!ep->id) { - DBG("Unable to config stream"); - util_iov_free(ep->caps, 1); - ep->caps = NULL; - util_iov_free(ep->metadata, 1); - ep->metadata = NULL; + if (bt_bap_stream_get_type(ep->stream) == BT_BAP_STREAM_TYPE_UNICAST) { + if (!ep->id) { + DBG("Unable to config stream"); + util_iov_free(ep->caps, 1); + ep->caps = NULL; + util_iov_free(ep->metadata, 1); + ep->metadata = NULL; + } } bt_bap_stream_set_user_data(ep->stream, ep->path); @@ -650,6 +734,7 @@ done: queue_foreach(ep->data->srcs, bap_config, NULL); queue_foreach(ep->data->snks, bap_config, NULL); + queue_foreach(ep->data->bcast, bap_config, NULL); } static bool pac_found(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, @@ -666,8 +751,13 @@ static bool pac_found(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, return true; } - /* TODO: Cache LRU? */ - if (btd_service_is_initiator(service)) { + if (bt_bap_pac_get_type(lpac) != BT_BAP_BROADCAST_SOURCE) { + /* TODO: Cache LRU? */ + if (btd_service_is_initiator(service)) { + if (!bt_bap_select(lpac, rpac, select_cb, ep)) + ep->data->selecting++; + } + } else { if (!bt_bap_select(lpac, rpac, select_cb, ep)) ep->data->selecting++; } @@ -698,11 +788,17 @@ static struct bap_ep *bap_find_ep_by_stream(struct bap_data *data, { struct bap_ep *ep; - ep = queue_find(data->snks, match_ep_by_stream, stream); - if (ep) - return ep; + if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_UNICAST) { + ep = queue_find(data->snks, match_ep_by_stream, stream); + if (ep) + return ep; - return queue_find(data->srcs, match_ep_by_stream, stream); + return queue_find(data->srcs, match_ep_by_stream, stream); + } else if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BROADCAST) { + + return queue_find(data->bcast, match_ep_by_stream, stream); + } else + return NULL; } static void iso_connect_cb(GIOChannel *chan, GError *err, gpointer user_data) @@ -734,11 +830,11 @@ static void bap_iso_qos(struct bt_bap_qos *qos, struct bt_iso_io_qos *io) if (!qos) return; - io->interval = qos->interval; - io->latency = qos->latency; - io->sdu = qos->sdu; - io->phy = qos->phy; - io->rtn = qos->rtn; + io->interval = qos->ucast.io_qos.interval; + io->latency = qos->ucast.io_qos.latency; + io->sdu = qos->ucast.io_qos.sdu; + io->phy = qos->ucast.io_qos.phy; + io->rtn = qos->ucast.io_qos.rtn; } static bool match_stream_qos(const void *data, const void *user_data) @@ -749,10 +845,10 @@ static bool match_stream_qos(const void *data, const void *user_data) qos = bt_bap_stream_get_qos((void *)stream); - if (iso_qos->ucast.cig != qos->cig_id) + if (iso_qos->ucast.cig != qos->ucast.cig_id) return false; - return iso_qos->ucast.cis == qos->cis_id; + return iso_qos->ucast.cis == qos->ucast.cis_id; } static void iso_confirm_cb(GIOChannel *io, void *user_data) @@ -941,6 +1037,65 @@ static void bap_connect_io(struct bap_data *data, struct bap_ep *ep, bt_bap_stream_io_connecting(stream, g_io_channel_unix_get_fd(io)); } +static void bap_connect_io_broadcast(struct bap_data *data, struct bap_ep *ep, + struct bt_bap_stream *stream, + struct bt_iso_qos *qos, int defer) +{ + struct btd_adapter *adapter = device_get_adapter(data->device); + GIOChannel *io = NULL; + GError *err = NULL; + bdaddr_t dst_addr = {0}; + char addr[18]; + struct bt_iso_base base; + + /* If IO already set and we are in the creation step, skip creating it again */ + if (bt_bap_stream_get_io(stream) && (defer == true)) + return; + + if (ep->io_id) { + g_source_remove(ep->io_id); + ep->io_id = 0; + } + base.base_len = ep->caps->iov_len; + + memset(base.base, 0, 248); + memcpy(base.base, ep->caps->iov_base, base.base_len); + DBG("ep %p stream %p defer %s", ep, stream, defer ? "true" : "false"); + ba2str(btd_adapter_get_address(adapter), addr); + + /* Just create socket and advance to the configured state (when defer = true) */ + if (defer == true) { + io = bt_io_connect(bap_connect_io_cb, ep, NULL, &err, + BT_IO_OPT_SOURCE_BDADDR, + btd_adapter_get_address(adapter), + BT_IO_OPT_DEST_BDADDR, + &dst_addr, + BT_IO_OPT_DEST_TYPE, + BDADDR_LE_PUBLIC, + BT_IO_OPT_MODE, BT_IO_MODE_ISO, + BT_IO_OPT_QOS, qos, + BT_IO_OPT_BASE, &base, + BT_IO_OPT_DEFER_TIMEOUT, defer, + BT_IO_OPT_INVALID); + + if (!io) { + error("%s", err->message); + g_error_free(err); + return; + } + + ep->io_id = g_io_add_watch(io, G_IO_HUP | G_IO_ERR | G_IO_NVAL, + bap_io_disconnected, ep); + + ep->io = io; + + bt_bap_stream_io_connecting(stream, g_io_channel_unix_get_fd(io)); + } else { /* Advance stream state to Streaming */ + io = ep->io; + // TO DO change to streaming state + } +} + static void bap_listen_io(struct bap_data *data, struct bt_bap_stream *stream, struct bt_iso_qos *qos) { @@ -987,20 +1142,44 @@ static void bap_create_io(struct bap_data *data, struct bap_ep *ep, if (!queue_find(data->streams, NULL, stream)) queue_push_tail(data->streams, stream); - if (!bt_bap_stream_io_get_qos(stream, &qos[0], &qos[1])) { - error("bt_bap_stream_get_qos_links: failed"); - return; + if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_UNICAST) { + if (!bt_bap_stream_io_get_qos(stream, &qos[0], &qos[1])) { + error("bt_bap_stream_get_qos_links: failed"); + return; + } } memset(&iso_qos, 0, sizeof(iso_qos)); - iso_qos.ucast.cig = qos[0] ? qos[0]->cig_id : qos[1]->cig_id; - iso_qos.ucast.cis = qos[0] ? qos[0]->cis_id : qos[1]->cis_id; + if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BROADCAST) { + if (defer == true) { + iso_qos.bcast.big = ep->qos.bcast.big; + iso_qos.bcast.bis = ep->qos.bcast.bis; + iso_qos.bcast.sync_interval = ep->qos.bcast.sync_interval; + iso_qos.bcast.packing = ep->qos.bcast.packing; + iso_qos.bcast.framing = ep->qos.bcast.framing; + iso_qos.bcast.encryption = ep->qos.bcast.encryption; + memcpy(iso_qos.bcast.bcode, ep->qos.bcast.bcode.iov_base, 16); + iso_qos.bcast.options = ep->qos.bcast.options; + iso_qos.bcast.skip = ep->qos.bcast.skip; + iso_qos.bcast.sync_timeout = ep->qos.bcast.sync_timeout; + iso_qos.bcast.sync_cte_type = ep->qos.bcast.sync_cte_type; + iso_qos.bcast.mse = ep->qos.bcast.mse; + iso_qos.bcast.timeout = ep->qos.bcast.timeout; + memcpy(&iso_qos.bcast.out, &ep->qos.bcast.io_qos, sizeof(struct bt_iso_io_qos)); + } + } else { + iso_qos.ucast.cig = qos[0] ? qos[0]->ucast.cig_id : qos[1]->ucast.cig_id; + iso_qos.ucast.cis = qos[0] ? qos[0]->ucast.cis_id : qos[1]->ucast.cis_id; - bap_iso_qos(qos[0], &iso_qos.ucast.in); - bap_iso_qos(qos[1], &iso_qos.ucast.out); + bap_iso_qos(qos[0], &iso_qos.ucast.in); + bap_iso_qos(qos[1], &iso_qos.ucast.out); + } if (ep) - bap_connect_io(data, ep, stream, &iso_qos, defer); + if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BROADCAST) + bap_connect_io_broadcast(data, ep, stream, &iso_qos, defer); + else + bap_connect_io(data, ep, stream, &iso_qos, defer); else bap_listen_io(data, stream, &iso_qos); } @@ -1039,12 +1218,14 @@ static void bap_state(struct bt_bap_stream *stream, uint8_t old_state, } - /* Wait QoS response to respond */ - ep->id = bt_bap_stream_qos(stream, &ep->qos, qos_cb, - ep); - if (!ep->id) { - error("Failed to Configure QoS"); - bt_bap_stream_release(stream, NULL, NULL); + if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_UNICAST) { + /* Wait QoS response to respond */ + ep->id = bt_bap_stream_qos(stream, &ep->qos, qos_cb, + ep); + if (!ep->id) { + error("Failed to Configure QoS"); + bt_bap_stream_release(stream, NULL, NULL); + } } } break; @@ -1055,6 +1236,12 @@ static void bap_state(struct bt_bap_stream *stream, uint8_t old_state, if (ep) bap_create_io(data, ep, stream, false); break; + case BT_BAP_STREAM_STATE_STREAMING: + if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BROADCAST) { + if (ep) + bap_create_io(data, ep, stream, false); + } + break; } } @@ -1074,6 +1261,20 @@ static void pac_added(struct bt_bap_pac *pac, void *user_data) bt_bap_foreach_pac(data->bap, BT_BAP_SINK, pac_found, service); } +static void pac_added_broadcast(struct bt_bap_pac *pac, void *user_data) +{ + struct btd_service *service = user_data; + struct bap_data *data; + + if (bt_bap_pac_get_type(pac) == BT_BAP_BROADCAST_SOURCE) { + DBG("pac %p", pac); + + data = btd_service_get_user_data(service); + + bt_bap_foreach_pac(data->bap, BT_BAP_BROADCAST_SOURCE, pac_found, service); + } +} + static bool ep_match_pac(const void *data, const void *match_data) { const struct bap_ep *ep = data; @@ -1114,6 +1315,38 @@ static void pac_removed(struct bt_bap_pac *pac, void *user_data) ep_unregister(ep); } +static void pac_removed_broadcast(struct bt_bap_pac *pac, void *user_data) +{ + struct btd_service *service = user_data; + struct bap_data *data; + struct queue *queue; + struct bap_ep *ep; + + DBG("pac %p", pac); + + data = btd_service_get_user_data(service); + + switch (bt_bap_pac_get_type(pac)) { + case BT_BAP_SINK: + queue = data->srcs; + break; + case BT_BAP_SOURCE: + queue = data->snks; + break; + case BT_BAP_BROADCAST_SOURCE: + queue = data->bcast; + break; + default: + return; + } + + ep = queue_remove_if(queue, ep_match_pac, pac); + if (!ep) + return; + + ep_unregister(ep); +} + static struct bap_data *bap_data_new(struct btd_device *device) { struct bap_data *data; @@ -1122,6 +1355,7 @@ static struct bap_data *bap_data_new(struct btd_device *device) data->device = device; data->srcs = queue_new(); data->snks = queue_new(); + data->bcast = queue_new(); return data; } @@ -1154,6 +1388,14 @@ static bool match_data(const void *data, const void *match_data) return bdata->bap == bap; } +static bool match_data_bap_data(const void *data, const void *match_data) +{ + const struct bap_data *bdata = data; + const struct btd_adapter *adapter = match_data; + + return bdata->user_data == adapter; +} + static void bap_connecting(struct bt_bap_stream *stream, bool state, int fd, void *user_data) { @@ -1178,26 +1420,49 @@ static void bap_connecting(struct bt_bap_stream *stream, bool state, int fd, g_io_channel_set_close_on_unref(io, FALSE); - /* Attempt to get CIG/CIS if they have not been set */ - if (ep->qos.cig_id == BT_ISO_QOS_CIG_UNSET || - ep->qos.cis_id == BT_ISO_QOS_CIS_UNSET) { - struct bt_iso_qos qos; - GError *err = NULL; + if (bt_bap_stream_get_type(ep->stream) == BT_BAP_STREAM_TYPE_UNICAST) { + /* Attempt to get CIG/CIS if they have not been set */ + if (ep->qos.ucast.cig_id == BT_ISO_QOS_CIG_UNSET || + ep->qos.ucast.cis_id == BT_ISO_QOS_CIS_UNSET) { + struct bt_iso_qos qos; + GError *err = NULL; + + if (!bt_io_get(io, &err, BT_IO_OPT_QOS, &qos, + BT_IO_OPT_INVALID)) { + error("%s", err->message); + g_error_free(err); + g_io_channel_unref(io); + return; + } - if (!bt_io_get(io, &err, BT_IO_OPT_QOS, &qos, - BT_IO_OPT_INVALID)) { - error("%s", err->message); - g_error_free(err); - g_io_channel_unref(io); - return; + ep->qos.ucast.cig_id = qos.ucast.cig; + ep->qos.ucast.cis_id = qos.ucast.cis; } - ep->qos.cig_id = qos.ucast.cig; - ep->qos.cis_id = qos.ucast.cis; - } + DBG("stream %p fd %d: CIG 0x%02x CIS 0x%02x", stream, fd, + ep->qos.ucast.cig_id, ep->qos.ucast.cis_id); + } else if (bt_bap_stream_get_type(ep->stream) == BT_BAP_STREAM_TYPE_BROADCAST) { + /* Attempt to get BIG/BIS if they have not been set */ + if (ep->qos.bcast.big == BT_ISO_QOS_BIG_UNSET || + ep->qos.bcast.bis == BT_ISO_QOS_BIS_UNSET) { + struct bt_iso_qos qos; + GError *err = NULL; + + if (!bt_io_get(io, &err, BT_IO_OPT_QOS, &qos, + BT_IO_OPT_INVALID)) { + error("%s", err->message); + g_error_free(err); + g_io_channel_unref(io); + return; + } + + ep->qos.bcast.big = qos.bcast.big; + ep->qos.bcast.bis = qos.bcast.bis; + } - DBG("stream %p fd %d: CIG 0x%02x CIS 0x%02x", stream, fd, - ep->qos.cig_id, ep->qos.cis_id); + DBG("stream %p fd %d: BIG 0x%02x BIS 0x%02x", stream, fd, + ep->qos.bcast.big, ep->qos.bcast.bis); + } } static void bap_attached(struct bt_bap *bap, void *user_data) @@ -1345,6 +1610,68 @@ static int bap_disconnect(struct btd_service *service) return 0; } +static int bap_adapter_probe(struct btd_profile *p, + struct btd_adapter *adapter) +{ + struct btd_device *device = btd_adapter_get_device(adapter, BDADDR_ANY, BDADDR_LE_PUBLIC); + struct btd_gatt_database *database = btd_adapter_get_database(adapter); + struct btd_service *service = service_create(device, p); + struct bap_data *data; + char addr[18]; + + ba2str(device_get_address(device), addr); + DBG("%s", addr); + + if (!btd_adapter_has_exp_feature(adapter, EXP_FEAT_ISO_SOCKET)) { + error("BAP requires ISO Socket which is not enabled"); + return -ENOTSUP; + } + + data = bap_data_new(device); + data->service = service; + + data->bap = bt_bap_new(btd_gatt_database_get_db(database), + btd_device_get_gatt_db(device)); + if (!data->bap) { + error("Unable to create BAP instance"); + free(data); + return -EINVAL; + } + + bap_data_add(data); + + if (!bt_bap_attach_broadcast(data->bap)) { + error("BAP unable to attach"); + return -EINVAL; + } + + data->state_id = bt_bap_state_register(data->bap, bap_state, + bap_connecting, data, NULL); + data->pac_id = bt_bap_pac_register(data->bap, pac_added_broadcast, + pac_removed_broadcast, service, NULL); + + bt_bap_set_user_data(data->bap, service); + bap_data_set_user_data(data, adapter); + return 0; +} + +static void bap_adapter_remove(struct btd_profile *p, + struct btd_adapter *adapter) +{ + struct bap_data *data = queue_find(sessions, match_data_bap_data, adapter); + char addr[18]; + + ba2str(btd_adapter_get_address(adapter), addr); + DBG("%s", addr); + + if (!data) { + error("BAP service not handled by profile"); + return; + } + + bap_data_remove(data); +} + static struct btd_profile bap_profile = { .name = "bap", .priority = BTD_PROFILE_PRIORITY_MEDIUM, @@ -1353,6 +1680,8 @@ static struct btd_profile bap_profile = { .device_remove = bap_remove, .accept = bap_accept, .disconnect = bap_disconnect, + .adapter_probe = bap_adapter_probe, + .adapter_remove = bap_adapter_remove, .auto_connect = true, .experimental = true, }; diff --git a/profiles/audio/media.c b/profiles/audio/media.c index 6ce668e31..ab9ae42e0 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c @@ -6,7 +6,7 @@ * Copyright (C) 2006-2007 Nokia Corporation * Copyright (C) 2004-2009 Marcel Holtmann * Copyright (C) 2011 BMW Car IT GmbH. All rights reserved. - * + * Copyright 2023 NXP * */ @@ -748,7 +748,11 @@ static int parse_select_properties(DBusMessageIter *props, struct iovec *caps, struct bt_bap_qos *qos) { const char *key; + struct bt_bap_io_qos io_qos; + uint8_t framing = 0; + bool broadcast = false; + memset(&io_qos, 0, sizeof(io_qos)); while (dbus_message_iter_get_arg_type(props) == DBUS_TYPE_DICT_ENTRY) { DBusMessageIter value, entry; int var; @@ -777,17 +781,27 @@ static int parse_select_properties(DBusMessageIter *props, struct iovec *caps, if (var != DBUS_TYPE_BYTE) goto fail; - dbus_message_iter_get_basic(&value, &qos->cig_id); + dbus_message_iter_get_basic(&value, &qos->ucast.cig_id); + } else if (!strcasecmp(key, "BIG")) { + if (var != DBUS_TYPE_BYTE) + goto fail; + + dbus_message_iter_get_basic(&value, &qos->bcast.big); } else if (!strcasecmp(key, "CIS")) { if (var != DBUS_TYPE_BYTE) goto fail; - dbus_message_iter_get_basic(&value, &qos->cis_id); + dbus_message_iter_get_basic(&value, &qos->ucast.cig_id); + } else if (!strcasecmp(key, "BIS")) { + if (var != DBUS_TYPE_BYTE) + goto fail; + + dbus_message_iter_get_basic(&value, &qos->bcast.bis); } else if (!strcasecmp(key, "Interval")) { if (var != DBUS_TYPE_UINT32) goto fail; - dbus_message_iter_get_basic(&value, &qos->interval); + dbus_message_iter_get_basic(&value, &io_qos.interval); } else if (!strcasecmp(key, "Framing")) { dbus_bool_t val; @@ -796,7 +810,7 @@ static int parse_select_properties(DBusMessageIter *props, struct iovec *caps, dbus_message_iter_get_basic(&value, &val); - qos->framing = val; + framing = val; } else if (!strcasecmp(key, "PHY")) { const char *str; @@ -806,42 +820,106 @@ static int parse_select_properties(DBusMessageIter *props, struct iovec *caps, dbus_message_iter_get_basic(&value, &str); if (!strcasecmp(str, "1M")) - qos->phy = 0x01; + io_qos.phy = 0x01; else if (!strcasecmp(str, "2M")) - qos->phy = 0x02; + io_qos.phy = 0x02; else goto fail; } else if (!strcasecmp(key, "SDU")) { if (var != DBUS_TYPE_UINT16) goto fail; - dbus_message_iter_get_basic(&value, &qos->sdu); + dbus_message_iter_get_basic(&value, &io_qos.sdu); } else if (!strcasecmp(key, "Retransmissions")) { if (var != DBUS_TYPE_BYTE) goto fail; - dbus_message_iter_get_basic(&value, &qos->rtn); + dbus_message_iter_get_basic(&value, &io_qos.rtn); } else if (!strcasecmp(key, "Latency")) { if (var != DBUS_TYPE_UINT16) goto fail; - dbus_message_iter_get_basic(&value, &qos->latency); + dbus_message_iter_get_basic(&value, &io_qos.latency); } else if (!strcasecmp(key, "Delay")) { if (var != DBUS_TYPE_UINT32) goto fail; - dbus_message_iter_get_basic(&value, &qos->delay); + dbus_message_iter_get_basic(&value, &qos->ucast.delay); } else if (!strcasecmp(key, "TargetLatency")) { if (var != DBUS_TYPE_BYTE) goto fail; dbus_message_iter_get_basic(&value, - &qos->target_latency); + &qos->ucast.target_latency); + } else if (!strcasecmp(key, "Encryption")) { + if (var != DBUS_TYPE_BYTE) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.encryption); + broadcast = true; + } else if (!strcasecmp(key, "Options")) { + if (var != DBUS_TYPE_BYTE) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.options); + } else if (!strcasecmp(key, "Skip")) { + if (var != DBUS_TYPE_UINT16) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.skip); + } else if (!strcasecmp(key, "SyncTimeout")) { + if (var != DBUS_TYPE_UINT16) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.sync_timeout); + } else if (!strcasecmp(key, "SyncCteType")) { + if (var != DBUS_TYPE_BYTE) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.sync_cte_type); + + } else if (!strcasecmp(key, "SyncInterval")) { + if (var != DBUS_TYPE_BYTE) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.sync_interval); + } else if (!strcasecmp(key, "MSE")) { + if (var != DBUS_TYPE_BYTE) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.mse); + } else if (!strcasecmp(key, "Timeout")) { + if (var != DBUS_TYPE_UINT16) + goto fail; + + dbus_message_iter_get_basic(&value, + &qos->bcast.timeout); + } else if (!strcasecmp(key, "BroadcastCode")) { + if (var != DBUS_TYPE_ARRAY) + goto fail; + + parse_array(&value, &qos->bcast.bcode); } dbus_message_iter_next(props); } + if (broadcast) { + memcpy(&qos->bcast.io_qos, &io_qos, sizeof(io_qos)); + qos->bcast.framing = framing; + + } else { + memcpy(&qos->ucast.io_qos, &io_qos, sizeof(io_qos)); + qos->ucast.framing = framing; + } + return 0; fail: @@ -875,8 +953,8 @@ static void pac_select_cb(struct media_endpoint *endpoint, void *ret, int size, memset(&qos, 0, sizeof(qos)); /* Mark CIG and CIS to be auto assigned */ - qos.cig_id = BT_ISO_QOS_CIG_UNSET; - qos.cis_id = BT_ISO_QOS_CIS_UNSET; + qos.ucast.cig_id = BT_ISO_QOS_CIG_UNSET; + qos.ucast.cis_id = BT_ISO_QOS_CIS_UNSET; memset(&caps, 0, sizeof(caps)); memset(&meta, 0, sizeof(meta)); @@ -1166,15 +1244,13 @@ static bool endpoint_init_pac(struct media_endpoint *endpoint, uint8_t type, endpoint->pac = bt_bap_add_vendor_pac(db, name, type, endpoint->codec, endpoint->cid, endpoint->vid, &endpoint->qos, - &data, metadata); + &data, metadata, &pac_ops, endpoint); if (!endpoint->pac) { error("Unable to create PAC"); free(metadata); return false; } - bt_bap_pac_set_ops(endpoint->pac, &pac_ops, endpoint); - DBG("PAC %s registered", name); free(name); @@ -1193,6 +1269,11 @@ static bool endpoint_init_pac_source(struct media_endpoint *endpoint, int *err) return endpoint_init_pac(endpoint, BT_BAP_SOURCE, err); } +static bool endpoint_init_broadcast_source(struct media_endpoint *endpoint, int *err) +{ + return endpoint_init_pac(endpoint, BT_BAP_BROADCAST_SOURCE, err); +} + static bool endpoint_properties_exists(const char *uuid, struct btd_device *dev, void *user_data) @@ -1295,6 +1376,18 @@ static bool experimental_endpoint_supported(struct btd_adapter *adapter) return g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL; } +static bool experimental_broadcaster_ep_supported(struct btd_adapter *adapter) +{ + + if (!btd_adapter_has_exp_feature(adapter, EXP_FEAT_ISO_SOCKET)) + return false; + + if (!btd_adapter_has_settings(adapter, MGMT_SETTING_ISO_BROADCASTER)) + return false; + + return g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL; +} + static struct media_endpoint_init { const char *uuid; bool (*func)(struct media_endpoint *endpoint, int *err); @@ -1308,6 +1401,8 @@ static struct media_endpoint_init { experimental_endpoint_supported }, { PAC_SOURCE_UUID, endpoint_init_pac_source, experimental_endpoint_supported }, + { BAA_SERVICE_UUID, endpoint_init_broadcast_source, + experimental_broadcaster_ep_supported }, }; static struct media_endpoint * diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c index 9172d167e..743fb5156 100644 --- a/profiles/audio/transport.c +++ b/profiles/audio/transport.c @@ -5,6 +5,7 @@ * * Copyright (C) 2006-2007 Nokia Corporation * Copyright (C) 2004-2009 Marcel Holtmann + * Copyright 2023 NXP * * */ @@ -525,6 +526,13 @@ static void media_owner_add(struct media_owner *owner, owner->pending = req; } +static void *get_stream_bap(struct media_transport *transport) +{ + struct bap_transport *bap = transport->data; + + return bap->stream; +} + static DBusMessage *acquire(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -540,15 +548,22 @@ static DBusMessage *acquire(DBusConnection *conn, DBusMessage *msg, return btd_error_not_authorized(msg); owner = media_owner_create(msg); + if (bt_bap_stream_get_type(get_stream_bap(transport)) == BT_BAP_STREAM_TYPE_BROADCAST) { + req = media_request_create(msg, 0x00); + media_owner_add(owner, req); + media_transport_set_owner(transport, owner); + } id = transport->resume(transport, owner); if (id == 0) { media_owner_free(owner); return btd_error_not_authorized(msg); } - req = media_request_create(msg, id); - media_owner_add(owner, req); - media_transport_set_owner(transport, owner); + if (bt_bap_stream_get_type(get_stream_bap(transport)) == BT_BAP_STREAM_TYPE_UNICAST) { + req = media_request_create(msg, id); + media_owner_add(owner, req); + media_transport_set_owner(transport, owner); + } return NULL; } @@ -828,7 +843,7 @@ static gboolean qos_exists(const GDBusPropertyTable *property, void *data) struct media_transport *transport = data; struct bap_transport *bap = transport->data; - return bap->qos.phy != 0x00; + return bap->qos.ucast.io_qos.phy != 0x00; } static gboolean get_cig(const GDBusPropertyTable *property, @@ -838,7 +853,7 @@ static gboolean get_cig(const GDBusPropertyTable *property, struct bap_transport *bap = transport->data; dbus_message_iter_append_basic(iter, DBUS_TYPE_BYTE, - &bap->qos.cig_id); + &bap->qos.ucast.cig_id); return TRUE; } @@ -850,7 +865,7 @@ static gboolean get_cis(const GDBusPropertyTable *property, struct bap_transport *bap = transport->data; dbus_message_iter_append_basic(iter, DBUS_TYPE_BYTE, - &bap->qos.cis_id); + &bap->qos.ucast.cis_id); return TRUE; } @@ -862,7 +877,7 @@ static gboolean get_interval(const GDBusPropertyTable *property, struct bap_transport *bap = transport->data; dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, - &bap->qos.interval); + &bap->qos.ucast.io_qos.interval); return TRUE; } @@ -872,7 +887,7 @@ static gboolean get_framing(const GDBusPropertyTable *property, { struct media_transport *transport = data; struct bap_transport *bap = transport->data; - dbus_bool_t val = bap->qos.framing; + dbus_bool_t val = bap->qos.ucast.framing; dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &val); @@ -885,7 +900,7 @@ static gboolean get_phy(const GDBusPropertyTable *property, struct media_transport *transport = data; struct bap_transport *bap = transport->data; - dbus_message_iter_append_basic(iter, DBUS_TYPE_BYTE, &bap->qos.phy); + dbus_message_iter_append_basic(iter, DBUS_TYPE_BYTE, &bap->qos.ucast.io_qos.phy); return TRUE; } @@ -896,7 +911,7 @@ static gboolean get_sdu(const GDBusPropertyTable *property, struct media_transport *transport = data; struct bap_transport *bap = transport->data; - dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &bap->qos.sdu); + dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &bap->qos.ucast.io_qos.sdu); return TRUE; } @@ -907,7 +922,7 @@ static gboolean get_retransmissions(const GDBusPropertyTable *property, struct media_transport *transport = data; struct bap_transport *bap = transport->data; - dbus_message_iter_append_basic(iter, DBUS_TYPE_BYTE, &bap->qos.rtn); + dbus_message_iter_append_basic(iter, DBUS_TYPE_BYTE, &bap->qos.ucast.io_qos.rtn); return TRUE; } @@ -919,7 +934,7 @@ static gboolean get_latency(const GDBusPropertyTable *property, struct bap_transport *bap = transport->data; dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, - &bap->qos.latency); + &bap->qos.ucast.io_qos.latency); return TRUE; } @@ -930,7 +945,7 @@ static gboolean get_delay(const GDBusPropertyTable *property, struct media_transport *transport = data; struct bap_transport *bap = transport->data; - dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &bap->qos.delay); + dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &bap->qos.ucast.delay); return TRUE; } @@ -1478,13 +1493,6 @@ static void bap_connecting(struct bt_bap_stream *stream, bool state, int fd, bap_update_links(transport); } -static void *get_stream_bap(struct media_transport *transport) -{ - struct bap_transport *bap = transport->data; - - return bap->stream; -} - static void free_bap(void *data) { struct bap_transport *bap = data; @@ -1555,7 +1563,8 @@ struct media_transport *media_transport_create(struct btd_device *device, goto fail; properties = a2dp_properties; } else if (!strcasecmp(uuid, PAC_SINK_UUID) || - !strcasecmp(uuid, PAC_SOURCE_UUID)) { + !strcasecmp(uuid, PAC_SOURCE_UUID) || + !strcasecmp(uuid, BAA_SERVICE_UUID)) { if (media_transport_init_bap(transport, stream) < 0) goto fail; properties = bap_properties; diff --git a/src/shared/bap.c b/src/shared/bap.c index f194f466f..573089170 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -4,6 +4,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2022 Intel Corporation. All rights reserved. + * Copyright 2023 NXP * */ @@ -120,6 +121,8 @@ struct bt_bap_db { struct bt_ascs *ascs; struct queue *sinks; struct queue *sources; + struct queue *broadcast_sources; + struct queue *broadcast_sinks; }; struct bt_bap_req { @@ -622,6 +625,18 @@ static struct bt_bap_endpoint *bap_endpoint_new(struct bt_bap_db *bdb, return ep; } +static struct bt_bap_endpoint *bap_endpoint_new_broacast(struct bt_bap_db *bdb) +{ + struct bt_bap_endpoint *ep; + + ep = new0(struct bt_bap_endpoint, 1); + ep->bdb = bdb; + ep->attr = NULL; + ep->dir = BT_BAP_BROADCAST_SOURCE; + + return ep; +} + static struct bt_bap_endpoint *bap_get_endpoint(struct queue *endpoints, struct bt_bap_db *db, struct gatt_db_attribute *attr) @@ -644,6 +659,26 @@ static struct bt_bap_endpoint *bap_get_endpoint(struct queue *endpoints, return ep; } +static struct bt_bap_endpoint *bap_get_endpoint_broadcast(struct queue *endpoints, + struct bt_bap_db *db) +{ + struct bt_bap_endpoint *ep; + + if (!db) + return NULL; + + if (queue_length(endpoints) > 0) + return queue_peek_head(endpoints); + + ep = bap_endpoint_new_broacast(db); + if (!ep) + return NULL; + + queue_push_tail(endpoints, ep); + + return ep; +} + static bool bap_endpoint_match_id(const void *data, const void *match_data) { const struct bt_bap_endpoint *ep = data; @@ -861,15 +896,15 @@ static void stream_notify_qos(struct bt_bap_stream *stream) status->state = ep->state; qos = (void *)status->params; - qos->cis_id = stream->qos.cis_id; - qos->cig_id = stream->qos.cig_id; - put_le24(stream->qos.interval, qos->interval); - qos->framing = stream->qos.framing; - qos->phy = stream->qos.phy; - qos->sdu = cpu_to_le16(stream->qos.sdu); - qos->rtn = stream->qos.rtn; - qos->latency = cpu_to_le16(stream->qos.latency); - put_le24(stream->qos.delay, qos->pd); + qos->cis_id = stream->qos.ucast.cis_id; + qos->cig_id = stream->qos.ucast.cig_id; + put_le24(stream->qos.ucast.io_qos.interval, qos->interval); + qos->framing = stream->qos.ucast.framing; + qos->phy = stream->qos.ucast.io_qos.phy; + qos->sdu = cpu_to_le16(stream->qos.ucast.io_qos.sdu); + qos->rtn = stream->qos.ucast.io_qos.rtn; + qos->latency = cpu_to_le16(stream->qos.ucast.io_qos.latency); + put_le24(stream->qos.ucast.delay, qos->pd); gatt_db_attribute_notify(ep->attr, (void *) status, len, bt_bap_get_att(stream->bap)); @@ -898,8 +933,8 @@ static void stream_notify_metadata(struct bt_bap_stream *stream) status->state = ep->state; meta = (void *)status->params; - meta->cis_id = stream->qos.cis_id; - meta->cig_id = stream->qos.cig_id; + meta->cis_id = stream->qos.ucast.cis_id; + meta->cig_id = stream->qos.ucast.cig_id; if (stream->meta) { meta->len = stream->meta->iov_len; @@ -1260,6 +1295,36 @@ static void bap_stream_state_changed(struct bt_bap_stream *stream) bt_bap_unref(bap); } +static void stream_set_state_broadcast(struct bt_bap_stream *stream, uint8_t state) +{ + struct bt_bap_endpoint *ep = stream->ep; + struct bt_bap *bap = stream->bap; + const struct queue_entry *entry; + + ep->old_state = ep->state; + ep->state = state; + + bt_bap_ref(bap); + + 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); + } + + /* Post notification updates */ + switch (stream->ep->state) { + case BT_ASCS_ASE_STATE_IDLE: + bap_stream_detach(stream); + break; + } + + bt_bap_unref(bap); +} + static void stream_set_state(struct bt_bap_stream *stream, uint8_t state) { struct bt_bap_endpoint *ep = stream->ep; @@ -1396,6 +1461,11 @@ 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_BROADCAST) { + stream_set_state_broadcast(stream, BT_BAP_STREAM_STATE_CONFIG); + return; + } + stream_set_state(stream, BT_BAP_STREAM_STATE_CONFIG); } @@ -1575,20 +1645,20 @@ static uint8_t ascs_qos(struct bt_ascs *ascs, struct bt_bap *bap, memset(&qos, 0, sizeof(qos)); - qos.cig_id = req->cig; - qos.cis_id = req->cis; - qos.interval = get_le24(req->interval); - qos.framing = req->framing; - qos.phy = req->phy; - qos.sdu = le16_to_cpu(req->sdu); - qos.rtn = req->rtn; - qos.latency = le16_to_cpu(req->latency); - qos.delay = get_le24(req->pd); + qos.ucast.cig_id = req->cig; + qos.ucast.cis_id = req->cis; + qos.ucast.io_qos.interval = get_le24(req->interval); + qos.ucast.framing = req->framing; + qos.ucast.io_qos.phy = req->phy; + qos.ucast.io_qos.sdu = le16_to_cpu(req->sdu); + qos.ucast.io_qos.rtn = req->rtn; + qos.ucast.io_qos.latency = le16_to_cpu(req->latency); + qos.ucast.delay = get_le24(req->pd); DBG(bap, "CIG 0x%02x CIS 0x%02x interval %u framing 0x%02x " "phy 0x%02x SDU %u rtn %u latency %u pd %u", - req->cig, req->cis, qos.interval, qos.framing, qos.phy, - qos.sdu, qos.rtn, qos.latency, qos.delay); + req->cig, req->cis, qos.ucast.io_qos.interval, qos.ucast.framing, qos.ucast.io_qos.phy, + qos.ucast.io_qos.sdu, qos.ucast.io_qos.rtn, qos.ucast.io_qos.latency, qos.ucast.delay); ep = bap_get_local_endpoint_id(bap, req->ase); if (!ep) { @@ -2219,6 +2289,8 @@ static struct bt_bap_db *bap_db_new(struct gatt_db *db) bdb->db = gatt_db_ref(db); bdb->sinks = queue_new(); bdb->sources = queue_new(); + bdb->broadcast_sources = queue_new(); + bdb->broadcast_sinks = queue_new(); if (!bap_db) bap_db = queue_new(); @@ -2394,6 +2466,16 @@ static void bap_add_source(struct bt_bap_pac *pac) iov.iov_len, NULL); } +static void bap_add_broadcast_source(struct bt_bap_pac *pac) +{ + queue_push_tail(pac->bdb->broadcast_sources, pac); +} + +static void bap_add_broadcast_sink(struct bt_bap_pac *pac) +{ + queue_push_tail(pac->bdb->broadcast_sinks, pac); +} + static void notify_pac_added(void *data, void *user_data) { struct bt_bap_pac_changed *changed = data; @@ -2415,10 +2497,12 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db, uint8_t id, uint16_t cid, uint16_t vid, struct bt_bap_pac_qos *qos, struct iovec *data, - struct iovec *metadata) + struct iovec *metadata, + struct bt_bap_pac_ops *pac_ops, + void *user_data) { struct bt_bap_db *bdb; - struct bt_bap_pac *pac; + struct bt_bap_pac *pac, *pac_brodcast_sink; struct bt_bap_codec codec; if (!db) @@ -2444,11 +2528,17 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db, case BT_BAP_SOURCE: bap_add_source(pac); break; + case BT_BAP_BROADCAST_SOURCE: + bap_add_broadcast_source(pac); + pac_brodcast_sink = bap_pac_new(bdb, name, type, &codec, qos, data, metadata); + bap_add_broadcast_sink(pac_brodcast_sink); + break; default: bap_pac_free(pac); return NULL; } + bt_bap_pac_set_ops(pac, pac_ops, user_data); queue_foreach(sessions, notify_session_pac_added, pac); return pac; @@ -2458,10 +2548,12 @@ struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name, uint8_t type, uint8_t id, struct bt_bap_pac_qos *qos, struct iovec *data, - struct iovec *metadata) + struct iovec *metadata, + struct bt_bap_pac_ops *pac_ops, + void *user_data) { return bt_bap_add_vendor_pac(db, name, type, id, 0x0000, 0x0000, qos, - data, metadata); + data, metadata, pac_ops, user_data); } uint8_t bt_bap_pac_get_type(struct bt_bap_pac *pac) @@ -2486,6 +2578,21 @@ uint32_t bt_bap_pac_get_locations(struct bt_bap_pac *pac) } } +uint8_t bt_bap_stream_get_type(struct bt_bap_stream *stream) +{ + if (!stream) + return BT_BAP_STREAM_TYPE_UNKNOWN; + + if ((bt_bap_pac_get_type(stream->lpac) == BT_BAP_SINK) || + (bt_bap_pac_get_type(stream->lpac) == BT_BAP_SOURCE)) + return BT_BAP_STREAM_TYPE_UNICAST; + else if ((bt_bap_pac_get_type(stream->lpac) == BT_BAP_BROADCAST_SOURCE) || + (bt_bap_pac_get_type(stream->lpac) == BT_BAP_BROADCAST_SINK)) + return BT_BAP_STREAM_TYPE_BROADCAST; + else + return BT_BAP_STREAM_TYPE_UNKNOWN; +} + static void notify_pac_removed(void *data, void *user_data) { struct bt_bap_pac_changed *changed = data; @@ -2544,6 +2651,9 @@ bool bt_bap_remove_pac(struct bt_bap_pac *pac) if (queue_remove_if(pac->bdb->sources, NULL, pac)) goto found; + if (queue_remove_if(pac->bdb->broadcast_sources, NULL, pac)) + goto found; + return false; found: @@ -3295,13 +3405,13 @@ static void ep_status_qos(struct bt_bap *bap, struct bt_bap_endpoint *ep, if (!ep->stream) return; - ep->stream->qos.interval = interval; - ep->stream->qos.framing = qos->framing; - ep->stream->qos.phy = qos->phy; - ep->stream->qos.sdu = sdu; - ep->stream->qos.rtn = qos->rtn; - ep->stream->qos.latency = latency; - ep->stream->qos.delay = pd; + ep->stream->qos.ucast.io_qos.interval = interval; + ep->stream->qos.ucast.framing = qos->framing; + ep->stream->qos.ucast.io_qos.phy = qos->phy; + ep->stream->qos.ucast.io_qos.sdu = sdu; + ep->stream->qos.ucast.io_qos.rtn = qos->rtn; + ep->stream->qos.ucast.io_qos.latency = latency; + ep->stream->qos.ucast.delay = pd; if (ep->old_state == BT_ASCS_ASE_STATE_CONFIG) bap_stream_config_cfm(ep->stream); @@ -3876,6 +3986,25 @@ clone: return true; } +bool bt_bap_attach_broadcast(struct bt_bap *bap) +{ + struct bt_bap_endpoint *ep; + + if (queue_find(sessions, NULL, bap)) + return true; + + if (!sessions) + sessions = queue_new(); + + queue_push_tail(sessions, bap); + + ep = bap_get_endpoint_broadcast(bap->remote_eps, bap->ldb); + if (ep) + ep->bap = bap; + + return true; +} + static void stream_foreach_detach(void *data, void *user_data) { struct bt_bap_stream *stream = data; @@ -4080,7 +4209,10 @@ void bt_bap_foreach_pac(struct bt_bap *bap, uint8_t type, func, user_data); case BT_BAP_SOURCE: return bap_foreach_pac(bap->ldb->sinks, bap->rdb->sources, - func, user_data); + func, user_data); + case BT_BAP_BROADCAST_SOURCE: + return bap_foreach_pac(bap->ldb->broadcast_sources, bap->ldb->broadcast_sinks, + func, user_data); } } @@ -4193,42 +4325,49 @@ unsigned int bt_bap_stream_config(struct bt_bap_stream *stream, if (!bap_stream_valid(stream)) return 0; - if (!stream->client) { - stream_config(stream, data, NULL); - return 0; - } + if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_UNICAST) { + if (!stream->client) { + stream_config(stream, data, NULL); + return 0; + } - memset(&config, 0, sizeof(config)); + memset(&config, 0, sizeof(config)); - config.ase = stream->ep->id; - config.latency = qos->target_latency; - config.phy = qos->phy; - config.codec = stream->rpac->codec; + config.ase = stream->ep->id; + config.latency = qos->ucast.target_latency; + config.phy = qos->ucast.io_qos.phy; + config.codec = stream->rpac->codec; - iov[0].iov_base = &config; - iov[0].iov_len = sizeof(config); + iov[0].iov_base = &config; + iov[0].iov_len = sizeof(config); - if (data) { - if (!bap_print_cc(data->iov_base, data->iov_len, - stream->bap->debug_func, - stream->bap->debug_data)) - return 0; + if (data) { + if (!bap_print_cc(data->iov_base, data->iov_len, + stream->bap->debug_func, + stream->bap->debug_data)) + return 0; - config.cc_len = data->iov_len; - iov[1] = *data; - iovlen++; - } + config.cc_len = data->iov_len; + iov[1] = *data; + iovlen++; + } - req = bap_req_new(stream, BT_ASCS_CONFIG, iov, iovlen, func, user_data); + req = bap_req_new(stream, BT_ASCS_CONFIG, iov, iovlen, func, user_data); - if (!bap_queue_req(stream->bap, req)) { - bap_req_free(req); - return 0; - } + if (!bap_queue_req(stream->bap, req)) { + bap_req_free(req); + return 0; + } - stream->qos = *qos; + stream->qos = *qos; - return req->id; + return req->id; + } else if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BROADCAST) { + stream->qos = *qos; + return 0; + } else { + return 0; + } } static bool match_pac(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, @@ -4289,7 +4428,7 @@ struct bt_bap_stream *bt_bap_stream_new(struct bt_bap *bap, if (rpac) type = rpac->type; else if (lpac) { - switch(lpac->type) { + switch (lpac->type) { case BT_BAP_SINK: type = BT_BAP_SOURCE; break; @@ -4354,6 +4493,10 @@ bool bt_bap_stream_set_user_data(struct bt_bap_stream *stream, void *user_data) stream->user_data = user_data; + if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BROADCAST) + stream->lpac->ops->config(stream, stream->cc, &stream->qos, + ep_config_cb, stream->lpac->user_data); + return true; } @@ -4384,15 +4527,15 @@ unsigned int bt_bap_stream_qos(struct bt_bap_stream *stream, /* TODO: Figure out how to pass these values around */ qos.ase = stream->ep->id; - qos.cig = data->cig_id; - qos.cis = data->cis_id; - put_le24(data->interval, qos.interval); - qos.framing = data->framing; - qos.phy = data->phy; - qos.sdu = cpu_to_le16(data->sdu); - qos.rtn = data->rtn; - qos.latency = cpu_to_le16(data->latency); - put_le24(data->delay, qos.pd); + qos.cig = data->ucast.cig_id; + qos.cis = data->ucast.cis_id; + put_le24(data->ucast.io_qos.interval, qos.interval); + qos.framing = data->ucast.framing; + qos.phy = data->ucast.io_qos.phy; + qos.sdu = cpu_to_le16(data->ucast.io_qos.sdu); + qos.rtn = data->ucast.io_qos.rtn; + qos.latency = cpu_to_le16(data->ucast.io_qos.latency); + put_le24(data->ucast.delay, qos.pd); iov.iov_base = &qos; iov.iov_len = sizeof(qos); @@ -4463,7 +4606,7 @@ unsigned int bt_bap_stream_enable(struct bt_bap_stream *stream, bt_bap_stream_func_t func, void *user_data) { - int ret; + int ret = 0; /* Table 3.2: ASE state machine transition * Initiating device - client Only @@ -4471,12 +4614,17 @@ unsigned int bt_bap_stream_enable(struct bt_bap_stream *stream, if (!bap_stream_valid(stream) || !stream->client) return 0; - ret = bap_stream_metadata(stream, BT_ASCS_ENABLE, metadata, func, - user_data); - if (!ret || !enable_links) - return ret; + if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_UNICAST) { + ret = bap_stream_metadata(stream, BT_ASCS_ENABLE, metadata, func, + user_data); + if (!ret || !enable_links) + return ret; - queue_foreach(stream->links, bap_stream_enable_link, metadata); + queue_foreach(stream->links, bap_stream_enable_link, metadata); + } else if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BROADCAST) { + stream_set_state_broadcast(stream, BT_BAP_STREAM_STATE_STREAMING); + return ret = 1; + } return ret; } @@ -4655,6 +4803,15 @@ unsigned int bt_bap_stream_release(struct bt_bap_stream *stream, bap = stream->bap; + /* If stream is broadcast, no BT_ASCS_RELEASE is required */ + if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BROADCAST) { + if (!bap_stream_valid(stream)) { + stream_set_state_broadcast(stream, BT_BAP_STREAM_STATE_IDLE); + stream = NULL; + } + return 0; + } + /* If stream does not belong to a client session, clean it up now */ if (!bap_stream_valid(stream)) { stream_set_state(stream, BT_BAP_STREAM_STATE_IDLE); @@ -4690,8 +4847,11 @@ uint32_t bt_bap_stream_get_location(struct bt_bap_stream *stream) if (stream->ep->dir == BT_BAP_SOURCE) return pacs->source_loc_value; - else + else if (stream->ep->dir == BT_BAP_SINK) return pacs->sink_loc_value; + else + // TO DO get the location values from metadata for brodcast source and sink + return stream->bap->ldb->pacs->source_loc_value; } struct iovec *bt_bap_stream_get_config(struct bt_bap_stream *stream) @@ -4796,8 +4956,8 @@ int bt_bap_stream_io_link(struct bt_bap_stream *stream, return -EALREADY; if (stream->client != link->client || - stream->qos.cig_id != link->qos.cig_id || - stream->qos.cis_id != link->qos.cis_id) + stream->qos.ucast.cig_id != link->qos.ucast.cig_id || + stream->qos.ucast.cis_id != link->qos.ucast.cis_id) return -EINVAL; if (!stream->links) @@ -4834,7 +4994,7 @@ static void bap_stream_get_in_qos(void *data, void *user_data) struct bt_bap_qos **qos = user_data; if (!qos || *qos || stream->ep->dir != BT_BAP_SOURCE || - !stream->qos.sdu) + !stream->qos.ucast.io_qos.sdu) return; *qos = &stream->qos; @@ -4845,7 +5005,7 @@ static void bap_stream_get_out_qos(void *data, void *user_data) struct bt_bap_stream *stream = data; struct bt_bap_qos **qos = user_data; - if (!qos || *qos || stream->ep->dir != BT_BAP_SINK || !stream->qos.sdu) + if (!qos || *qos || stream->ep->dir != BT_BAP_SINK || !stream->qos.ucast.io_qos.sdu) return; *qos = &stream->qos; diff --git a/src/shared/bap.h b/src/shared/bap.h index e9f769d0e..3b07df158 100644 --- a/src/shared/bap.h +++ b/src/shared/bap.h @@ -4,6 +4,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2022 Intel Corporation. All rights reserved. + * Copyright 2023 NXP * */ @@ -14,8 +15,14 @@ #define __packed __attribute__((packed)) #endif -#define BT_BAP_SINK 0x01 +#define BT_BAP_SINK 0x01 #define BT_BAP_SOURCE 0x02 +#define BT_BAP_BROADCAST_SOURCE 0x03 +#define BT_BAP_BROADCAST_SINK 0x04 + +#define BT_BAP_STREAM_TYPE_UNICAST 0x01 +#define BT_BAP_STREAM_TYPE_BROADCAST 0x02 +#define BT_BAP_STREAM_TYPE_UNKNOWN 0x03 #define BT_BAP_STREAM_STATE_IDLE 0x00 #define BT_BAP_STREAM_STATE_CONFIG 0x01 @@ -49,17 +56,46 @@ struct bt_ltv { uint8_t value[0]; } __packed; -struct bt_bap_qos { +struct bt_bap_io_qos { + uint32_t interval; /* Frame interval */ + uint16_t latency; /* Transport Latency */ + uint16_t sdu; /* Maximum SDU Size */ + uint8_t phy; /* PHY */ + uint8_t rtn; /* Retransmission Effort */ +}; + +struct bt_bap_ucast_qos { uint8_t cig_id; uint8_t cis_id; - uint32_t interval; /* Frame interval */ uint8_t framing; /* Frame framing */ - uint8_t phy; /* PHY */ - uint16_t sdu; /* Maximum SDU Size */ - uint8_t rtn; /* Retransmission Effort */ - uint16_t latency; /* Transport Latency */ uint32_t delay; /* Presentation Delay */ uint8_t target_latency; /* Target Latency */ + struct bt_bap_io_qos io_qos; +}; + +struct bt_bap_bcast_qos { + uint8_t big; + uint8_t bis; + uint8_t sync_interval; + uint8_t packing; + uint8_t framing; + uint8_t encryption; + struct iovec bcode; + uint8_t options; + uint16_t skip; + uint16_t sync_timeout; + uint8_t sync_cte_type; + uint8_t mse; + uint16_t timeout; + uint8_t pa_sync; + struct bt_bap_io_qos io_qos; +}; + +struct bt_bap_qos { + union { + struct bt_bap_ucast_qos ucast; + struct bt_bap_bcast_qos bcast; + }; }; typedef void (*bt_bap_ready_func_t)(struct bt_bap *bap, void *user_data); @@ -98,28 +134,32 @@ struct bt_bap_pac_qos { uint32_t ppd_max; }; +struct bt_bap_pac_ops { + int (*select)(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, + struct bt_bap_pac_qos *qos, + bt_bap_pac_select_t cb, void *cb_data, void *user_data); + int (*config)(struct bt_bap_stream *stream, struct iovec *cfg, + struct bt_bap_qos *qos, bt_bap_pac_config_t cb, + void *user_data); + void (*clear)(struct bt_bap_stream *stream, void *user_data); +}; + struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db, const char *name, uint8_t type, uint8_t id, uint16_t cid, uint16_t vid, struct bt_bap_pac_qos *qos, struct iovec *data, - struct iovec *metadata); + struct iovec *metadata, + struct bt_bap_pac_ops *pac_ops, + void *user_data); struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name, uint8_t type, uint8_t id, struct bt_bap_pac_qos *qos, struct iovec *data, - struct iovec *metadata); - -struct bt_bap_pac_ops { - int (*select)(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, - struct bt_bap_pac_qos *qos, - bt_bap_pac_select_t cb, void *cb_data, void *user_data); - int (*config)(struct bt_bap_stream *stream, struct iovec *cfg, - struct bt_bap_qos *qos, bt_bap_pac_config_t cb, - void *user_data); - void (*clear)(struct bt_bap_stream *stream, void *user_data); -}; + struct iovec *metadata, + struct bt_bap_pac_ops *pac_ops, + void *user_data); bool bt_bap_pac_set_ops(struct bt_bap_pac *pac, struct bt_bap_pac_ops *ops, void *user_data); @@ -130,6 +170,8 @@ uint8_t bt_bap_pac_get_type(struct bt_bap_pac *pac); uint32_t bt_bap_pac_get_locations(struct bt_bap_pac *pac); +uint8_t bt_bap_stream_get_type(struct bt_bap_stream *stream); + struct bt_bap_stream *bt_bap_pac_get_stream(struct bt_bap_pac *pac); /* Session related function */ @@ -149,6 +191,7 @@ struct bt_bap *bt_bap_ref(struct bt_bap *bap); void bt_bap_unref(struct bt_bap *bap); bool bt_bap_attach(struct bt_bap *bap, struct bt_gatt_client *client); +bool bt_bap_attach_broadcast(struct bt_bap *bap); void bt_bap_detach(struct bt_bap *bap); bool bt_bap_set_debug(struct bt_bap *bap, bt_bap_debug_func_t cb, diff --git a/unit/test-bap.c b/unit/test-bap.c index bf525742d..8d1b3fd52 100644 --- a/unit/test-bap.c +++ b/unit/test-bap.c @@ -377,11 +377,11 @@ static void test_client_config(struct test_data *data) "test-bap-snk", BT_BAP_SINK, 0x0ff, 0x0001, 0x0001, - NULL, data->caps, NULL); + NULL, data->caps, NULL, NULL, NULL); else data->snk = bt_bap_add_pac(data->db, "test-bap-snk", BT_BAP_SINK, LC3_ID, - NULL, data->caps, NULL); + NULL, data->caps, NULL, NULL, NULL); g_assert(data->snk); } @@ -391,11 +391,11 @@ static void test_client_config(struct test_data *data) "test-bap-src", BT_BAP_SOURCE, 0x0ff, 0x0001, 0x0001, - NULL, data->caps, NULL); + NULL, data->caps, NULL, NULL, NULL); else data->src = bt_bap_add_pac(data->db, "test-bap-src", BT_BAP_SOURCE, LC3_ID, - NULL, data->caps, NULL); + NULL, data->caps, NULL, NULL, NULL); g_assert(data->src); } } @@ -712,12 +712,15 @@ static void test_disc(void) #define QOS_BALANCED_2M \ { \ .target_latency = BT_BAP_CONFIG_LATENCY_BALANCED, \ - .phy = BT_BAP_CONFIG_PHY_2M, \ + .io_qos.phy = BT_BAP_CONFIG_PHY_2M, \ } - +#define QOS_UCAST \ +{\ + .ucast = QOS_BALANCED_2M, \ +} static struct test_config cfg_snk_8_1 = { .cc = LC3_CONFIG_8_1, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -727,7 +730,7 @@ static struct test_config cfg_snk_8_1 = { static struct test_config cfg_snk_8_2 = { .cc = LC3_CONFIG_8_2, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -737,7 +740,7 @@ static struct test_config cfg_snk_8_2 = { static struct test_config cfg_snk_16_1 = { .cc = LC3_CONFIG_16_1, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -747,7 +750,7 @@ static struct test_config cfg_snk_16_1 = { static struct test_config cfg_snk_16_2 = { .cc = LC3_CONFIG_16_2, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -757,7 +760,7 @@ static struct test_config cfg_snk_16_2 = { static struct test_config cfg_snk_24_1 = { .cc = LC3_CONFIG_24_1, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -767,7 +770,7 @@ static struct test_config cfg_snk_24_1 = { static struct test_config cfg_snk_24_2 = { .cc = LC3_CONFIG_24_2, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -777,7 +780,7 @@ static struct test_config cfg_snk_24_2 = { static struct test_config cfg_snk_32_1 = { .cc = LC3_CONFIG_32_1, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -787,7 +790,7 @@ static struct test_config cfg_snk_32_1 = { static struct test_config cfg_snk_32_2 = { .cc = LC3_CONFIG_32_2, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -797,7 +800,7 @@ static struct test_config cfg_snk_32_2 = { static struct test_config cfg_snk_44_1 = { .cc = LC3_CONFIG_44_1, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -807,7 +810,7 @@ static struct test_config cfg_snk_44_1 = { static struct test_config cfg_snk_44_2 = { .cc = LC3_CONFIG_44_2, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -817,7 +820,7 @@ static struct test_config cfg_snk_44_2 = { static struct test_config cfg_snk_48_1 = { .cc = LC3_CONFIG_48_1, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -827,7 +830,7 @@ static struct test_config cfg_snk_48_1 = { static struct test_config cfg_snk_48_2 = { .cc = LC3_CONFIG_48_2, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -837,7 +840,7 @@ static struct test_config cfg_snk_48_2 = { static struct test_config cfg_snk_48_3 = { .cc = LC3_CONFIG_48_3, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -847,7 +850,7 @@ static struct test_config cfg_snk_48_3 = { static struct test_config cfg_snk_48_4 = { .cc = LC3_CONFIG_48_4, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -857,7 +860,7 @@ static struct test_config cfg_snk_48_4 = { static struct test_config cfg_snk_48_5 = { .cc = LC3_CONFIG_48_5, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -867,7 +870,7 @@ static struct test_config cfg_snk_48_5 = { static struct test_config cfg_snk_48_6 = { .cc = LC3_CONFIG_48_6, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, }; @@ -899,7 +902,7 @@ static struct test_config cfg_snk_48_6 = { static struct test_config cfg_src_8_1 = { .cc = LC3_CONFIG_8_1, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -909,7 +912,7 @@ static struct test_config cfg_src_8_1 = { static struct test_config cfg_src_8_2 = { .cc = LC3_CONFIG_8_2, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -919,7 +922,7 @@ static struct test_config cfg_src_8_2 = { static struct test_config cfg_src_16_1 = { .cc = LC3_CONFIG_16_1, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -929,7 +932,7 @@ static struct test_config cfg_src_16_1 = { static struct test_config cfg_src_16_2 = { .cc = LC3_CONFIG_16_2, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -939,7 +942,7 @@ static struct test_config cfg_src_16_2 = { static struct test_config cfg_src_24_1 = { .cc = LC3_CONFIG_24_1, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -949,7 +952,7 @@ static struct test_config cfg_src_24_1 = { static struct test_config cfg_src_24_2 = { .cc = LC3_CONFIG_24_2, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -959,7 +962,7 @@ static struct test_config cfg_src_24_2 = { static struct test_config cfg_src_32_1 = { .cc = LC3_CONFIG_32_1, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -969,7 +972,7 @@ static struct test_config cfg_src_32_1 = { static struct test_config cfg_src_32_2 = { .cc = LC3_CONFIG_32_2, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -979,7 +982,7 @@ static struct test_config cfg_src_32_2 = { static struct test_config cfg_src_44_1 = { .cc = LC3_CONFIG_44_1, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -989,7 +992,7 @@ static struct test_config cfg_src_44_1 = { static struct test_config cfg_src_44_2 = { .cc = LC3_CONFIG_44_2, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -999,7 +1002,7 @@ static struct test_config cfg_src_44_2 = { static struct test_config cfg_src_48_1 = { .cc = LC3_CONFIG_48_1, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -1009,7 +1012,7 @@ static struct test_config cfg_src_48_1 = { static struct test_config cfg_src_48_2 = { .cc = LC3_CONFIG_48_2, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -1019,7 +1022,7 @@ static struct test_config cfg_src_48_2 = { static struct test_config cfg_src_48_3 = { .cc = LC3_CONFIG_48_3, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -1029,7 +1032,7 @@ static struct test_config cfg_src_48_3 = { static struct test_config cfg_src_48_4 = { .cc = LC3_CONFIG_48_4, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -1039,7 +1042,7 @@ static struct test_config cfg_src_48_4 = { static struct test_config cfg_src_48_5 = { .cc = LC3_CONFIG_48_5, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -1049,7 +1052,7 @@ static struct test_config cfg_src_48_5 = { static struct test_config cfg_src_48_6 = { .cc = LC3_CONFIG_48_6, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, }; @@ -1141,7 +1144,7 @@ static void test_scc_cc_lc3(void) static struct test_config cfg_snk_vs = { .cc = IOV_NULL, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .snk = true, .vs = true, }; @@ -1155,7 +1158,7 @@ static struct test_config cfg_snk_vs = { static struct test_config cfg_src_vs = { .cc = IOV_NULL, - .qos = QOS_BALANCED_2M, + .qos = QOS_UCAST, .src = true, .vs = true, };