* Re: [PATCH 1/3] HID: wacom: generic: add 3 tablet touch keys
2017-02-15 5:26 [PATCH 1/3] HID: wacom: generic: add 3 tablet touch keys Ping Cheng
@ 2017-02-16 8:07 ` Benjamin Tissoires
2017-02-23 18:25 ` Aaron Armstrong Skomra
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Benjamin Tissoires @ 2017-02-16 8:07 UTC (permalink / raw)
To: Ping Cheng
Cc: linux-input, Jiri Kosina, Dmitry Torokhov, Ping Cheng, Ping Cheng
On Wed, Feb 15, 2017 at 6:26 AM, Ping Cheng <pinglinux@gmail.com> wrote:
> 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 :)
> the top edge of the tablet.
>
> Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
The series is:
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cheers,
Benjamin
> ---
> 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(+)
>
> diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> index d51daf5..a0135ac 100644
> --- a/drivers/hid/wacom_wac.c
> +++ b/drivers/hid/wacom_wac.c
> @@ -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) {
> diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
> index 857ccee..5eba31d 100644
> --- a/drivers/hid/wacom_wac.h
> +++ b/drivers/hid/wacom_wac.h
> @@ -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)
> diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
> index 3af60ee..f5a8d96 100644
> --- a/include/uapi/linux/input-event-codes.h
> +++ b/include/uapi/linux/input-event-codes.h
> @@ -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
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/3] HID: wacom: generic: add 3 tablet touch keys
2017-02-15 5:26 [PATCH 1/3] HID: wacom: generic: add 3 tablet touch keys Ping Cheng
2017-02-16 8:07 ` Benjamin Tissoires
@ 2017-02-23 18:25 ` Aaron Armstrong Skomra
2017-02-28 18:50 ` Dmitry Torokhov
2017-03-06 13:07 ` Jiri Kosina
3 siblings, 0 replies; 5+ messages in thread
From: Aaron Armstrong Skomra @ 2017-02-23 18:25 UTC (permalink / raw)
To: Ping Cheng
Cc: linux-input, Jiri Kosina, Benjamin Tissoires, Dmitry Torokhov,
Ping Cheng, Ping Cheng
On Tue, Feb 14, 2017 at 9:26 PM, Ping Cheng <pinglinux@gmail.com> wrote:
> 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 <ping.cheng@wacom.com>
> ---
> 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(+)
>
> diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> index d51daf5..a0135ac 100644
> --- a/drivers/hid/wacom_wac.c
> +++ b/drivers/hid/wacom_wac.c
> @@ -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) {
> diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
> index 857ccee..5eba31d 100644
> --- a/drivers/hid/wacom_wac.h
> +++ b/drivers/hid/wacom_wac.h
> @@ -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)
> diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
> index 3af60ee..f5a8d96 100644
> --- a/include/uapi/linux/input-event-codes.h
> +++ b/include/uapi/linux/input-event-codes.h
> @@ -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
>
Tested-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
for the series.
Best,
Aaron
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/3] HID: wacom: generic: add 3 tablet touch keys
2017-02-15 5:26 [PATCH 1/3] HID: wacom: generic: add 3 tablet touch keys Ping Cheng
2017-02-16 8:07 ` Benjamin Tissoires
2017-02-23 18:25 ` Aaron Armstrong Skomra
@ 2017-02-28 18:50 ` Dmitry Torokhov
2017-03-06 13:07 ` Jiri Kosina
3 siblings, 0 replies; 5+ messages in thread
From: Dmitry Torokhov @ 2017-02-28 18:50 UTC (permalink / raw)
To: Ping Cheng; +Cc: linux-input, jikos, benjamin.tissoires, Ping Cheng, Ping Cheng
On Tue, Feb 14, 2017 at 09:26:21PM -0800, Ping Cheng wrote:
> 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 <ping.cheng@wacom.com>
> ---
> drivers/hid/wacom_wac.c | 12 ++++++++++++
> drivers/hid/wacom_wac.h | 3 +++
> include/uapi/linux/input-event-codes.h | 1 +
For the event code:
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> 3 files changed, 16 insertions(+)
>
> diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> index d51daf5..a0135ac 100644
> --- a/drivers/hid/wacom_wac.c
> +++ b/drivers/hid/wacom_wac.c
> @@ -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) {
> diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
> index 857ccee..5eba31d 100644
> --- a/drivers/hid/wacom_wac.h
> +++ b/drivers/hid/wacom_wac.h
> @@ -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)
> diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
> index 3af60ee..f5a8d96 100644
> --- a/include/uapi/linux/input-event-codes.h
> +++ b/include/uapi/linux/input-event-codes.h
> @@ -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
>
--
Dmitry
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/3] HID: wacom: generic: add 3 tablet touch keys
2017-02-15 5:26 [PATCH 1/3] HID: wacom: generic: add 3 tablet touch keys Ping Cheng
` (2 preceding siblings ...)
2017-02-28 18:50 ` Dmitry Torokhov
@ 2017-03-06 13:07 ` Jiri Kosina
3 siblings, 0 replies; 5+ messages in thread
From: Jiri Kosina @ 2017-03-06 13:07 UTC (permalink / raw)
To: Ping Cheng
Cc: linux-input, benjamin.tissoires, dmitry.torokhov, Ping Cheng,
Ping Cheng
On Tue, 14 Feb 2017, Ping Cheng wrote:
> 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 <ping.cheng@wacom.com>
I've queued this series in for-4.12/wacom. Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 5+ messages in thread