From: Chris Bagwell <chris@cnpbagwell.com>
To: Ping Cheng <pinglinux@gmail.com>
Cc: "linux-input@vger.kernel.org" <linux-input@vger.kernel.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Peter Hutterer <peter.hutterer@who-t.net>,
Ping Cheng <pingc@wacom.com>
Subject: Re: [PATCH v2 2/2] Input: wacom - add support for three new Intuos devices
Date: Thu, 7 Nov 2013 20:25:40 -0600 [thread overview]
Message-ID: <CAGzDe_a_VF7697u66LsWoV+C6+VLRzQJ8FWnct9SGK6DQurULQ@mail.gmail.com> (raw)
In-Reply-To: <1381439866-1161-1-git-send-email-pingc@wacom.com>
On Thu, Oct 10, 2013 at 4:17 PM, Ping Cheng <pinglinux@gmail.com> wrote:
> This series of models added a hardware switch to turn touch
> data on/off. To report the state of the switch, SW_TOUCH
> is added in include/uapi/linux/input.h.
So I guess the big point is this patch can't go in until a SW_TOUCH
goes in first.
Since the 1/2 or this 2/2 series has already gone in, would you mind
breaking this
remaining patch up into the basic support for new Intuos (without the
SW_TOUCH) and
then a separate patch to add SW_TOUCH support on top of that? Then
the basic support can go in ASAP.
I only have comments on this patch related to the SW_TOUCH part... things like:
* should the SW_TOUCH be reported against the wireless interface or
the touch interface... userland apps may have an opinion on which is
best.
* the part with updating SW_TOUCH from unrelated interfaces could use
a review by someone like Dmitry for possible issues.
* It would be better if you didn't add that EV_SW for HW that will
not report the SW_TOUCH.
If you break the patch into 2, you can add my line for the basic
support without SW_TOUCH:
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Chris
>
> The driver is also updated to process wireless devices that do
> not support touch interface.
>
> Tested-by: Jason Gerecke <killertofu@gmail.com>
> Signed-off-by: Ping Cheng <pingc@wacom.com>
> ---
> v2: Change SW_TOUCH_ENABLED to SW_TOUCH and clear BTN_TOUCH bit
> for button only interfaces as suggested by Peter Hutterer.
> ---
> drivers/input/tablet/wacom_sys.c | 16 +++++++-
> drivers/input/tablet/wacom_wac.c | 87 ++++++++++++++++++++++++++++++++--------
> drivers/input/tablet/wacom_wac.h | 7 ++++
> include/uapi/linux/input.h | 1 +
> 4 files changed, 93 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
> index 7bdb5e9..efd9729 100644
> --- a/drivers/input/tablet/wacom_sys.c
> +++ b/drivers/input/tablet/wacom_sys.c
> @@ -1190,12 +1190,15 @@ static void wacom_wireless_work(struct work_struct *work)
> wacom_wac1->features.device_type = BTN_TOOL_PEN;
> snprintf(wacom_wac1->name, WACOM_NAME_MAX, "%s (WL) Pen",
> wacom_wac1->features.name);
> + wacom_wac1->shared->touch_max = wacom_wac1->features.touch_max;
> + wacom_wac1->shared->type = wacom_wac1->features.type;
> error = wacom_register_input(wacom1);
> if (error)
> goto fail;
>
> /* Touch interface */
> - if (wacom_wac1->features.touch_max) {
> + if (wacom_wac1->features.touch_max ||
> + wacom_wac1->features.type == INTUOS_HT) {
> wacom_wac2->features =
> *((struct wacom_features *)id->driver_info);
> wacom_wac2->features.pktlen = WACOM_PKGLEN_BBTOUCH3;
> @@ -1210,6 +1213,10 @@ static void wacom_wireless_work(struct work_struct *work)
> error = wacom_register_input(wacom2);
> if (error)
> goto fail;
> +
> + if (wacom_wac1->features.type == INTUOS_HT &&
> + wacom_wac1->features.touch_max)
> + wacom_wac->shared->touch_input = wacom_wac2->input;
> }
>
> error = wacom_initialize_battery(wacom);
> @@ -1318,7 +1325,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
> * HID descriptor. If this is the touch interface (wMaxPacketSize
> * of WACOM_PKGLEN_BBTOUCH3), override the table values.
> */
> - if (features->type >= INTUOS5S && features->type <= INTUOSPL) {
> + if (features->type >= INTUOS5S && features->type <= INTUOS_HT) {
> if (endpoint->wMaxPacketSize == WACOM_PKGLEN_BBTOUCH3) {
> features->device_type = BTN_TOOL_FINGER;
> features->pktlen = WACOM_PKGLEN_BBTOUCH3;
> @@ -1390,6 +1397,11 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
> }
> }
>
> + if (wacom_wac->features.type == INTUOS_HT && wacom_wac->features.touch_max) {
> + if (wacom_wac->features.device_type == BTN_TOOL_FINGER)
> + wacom_wac->shared->touch_input = wacom_wac->input;
> + }
> +
> return 0;
>
> fail5: wacom_destroy_leds(wacom);
> diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
> index 9c8eded..4cbea85 100644
> --- a/drivers/input/tablet/wacom_wac.c
> +++ b/drivers/input/tablet/wacom_wac.c
> @@ -1176,10 +1176,17 @@ static void wacom_bpt3_touch_msg(struct wacom_wac *wacom, unsigned char *data)
> static void wacom_bpt3_button_msg(struct wacom_wac *wacom, unsigned char *data)
> {
> struct input_dev *input = wacom->input;
> + struct wacom_features *features = &wacom->features;
>
> - input_report_key(input, BTN_LEFT, (data[1] & 0x08) != 0);
> + if (features->type == INTUOS_HT) {
> + input_report_key(input, BTN_LEFT, (data[1] & 0x02) != 0);
> + input_report_key(input, BTN_BACK, (data[1] & 0x08) != 0);
> + } else {
> +
> + input_report_key(input, BTN_BACK, (data[1] & 0x02) != 0);
> + input_report_key(input, BTN_LEFT, (data[1] & 0x08) != 0);
> + }
> input_report_key(input, BTN_FORWARD, (data[1] & 0x04) != 0);
> - input_report_key(input, BTN_BACK, (data[1] & 0x02) != 0);
> input_report_key(input, BTN_RIGHT, (data[1] & 0x01) != 0);
> }
>
> @@ -1213,13 +1220,23 @@ static int wacom_bpt3_touch(struct wacom_wac *wacom)
>
> static int wacom_bpt_pen(struct wacom_wac *wacom)
> {
> + struct wacom_features *features = &wacom->features;
> struct input_dev *input = wacom->input;
> unsigned char *data = wacom->data;
> int prox = 0, x = 0, y = 0, p = 0, d = 0, pen = 0, btn1 = 0, btn2 = 0;
>
> - if (data[0] != 0x02)
> + if (data[0] != WACOM_REPORT_PENABLED && data[0] != WACOM_REPORT_USB_MODE)
> return 0;
>
> + if (data[0] == WACOM_REPORT_USB_MODE) {
> + if ((features->type == INTUOS_HT) && features->touch_max) {
> + input_report_switch(wacom->shared->touch_input,
> + SW_TOUCH, data[8] & 0x40);
> + input_sync(wacom->shared->touch_input);
> + }
> + return 0;
> + }
> +
> prox = (data[1] & 0x20) == 0x20;
>
> /*
> @@ -1297,13 +1314,20 @@ static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len)
> unsigned char *data = wacom->data;
> int connected;
>
> - if (len != WACOM_PKGLEN_WIRELESS || data[0] != 0x80)
> + if (len != WACOM_PKGLEN_WIRELESS || data[0] != WACOM_REPORT_WL_MODE)
> return 0;
>
> connected = data[1] & 0x01;
> if (connected) {
> int pid, battery;
>
> + if ((wacom->shared->type == INTUOS_HT) &&
> + wacom->shared->touch_max) {
> + input_report_switch(wacom->shared->touch_input,
> + SW_TOUCH, data[5] & 0x40);
> + input_sync(wacom->shared->touch_input);
> + }
> +
> pid = get_unaligned_be16(&data[6]);
> battery = data[5] & 0x3f;
> if (wacom->pid != pid) {
> @@ -1391,6 +1415,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)
> break;
>
> case BAMBOO_PT:
> + case INTUOS_HT:
> sync = wacom_bpt_irq(wacom_wac, len);
> break;
>
> @@ -1459,7 +1484,7 @@ void wacom_setup_device_quirks(struct wacom_features *features)
>
> /* these device have multiple inputs */
> if (features->type >= WIRELESS ||
> - (features->type >= INTUOS5S && features->type <= INTUOSPL) ||
> + (features->type >= INTUOS5S && features->type <= INTUOS_HT) ||
> (features->oVid && features->oPid))
> features->quirks |= WACOM_QUIRK_MULTI_INPUT;
>
> @@ -1531,7 +1556,8 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
> struct wacom_features *features = &wacom_wac->features;
> int i;
>
> - input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
> + input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) |
> + BIT_MASK(EV_SW);
>
> __set_bit(BTN_TOUCH, input_dev->keybit);
> __set_bit(ABS_MISC, input_dev->absbit);
> @@ -1771,33 +1797,48 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
> __set_bit(INPUT_PROP_POINTER, input_dev->propbit);
> break;
>
> + case INTUOS_HT:
> + if (features->touch_max &&
> + (features->device_type == BTN_TOOL_FINGER))
> + __set_bit(SW_TOUCH, input_dev->swbit);
> + /* fall through */
> +
> case BAMBOO_PT:
> __clear_bit(ABS_MISC, input_dev->absbit);
>
> - __set_bit(INPUT_PROP_POINTER, input_dev->propbit);
> -
> if (features->device_type == BTN_TOOL_FINGER) {
> - unsigned int flags = INPUT_MT_POINTER;
>
> __set_bit(BTN_LEFT, input_dev->keybit);
> __set_bit(BTN_FORWARD, input_dev->keybit);
> __set_bit(BTN_BACK, input_dev->keybit);
> __set_bit(BTN_RIGHT, input_dev->keybit);
>
> - if (features->pktlen == WACOM_PKGLEN_BBTOUCH3) {
> - input_set_abs_params(input_dev,
> + if (features->touch_max) {
> + /* touch interface */
> + unsigned int flags = INPUT_MT_POINTER;
> +
> + __set_bit(INPUT_PROP_POINTER, input_dev->propbit);
> + if (features->pktlen == WACOM_PKGLEN_BBTOUCH3) {
> + input_set_abs_params(input_dev,
> ABS_MT_TOUCH_MAJOR,
> 0, features->x_max, 0, 0);
> - input_set_abs_params(input_dev,
> + input_set_abs_params(input_dev,
> ABS_MT_TOUCH_MINOR,
> 0, features->y_max, 0, 0);
> + } else {
> + __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
> + __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
> + flags = 0;
> + }
> + input_mt_init_slots(input_dev, features->touch_max, flags);
> } else {
> - __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
> - __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
> - flags = 0;
> + /* buttons/keys only interface */
> + __clear_bit(ABS_X, input_dev->absbit);
> + __clear_bit(ABS_Y, input_dev->absbit);
> + __clear_bit(BTN_TOUCH, input_dev->keybit);
> }
> - input_mt_init_slots(input_dev, features->touch_max, flags);
> } else if (features->device_type == BTN_TOOL_PEN) {
> + __set_bit(INPUT_PROP_POINTER, input_dev->propbit);
> __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
> __set_bit(BTN_TOOL_PEN, input_dev->keybit);
> __set_bit(BTN_STYLUS, input_dev->keybit);
> @@ -2194,6 +2235,17 @@ static const struct wacom_features wacom_features_0x300 =
> static const struct wacom_features wacom_features_0x301 =
> { "Wacom Bamboo One M", WACOM_PKGLEN_BBPEN, 21648, 13530, 1023,
> 31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
> +static const struct wacom_features wacom_features_0x302 =
> + { "Wacom Intuos PT S", WACOM_PKGLEN_BBPEN, 15200, 9500, 1023,
> + 31, INTUOS_HT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
> + .touch_max = 16 };
> +static const struct wacom_features wacom_features_0x303 =
> + { "Wacom Intuos PT M", WACOM_PKGLEN_BBPEN, 21600, 13500, 1023,
> + 31, INTUOS_HT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
> + .touch_max = 16 };
> +static const struct wacom_features wacom_features_0x30E =
> + { "Wacom Intuos S", WACOM_PKGLEN_BBPEN, 15200, 9500, 1023,
> + 31, INTUOS_HT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
> static const struct wacom_features wacom_features_0x6004 =
> { "ISD-V4", WACOM_PKGLEN_GRAPHIRE, 12800, 8000, 255,
> 0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
> @@ -2329,6 +2381,9 @@ const struct usb_device_id wacom_ids[] = {
> { USB_DEVICE_WACOM(0x10D) },
> { USB_DEVICE_WACOM(0x300) },
> { USB_DEVICE_WACOM(0x301) },
> + { USB_DEVICE_WACOM(0x302) },
> + { USB_DEVICE_DETAILED(0x303, USB_CLASS_HID, 0, 0) },
> + { USB_DEVICE_DETAILED(0x30E, USB_CLASS_HID, 0, 0) },
> { USB_DEVICE_WACOM(0x304) },
> { USB_DEVICE_DETAILED(0x314, USB_CLASS_HID, 0, 0) },
> { USB_DEVICE_DETAILED(0x315, USB_CLASS_HID, 0, 0) },
> diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
> index fd23a37..ba9e335 100644
> --- a/drivers/input/tablet/wacom_wac.h
> +++ b/drivers/input/tablet/wacom_wac.h
> @@ -54,6 +54,8 @@
> #define WACOM_REPORT_TPCST 16
> #define WACOM_REPORT_TPC1FGE 18
> #define WACOM_REPORT_24HDT 1
> +#define WACOM_REPORT_WL_MODE 128
> +#define WACOM_REPORT_USB_MODE 192
>
> /* device quirks */
> #define WACOM_QUIRK_MULTI_INPUT 0x0001
> @@ -81,6 +83,7 @@ enum {
> INTUOSPS,
> INTUOSPM,
> INTUOSPL,
> + INTUOS_HT,
> WACOM_21UX2,
> WACOM_22HD,
> DTK,
> @@ -129,6 +132,10 @@ struct wacom_features {
> struct wacom_shared {
> bool stylus_in_proximity;
> bool touch_down;
> + /* for wireless device to access USB interfaces */
> + unsigned touch_max;
> + int type;
> + struct input_dev *touch_input;
> };
>
> struct wacom_wac {
> diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
> index d08abf9..70e53e8 100644
> --- a/include/uapi/linux/input.h
> +++ b/include/uapi/linux/input.h
> @@ -855,6 +855,7 @@ struct input_keymap_entry {
> #define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */
> #define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */
> #define SW_LINEIN_INSERT 0x0d /* set = inserted */
> +#define SW_TOUCH 0x0e /* set = touch switch turned on (touch events off) */
> #define SW_MAX 0x0f
> #define SW_CNT (SW_MAX+1)
>
> --
> 1.8.1.2
>
next prev parent reply other threads:[~2013-11-08 2:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-10 21:17 [PATCH v2 2/2] Input: wacom - add support for three new Intuos devices Ping Cheng
2013-10-14 0:27 ` Peter Hutterer
2013-11-08 2:25 ` Chris Bagwell [this message]
2013-11-08 19:13 ` Ping Cheng
2013-11-12 2:50 ` Chris Bagwell
[not found] ` <CAF8JNhJb8oT9ZKD+QL1sYpJWGC9=JMMogxnK5cToWD9KK9MVdg@mail.gmail.com>
2013-11-12 17:29 ` Fwd: " Ping Cheng
2013-11-12 0:56 ` Peter Hutterer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAGzDe_a_VF7697u66LsWoV+C6+VLRzQJ8FWnct9SGK6DQurULQ@mail.gmail.com \
--to=chris@cnpbagwell.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=peter.hutterer@who-t.net \
--cc=pingc@wacom.com \
--cc=pinglinux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.