From patchwork Fri Dec 16 23:24:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 9478701 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 4FFB9601C2 for ; Fri, 16 Dec 2016 23:24:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 407F028658 for ; Fri, 16 Dec 2016 23:24:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33ECF28681; Fri, 16 Dec 2016 23:24:58 +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 7C66628658 for ; Fri, 16 Dec 2016 23:24:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757890AbcLPXY4 (ORCPT ); Fri, 16 Dec 2016 18:24:56 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:35326 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756699AbcLPXYz (ORCPT ); Fri, 16 Dec 2016 18:24:55 -0500 Received: by mail-pg0-f68.google.com with SMTP id p66so11059112pga.2 for ; Fri, 16 Dec 2016 15:24:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=1x6KIBN5ydVJmVlfD5SHh7HKXq22mPowJSdMY2FTMkE=; b=VvCO2b550YM7lzUm1OzHHT21BdIGjFaSZae/VVmZZsYTyfFBqFsbb+7Hn3EuK5Kuhw gO6s/DhYXVIy1qcfZTu7VpeA1ye/KZctR9sE3haOYD1+AYdvoNLa9CTKQn6RMKfTlIQf iDNtUdra+wiqHEXQa27CgvQnmp0PiySivkxTi/XpO67XGnA9EtpKa6clA2yY1B9VUR95 xNRsEozuAB2L2GdYF3nAtxZ7VKFIK8AuMdGjJ8BntDNvsjkgo7y5bFbBfIwWeo/Hlfv4 C17blIjV5/MEbEX2PQmD377RlRRCnwArNYRwYd99ClDbcxazQoH3MrNPbKrwnyD62Q4m oRrA== 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; bh=1x6KIBN5ydVJmVlfD5SHh7HKXq22mPowJSdMY2FTMkE=; b=EgGlyNx1Zyo3+Bh3oZIA/FMpyiAZIm5zBrl6dTTz66wSxvUO56JLS5MKOnlCuE31eu ARQGABPnhSJXC2/FunlTRK+cEJwOF1MSbKcm13+C1efyj51BQDEht5KFWGntS6ZvgCzt upRVZerh1VJ/Cb6HtTQFoEIfmUXdbaYusZLuTHl2Dk7856dCr7a45b/lQwZhqK0AN/Oc +5MRjha9imqcIuUYFOg82OcFSy5zXwctQqiCHJ7yPT0xaW5ZkNvDetX6HoAy8AiAzeuq way8viB7mwnbvJb9XVjItO+wSIiX3y8YygHU5+mNjpXzrKiE7spax8R2aGhGlUdccw0D 5NyA== X-Gm-Message-State: AKaTC01QzNbOfZ7hhzOl1oespAZEW5YNx5E/dhQwXKEkHFFssUDrRAE79plTWVXfgJe2Mw== X-Received: by 10.84.217.70 with SMTP id e6mr11870066plj.161.1481930695177; Fri, 16 Dec 2016 15:24:55 -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 189sm14301510pgh.5.2016.12.16.15.24.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Dec 2016 15:24: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, dmitry.torokhov@gmail.com, benjamin.tissoires@redhat.com, Ping Cheng , Ping Cheng Subject: [PATCH v3] HID: wacom: generic: add 5 tablet touch keys Date: Fri, 16 Dec 2016 15:24:40 -0800 Message-Id: <1481930680-6023-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 Wacom Cintiq Pro [1] is a series of display tablets. They support 5 touch keys on the tablet. Those keys represent specific functions. They turn display off; bring up OSD; bring up On Screen Keyboard; bring up desktop control panel; and turn touch on/off. The most left touch key, that turns display on/off, is controlled by firmware. When the display is on, the mode is set. Otherwise, the mode is off. So, it works like a switch. That's why we introduced a new switch: SW_INDIRECT. The switch defauts to INDIRECT instead of DIRECT was a request from useland, more specifically Gnome, developers. Other four touch keys are true software keys. We use the existing KEY_BUTTONCONFIG and KEY_CONTROLPANEL for OSD and control panel. But, we have to request two new keys: KEY_ONSCREEN_KEYBOARD and KEY_MUTE_DEVICE since none of the existing keys support those two actions. [1] http://www.wacom.com/en-us/products/pen-displays/wacom-cintiq-pro Signed-off-by: Ping Cheng --- v3: Since no one has followed up with v2, let's add some more comments for SW_INDIRECT so we keep the offlist decision public ;). --- drivers/hid/wacom_wac.c | 25 +++++++++++++++++++++++++ drivers/hid/wacom_wac.h | 5 +++++ include/linux/mod_devicetable.h | 2 +- include/uapi/linux/input-event-codes.h | 6 +++++- 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index b1a9a3c..739c592 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -1578,6 +1578,26 @@ static void wacom_wac_pad_usage_mapping(struct hid_device *hdev, wacom_map_usage(input, usage, field, EV_ABS, ABS_WHEEL, 0); features->device_type |= WACOM_DEVICETYPE_PAD; break; + case WACOM_HID_WD_DIRECT: + wacom_map_usage(input, usage, field, EV_SW, SW_INDIRECT, 0); + features->device_type |= WACOM_DEVICETYPE_PAD; + break; + case WACOM_HID_WD_BUTTONCONFIG: + wacom_map_usage(input, usage, field, EV_KEY, KEY_BUTTONCONFIG, 0); + features->device_type |= WACOM_DEVICETYPE_PAD; + break; + case WACOM_HID_WD_ONSCREEN_KEYBOARD: + wacom_map_usage(input, usage, field, EV_KEY, KEY_ONSCREEN_KEYBOARD, 0); + features->device_type |= WACOM_DEVICETYPE_PAD; + break; + case WACOM_HID_WD_CONTROLPANEL: + wacom_map_usage(input, usage, field, EV_KEY, KEY_CONTROLPANEL, 0); + features->device_type |= WACOM_DEVICETYPE_PAD; + break; + case WACOM_HID_WD_MUTE_DEVICE: + wacom_map_usage(input, usage, field, EV_KEY, KEY_MUTE_DEVICE, 0); + features->device_type |= WACOM_DEVICETYPE_PAD; + break; } switch (equivalent_usage & 0xfffffff0) { @@ -1629,6 +1649,11 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field case WACOM_HID_WD_TOUCHRINGSTATUS: break; + case WACOM_HID_WD_DIRECT: + features->input_event_flag = true; + input_event(input, usage->type, usage->code, !value); + break; + default: features->input_event_flag = true; input_event(input, usage->type, usage->code, value); diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index fb0e50a..7a7b0f1 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -105,6 +105,11 @@ #define WACOM_HID_WD_ACCELEROMETER_Z (WACOM_HID_UP_WACOMDIGITIZER | 0x0403) #define WACOM_HID_WD_BATTERY_CHARGING (WACOM_HID_UP_WACOMDIGITIZER | 0x0404) #define WACOM_HID_WD_BATTERY_LEVEL (WACOM_HID_UP_WACOMDIGITIZER | 0x043b) +#define WACOM_HID_WD_DIRECT (WACOM_HID_UP_WACOMDIGITIZER | 0x0980) +#define WACOM_HID_WD_MUTE_DEVICE (WACOM_HID_UP_WACOMDIGITIZER | 0x0981) +#define WACOM_HID_WD_CONTROLPANEL (WACOM_HID_UP_WACOMDIGITIZER | 0x0982) +#define WACOM_HID_WD_ONSCREEN_KEYBOARD (WACOM_HID_UP_WACOMDIGITIZER | 0x0983) +#define WACOM_HID_WD_BUTTONCONFIG (WACOM_HID_UP_WACOMDIGITIZER | 0x0986) #define WACOM_HID_WD_EXPRESSKEY00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0910) #define WACOM_HID_WD_EXPRESSKEYCAP00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0950) #define WACOM_HID_WD_BUTTONHOME (WACOM_HID_UP_WACOMDIGITIZER | 0x0990) diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index ed84c07..342ddd6 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -291,7 +291,7 @@ struct pcmcia_device_id { #define INPUT_DEVICE_ID_LED_MAX 0x0f #define INPUT_DEVICE_ID_SND_MAX 0x07 #define INPUT_DEVICE_ID_FF_MAX 0x7f -#define INPUT_DEVICE_ID_SW_MAX 0x0f +#define INPUT_DEVICE_ID_SW_MAX 0x1f #define INPUT_DEVICE_ID_MATCH_BUS 1 #define INPUT_DEVICE_ID_MATCH_VENDOR 2 diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index d6d071f..32ef894 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -641,6 +641,9 @@ * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) */ #define KEY_DATA 0x275 +/* same as SW_MUTE_DEVICE but triggered by a key */ +#define KEY_MUTE_DEVICE 0x278 +#define KEY_ONSCREEN_KEYBOARD 0x279 #define BTN_TRIGGER_HAPPY 0x2c0 #define BTN_TRIGGER_HAPPY1 0x2c0 @@ -781,7 +784,8 @@ #define SW_LINEIN_INSERT 0x0d /* set = inserted */ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_PEN_INSERTED 0x0f /* set = pen inserted */ -#define SW_MAX 0x0f +#define SW_INDIRECT 0x10 /* set = not a direct input device */ +#define SW_MAX 0x1f #define SW_CNT (SW_MAX+1) /*