Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

HID: wacom: generic: add 3 tablet touch keys

This patch add support to the 3 touch keys on Wacom Cintiq Pro. These touch
keys are in the middle of the other two keys on the top edge of the tablet.

Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Tested-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

authored by

Ping Cheng and committed by
Jiri Kosina
4eb220cb 81bbef23

+16
+12
drivers/hid/wacom_wac.c
··· 1768 1768 wacom_map_usage(input, usage, field, EV_ABS, ABS_WHEEL, 0); 1769 1769 features->device_type |= WACOM_DEVICETYPE_PAD; 1770 1770 break; 1771 + case WACOM_HID_WD_BUTTONCONFIG: 1772 + wacom_map_usage(input, usage, field, EV_KEY, KEY_BUTTONCONFIG, 0); 1773 + features->device_type |= WACOM_DEVICETYPE_PAD; 1774 + break; 1775 + case WACOM_HID_WD_ONSCREEN_KEYBOARD: 1776 + wacom_map_usage(input, usage, field, EV_KEY, KEY_ONSCREEN_KEYBOARD, 0); 1777 + features->device_type |= WACOM_DEVICETYPE_PAD; 1778 + break; 1779 + case WACOM_HID_WD_CONTROLPANEL: 1780 + wacom_map_usage(input, usage, field, EV_KEY, KEY_CONTROLPANEL, 0); 1781 + features->device_type |= WACOM_DEVICETYPE_PAD; 1782 + break; 1771 1783 } 1772 1784 1773 1785 switch (equivalent_usage & 0xfffffff0) {
+3
drivers/hid/wacom_wac.h
··· 120 120 #define WACOM_HID_WD_BATTERY_LEVEL (WACOM_HID_UP_WACOMDIGITIZER | 0x043b) 121 121 #define WACOM_HID_WD_EXPRESSKEY00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0910) 122 122 #define WACOM_HID_WD_EXPRESSKEYCAP00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0950) 123 + #define WACOM_HID_WD_CONTROLPANEL (WACOM_HID_UP_WACOMDIGITIZER | 0x0982) 124 + #define WACOM_HID_WD_ONSCREEN_KEYBOARD (WACOM_HID_UP_WACOMDIGITIZER | 0x0983) 125 + #define WACOM_HID_WD_BUTTONCONFIG (WACOM_HID_UP_WACOMDIGITIZER | 0x0986) 123 126 #define WACOM_HID_WD_BUTTONHOME (WACOM_HID_UP_WACOMDIGITIZER | 0x0990) 124 127 #define WACOM_HID_WD_BUTTONUP (WACOM_HID_UP_WACOMDIGITIZER | 0x0991) 125 128 #define WACOM_HID_WD_BUTTONDOWN (WACOM_HID_UP_WACOMDIGITIZER | 0x0992)
+1
include/uapi/linux/input-event-codes.h
··· 641 641 * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) 642 642 */ 643 643 #define KEY_DATA 0x277 644 + #define KEY_ONSCREEN_KEYBOARD 0x278 644 645 645 646 #define BTN_TRIGGER_HAPPY 0x2c0 646 647 #define BTN_TRIGGER_HAPPY1 0x2c0