From patchwork Mon Jun 25 20:24:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gerecke, Jason" X-Patchwork-Id: 10487245 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B71A960230 for ; Mon, 25 Jun 2018 20:24:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA4682869D for ; Mon, 25 Jun 2018 20:24:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9EF85286A8; Mon, 25 Jun 2018 20:24:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DB762869F for ; Mon, 25 Jun 2018 20:24:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755691AbeFYUYz (ORCPT ); Mon, 25 Jun 2018 16:24:55 -0400 Received: from mail-pg0-f47.google.com ([74.125.83.47]:40056 "EHLO mail-pg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755690AbeFYUYy (ORCPT ); Mon, 25 Jun 2018 16:24:54 -0400 Received: by mail-pg0-f47.google.com with SMTP id w8-v6so6551362pgp.7 for ; Mon, 25 Jun 2018 13:24:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vjF6Hdk+KPSm1DYWubh4hQtbuUdsW0XbVv0hrVY6ij8=; b=vh1kBLpDipMBU2rE3DHdVmRnb4yaWCc9a2mZ/UoH/FfhU2k7dMYLfpf/sgp+MZqXoq qj6AU2RDUQWaEqQ8Ji9J7zPp4NOtyHcPnhXQqkQaLI2THOagKqidcDvvRNrbLTmj7MCv A3RIULHfXuILqtf1C7KaTQ/Ye+60oTNsDS9eMPF9Cg/r2IPvQvlCB06yDxMryBt2rXgY wbd5bh4CT+4jZvRmv9ZRD+CVxbgsqdLax1gO8skUg9OcwX5VPEBS4cpSol4cdm0BmiNx i/detHDYblFpiRyMgSTrZe7d3/+7+7aaLl9TRjH5wcNf5w1pHao+tOwtXcXoOwsX3PFy e5oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vjF6Hdk+KPSm1DYWubh4hQtbuUdsW0XbVv0hrVY6ij8=; b=Ba2O/6RRpAu/oReeRCIg2pOSMo1Sfug0CKfSyv1DXFlMalfwwoFcEtnAi2nhekGE1K +lBatAgBQPTMhuBWXa1WI1qtCX9ELeSHMnEyyXpuEWo9trPRBuqfCjkdCxP50KQj40So 27tcDmmpBWGWhqZ2af4i/EvQ5jaqNoPp8/jkuDBHXLubMdq6fZLQM0yDf3/sDbAmTiLr UgBGgLKR+2hFOC1MbMtph/yLWCL6yY+Zzwj/vVKWmYzUAFH44Xd/EVCGeNxqUB868Oax Q3cpxGC1FGtwWOL5HBYOaaWLZykQaqYXdRTtdPM8AfK7ri8ejsn0eCEH8+EzHbmaFn4/ pYZQ== X-Gm-Message-State: APt69E3Q+ZhoyyB7iAYRaDsZ5m0rpt1G4gEpF18aIbTEkjw9AZiBYthK wgj2i/C1DWGAc5PyneseWazs/QOQ X-Google-Smtp-Source: ADUXVKL9Ur94KfUVNJbTCS0NxozkcztyssmcXx9S4cAwW2JDPS8314MJV/wIFDTFLBsLDzzhfCtGEw== X-Received: by 2002:a62:8d5:: with SMTP id 82-v6mr14566309pfi.154.1529958293764; Mon, 25 Jun 2018 13:24:53 -0700 (PDT) Received: from wacom-arch2.corp.onewacom.com ([50.225.60.4]) by smtp.gmail.com with ESMTPSA id z26-v6sm31865677pfd.60.2018.06.25.13.24.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jun 2018 13:24:52 -0700 (PDT) From: Jason Gerecke To: linux-input@vger.kernel.org, Jiri Kosina Cc: Benjamin Tissoires , Ping Cheng , Aaron Skomra , Ping Cheng , Ping Cheng Subject: [PATCH 3/3] HID: wacom: convert Wacom custom usages to standard HID usages Date: Mon, 25 Jun 2018 13:24:36 -0700 Message-Id: <20180625202436.25114-3-killertofu@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180625202436.25114-1-killertofu@gmail.com> References: <20180625202436.25114-1-killertofu@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ping Cheng Otherwise the switch would not catch the proper usages. Signed-off-by: Ping Cheng --- drivers/hid/wacom_sys.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 463eaf5f1290..5f5c2593b898 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -394,6 +394,7 @@ static void wacom_usage_mapping(struct hid_device *hdev, struct wacom_features *features = &wacom->wacom_wac.features; bool finger = WACOM_FINGER_FIELD(field); bool pen = WACOM_PEN_FIELD(field); + unsigned equivalent_usage = wacom_equivalent_usage(usage->hid); /* * Requiring Stylus Usage will ignore boot mouse @@ -409,7 +410,7 @@ static void wacom_usage_mapping(struct hid_device *hdev, wacom_hid_usage_quirk(hdev, field, usage); - switch (usage->hid) { + switch (equivalent_usage) { case HID_GD_X: features->x_max = field->logical_maximum; if (finger) {