Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp2210467rwb; Mon, 19 Sep 2022 01:07:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM66nStVjCsBf+dOyXZstMGip8/taRfDxzr0qDCN/qqs25vXvqxe7Th4rQbxTzrBSjX+/vuB X-Received: by 2002:a17:90a:6d62:b0:200:579f:e4ea with SMTP id z89-20020a17090a6d6200b00200579fe4eamr29892478pjj.244.1663574832274; Mon, 19 Sep 2022 01:07:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663574832; cv=none; d=google.com; s=arc-20160816; b=OobJtx7b7nKI0Ok5HfI3wTja0fuXCcyW1H/5UusLEaVJkCvEmTfaiWFcJi1zPEtp0f v5TFsXSL9uRYfPIcDox8tcdtK/AYoY21KgyQke9sGWkOan30s9SOcmokoYcn6UGKClbB APFssGHnrKeHYFFL7pQNiOOlp3PxitSP6J9Li4KCGnkpQgYmrizYSj0tb//HUiL64MXc y/xEU6Ig/75mmiDb0uv/Xvx3BSPpT6rlO8B2toPW3QnYEMaVqcxbYrv6Wv3zIdtfRA5/ 8nxTMhyihpDn7UVk39lBaE1i+hR0su+DyaZJwvVRbCADOcL8dC77FGifBSXsUgmO21tE K47A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DJGf3omevWU72/r4E1EK0Cg2bI03daN1pYJT4NWr1pg=; b=Mc7P4QbAY+x6byUmMsWkjJl00Kon4uuDFXAaWNUPWkS8kK86rP/T/LnMgnIyQWtGDG GLp0Xhpm6ZMSCkcF0Ds/MOUj4aM0m5kRf7s+q4DYJMnGuS8OWlhlregIrZjjcpcaQ4v0 enLHuVDzIx4cagrv1OwWv9uZJMMyeRzl0a06oFoHEJp7amcKkrPoe/tStY2yideC6ReJ 4+1g5TsF/DeK7sTNwS/HlCw7RGSjbOrnChGPvjra8COs7E93QKiJSq1wHO8d0RxT1VVl wcQouQesda3+wofNsxyDHgeGFHqs4OkRbNZo0QW2QoHpePSuxxIN5+7L16JiKKXTABCG hSEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=EHGKgfWJ; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y29-20020a634b1d000000b0043a20e51026si2913367pga.8.2022.09.19.01.06.41; Mon, 19 Sep 2022 01:07:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=EHGKgfWJ; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229835AbiISIGJ (ORCPT + 99 others); Mon, 19 Sep 2022 04:06:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229865AbiISIF4 (ORCPT ); Mon, 19 Sep 2022 04:05:56 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FB8813DF3 for ; Mon, 19 Sep 2022 01:05:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663574755; x=1695110755; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kBQRHwmj5jBLZDQZaifMfbtxMnVSmpvncYMBxNKp0GQ=; b=EHGKgfWJhrXBAhw92Qx31hh6V5GyuAhxOWdKinvKJFxlZvXWSEbfenYm U42btk3bbXDOWKyncmY1SVw+HHBskYjWXSfa4S7KSINhjlphh8PhLHw6i ZH/VQOWsXrdiURm9PNKYpQ8SMJi9Xhfe2XwyLg5ef4kIEvVPvKhZGlj+N QvaGwwbdzspBY39PDry74SBFT1hRENvH1YEj42j8zSa94AuUJQVVM1Cp4 UWSipWhhfSE6ejf/c4ZkJNT5F/V0r1C5XEFNQxNEhfeKWXAwEfCkaoypk f2wterU8djpsgLDjNtVhlKcCoFHNVH4bdyfht3izjLZHP1sKm2c0xGgBZ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10474"; a="279718280" X-IronPort-AV: E=Sophos;i="5.93,327,1654585200"; d="scan'208";a="279718280" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Sep 2022 01:05:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,327,1654585200"; d="scan'208";a="947113966" Received: from bsblt022.iind.intel.com ([10.224.186.21]) by fmsmga005.fm.intel.com with ESMTP; 19 Sep 2022 01:05:53 -0700 From: Sathish Narasimman To: linux-bluetooth@vger.kernel.org Cc: Sathish Narasimman Subject: [PATCH BlueZ v3 3/3] monitor/att: Add decoding support for Volume Control Serice Date: Mon, 19 Sep 2022 13:37:22 +0530 Message-Id: <20220919080722.562080-3-sathish.narasimman@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220919080722.562080-1-sathish.narasimman@intel.com> References: <20220919080722.562080-1-sathish.narasimman@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds decoding support for VCS attributes > ACL Data RX: Handle 3585 flags 0x02 dlen 7 ATT: Read Request (0x0a) len 2 Handle: 0x0017 Type: Volume State (0x2b7d) < ACL Data TX: Handle 3585 flags 0x00 dlen 8 ATT: Read Response (0x0b) len 3 Value: 000000 Handle: 0x0017 Type: Volume State (0x2b7d) Volume Setting: 0 Not Muted: 0 Change Counter: 0 > HCI Event: Number of Completed Packets (0x13) plen 5 Num handles: 1 Handle: 3585 Address: 49:71:FC:C0:66:C6 (Resolvable) Count: 1 > ACL Data RX: Handle 3585 flags 0x02 dlen 7 ATT: Read Request (0x0a) len 2 Handle: 0x001c Type: Volume Flags (0x2b7f) < ACL Data TX: Handle 3585 flags 0x00 dlen 6 ATT: Read Response (0x0b) len 1 Value: 01 Handle: 0x001c Type: Volume Flags (0x2b7f) Volume Falg: 1 --- monitor/att.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/monitor/att.c b/monitor/att.c index b7470f7a2ff4..3c1ff2e2aaa0 100644 --- a/monitor/att.c +++ b/monitor/att.c @@ -1590,6 +1590,162 @@ static void pac_context_notify(const struct l2cap_frame *frame) print_pac_context(frame); } +static void print_vcs_state(const struct l2cap_frame *frame) +{ + uint8_t vol_set, mute, chng_ctr; + + if (!l2cap_frame_get_u8((void *)frame, &vol_set)) { + print_text(COLOR_ERROR, "Volume Settings: invalid size"); + goto done; + } + print_field(" Volume Setting: %u", vol_set); + + if (!l2cap_frame_get_u8((void *)frame, &mute)) { + print_text(COLOR_ERROR, "Mute Filed: invalid size"); + goto done; + } + + switch (mute) { + case 0x00: + print_field(" Not Muted: %u", mute); + break; + case 0x01: + print_field(" Muted: %u", mute); + break; + default: + print_field(" Unknown Mute Value: %u", mute); + break; + } + + if (!l2cap_frame_get_u8((void *)frame, &chng_ctr)) { + print_text(COLOR_ERROR, "Change Counter: invalid size"); + goto done; + } + print_field(" Change Counter: %u", chng_ctr); + +done: + if (frame->size) + print_hex_field(" Data", frame->data, frame->size); +} + +static void vol_state_read(const struct l2cap_frame *frame) +{ + print_vcs_state(frame); +} + +static void vol_state_notify(const struct l2cap_frame *frame) +{ + print_vcs_state(frame); +} + +static bool vcs_config_cmd(const struct l2cap_frame *frame) +{ + if (!l2cap_frame_print_u8((void *)frame, " Change Counter")) + return false; + + return true; +} + +static bool vcs_absolute_cmd(const struct l2cap_frame *frame) +{ + if (!l2cap_frame_print_u8((void *)frame, " Change Counter")) + return false; + + if (!l2cap_frame_print_u8((void *)frame, " Volume Setting")) + return false; + + return true; +} + +#define ASE_CMD(_op, _desc, _func) \ +[_op] = { \ + .desc = _desc, \ + .func = _func, \ +} + +struct vcs_cmd { + const char *desc; + bool (*func)(const struct l2cap_frame *frame); +} vcs_cmd_table[] = { + /* Opcode = 0x00 (Relative Volume Down) */ + ASE_CMD(0x00, "Relative Volume Down", vcs_config_cmd), + /* Opcode = 0x01 (Relative Volume Up) */ + ASE_CMD(0x01, "Relative Volume Up", vcs_config_cmd), + /* Opcode = 0x02 (Unmute/Relative Volume Down) */ + ASE_CMD(0x02, "Unmute/Relative Volume Down", vcs_config_cmd), + /* Opcode = 0x03 (Unmute/Relative Volume Up) */ + ASE_CMD(0x03, "Unmute/Relative Volume Up", vcs_config_cmd), + /* Opcode = 0x04 (Set Absolute Volume) */ + ASE_CMD(0x04, "Set Absolute Volume", vcs_absolute_cmd), + /* Opcode = 0x05 (Unmute) */ + ASE_CMD(0x05, "Unmute", vcs_config_cmd), + /* Opcode = 0x06 (Mute) */ + ASE_CMD(0x06, "Mute", vcs_config_cmd), +}; + +static struct vcs_cmd *vcs_get_cmd(uint8_t op) +{ + if (op > ARRAY_SIZE(vcs_cmd_table)) + return NULL; + + return &vcs_cmd_table[op]; +} + +static void print_vcs_cmd(const struct l2cap_frame *frame) +{ + uint8_t op; + struct vcs_cmd *cmd; + + if (!l2cap_frame_get_u8((void *)frame, &op)) { + print_text(COLOR_ERROR, "opcode: invalid size"); + goto done; + } + + cmd = vcs_get_cmd(op); + if (!cmd) { + print_field(" Opcode: Reserved (0x%2.2x)", op); + goto done; + } + + print_field(" Opcode: %s (0x%2.2x)", cmd->desc, op); + if (!cmd->func(frame)) + print_field(" Unknown Opcode"); + +done: + if (frame->size) + print_hex_field(" Data", frame->data, frame->size); +} + +static void vol_cp_write(const struct l2cap_frame *frame) +{ + print_vcs_cmd(frame); +} + +static void print_vcs_flag(const struct l2cap_frame *frame) +{ + uint8_t vol_flag; + + if (!l2cap_frame_get_u8((void *)frame, &vol_flag)) { + print_text(COLOR_ERROR, "Volume Flag: invalid size"); + goto done; + } + print_field(" Volume Falg: %u", vol_flag); + +done: + if (frame->size) + print_hex_field(" Data", frame->data, frame->size); +} + +static void vol_flag_read(const struct l2cap_frame *frame) +{ + print_vcs_flag(frame); +} + +static void vol_flag_notify(const struct l2cap_frame *frame) +{ + print_vcs_flag(frame); +} + #define GATT_HANDLER(_uuid, _read, _write, _notify) \ { \ .uuid = { \ @@ -1617,6 +1773,9 @@ struct gatt_handler { GATT_HANDLER(0x2bcc, pac_loc_read, NULL, pac_loc_notify), GATT_HANDLER(0x2bcd, pac_context_read, NULL, pac_context_notify), GATT_HANDLER(0x2bce, pac_context_read, NULL, pac_context_notify), + GATT_HANDLER(0x2b7d, vol_state_read, NULL, vol_state_notify), + GATT_HANDLER(0x2b7e, NULL, vol_cp_write, NULL), + GATT_HANDLER(0x2b7f, vol_flag_read, NULL, vol_flag_notify), }; static struct gatt_handler *get_handler(struct gatt_db_attribute *attr) -- 2.25.1