From patchwork Fri Dec 9 06:05:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 9467553 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 7CC0D602F0 for ; Fri, 9 Dec 2016 06:05:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6EE452861A for ; Fri, 9 Dec 2016 06:05:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63FC52861F; Fri, 9 Dec 2016 06:05:57 +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 D031E2861A for ; Fri, 9 Dec 2016 06:05:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754076AbcLIGF4 (ORCPT ); Fri, 9 Dec 2016 01:05:56 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34997 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752070AbcLIGFz (ORCPT ); Fri, 9 Dec 2016 01:05:55 -0500 Received: by mail-pf0-f194.google.com with SMTP id i88so599516pfk.2 for ; Thu, 08 Dec 2016 22:05:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=TZlBorhYIw83hPWdVb/aJrXbRS1A5XMOowM+0nocu90=; b=vDsQNPdk+ycBAhaNLwqEn7euEW7EE8pm2GthVcibpcTzRUyfntleN1LdjHpoAW8yYU WO53yIZc6hSgGgkcLkg8ASJmczsZkvZIeQPuf1pSzlUFDmLb8GDe4GCajRjUgICDHYeD FGXw4xcamDB7SFOcEytEHujZh5AFhsCO1+mkOp7R2hjaadoKLtTycyEs8V6ivKN1E0e7 59D/4ZZMxmP68EpACBXjw9FsaJ4qEHX4ASOyFfsMZNfPqR2p5d6CP2IEKmr0eC7Y20PY jJQK6UAyM8J7I3ixH5JMSiOt0iBblhSRxzEW8XdiKItdEELBLQJv+KYcUhZs9H7fFC1z JqMQ== 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; bh=TZlBorhYIw83hPWdVb/aJrXbRS1A5XMOowM+0nocu90=; b=atgNLiGv5R8pZKh49QbSu3jqwYtasybfQshX1v0WmYkOFZs03Qk5XT0ne1ViJOl9Nk GgG5pKzarnbP5AxGfuXkg4yH4CvgQDj3wEorhRJubrRy9hsX+ibp26Ca2+tysDXqFAI1 k9uKvKtsnjbrZBWcvbmk6lq9DhUEEmWbjEYM0zLzYR1X0WHJd+NtcLPkCUtXHuO1Lvk7 m6AAgOITDOl8Vdrq8lwA3tpoSaYj6v0OQxaCO2JENuGXdPRy0/A2VYTzRyemGKGMzEmY GjxFhLyJtgwiXEFFZvYiqW7g+detHm69n8CobXzMZi9tNRX1WIZz0MN8muAhq6Npi/hv oIoQ== X-Gm-Message-State: AKaTC00QWqhFM7LIRAsHV+Mmtt1oIlOfscHRIb7h63plcB7zqobNdNxjKKbQ0U0Qgm8Fnw== X-Received: by 10.99.0.194 with SMTP id 185mr140148350pga.111.1481263554446; Thu, 08 Dec 2016 22:05:54 -0800 (PST) Received: from localhost.net (c-24-21-228-48.hsd1.wa.comcast.net. [24.21.228.48]) by smtp.gmail.com with ESMTPSA id p79sm54207084pfj.51.2016.12.08.22.05.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Dec 2016 22:05:54 -0800 (PST) From: Ping Cheng X-Google-Original-From: Ping Cheng To: linux-input@vger.kernel.org Cc: jikos@kernel.org, jason.gerecke@wacom.com, Ping Cheng , Ping Cheng Subject: [PATCH 3/4 v2] HID: wacom: generic: Pad supports more than buttons Date: Thu, 8 Dec 2016 22:05:44 -0800 Message-Id: <1481263544-7044-1-git-send-email-pingc@wacom.com> X-Mailer: git-send-email 1.8.3.1 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 Make sure everything reported from pad are registered Signed-off-by: Ping Cheng Reviewed-By: Jason Gerecke --- drivers/hid/wacom_wac.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 29d2610..7a748a7 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -1538,14 +1538,17 @@ static void wacom_wac_pad_usage_mapping(struct hid_device *hdev, case WACOM_HID_WD_ACCELEROMETER_X: __set_bit(INPUT_PROP_ACCELEROMETER, input->propbit); wacom_map_usage(input, usage, field, EV_ABS, ABS_X, 0); + features->device_type |= WACOM_DEVICETYPE_PAD; break; case WACOM_HID_WD_ACCELEROMETER_Y: __set_bit(INPUT_PROP_ACCELEROMETER, input->propbit); wacom_map_usage(input, usage, field, EV_ABS, ABS_Y, 0); + features->device_type |= WACOM_DEVICETYPE_PAD; break; case WACOM_HID_WD_ACCELEROMETER_Z: __set_bit(INPUT_PROP_ACCELEROMETER, input->propbit); wacom_map_usage(input, usage, field, EV_ABS, ABS_Z, 0); + features->device_type |= WACOM_DEVICETYPE_PAD; break; case WACOM_HID_WD_BUTTONHOME: case WACOM_HID_WD_BUTTONUP: @@ -1557,18 +1560,23 @@ static void wacom_wac_pad_usage_mapping(struct hid_device *hdev, wacom_numbered_button_to_key(features->numbered_buttons), 0); features->numbered_buttons++; + features->device_type |= WACOM_DEVICETYPE_PAD; break; case WACOM_HID_WD_TOUCHONOFF: wacom_map_usage(input, usage, field, EV_SW, SW_MUTE_DEVICE, 0); + features->device_type |= WACOM_DEVICETYPE_PAD; break; case WACOM_HID_WD_TOUCHSTRIP: wacom_map_usage(input, usage, field, EV_ABS, ABS_RX, 0); + features->device_type |= WACOM_DEVICETYPE_PAD; break; case WACOM_HID_WD_TOUCHSTRIP2: wacom_map_usage(input, usage, field, EV_ABS, ABS_RY, 0); + features->device_type |= WACOM_DEVICETYPE_PAD; break; case WACOM_HID_WD_TOUCHRING: wacom_map_usage(input, usage, field, EV_ABS, ABS_WHEEL, 0); + features->device_type |= WACOM_DEVICETYPE_PAD; break; } @@ -1578,6 +1586,7 @@ static void wacom_wac_pad_usage_mapping(struct hid_device *hdev, wacom_numbered_button_to_key(features->numbered_buttons), 0); features->numbered_buttons++; + features->device_type |= WACOM_DEVICETYPE_PAD; break; } }