From patchwork Thu Oct 6 21:22:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gerecke, Jason" X-Patchwork-Id: 9365323 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 777756077E for ; Thu, 6 Oct 2016 21:22:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 628FA29253 for ; Thu, 6 Oct 2016 21:22:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5729529256; Thu, 6 Oct 2016 21:22:46 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 E9DE529253 for ; Thu, 6 Oct 2016 21:22:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935111AbcJFVWp (ORCPT ); Thu, 6 Oct 2016 17:22:45 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:33361 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935071AbcJFVWo (ORCPT ); Thu, 6 Oct 2016 17:22:44 -0400 Received: by mail-qt0-f195.google.com with SMTP id m5so836090qtb.0 for ; Thu, 06 Oct 2016 14:22:44 -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=K6ZgWY3Qxp/FZTaZhRxnZXb82/hFKmDL12CpxjgdhSQ=; b=AyIvK2l8ntfqozrI12PG12Ph/q6vYy1tX75lD+/BYBnbof7fQAXxL5PlN0z5v+PUuK jYpjs/pfmEr/LzEbPNcVGzZy4oVXj9jolyfd8N2Zs48y38kgBOCAfFTnYBDKrRBQlE/t yT1LIZhOCXzRKNsdbUjXT+m8WQbIlgtAxRtQKwZTnPu5wi1Lun4GuyTQYXnNrjiSStrD NlRcL9klnjfW1kZ3cFGh0rLiYs+FBu7Ccd+Zv1116x5ANpo2NQdF9z7yq+4KERxrpoWw qAS36I0rNUcU+ajr5zgNaJ3dgtfGS7zSd+7aAtp7B4HyVl5hS4dHTYA7PFhozEB2TKRH q3uQ== 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=K6ZgWY3Qxp/FZTaZhRxnZXb82/hFKmDL12CpxjgdhSQ=; b=RYM8+rTBNagV+oUPm+N6JrsHmRhJEOBoM2ScXbuX4LUbPvLm9LrmyIdVvBLhLbhfZ5 pdvCb8ZTxx561bxA4a3s0ph0e5GL4iBePw6ZyYGblT7M/nIBQhYTcq3cw+FZ/IsMTt75 GY8yLKLrmXo/tlqHe6xmMoQ6nTWEGJU+F691ZuhyPcZlF6sPpr4VsqrqwQk6s/PyjdxA lH9Nz7QRKaeQwYX3o2VOsBNgqtW4QUnl9QrXWIeEDu7grIyxxeMzR2gQ8dqeyh8v9rNS wI607OwHDB2bZP8fEixG3qkk7QFQeJE0wKEdOwxNE6vLkg/widks2Gs+BJsjXnAAM7vU rI/w== X-Gm-Message-State: AA6/9RnNCTQw5yazB1lnaZg36xHlfQ4/mbSS6JShGaRoA3xj72wO5Sn3svHqJKcr0vA8ow== X-Received: by 10.237.59.220 with SMTP id s28mr17122503qte.37.1475788963839; Thu, 06 Oct 2016 14:22:43 -0700 (PDT) Received: from wacom-arch2.corp.onewacom.com ([50.225.60.4]) by smtp.gmail.com with ESMTPSA id m4sm5773714qkf.29.2016.10.06.14.22.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Oct 2016 14:22:43 -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 02/19] HID: wacom: Have WACOM_PEN_FIELD and WACOM_FINGER_FIELD recgonize more fields Date: Thu, 6 Oct 2016 14:22:14 -0700 Message-Id: <20161006212231.31440-3-killertofu@gmail.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161006212231.31440-1-killertofu@gmail.com> References: <20161006212231.31440-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 We've defined several new usages (e.g. WACOM_G9_PEN and WACOM_G9_TOUCHSCREEN) which aren't checked by the WACOM_PEN_FIELD and WACOM_FINGER_FIELD macros but probably should be. Signed-off-by: Jason Gerecke --- drivers/hid/wacom_wac.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index 3592186..472b0a7 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -98,10 +98,14 @@ ((f)->physical == HID_DG_PEN) || \ ((f)->application == HID_DG_PEN) || \ ((f)->application == HID_DG_DIGITIZER) || \ - ((f)->application == WACOM_HID_WD_DIGITIZER)) + ((f)->application == WACOM_HID_WD_DIGITIZER) || \ + ((f)->application == WACOM_HID_G9_PEN) || \ + ((f)->application == WACOM_HID_G11_PEN)) #define WACOM_FINGER_FIELD(f) (((f)->logical == HID_DG_FINGER) || \ ((f)->physical == HID_DG_FINGER) || \ - ((f)->application == HID_DG_TOUCHSCREEN)) + ((f)->application == HID_DG_TOUCHSCREEN) || \ + ((f)->application == WACOM_HID_G9_TOUCHSCREEN) || \ + ((f)->application == WACOM_HID_G11_TOUCHSCREEN)) enum { PENPARTNER = 0,