From patchwork Fri Oct 7 22:16:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gerecke X-Patchwork-Id: 9367715 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 85EB260CDC for ; Fri, 7 Oct 2016 22:18:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 780872983D for ; Fri, 7 Oct 2016 22:18:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CCAF29840; Fri, 7 Oct 2016 22:18:06 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 1B5F92983D for ; Fri, 7 Oct 2016 22:18:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757447AbcJGWSF (ORCPT ); Fri, 7 Oct 2016 18:18:05 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:36613 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757421AbcJGWSB (ORCPT ); Fri, 7 Oct 2016 18:18:01 -0400 Received: by mail-qk0-f194.google.com with SMTP id z190so3303292qkc.3 for ; Fri, 07 Oct 2016 15:17:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DKLCU5MjDE1lYJ4CN987hiisBc6hCYISSB/6ndMuoP0=; b=sKyrf2hrYIDFKdc7s/wShuPVHIWqNtir7VtQnlluvvYMFUCr7ue7dgO8JYO8AC5QdA 1hZDCWSWfcLffr2tiEn9+B1TGiqGpep/QvTQRZ6XbmdIdE6MNyrtxTG2cGvlfO3ty3kz 1ng9ajCE4ajInAD69WNqTqWwad7/WHCBgLVHIePeTrXidL4YSKozeUCv85OgluvDegBf Zm6mAWL1Dp9ibQqYy5idaYezAfBCwPmwZMbw8NV2yM9ffjEf2wwg/kzw/gfr5KSVwszp hzb2yc0oS/ardO8+eNen8XhOZiJDYAe6yzF6VxTW30Q4477lqel8TO+XgZernviKbc4p Up6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DKLCU5MjDE1lYJ4CN987hiisBc6hCYISSB/6ndMuoP0=; b=VP7IPauTbHdH751zMNrKK0gOHUcdRgzGKPwJL0Mj5LwwjabA1Zv9e8EDI5RIIa9GTF 3gy0mg2Mo/NDXrre43NNFI/uqHQ3dVvE4fghB3i5b8yrln5bZ5fMvD7HljVLCiJzUrTn KgMhV7eW9NXHYFgVprVW5vsKgYp/K9fEteF1PiZSOZi6an50X4I1bSYY2ylKzBUapZ32 8dCbL0b5rvk7TtnKrXhoFp4pjtSWrj4SNU7OG0ZQV+JHH5gtZjRg1pSxVosJQtAx7srY ABQkLabvb8kYGRbNXuY13tyU9HRT67u614N1RbGwOXqJOqaquFo+OPFeiYw7M/s8ALoF MwQg== X-Gm-Message-State: AA6/9Rk8kX4+Bh8oUukNS/eWg0PzEE7EMqr8NCY0L1RqXjlCKOYHoGJASb4DXuvdiEFVmw== X-Received: by 10.55.204.215 with SMTP id n84mr23620947qkl.240.1475878636936; Fri, 07 Oct 2016 15:17:16 -0700 (PDT) Received: from wacom-arch2.corp.onewacom.com ([50.225.60.4]) by smtp.gmail.com with ESMTPSA id u63sm7633162qkd.16.2016.10.07.15.17.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Oct 2016 15:17:16 -0700 (PDT) From: Jason Gerecke To: linux-input@vger.kernel.org, Jiri Kosina Cc: Benjamin Tissoires , Ping Cheng , Ping Cheng , Aaron Skomra , Jason Gerecke , Jason Gerecke Subject: [PATCH v2 09/18] HID: wacom: generic: Add support for vendor-defined "Fingerwheel" usage Date: Fri, 7 Oct 2016 15:16:44 -0700 Message-Id: <20161007221653.26941-9-killertofu@gmail.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161007221653.26941-1-killertofu@gmail.com> References: <20161006212231.31440-1-killertofu@gmail.com> <20161007221653.26941-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 The airbrush fingerwheel does not have a usage that corresponds cleanly with a standard HID usage, so we add explicit support for it via its vendor-defined usage. Signed-off-by: Jason Gerecke Reviewed-by: Benjamin Tissoires --- drivers/hid/wacom_wac.c | 3 +++ drivers/hid/wacom_wac.h | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index aa51684..009c25d 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -1539,6 +1539,9 @@ static void wacom_wac_pen_usage_mapping(struct hid_device *hdev, case HID_DG_TOOLSERIALNUMBER: wacom_map_usage(input, usage, field, EV_MSC, MSC_SERIAL, 0); break; + case WACOM_HID_WD_FINGERWHEEL: + wacom_map_usage(input, usage, field, EV_ABS, ABS_WHEEL, 0); + break; } } diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index 1ced6e4..18cae38 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -89,6 +89,7 @@ #define WACOM_HID_SP_DIGITIZERINFO 0x00100000 #define WACOM_HID_WD_DIGITIZER (WACOM_HID_UP_WACOMDIGITIZER | 0x01) #define WACOM_HID_WD_DISTANCE (WACOM_HID_UP_WACOMDIGITIZER | 0x0132) +#define WACOM_HID_WD_FINGERWHEEL (WACOM_HID_UP_WACOMDIGITIZER | 0x0d03) #define WACOM_HID_WD_DATAMODE (WACOM_HID_UP_WACOMDIGITIZER | 0x1002) #define WACOM_HID_UP_G9 0xff090000 #define WACOM_HID_G9_PEN (WACOM_HID_UP_G9 | 0x02)