From patchwork Fri Jun 9 09:42:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nitin Jadhav X-Patchwork-Id: 690985 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 91BE8C7EE25 for ; Fri, 9 Jun 2023 09:51:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241375AbjFIJvj (ORCPT ); Fri, 9 Jun 2023 05:51:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241344AbjFIJu7 (ORCPT ); Fri, 9 Jun 2023 05:50:59 -0400 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2059.outbound.protection.outlook.com [40.107.8.59]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30DA77A84 for ; Fri, 9 Jun 2023 02:44:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b23O2S/XpuRhVc5WJSHI++5/4TprD5928eDgucBRyV+m05uUKl3RdDmOb8lnCGtySPeQu6UhfAx9GuNomiqv3GzuZFDd8ksaaMjN/dWM7CFf6dapBGCYy9D75pYn4P41XiLhwVViOmvHLfKkhOb5h7YSfwwUs0gDheJYzrc7tX6kKJFnrAx5qHNQmHEVR45ukjj+dKX+2bfSQ43c3/D1ZWGro8nO05otwfxCnOJ0nxPbO665lIzqBpMWIN3/pHRbJ7earslRBgcffUSR1PpkGtq3aGwMs1sixfq8qubSnFGatkGJsRoMWbfLfbe5MKmuekosDtSVhTW+pgJSgupl0Q== 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=fO3jTnAmM88LAZH+zjV7RwZRJJsbDjwWt2P9vEDH9CM=; b=FxsiadY/OihNgWVcxAL4VeXfiHLBv32dJh0jWiGgwF5sWJ2JlMNfZKFGNjNTAKDhkjJqaO5h9WwuvewCYnkHIvWYT4GkSTQEjSEOcFRUUS+jxzDqa9P5SvXkKjFl9VbNXQGGkaqPuK6pE2wkjZwvgBVhMXTAxhs9PsvbZXnQX01oTBV77RveBHw2+GcjAgqCjnPNaLvXO2oUcPKKfwo+mASyJ4F3xkV65vhQCHSSK6wAB8qZlhu58yO1aa2dWhv8kxOE37nk+pLHKOhgFZXKqxKTbYKWmh6ndWMNXv/sDhwbJ7zqJebCKEv1551ntMEHHaoob3t6y0jLw0V4735gbQ== 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=fO3jTnAmM88LAZH+zjV7RwZRJJsbDjwWt2P9vEDH9CM=; b=GbsEOl2RaK/seA45R+Ghy8n0LaHlVf+2X0svLZQsjhRC/Jy41LMp/sbU6cbQOBEP/A6tIUibxHs5VXh7VOqBVR8Q0g/0x9XrIzl6SNgtlJqH8DLvxBX0tE1SPAJpdL7sOGFzv6SZus8fDSGS0PY/I42B9W3zYBhAgccIRN+GayQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB9126.eurprd04.prod.outlook.com (2603:10a6:20b:449::16) by PAXPR04MB8191.eurprd04.prod.outlook.com (2603:10a6:102:1c4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.41; Fri, 9 Jun 2023 09:43:08 +0000 Received: from AS8PR04MB9126.eurprd04.prod.outlook.com ([fe80::ad2c:857b:a144:9af4]) by AS8PR04MB9126.eurprd04.prod.outlook.com ([fe80::ad2c:857b:a144:9af4%3]) with mapi id 15.20.6455.030; Fri, 9 Jun 2023 09:43:08 +0000 From: Nitin Jadhav To: linux-bluetooth@vger.kernel.org Cc: devyani.godbole@nxp.com, mihai-octavian.urzica@nxp.com, silviu.barbulescu@nxp.com, nitin.jadhav@nxp.com Subject: [PATCH BlueZ v4 1/3] lib/uuid.h: Add VOCS characteristic uuid(s) Date: Fri, 9 Jun 2023 15:12:20 +0530 Message-Id: <20230609094222.1877-2-nitin.jadhav@nxp.com> X-Mailer: git-send-email 2.33.1.windows.1 In-Reply-To: <20230609094222.1877-1-nitin.jadhav@nxp.com> References: <20230609094222.1877-1-nitin.jadhav@nxp.com> X-ClientProxiedBy: SI2PR06CA0008.apcprd06.prod.outlook.com (2603:1096:4:186::23) To AS8PR04MB9126.eurprd04.prod.outlook.com (2603:10a6:20b:449::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB9126:EE_|PAXPR04MB8191:EE_ X-MS-Office365-Filtering-Correlation-Id: 154c1b97-31ac-475e-45c7-08db68cdee9b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oKZpUoRa8C2fiNEtFjoDZIr0uBAOF/y451XcQnkK7oFez0+oXgvNkzZsB0Gg6R+xhaPRqgSdp3c1nfU7l4SnZsulkBAlLLFIK2RNyB3XJngxnz/A4gV4DB3quycxM0xyuaGSvbRjEE7Bp9ZjL2rBD2nA5uaS0qDCWqgbXvThN9nt3XX6BOHjohargK+Wx+tZSe8UHgusqmzC8ZDpB05kaTOsuKWq6lq5n+SYHvoLM3vhvwbiQRVUdNyXLMbhXqiww5jtXXsWVmOofFn306gmi+23WUbkacm70kJf5hSIn6EZaxGQrSek2IlXfXnEpfeqBAWDJ3YKu5L419/Ux719ENxTj59xJ733RqaReGiDy8jrjOkhMYqHkpYH12mE03cirSziU1kwD3HP5P05dzZ9ZZYlHPS1SzlFaoNAfnSWBiQ8xgRZErWczYdGIwVbjHZhUhtluFb4yRpLuiLIpClHVzQn6jtOFOawWVrx4hWNeG7LYImrXxkhaF+55wdmIH/BWyDWU2f5aGBEgAh7TiDFJ5kmw+JJxqd06wAaF4tuVGHFVMeDcdCevR8UNATnbdKwEGq7hkQrfWcOt4wIgFgijYTTXq3RlfNBszktYdrlXRU92g7RvQC7g3lmL1GknUDa X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB9126.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(39860400002)(346002)(376002)(366004)(451199021)(36756003)(2906002)(4744005)(86362001)(44832011)(5660300002)(2616005)(52116002)(6486002)(186003)(6666004)(6506007)(26005)(6512007)(1076003)(478600001)(66946007)(66556008)(66476007)(4326008)(38350700002)(38100700002)(316002)(41300700001)(6916009)(8936002)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mSwhPPik+hSao2Lgmqvzoy8Noh7O2itcRBmjHN1JiQbqXkn9NMt5BTwc13HgpWpOmNePhHO1bwesD6RTCWm5TxrAl5+kdL0FeveszFUwY+gfuxdGDTvd87n8k4tAsCw9JMltwjL2PS6I0Ae5fn8mrpdWkFkCcevNd/v0u1t2r5MW84vu1pIa9y0ZGBO5QMSDvZT9lkAiSeC/8k7YkJ+EwyyccJL5JxFN6GxolQad/yoOx0q4toW6E01nVeHmkDg48vD7vHMVCWgDEQ5X7pCevBxlJ7U5x+ysAYtoQMYO7ZzMg0hOHMSAPb5wqtGAlwwM5jx/OuuVoMiCFLFOg1pTZng7rjLUE9AnxhFw2QYwnSxKTDEFfqam+iP1I5sqffdhOpeGYN8wju5uX8WnOurNECG54NMyfymlYMbJHngl4BfNgfX7r3cgQbCQuYM2aEcR/asV2lCng8B410ASfX5NVRhHisJvEbzIkgd4Xw0lf25aZyoUaTTlAGBpaF8+Ws4xLbEMU2oah2z6UcK4Ugwri+w+KOUs+iE7mQlvpjj5407h4eONVr7TwMn3G0+QkGDgoIGTiQNy31khgHQ5226Tmg8ikfEOBmsAdb6bsOkW2DABj51ehcjJ8QCDStfGFnMME8V22qCQiqzYXvN3XG0VQzUxKYt1/VDEVfF4Os+Q0juV6CFmSaksanFHRT7K75dc1AJOppXvyhiuSbph5fNH060Seknd2240F8iBH6DfQjFF5PpCQd2YGqzzenq4b2fFTlJsXjcd7I2I22RVsEOQdmZeRH8i4N7DXySefKIRV/QAszVP11iKANCQjiT3rZorcfn09wiEdf+6oKC4q/zxSZGNhXx7URaMaUbHjEzuNnIY9roqjFBaRqxz6hbBBiKrJFf1Y5Db5Irg5ZVwKlF59damU7c93Jyukbyu3nrmzbYAueXyJfJOATlveeTdP06KjPExjq8w5i16xLDK4SqoXYVWeI52usFHrc76cVrkVUHJuPUwlE7zQge0P4XCVaPXORuUrk6+emltRwAeLFhOZzWFXZG4Z+wHxL0WT7aAb7S9XdjfkyRKVTTGIgsliWMDIop6u7dKoRTQIOz3ZocYTpTVbN3sDZ8bqXzjWA9icwcXUHrf/lY6c3n40l+5uf6umBwWABmm/8V9kXmmY58rs2t99oCxFXrS5o5OVRttaxgfvznYyJ8Nj6QOmaM1C8nitLzVlZKFBItFDNnxsBZ1DAI6iXUBXamOrYuxmYM5PyFfET6+Bem1ICTLXysEqrihTTxMwsTSYfh4jhxVTB86MthXRBOXHaN83uBlU4wX172o77YspKSXd3BASBvUc9Z8BYcT4tcXIJzk+/gv1H2O8HEkOHgwvG000mGdk3rFp7sA4YhqS8YO45tvYpD3dhFbPfx1j0+RPp/PSV1891oqZwetIehEVyTPP0lqxZNOM/XnxHgZ4vJr3o3uff+5vlxNweSMabD2NzMvoOfYWknUa8dHIpHvKpWu2i9DAAYe7IDlk4sknOOUDa60ikM5id6R9RY7HzXPTRN2eF+PQ0Hceqmrbn0RgfvtCB/FclicKUPnX69zYFuY8Yq6uXmtRqHT X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 154c1b97-31ac-475e-45c7-08db68cdee9b X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB9126.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2023 09:43:08.7002 (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: 47OAm3ZVGJIsipbjyKApBlYQ6S29m+JAPMCn0uoTNLCbPRhSnbOTn7HMrk3liAN/AxHd7VbjfLuCWe/fZJI8Kw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8191 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org --- lib/uuid.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/uuid.h b/lib/uuid.h index 5cdfedb4b..cd3b3655f 100644 --- a/lib/uuid.h +++ b/lib/uuid.h @@ -179,6 +179,11 @@ extern "C" { #define VOL_CP_CHRC_UUID 0x2B7E #define VOL_FLAG_CHRC_UUID 0x2B7F +#define VOCS_STATE_CHAR_UUID 0x2B80 +#define VOCS_AUDIO_LOC_CHRC_UUID 0x2B81 +#define VOCS_CP_CHRC_UUID 0x2B82 +#define VOCS_AUDIO_OP_DESC_CHAR_UUID 0x2B83 + #define GMCS_UUID 0x1849 #define MEDIA_PLAYER_NAME_CHRC_UUID 0x2b93 #define MEDIA_TRACK_CHNGD_CHRC_UUID 0x2b96 From patchwork Fri Jun 9 09:42:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nitin Jadhav X-Patchwork-Id: 691229 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 1FDA0C7EE2E for ; Fri, 9 Jun 2023 09:51:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241887AbjFIJvh (ORCPT ); Fri, 9 Jun 2023 05:51:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241892AbjFIJu6 (ORCPT ); Fri, 9 Jun 2023 05:50:58 -0400 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2075.outbound.protection.outlook.com [40.107.8.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 849ED72B2 for ; Fri, 9 Jun 2023 02:44:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jWTirEi8ZEC1ePsHNGUb2tTHmd1hcJVvOdLrucW6SrxuyEOLbe8lPUIjfQdzcUrWL0rdG7qXV98x+08+O8g3z0vrzyga2zNPyIsZiFLAPqKK6OpePQgwgdYZVSUihQ9WeR9Wl1kHCw7VjQ0NAC5XBUfvbo4yejluz8spSr1IUQOlwMK2D0Ou9ZN6CGK9jftA45+P3XKyHSorU3QEYP/7qNCQv2zAOcAZICDCIEeRikPaSm88MtvITQ1HdqaJbhYRPqsag60EBIET55mm2Bj5fZtAQ9/HQvpwrOE0U8TxGwdupIcezI3/0W2CLCBxpflMZIAGKouRPpX7F2vg+66bmA== 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=K4HnO32sQosoDq/iw5iPZm+PhDJPhTcaTbT93x9EXkg=; b=WenekV1v2QnTp+dNutVMxP2514rDQdCVNdu+H8GktbJ+jm+wDJPxPM/1uHcz7qJ+Jn3Aozfg3ijYo7thaXEXZ2cWHQPok5PlNEDMsVK+bUzR3Xz7vzgpkPCthJgrvmRaOJ8LXFXOCYVjsoo8KLGXsNe/WHnB11OOkH8oOvqyP9GMZVs2JbAyj0R9oPWoqtyYFPNRmvW6olHJeZCCFAR+CFgNJRB1Wj44BeCoZIxEuW/MwVP4xF6nwUVYupCl85eATAlq6Qv26RQatiFhPNvkjpcBCqQuUWf67VpjG6uLQu/SSJ58heK/09wHxaCEH6SD0gslNRP2ampHC9ZqCR3AOw== 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=K4HnO32sQosoDq/iw5iPZm+PhDJPhTcaTbT93x9EXkg=; b=iiRfv80rVncXZy1ZtyCeekiCbnYNJoFt0Swq2IlxKqQHylg782mGzCPk297cZcoDKNBmsODj/ud0Rpn2doASMD5+KbHQM3sn4Qg9WpWpII5YESD/TK+xBOQ690s0ud5ddxWas9Gr9olpzGjKWuaqt2itoSHeunVj/4E/fgknnsc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB9126.eurprd04.prod.outlook.com (2603:10a6:20b:449::16) by PAXPR04MB8191.eurprd04.prod.outlook.com (2603:10a6:102:1c4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.41; Fri, 9 Jun 2023 09:43:12 +0000 Received: from AS8PR04MB9126.eurprd04.prod.outlook.com ([fe80::ad2c:857b:a144:9af4]) by AS8PR04MB9126.eurprd04.prod.outlook.com ([fe80::ad2c:857b:a144:9af4%3]) with mapi id 15.20.6455.030; Fri, 9 Jun 2023 09:43:12 +0000 From: Nitin Jadhav To: linux-bluetooth@vger.kernel.org Cc: devyani.godbole@nxp.com, mihai-octavian.urzica@nxp.com, silviu.barbulescu@nxp.com, nitin.jadhav@nxp.com Subject: [PATCH BlueZ v4 2/3] shared/vcp: Add initial code for handling VOCS Date: Fri, 9 Jun 2023 15:12:21 +0530 Message-Id: <20230609094222.1877-3-nitin.jadhav@nxp.com> X-Mailer: git-send-email 2.33.1.windows.1 In-Reply-To: <20230609094222.1877-1-nitin.jadhav@nxp.com> References: <20230609094222.1877-1-nitin.jadhav@nxp.com> X-ClientProxiedBy: SI2PR06CA0008.apcprd06.prod.outlook.com (2603:1096:4:186::23) To AS8PR04MB9126.eurprd04.prod.outlook.com (2603:10a6:20b:449::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB9126:EE_|PAXPR04MB8191:EE_ X-MS-Office365-Filtering-Correlation-Id: 94382fde-1a0d-40dc-4228-08db68cdf121 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sD4HAr1YoiW8hJBTO90Z2KoBH6rvFeXi8ZLnmL5UaqXBn2AZkYJIWIr5G899PppUrc+iEMdOMCHGtSxwGm5do2P3q+E//pMxDEvF05OpwgarS2iJtcEbjXikzIfcM1qC+Kdfi95D9/DJ03d5sC0QRVN5ElWqta9ZpNFKIjA5RVrVMA3XH7WnHL+Q9NS/XqH8Lv+loWk4q8bPxp8Br9om3jIwOhrLR7W6Fn1CNvDzvnfEBEvArOW2o5aim1qvIbYY79hyOO+8nhfZKb4cdD6MSSKzGwA3cy40PI4CL3BFBh4guR/TZw2tmBGxiUd4869Y+n3h4W/LbxkUBw4Xzr31C4wXRCZ0RwyjJkZ28nu1vuyzemfGTR9enA2M2YQWXORCFru0PTsAUlDvNEU5qbSm3XU8x3PuAv1J9ssZKGo55HZBu1RFtNretxIgA9iQkmQk5AEIR3kZAIMHfwRIIHIL0SO+V6C/Zd1xO2bdAufHgHM/YkqxKbpA1EJNwTW3orCZHKhEz09yOX+HGStxN0hhM5I6eIuAlNV4y5fgK97eXqwvsy2+C1gYGgFAZn8OFyXusplaII/m0xhYh4skn2YL4rFZCW3v9EIOg4Sy7hfme0PQJIu0Wz33ML/x+ux/56aT X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB9126.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(39860400002)(346002)(376002)(366004)(451199021)(36756003)(2906002)(30864003)(86362001)(44832011)(5660300002)(2616005)(52116002)(6486002)(186003)(83380400001)(6666004)(6506007)(26005)(6512007)(1076003)(478600001)(66946007)(66556008)(66476007)(4326008)(38350700002)(38100700002)(316002)(41300700001)(6916009)(8936002)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o/lFXOn8FfULvZY7P24kOsvHcWbvqg+P9K5pxvp8GwqFsvDPhw03YvGRpENvQ7Dwdv7OHx+2g6GWQcxMNv37zleNgHn/x0WU0Z7uL7Tgi9tneVDEDtkoblXpsXALQgM/PG9Kt//LuL/UJi6vRRejSlMAywYBKxAu8MplFD+pytci58PVCZL8JrBJdhqIz6MtNkwDeU87HU/Jo+PCmGHsTIcGhej+xcznBtJCP+6NxcZhQC3ErceJT1QzmfUNobsynvRU4110M2t9K3kE5P+RrO6UzW2gqroSRpXY2+50y7K9aT5FBZctYHdDZfK1Ye1/8ICDTXyramwJltrJwDzx/kUsNfUpUD0Txa1jKLNSTgZciBspFy57fDm7qdD7V7NUZH/LeMIMvOc0GFwAJJ6dQanDZPm2Z8B5CAlTE511XV3A+k55HhGMyxLRWwTKiUti0gkmN+/n0DYnYagRq2tZHG3++jMvedfqb7ihhp7BnqUU8CM4rwvFAD2SILSWzpVzPTH4YPKjFFu+VvoGFiOM1KxpBkq9XBEOo0KrwQplczmahxhpsRrZF7kntqiPsudxIpGPDVkqWdMk6zIQKP/5ScEUnuDs0/JHCg6+c41nj9l8Hqlc1Nb91BiCYqy8QfG4SCbiAOTsQWTCsSlaAJ2bN+EeK3/PVEfO+2hGJ6MqUxWUBMmzXUbXDnkbZDByrQeUQeNEbLLZbc+9yyzic7TIWCekTl3HnmdoTUgdI+fyevZq0YnTxbEQcEVLcARW65K/HR+MWPwTFghDWUBFMwHgKVQ1JVDTGAkl8n6kcx0XuO6IMGrBCOp3FfVPEj67Zf3XWNdY7y1JWf5uEcKJpg2k7eH8g9tHllfJuyZf3QOx0+OAk9ck9PXlO2i418e0WHGKyBBfPl+yfR+jODcOecLYUY1QM0cw9V7uTZpUGY0AZThWY5QdVudINvz971g+eP+pcOl//g/0OaWDi839UTHsqXur4Fe3YDSovxy/4pLiWZax44TVTylDhqbR1X2TJZ7Lj4lVn4TPFC6v83pkEDoE1ssqzGL3G+f+iK6fzGOzA3LbLUnRamO6ZKyxX1Pa3MmUDariSZNpBS1+Zb8Pj1JgRGZtoWYqk8fFIF1jhOJTXKpiry54c9uZ+JY5PVFYOomdE1AuwLm12Mdoaqp3r7CLKkoFUq5XzR1HZiAL6WIjG9CoAF3gNq3oM3rc4elf+kMnUQMlVJ6+VKxaUAQDLSyff/MU++fzPdZxARKY1C+bK/Qhm1/NqI0m3BtFZCEH6m4g7XxZsAGAfEVM2SaELNrhgRWtdScuaHz6Pe78G/waon6485PHFtBCQxHR4FiSSY29NFTk5pKjCD6e+kAl3/DeNfXC59iP7d++dEnn6gVaUDuTPJHazRP0A3FHMqrEo2eeRRgst9PUEwbP1VpLQogzYDmErbX+QM1p0bdYv1j/775Pv7gWgZBVduO96kVEavOG9aAfrFAOkXXIsZ0MMTvMIZoPfL0nvrYvE1Be08OIQcCO0QUlFJiyUJoG3hePxPyM98qO3Sbxrobg7mLQMbfI1BOmL5xnkebQ9wuD9r9Oh5j5oPrvYWKHWV3QspZwdsbO X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94382fde-1a0d-40dc-4228-08db68cdf121 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB9126.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2023 09:43:12.9247 (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: iRYb0a+3c2Ze9RM9rvemOEWLDl0nGiXL9ZjNwugLwtG2XoM4ZMC6kziSGd9YNeltlVz60D7y0HaPGzq4GGCJCw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8191 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Summary: - This adds implementation for VOCS service and characteristics - Implementation based on VOCS_v1.0.pdf specification - Tested using PTS with reference to VOCS.TS.p1.pdf --- v2: Corrected prefixs and cosmetic changes (Luiz Augusto von Dentz) v3: Commit message modified and fixed long line length warning (Paul Menzel) v4: Used BIT macro to set bit of audio location macros (Luiz Augusto von Dentz) --- src/shared/vcp.c | 549 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 549 insertions(+) diff --git a/src/shared/vcp.c b/src/shared/vcp.c index 5459cf892..6fc788e13 100644 --- a/src/shared/vcp.c +++ b/src/shared/vcp.c @@ -36,9 +36,40 @@ #define BT_ATT_ERROR_INVALID_CHANGE_COUNTER 0x80 #define BT_ATT_ERROR_OPCODE_NOT_SUPPORTED 0x81 +#define BT_VCP_NA BIT(0) +#define BT_VCP_FRONT_LEFT BIT(1) +#define BT_VCP_FRONT_RIGHT BIT(2) +#define BT_VCP_FRONT_CENTER BIT(3) +#define BT_VCP_LOW_FRQ_EFF_1 BIT(4) +#define BT_VCP_BACK_LEFT BIT(5) +#define BT_VCP_BACK_RIGHT BIT(6) +#define BT_VCP_FRONT_LEFT_CENTER BIT(7) +#define BT_VCP_FRONT_RIGHT_CENTER BIT(8) +#define BT_VCP_BACK_CENTER BIT(9) +#define BT_VCP_LOW_FRQ_EFF_2 BIT(10) +#define BT_VCP_SIDE_LEFT BIT(11) +#define BT_VCP_SIDE_RIGHT BIT(12) +#define BT_VCP_TOP_FRONT_LEFT BIT(13) +#define BT_VCP_TOP_FRONT_RIGHT BIT(14) +#define BT_VCP_TOP_FRONT_CENTER BIT(15) +#define BT_VCP_TOP_CENTER BIT(16) +#define BT_VCP_TOP_BACK_LEFT BIT(17) +#define BT_VCP_TOP_BACK_RIGHT BIT(18) +#define BT_VCP_TOP_SIDE_LEFT BIT(19) +#define BT_VCP_TOP_SIDE_RIGHT BIT(20) +#define BT_VCP_TOP_BACK_CENTER BIT(21) +#define BT_VCP_BOTTOM_FRONT_CENTER BIT(22) +#define BT_VCP_BOTTOM_FRONT_LEFT BIT(23) +#define BT_VCP_BOTTOM_FRONT_RIGHT BIT(24) +#define BT_VCP_FRONT_LEFT_WIDE BIT(25) +#define BT_VCP_FRONT_RIGHT_WIDE BIT(26) +#define BT_VCP_LEFT_SURROUND BIT(27) +#define BT_VCP_RIGHT_SURROUND BIT(28) + struct bt_vcp_db { struct gatt_db *db; struct bt_vcs *vcs; + struct bt_vocs *vocs; }; typedef void (*vcp_func_t)(struct bt_vcp *vcp, bool success, uint8_t att_ecode, @@ -57,11 +88,21 @@ struct bt_vcs_param { uint8_t change_counter; } __packed; +struct bt_vocs_param { + uint8_t op; + uint8_t change_counter; +} __packed; + struct bt_vcs_ab_vol { uint8_t change_counter; uint8_t vol_set; } __packed; +struct bt_vocs_set_vol_off { + uint8_t change_counter; + uint8_t set_vol_offset; +} __packed; + struct bt_vcp_cb { unsigned int id; bt_vcp_func_t attached; @@ -89,6 +130,10 @@ struct bt_vcp { unsigned int vstate_id; unsigned int vflag_id; + unsigned int state_id; + unsigned int audio_loc_id; + unsigned int ao_dec_id; + struct queue *notify; struct queue *pending; @@ -120,6 +165,27 @@ struct bt_vcs { struct gatt_db_attribute *vf_ccc; }; +/* Contains local bt_vcp_db */ +struct vol_offset_state { + uint16_t vol_offset; + uint8_t counter; +} __packed; + +struct bt_vocs { + struct bt_vcp_db *vdb; + struct vol_offset_state *vostate; + uint32_t vocs_audio_loc; + char *vocs_ao_dec; + struct gatt_db_attribute *service; + struct gatt_db_attribute *vos; + struct gatt_db_attribute *vos_ccc; + struct gatt_db_attribute *voal; + struct gatt_db_attribute *voal_ccc; + struct gatt_db_attribute *vo_cp; + struct gatt_db_attribute *voaodec; + struct gatt_db_attribute *voaodec_ccc; +}; + static struct queue *vcp_db; static struct queue *vcp_cbs; static struct queue *sessions; @@ -159,6 +225,17 @@ static struct vol_state *vdb_get_vstate(struct bt_vcp_db *vdb) return NULL; } +static struct vol_offset_state *vdb_get_vostate(struct bt_vcp_db *vdb) +{ + if (!vdb->vocs) + return NULL; + + if (vdb->vocs->vostate) + return vdb->vocs->vostate; + + return NULL; +} + static struct bt_vcs *vcp_get_vcs(struct bt_vcp *vcp) { if (!vcp) @@ -173,6 +250,20 @@ static struct bt_vcs *vcp_get_vcs(struct bt_vcp *vcp) return vcp->rdb->vcs; } +static struct bt_vocs *vcp_get_vocs(struct bt_vcp *vcp) +{ + if (!vcp) + return NULL; + + if (vcp->rdb->vocs) + return vcp->rdb->vocs; + + vcp->rdb->vocs = new0(struct bt_vocs, 1); + vcp->rdb->vocs->vdb = vcp->rdb; + + return vcp->rdb->vocs; +} + static void vcp_detached(void *data, void *user_data) { struct bt_vcp_cb *cb = data; @@ -202,6 +293,7 @@ static void vcp_db_free(void *data) gatt_db_unref(vdb->db); free(vdb->vcs); + free(vdb->vocs); free(vdb); } @@ -583,6 +675,45 @@ static uint8_t vcs_mute(struct bt_vcs *vcs, struct bt_vcp *vcp, return 0; } +static uint8_t vocs_set_vol_offset(struct bt_vocs *vocs, struct bt_vcp *vcp, + struct iovec *iov) +{ + struct bt_vcp_db *vdb; + struct vol_offset_state *vstate; + struct bt_vocs_set_vol_off *req; + + DBG(vcp, "Set Volume Offset"); + + vdb = vcp_get_vdb(vcp); + if (!vdb) { + DBG(vcp, "error: VDB not available"); + return 0; + } + + vstate = vdb_get_vostate(vdb); + if (!vstate) { + DBG(vcp, "error: VSTATE not available"); + return 0; + } + + req = iov_pull_mem(iov, sizeof(*req)); + if (!req) + return 0; + + if (req->change_counter != vstate->counter) { + DBG(vcp, "Change Counter Mismatch Volume not decremented!"); + return BT_ATT_ERROR_INVALID_CHANGE_COUNTER; + } + + vstate->vol_offset = req->set_vol_offset; + vstate->counter = -~vstate->counter; /*Increment Change Counter*/ + + gatt_db_attribute_notify(vdb->vocs->vos, (void *)vstate, + sizeof(struct vol_offset_state), + bt_vcp_get_att(vcp)); + return 0; +} + #define BT_VCS_REL_VOL_DOWN 0x00 #define BT_VCS_REL_VOL_UP 0x01 #define BT_VCS_UNMUTE_REL_VOL_DOWN 0x02 @@ -591,6 +722,8 @@ static uint8_t vcs_mute(struct bt_vcs *vcs, struct bt_vcp *vcp, #define BT_VCS_UNMUTE 0x05 #define BT_VCS_MUTE 0x06 +#define BT_VOCS_SET_VOL_OFFSET 0x01 + #define VCS_OP(_str, _op, _size, _func) \ { \ .str = _str, \ @@ -623,6 +756,26 @@ struct vcs_op_handler { {} }; +#define VOCS_OP(_str, _op, _size, _func) \ + { \ + .str = _str, \ + .op = _op, \ + .size = _size, \ + .func = _func, \ + } + +struct vocs_op_handler { + const char *str; + uint8_t op; + size_t size; + uint8_t (*func)(struct bt_vocs *vocs, struct bt_vcp *vcp, + struct iovec *iov); +} vocp_handlers[] = { + VOCS_OP("Set Volume Offset", BT_VOCS_SET_VOL_OFFSET, + sizeof(uint8_t), vocs_set_vol_offset), + {} +}; + static void vcs_cp_write(struct gatt_db_attribute *attrib, unsigned int id, uint16_t offset, const uint8_t *value, size_t len, @@ -683,6 +836,66 @@ respond: gatt_db_attribute_write_result(attrib, id, ret); } +static void vocs_cp_write(struct gatt_db_attribute *attrib, + unsigned int id, uint16_t offset, + const uint8_t *value, size_t len, + uint8_t opcode, struct bt_att *att, + void *user_data) +{ + struct bt_vocs *vocs = user_data; + struct bt_vcp *vcp = vcp_get_session(att, vocs->vdb->db); + struct iovec iov = { + .iov_base = (void *) value, + .iov_len = len, + }; + uint8_t *vcp_op; + struct vocs_op_handler *handler; + uint8_t ret = BT_ATT_ERROR_REQUEST_NOT_SUPPORTED; + + DBG(vcp, "VOCP Control Point Write"); + + if (offset) { + DBG(vcp, "invalid offset %d", offset); + ret = BT_ATT_ERROR_INVALID_OFFSET; + goto respond; + } + + if (len < sizeof(*vcp_op)) { + DBG(vcp, "invalid len %ld < %ld sizeof(*param)", len, + sizeof(*vcp_op)); + ret = BT_ATT_ERROR_INVALID_ATTRIBUTE_VALUE_LEN; + goto respond; + } + + vcp_op = iov_pull_mem(&iov, sizeof(*vcp_op)); + + for (handler = vocp_handlers; handler && handler->str; handler++) { + if (handler->op != *vcp_op) + continue; + + if (iov.iov_len < handler->size) { + DBG(vcp, "invalid len %ld < %ld handler->size", len, + handler->size); + ret = BT_ATT_ERROR_OPCODE_NOT_SUPPORTED; + goto respond; + } + + break; + } + + if (handler && handler->str) { + DBG(vcp, "%s", handler->str); + + ret = handler->func(vocs, vcp, &iov); + } else { + DBG(vcp, "Unknown opcode 0x%02x", *vcp_op); + ret = BT_ATT_ERROR_OPCODE_NOT_SUPPORTED; + } + +respond: + gatt_db_attribute_write_result(attrib, id, ret); +} + static void vcs_state_read(struct gatt_db_attribute *attrib, unsigned int id, uint16_t offset, uint8_t opcode, struct bt_att *att, @@ -698,6 +911,21 @@ static void vcs_state_read(struct gatt_db_attribute *attrib, iov.iov_len); } +static void vocs_state_read(struct gatt_db_attribute *attrib, + unsigned int id, uint16_t offset, + uint8_t opcode, struct bt_att *att, + void *user_data) +{ + struct bt_vocs *vocs = user_data; + struct iovec iov; + + iov.iov_base = vocs->vostate; + iov.iov_len = sizeof(*vocs->vostate); + + gatt_db_attribute_read_result(attrib, id, 0, iov.iov_base, + iov.iov_len); +} + static void vcs_flag_read(struct gatt_db_attribute *attrib, unsigned int id, uint16_t offset, uint8_t opcode, struct bt_att *att, @@ -713,6 +941,36 @@ static void vcs_flag_read(struct gatt_db_attribute *attrib, iov.iov_len); } +static void vocs_voal_read(struct gatt_db_attribute *attrib, + unsigned int id, uint16_t offset, + uint8_t opcode, struct bt_att *att, + void *user_data) +{ + struct bt_vocs *vocs = user_data; + struct iovec iov; + + iov.iov_base = &vocs->vocs_audio_loc; + iov.iov_len = sizeof(vocs->vocs_audio_loc); + + gatt_db_attribute_read_result(attrib, id, 0, iov.iov_base, + iov.iov_len); +} + +static void vocs_voaodec_read(struct gatt_db_attribute *attrib, + unsigned int id, uint16_t offset, + uint8_t opcode, struct bt_att *att, + void *user_data) +{ + struct bt_vocs *vocs = user_data; + struct iovec iov; + + iov.iov_base = &vocs->vocs_ao_dec; + iov.iov_len = strlen(vocs->vocs_ao_dec); + + gatt_db_attribute_read_result(attrib, id, 0, iov.iov_base, + iov.iov_len); +} + static struct bt_vcs *vcs_new(struct gatt_db *db) { struct bt_vcs *vcs; @@ -771,6 +1029,74 @@ static struct bt_vcs *vcs_new(struct gatt_db *db) return vcs; } +static struct bt_vocs *vocs_new(struct gatt_db *db) +{ + struct bt_vocs *vocs; + struct vol_offset_state *vostate; + bt_uuid_t uuid; + + if (!db) + return NULL; + + vocs = new0(struct bt_vocs, 1); + + vostate = new0(struct vol_offset_state, 1); + + vocs->vostate = vostate; + vocs->vocs_audio_loc = BT_VCP_FRONT_LEFT; + vocs->vocs_ao_dec = "Left Speaker"; + + /* Populate DB with VOCS attributes */ + bt_uuid16_create(&uuid, VOL_OFFSET_CS_UUID); + vocs->service = gatt_db_add_service(db, &uuid, true, 9); + + bt_uuid16_create(&uuid, VOCS_STATE_CHAR_UUID); + vocs->vos = gatt_db_service_add_characteristic(vocs->service, + &uuid, + BT_ATT_PERM_READ, + BT_GATT_CHRC_PROP_READ | + BT_GATT_CHRC_PROP_NOTIFY, + vocs_state_read, NULL, + vocs); + + vocs->vos_ccc = gatt_db_service_add_ccc(vocs->service, + BT_ATT_PERM_READ | BT_ATT_PERM_WRITE); + + bt_uuid16_create(&uuid, VOCS_AUDIO_LOC_CHRC_UUID); + vocs->voal = gatt_db_service_add_characteristic(vocs->service, + &uuid, + BT_ATT_PERM_READ, + BT_GATT_CHRC_PROP_READ | + BT_GATT_CHRC_PROP_NOTIFY, + vocs_voal_read, NULL, + vocs); + + vocs->voal_ccc = gatt_db_service_add_ccc(vocs->service, + BT_ATT_PERM_READ | BT_ATT_PERM_WRITE); + + bt_uuid16_create(&uuid, VOCS_CP_CHRC_UUID); + vocs->vo_cp = gatt_db_service_add_characteristic(vocs->service, + &uuid, + BT_ATT_PERM_WRITE, + BT_GATT_CHRC_PROP_WRITE, + NULL, vocs_cp_write, + vocs); + + bt_uuid16_create(&uuid, VOCS_AUDIO_OP_DESC_CHAR_UUID); + vocs->voaodec = gatt_db_service_add_characteristic(vocs->service, + &uuid, + BT_ATT_PERM_READ, + BT_GATT_CHRC_PROP_READ | + BT_GATT_CHRC_PROP_NOTIFY, + vocs_voaodec_read, NULL, + vocs); + + vocs->voaodec_ccc = gatt_db_service_add_ccc(vocs->service, + BT_ATT_PERM_READ | BT_ATT_PERM_WRITE); + + return vocs; +} + static struct bt_vcp_db *vcp_db_new(struct gatt_db *db) { struct bt_vcp_db *vdb; @@ -787,6 +1113,9 @@ static struct bt_vcp_db *vcp_db_new(struct gatt_db *db) vdb->vcs = vcs_new(db); vdb->vcs->vdb = vdb; + vdb->vocs = vocs_new(db); + vdb->vocs->vdb = vdb; + queue_push_tail(vcp_db, vdb); return vdb; @@ -911,6 +1240,46 @@ static void vcp_vstate_notify(struct bt_vcp *vcp, uint16_t value_handle, DBG(vcp, "Vol Counter 0x%x", vstate.counter); } +static void vcp_voffset_state_notify(struct bt_vcp *vcp, uint16_t value_handle, + const uint8_t *value, uint16_t length, + void *user_data) +{ + struct vol_offset_state vostate; + + memcpy(&vostate, value, sizeof(struct vol_offset_state)); + + DBG(vcp, "Vol Offset 0x%x", vostate.vol_offset); + DBG(vcp, "Vol Offset Counter 0x%x", vostate.counter); +} + +static void vcp_audio_loc_notify(struct bt_vcp *vcp, uint16_t value_handle, + const uint8_t *value, uint16_t length, + void *user_data) +{ + uint32_t *vocs_audio_loc_n = malloc(sizeof(uint32_t));; + + if (value != NULL) + memcpy(vocs_audio_loc_n, value, sizeof(uint32_t)); + + DBG(vcp, "VOCS Audio Location 0x%x", *vocs_audio_loc_n); + + free(vocs_audio_loc_n); +} + + +static void vcp_audio_descriptor_notify(struct bt_vcp *vcp, + uint16_t value_handle, + const uint8_t *value, + uint16_t length, + void *user_data) +{ + char vocs_audio_dec_n[256] = {'\0'}; + + memcpy(vocs_audio_dec_n, value, length); + + DBG(vcp, "VOCS Audio Descriptor 0x%s", *vocs_audio_dec_n); +} + static void vcp_vflag_notify(struct bt_vcp *vcp, uint16_t value_handle, const uint8_t *value, uint16_t length, void *user_data) @@ -972,6 +1341,86 @@ static void read_vol_state(struct bt_vcp *vcp, bool success, uint8_t att_ecode, DBG(vcp, "Vol Counter:%x", vs->counter); } +static void read_vol_offset_state(struct bt_vcp *vcp, bool success, + uint8_t att_ecode, + const uint8_t *value, uint16_t length, + void *user_data) +{ + struct vol_offset_state *vos; + struct iovec iov = { + .iov_base = (void *) value, + .iov_len = length, + }; + + if (!success) { + DBG(vcp, "Unable to read Vol Offset State: error 0x%02x", + att_ecode); + return; + } + + vos = iov_pull_mem(&iov, sizeof(*vos)); + if (!vos) { + DBG(vcp, "Unable to get Vol Offset State"); + return; + } + + DBG(vcp, "Vol Set:%x", vos->vol_offset); + DBG(vcp, "Vol Counter:%x", vos->counter); +} + +static void read_vocs_audio_location(struct bt_vcp *vcp, bool success, + uint8_t att_ecode, + const uint8_t *value, uint16_t length, + void *user_data) +{ + uint32_t *vocs_audio_loc; + struct iovec iov = { + .iov_base = (void *) value, + .iov_len = length, + }; + + if (!success) { + DBG(vcp, "Unable to read VOCS Audio Location: error 0x%02x", + att_ecode); + return; + } + + vocs_audio_loc = iov_pull_mem(&iov, sizeof(uint32_t)); + if (!*vocs_audio_loc) { + DBG(vcp, "Unable to get VOCS Audio Location"); + return; + } + + DBG(vcp, "VOCS Audio Loc:%x", *vocs_audio_loc); +} + + +static void read_vocs_audio_descriptor(struct bt_vcp *vcp, bool success, + uint8_t att_ecode, + const uint8_t *value, uint16_t length, + void *user_data) +{ + char *vocs_ao_dec_r; + struct iovec iov = { + .iov_base = (void *) value, + .iov_len = length, + }; + + if (!success) { + DBG(vcp, "Unable to read VOCS Audio Descriptor: error 0x%02x", + att_ecode); + return; + } + + vocs_ao_dec_r = iov_pull_mem(&iov, length); + if (!*vocs_ao_dec_r) { + DBG(vcp, "Unable to get VOCS Audio Descriptor"); + return; + } + + DBG(vcp, "VOCS Audio Descriptor:%s", *vocs_ao_dec_r); +} + static void vcp_pending_destroy(void *data) { struct bt_vcp_pending *pending = data; @@ -1128,6 +1577,90 @@ static void foreach_vcs_char(struct gatt_db_attribute *attr, void *user_data) } } +static void foreach_vocs_char(struct gatt_db_attribute *attr, void *user_data) +{ + struct bt_vcp *vcp = user_data; + uint16_t value_handle; + bt_uuid_t uuid, uuid_vostate, uuid_audio_loc, uuid_vo_cp, + uuid_audio_op_decs; + struct bt_vocs *vocs; + + if (!gatt_db_attribute_get_char_data(attr, NULL, &value_handle, + NULL, NULL, &uuid)) + return; + + bt_uuid16_create(&uuid_vostate, VOCS_STATE_CHAR_UUID); + bt_uuid16_create(&uuid_audio_loc, VOCS_AUDIO_LOC_CHRC_UUID); + bt_uuid16_create(&uuid_vo_cp, VOCS_CP_CHRC_UUID); + bt_uuid16_create(&uuid_audio_op_decs, VOCS_AUDIO_OP_DESC_CHAR_UUID); + + if (!bt_uuid_cmp(&uuid, &uuid_vostate)) { + DBG(vcp, "VOCS Vol state found: handle 0x%04x", value_handle); + + vocs = vcp_get_vocs(vcp); + if (!vocs || vocs->vos) + return; + + vocs->vos = attr; + + vcp_read_value(vcp, value_handle, read_vol_offset_state, vcp); + + vcp->state_id = vcp_register_notify(vcp, value_handle, + vcp_voffset_state_notify, NULL); + + return; + } + + if (!bt_uuid_cmp(&uuid, &uuid_audio_loc)) { + DBG(vcp, "VOCS Volume Audio Location found: handle 0x%04x", + value_handle); + + vocs = vcp_get_vocs(vcp); + if (!vocs || vocs->voal) + return; + + vocs->voal = attr; + + vcp_read_value(vcp, value_handle, read_vocs_audio_location, + vcp); + + vcp->audio_loc_id = vcp_register_notify(vcp, value_handle, + vcp_audio_loc_notify, NULL); + + return; + } + + if (!bt_uuid_cmp(&uuid, &uuid_vo_cp)) { + DBG(vcp, "VOCS Volume CP found: handle 0x%04x", value_handle); + + vocs = vcp_get_vocs(vcp); + if (!vocs || vocs->vo_cp) + return; + + vocs->vo_cp = attr; + + return; + } + + if (!bt_uuid_cmp(&uuid, &uuid_audio_op_decs)) { + DBG(vcp, "VOCS Vol Audio Descriptor found: handle 0x%04x", + value_handle); + + vocs = vcp_get_vocs(vcp); + if (!vocs || vocs->voaodec) + return; + + vocs->voaodec = attr; + + vcp_read_value(vcp, value_handle, read_vocs_audio_descriptor, + vcp); + vcp->ao_dec_id = vcp_register_notify(vcp, value_handle, + vcp_audio_descriptor_notify, NULL); + + } + +} + static void foreach_vcs_service(struct gatt_db_attribute *attr, void *user_data) { @@ -1141,6 +1674,19 @@ static void foreach_vcs_service(struct gatt_db_attribute *attr, gatt_db_service_foreach_char(attr, foreach_vcs_char, vcp); } +static void foreach_vocs_service(struct gatt_db_attribute *attr, + void *user_data) +{ + struct bt_vcp *vcp = user_data; + struct bt_vocs *vocs = vcp_get_vocs(vcp); + + vocs->service = attr; + + gatt_db_service_set_claimed(attr, true); + + gatt_db_service_foreach_char(attr, foreach_vocs_char, vcp); +} + bool bt_vcp_attach(struct bt_vcp *vcp, struct bt_gatt_client *client) { bt_uuid_t uuid; @@ -1163,6 +1709,9 @@ bool bt_vcp_attach(struct bt_vcp *vcp, struct bt_gatt_client *client) bt_uuid16_create(&uuid, VCS_UUID); gatt_db_foreach_service(vcp->ldb->db, &uuid, foreach_vcs_service, vcp); + bt_uuid16_create(&uuid, VOL_OFFSET_CS_UUID); + gatt_db_foreach_service(vcp->ldb->db, &uuid, foreach_vocs_service, vcp); + return true; } From patchwork Fri Jun 9 09:42:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nitin Jadhav X-Patchwork-Id: 691228 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 19C99C7EE2E for ; Fri, 9 Jun 2023 09:52:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241884AbjFIJwa (ORCPT ); Fri, 9 Jun 2023 05:52:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241413AbjFIJvj (ORCPT ); Fri, 9 Jun 2023 05:51:39 -0400 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2075.outbound.protection.outlook.com [40.107.8.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B191E5597 for ; Fri, 9 Jun 2023 02:44:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gCGZ8rOj1/rdZ/814hEq8WFBUcjRblRWgXNW1VYl3GIztsrfY68PSgdayoSlUhZeuQyXnsta970D12tMlr3KWZPuqfEmIhDWM5PSRlhSHxlHaedp/Sn7FHPfbbec7xGRdtG2kPAG18OfrOsWX+h5/hgPCYGx4uEb65ScLGz770Remr5x+7XBfOgtecZFO91ASITBucUunjcwdY+fmNJRWM/gVPO2tsp1HBbhBHC+OOiovdM8FzqtNElBfawknNVK6HmKtTGxB+pfyD8hpYfKZLxY9pdyesF031mRxAWlfJDJBLC+gAyApVxuN69qjewQeDiDVjOSjbDM94lqMjO9yQ== 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=gtmtePmdXN/XdtqE2lOonnIg7eVdZcnLvkbijL0OgE0=; b=oe7rWjpQUY1X4m8hmLMd7Fj4GeeMJPJiQ0yJLjkwsOLq2GU30sX7YrdKzFIB1Ja8Xx7vCH0lgKHBJmk/xZwyLCmk7gmMf+dXkyIPxQrf0QXbgpLZN5hKxZ1JZ5jl/qAMD1qagsTF9SP26/2NnmgUps8uGuNTDab86OudXAzQReMO6gkOjD4+qm4xpC7sWblvOwPBJqSRhduL8SVsxQx7MMkQC/lcgNX5BkTUGa69STUzM320KatyDtrkngWTivFqkjU7kuqvzRnVSGH47LMju6dDLrurSPjmsrWaHTXNzHxgh0DVD8YC9Jgv5VZb1nXBESApBnKeXF0EVdUK9EmWFg== 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=gtmtePmdXN/XdtqE2lOonnIg7eVdZcnLvkbijL0OgE0=; b=o0vW4nlo3TtgfFiUaYea6kcd4t9KxsguCJiG/XbcsuvypttmvWsFNquoIJMkpVHyfIegb0sE81kiHeMVPMzZy7QoQKF5hnIeEBOxkZnNtCfZC/3LupS26rHU7sItJdsniBhFNciOrIfSLbfW4m3sZGyfjnSUzCS9/2tN9u/pw1g= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB9126.eurprd04.prod.outlook.com (2603:10a6:20b:449::16) by PAXPR04MB8191.eurprd04.prod.outlook.com (2603:10a6:102:1c4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.41; Fri, 9 Jun 2023 09:43:17 +0000 Received: from AS8PR04MB9126.eurprd04.prod.outlook.com ([fe80::ad2c:857b:a144:9af4]) by AS8PR04MB9126.eurprd04.prod.outlook.com ([fe80::ad2c:857b:a144:9af4%3]) with mapi id 15.20.6455.030; Fri, 9 Jun 2023 09:43:17 +0000 From: Nitin Jadhav To: linux-bluetooth@vger.kernel.org Cc: devyani.godbole@nxp.com, mihai-octavian.urzica@nxp.com, silviu.barbulescu@nxp.com, nitin.jadhav@nxp.com Subject: [PATCH BlueZ v4 3/3] shared/vcp.c: Make VOCS (Secondary) as an included service of VCS (Primary) Date: Fri, 9 Jun 2023 15:12:22 +0530 Message-Id: <20230609094222.1877-4-nitin.jadhav@nxp.com> X-Mailer: git-send-email 2.33.1.windows.1 In-Reply-To: <20230609094222.1877-1-nitin.jadhav@nxp.com> References: <20230609094222.1877-1-nitin.jadhav@nxp.com> X-ClientProxiedBy: SI2PR06CA0008.apcprd06.prod.outlook.com (2603:1096:4:186::23) To AS8PR04MB9126.eurprd04.prod.outlook.com (2603:10a6:20b:449::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB9126:EE_|PAXPR04MB8191:EE_ X-MS-Office365-Filtering-Correlation-Id: fd71efb9-6dc4-4afa-eb21-08db68cdf3d6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wAoaIQg9Z3gerhJe8FpqU2MSGBgxT5RyeVce5JtB1IqdzO4A8/JOWuTGcP5MZDe89/34m7kEWBGGbsw/hlpBR4XZOscCt7ht6fRaSuLzdpREIRf0A9zadbMphS/RnMcisoD4np4NpDwY036Dl8fz0xjxtDlq9FpV4QFf2xeLnX7OxMbcwmtMgQkfqgKtFy4xlERdo6m2NeqSunY9+oBKeVotXefY2QpAOoicknZmWov2X3bdT3Lr/fn/zOGyxFYW8mlJNRoc+UdMaS5OgGso7zejpJO8CBZihyGMSd/rMZf2oPLUXas0cYE0v6iwTNm5popUP8kXIDtuHHtfiJagIxOH/8fXFm7YcTxCX9yn0KiTcZft9UVXAFr/Z3GIEhr3mDH2dmxtX4jQydttehzUK3H74cIeK/uKQpmg/VhceKhfDAE5NdJxhi24572E2uXTbB9X5ncXqgifUx2s+OeOn/xOf11q6ppOZg0c+XvKTa7QdPO6cp+ADrePNQjIkcR6zObO8FSapX8vV4hjZ5xlbN3ddZt8CYpbdvOQKgz1gOEgOY4Iss1xn9SrjjAhobPJz5yMvBTGDVnvIcC19iJ/Is2jd1MO0nw1OgCOV/5a5+7mwXkFlqShqdJHuGXVGq8a X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB9126.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(39860400002)(346002)(376002)(366004)(451199021)(36756003)(2906002)(86362001)(44832011)(5660300002)(2616005)(52116002)(6486002)(186003)(83380400001)(6666004)(6506007)(26005)(6512007)(1076003)(478600001)(66946007)(66556008)(66476007)(4326008)(38350700002)(38100700002)(316002)(41300700001)(6916009)(8936002)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3pRSy762gMA5UYsUjjx4D7Vde7rsq2tgjYWzhy0+kjT5BDZU5IDmH4tTWILwqNkwQVal67Blk+Jxkq/UWISYBKbECFeL0vrQnH3/l9kfYlwIkrMxWIGcmka1ZZt9CJayi+/OVv3eqn79Y45uOhyRS2EBcONsuSId6iuuRXCPAV2QmSKl1sqhdWjWtHLHvxY69cTrzy2jMIHI5Jgj2m8sJZ+ips9aI9bvFtLM2PINK4cyxXrKlNAaJ23QIsHly0nnQsDCtEL8AOWVI6EUgd1+NmH51NdT7FC7Z7a6sSSIpZt1ds5xcCgR6u78dXqaqZJuNG/AyvHly7auG8uxq0TJlhFj9wITpYp7Mup+Rubqnafuyguw59LnzRlhh/PZFXatu9jalaFwWZ8eX0dhDG2/Alcpz0TRnr25OZVSdWgVJaAG/IihhCdohHJFWQAgcIsi2KZzrhS3gvInsZCDkl6yMR85DUu4qlE9BMISyZK5DrYpb3D5tdRxOkqQHG8n9cJ2trVvoT9L8rfn5M9fTDXtBZ0xUQGveVPKmKZV76pd5CuquTfK6hJJEb3rwXmqHWYUNnB/72ojIBlrKQKMR1b89aVz+NHwyPMgtwcVBfodfoIe8T8dzkZTl3LRlVf2m5yUYSeEzcuso8NhjWJqHJ4EivRsmYGcjPx2MhhVmR4fu2PBL4DJHsSfxV5drF/GlBVKL1QT39wwks5so1PK4MsAVaTj5klO8x3Fp9c8vYGrQMGjcFIu+pga2EYoISujQNkOPpseTWjRuAQp++wHylfU7B0ePzVYuEN1XHURIEQsgi8x2Rdbv6ERMKCWNH+rxVkCX/MCEG6bci+C5zCBWaJfiylpo1SpMGPjUeWhmtab7X1AHUCe/iJMsPhDuzrw93GNavRHM+e9W+Jd1kCPV4Hc0vtrVwAAyGwijMNlgsZr157A2oKTqF0OlwQY7lHidkqwSPLGbBRbyL4rfel+zY3qA88UcdkBO5ny64Z/S0jJISKp+aTZm2v51TioeEjAkisce8hVO2H+YRfrGd2N80fh8lxaEH3wMN22kdDWcwwVYYk9A8Fx+3CAZrZtOSIEObb1R9M2eMWzSDiUH5rq0jJk9pj0oOsfyjL+nkt+b3U53up/RvGYs5mWnjuI7PgpBYbRwyBmxhzOsj5Vx8ZiOXcPdXTgowlVwcfvZca6rthJEDN4MQOjipcA08hAq4qW6mgr7mawCJCXSbLzSe+tKv/G8csMTu8XzQz7FnyW9L0svMeW0ovOqGNW5QqoY/X7UU9e/fgvVFysKh3GgZs3sDy7MjW8flIqeMNCjhtYrezsb25nSu1Dz46lnxLrMrbwE4MAcscK6+imAPhNSZ2yYuANxBbkvx+cxI1gslvQRVdCQ439FyTQ23ugjJR0gNh5AFTf+cEYtjSWwoYJ8P74wqAIR8rRJh2zsmq6gSBoYKhprjgzu5+HXVskxtwXDkkRethQbnIgxjUIBVHFpoXGE6eqi6xym4k00y8Ff2GevptG8mLW72lpWc2tucAwXawM32bnvRDWfzk4nrD78H7DgfLzHY/2FNgcaMtM/JzLInXzGHKHijQzex/kp7ltmg9VFLnGgTK5pD9hLyCS7sRbkRfN2w== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd71efb9-6dc4-4afa-eb21-08db68cdf3d6 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB9126.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2023 09:43:17.4386 (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: lAoJGvWtNuyNdg+hSQSGALc4cxsiS6TxNUa2iDBWQHIxAyosWGM80hsxcReYQxZyVpk0FCC7G4j8MO1R7TmhoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8191 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Fixed the following issue observed during PTS testing - Specified Upper and Lower Limit for Volume offset - Corrected the number of handles for VOCS - VOCS is made as included service of VCS (VOCS is secondary service and VSC is primary service) --- v2: Cosmetic Changes (Bluez Test Bot) --- src/shared/vcp.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/shared/vcp.c b/src/shared/vcp.c index 6fc788e13..93f72a678 100644 --- a/src/shared/vcp.c +++ b/src/shared/vcp.c @@ -32,9 +32,13 @@ #define VCP_STEP_SIZE 1 +#define VOCS_VOL_OFFSET_UPPER_LIMIT 255 +#define VOCS_VOL_OFFSET_LOWER_LIMIT -255 + /* Apllication Error Code */ #define BT_ATT_ERROR_INVALID_CHANGE_COUNTER 0x80 #define BT_ATT_ERROR_OPCODE_NOT_SUPPORTED 0x81 +#define BT_ATT_ERROR_VALUE_OUT_OF_RANGE 0x82 #define BT_VCP_NA BIT(0) #define BT_VCP_FRONT_LEFT BIT(1) @@ -100,7 +104,7 @@ struct bt_vcs_ab_vol { struct bt_vocs_set_vol_off { uint8_t change_counter; - uint8_t set_vol_offset; + int16_t set_vol_offset; } __packed; struct bt_vcp_cb { @@ -167,7 +171,7 @@ struct bt_vcs { /* Contains local bt_vcp_db */ struct vol_offset_state { - uint16_t vol_offset; + int16_t vol_offset; uint8_t counter; } __packed; @@ -705,6 +709,11 @@ static uint8_t vocs_set_vol_offset(struct bt_vocs *vocs, struct bt_vcp *vcp, return BT_ATT_ERROR_INVALID_CHANGE_COUNTER; } + if (req->set_vol_offset > VOCS_VOL_OFFSET_UPPER_LIMIT || + req->set_vol_offset < VOCS_VOL_OFFSET_LOWER_LIMIT) { + DBG(vcp, "error: Value Out of Range"); + return BT_ATT_ERROR_VALUE_OUT_OF_RANGE; + } vstate->vol_offset = req->set_vol_offset; vstate->counter = -~vstate->counter; /*Increment Change Counter*/ @@ -971,7 +980,7 @@ static void vocs_voaodec_read(struct gatt_db_attribute *attrib, iov.iov_len); } -static struct bt_vcs *vcs_new(struct gatt_db *db) +static struct bt_vcs *vcs_new(struct gatt_db *db, struct bt_vcp_db *vdb) { struct bt_vcs *vcs; struct vol_state *vstate; @@ -990,6 +999,8 @@ static struct bt_vcs *vcs_new(struct gatt_db *db) /* Populate DB with VCS attributes */ bt_uuid16_create(&uuid, VCS_UUID); vcs->service = gatt_db_add_service(db, &uuid, true, 9); + gatt_db_service_add_included(vcs->service, vdb->vocs->service); + gatt_db_service_set_active(vdb->vocs->service, true); bt_uuid16_create(&uuid, VOL_STATE_CHRC_UUID); vcs->vs = gatt_db_service_add_characteristic(vcs->service, @@ -1048,7 +1059,8 @@ static struct bt_vocs *vocs_new(struct gatt_db *db) /* Populate DB with VOCS attributes */ bt_uuid16_create(&uuid, VOL_OFFSET_CS_UUID); - vocs->service = gatt_db_add_service(db, &uuid, true, 9); + + vocs->service = gatt_db_add_service(db, &uuid, false, 12); bt_uuid16_create(&uuid, VOCS_STATE_CHAR_UUID); vocs->vos = gatt_db_service_add_characteristic(vocs->service, @@ -1110,11 +1122,10 @@ static struct bt_vcp_db *vcp_db_new(struct gatt_db *db) if (!vcp_db) vcp_db = queue_new(); - vdb->vcs = vcs_new(db); - vdb->vcs->vdb = vdb; - vdb->vocs = vocs_new(db); vdb->vocs->vdb = vdb; + vdb->vcs = vcs_new(db, vdb); + vdb->vcs->vdb = vdb; queue_push_tail(vcp_db, vdb);