HID: wacom: generic: add 3 tablet touch keys
Subsystems (3)
PATCH 1/3 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 middile of the other two keys on the top edge of the tablet.
--- drivers/hid/wacom_wac.c | 12 ++++++++++++ drivers/hid/wacom_wac.h | 3 +++ include/uapi/linux/input-event-codes.h | 1 + 3 files changed, 16 insertions(+)
drivers/hid/wacom_wac.c +12 -0
@@ -1761,6 +1761,18 @@ 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_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 ; }switch (equivalent_usage &0xfffffff0 ) {
drivers/hid/wacom_wac.h +3 -0
@@ -120,6 +120,9 @@#define WACOM_HID_WD_BATTERY_LEVEL (WACOM_HID_UP_WACOMDIGITIZER | 0x043b)#define WACOM_HID_WD_EXPRESSKEY00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0910)#define WACOM_HID_WD_EXPRESSKEYCAP00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0950) +#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_BUTTONHOME (WACOM_HID_UP_WACOMDIGITIZER | 0x0990)#define WACOM_HID_WD_BUTTONUP (WACOM_HID_UP_WACOMDIGITIZER | 0x0991)#define WACOM_HID_WD_BUTTONDOWN (WACOM_HID_UP_WACOMDIGITIZER | 0x0992)
include/uapi/linux/input-event-codes.h +1 -0
@@ -641,6 +641,7 @@* e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) */ #define KEY_DATA 0x277 +#define KEY_ONSCREEN_KEYBOARD 0x278#define BTN_TRIGGER_HAPPY 0x2c0#define BTN_TRIGGER_HAPPY1 0x2c0
Signature · 1 line
1.8.3.1
Quoted 2 lines · Ping Cheng
This patch add support to the 3 touch keys on Wacom Cintiq Pro. These touch keys are in the middile of the other two keys on
typo: middile -> middle :)
Quoted 3 lines
the top edge of the tablet.
Signed-off-by Ping Cheng <[email protected]>
The series is:
Cheers,
Benjamin
Quoted 58 lines
--- drivers/hid/wacom_wac.c | 12 ++++++++++++ drivers/hid/wacom_wac.h | 3 +++ include/uapi/linux/input-event-codes.h | 1 + 3 files changed, 16 insertions(+)drivers/hid/wacom_wac.c +12
-0@@ -1761,6 +1761,18 @@ 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_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 ; }switch (equivalent_usage &0xfffffff0 ) {drivers/hid/wacom_wac.h +3
-0@@ -120,6 +120,9 @@#define WACOM_HID_WD_BATTERY_LEVEL (WACOM_HID_UP_WACOMDIGITIZER | 0x043b)#define WACOM_HID_WD_EXPRESSKEY00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0910)#define WACOM_HID_WD_EXPRESSKEYCAP00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0950) +#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_BUTTONHOME (WACOM_HID_UP_WACOMDIGITIZER | 0x0990)#define WACOM_HID_WD_BUTTONUP (WACOM_HID_UP_WACOMDIGITIZER | 0x0991)#define WACOM_HID_WD_BUTTONDOWN (WACOM_HID_UP_WACOMDIGITIZER | 0x0992)include/uapi/linux/input-event-codes.h +1
-1@@ -641,6 +641,7 @@* e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) */ #define KEY_DATA 0x277 +#define KEY_ONSCREEN_KEYBOARD 0x278#define BTN_TRIGGER_HAPPY 0x2c0#define BTN_TRIGGER_HAPPY1 0x2c0 --1.8.3.1
Quoted 61 lines · Ping Cheng
This patch add support to the 3 touch keys on Wacom Cintiq Pro. These touch keys are in the middile of the other two keys on the top edge of the tablet.
Signed-off-by Ping Cheng <[email protected]>--- drivers/hid/wacom_wac.c | 12 ++++++++++++ drivers/hid/wacom_wac.h | 3 +++ include/uapi/linux/input-event-codes.h | 1 + 3 files changed, 16 insertions(+)drivers/hid/wacom_wac.c +12
-0@@ -1761,6 +1761,18 @@ 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_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 ; }switch (equivalent_usage &0xfffffff0 ) {drivers/hid/wacom_wac.h +3
-0@@ -120,6 +120,9 @@#define WACOM_HID_WD_BATTERY_LEVEL (WACOM_HID_UP_WACOMDIGITIZER | 0x043b)#define WACOM_HID_WD_EXPRESSKEY00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0910)#define WACOM_HID_WD_EXPRESSKEYCAP00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0950) +#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_BUTTONHOME (WACOM_HID_UP_WACOMDIGITIZER | 0x0990)#define WACOM_HID_WD_BUTTONUP (WACOM_HID_UP_WACOMDIGITIZER | 0x0991)#define WACOM_HID_WD_BUTTONDOWN (WACOM_HID_UP_WACOMDIGITIZER | 0x0992)include/uapi/linux/input-event-codes.h +1
-1@@ -641,6 +641,7 @@* e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) */ #define KEY_DATA 0x277 +#define KEY_ONSCREEN_KEYBOARD 0x278#define BTN_TRIGGER_HAPPY 0x2c0#define BTN_TRIGGER_HAPPY1 0x2c0 --
Quoted 2 lines
1.8.3.1
for the series.
Best,
Aaron
Quoted 9 lines · Ping Cheng
This patch add support to the 3 touch keys on Wacom Cintiq Pro. These touch keys are in the middile of the other two keys on the top edge of the tablet.
Signed-off-by Ping Cheng <[email protected]>--- drivers/hid/wacom_wac.c | 12 ++++++++++++ drivers/hid/wacom_wac.h | 3 +++ include/uapi/linux/input-event-codes.h | 1 +
For the event code:
Quoted 54 lines
3 files changed, 16 insertions(+)drivers/hid/wacom_wac.c +12
-0@@ -1761,6 +1761,18 @@ 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_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 ; }switch (equivalent_usage &0xfffffff0 ) {drivers/hid/wacom_wac.h +3
-0@@ -120,6 +120,9 @@#define WACOM_HID_WD_BATTERY_LEVEL (WACOM_HID_UP_WACOMDIGITIZER | 0x043b)#define WACOM_HID_WD_EXPRESSKEY00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0910)#define WACOM_HID_WD_EXPRESSKEYCAP00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0950) +#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_BUTTONHOME (WACOM_HID_UP_WACOMDIGITIZER | 0x0990)#define WACOM_HID_WD_BUTTONUP (WACOM_HID_UP_WACOMDIGITIZER | 0x0991)#define WACOM_HID_WD_BUTTONDOWN (WACOM_HID_UP_WACOMDIGITIZER | 0x0992)include/uapi/linux/input-event-codes.h +1
-0@@ -641,6 +641,7 @@* e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) */ #define KEY_DATA 0x277 +#define KEY_ONSCREEN_KEYBOARD 0x278#define BTN_TRIGGER_HAPPY 0x2c0#define BTN_TRIGGER_HAPPY1 0x2c0Signature · 1 line
1.8.3.1
Signature · 1 line
Dmitry
Quoted 5 lines · Ping Cheng
This patch add support to the 3 touch keys on Wacom Cintiq Pro. These touch keys are in the middile of the other two keys on the top edge of the tablet.
Signed-off-by Ping Cheng <[email protected]>
I've queued this series in for-4.12/wacom. Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs