The stylus of this device works just fine out of the box.
The touch is seen by default as a mouse with relative events and some
gestures.
Switching the default in raw mode allows us to retrieve the touch data
and have a consistent user experience accross all the multitouch touchpads.
Note that the buttons of this devices are reported through the touch
interface. There is no 'Pad' interface. It seemed more natural to have
the BTN_LEFT and BTN_RIGHT reported with the touch because they are
placed under the touch interface and it looks like they belong to the
touch part.
Signed-off-by: Benjamin Tissoires <[email protected]>
---
Hi,
several things before we can merge this:
Josep, Frederic:
Would you mind testing this patch with your Bamboo pads? I bought the wireless
variant and the USB one has a different ProductID. Hopefully, it will go
smoothly with the current patch.
Peter, Ping, Jason:
Given the nature of the device, I did not exported the 2 buttons as a separate
pad device.
Do you back me up with this choice?
Jiri:
As mentioned to Josep and Frederic, this has not been tested against the USB
(wired) version of the device. So please wait at least for one tested-by before
considering including this patch.
Thanks everyone!
Benjamin
drivers/hid/wacom_sys.c | 23 ++++++++++++++++++
drivers/hid/wacom_wac.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++
drivers/hid/wacom_wac.h | 3 +++
3 files changed, 88 insertions(+)
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index e1ec192..ef4d147 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -410,6 +410,9 @@ static int wacom_query_tablet_data(struct hid_device *hdev,
else if (features->type == WACOM_27QHDT) {
return wacom_set_device_mode(hdev, 131, 3, 2);
}
+ else if (features->type == BAMBOO_PAD) {
+ return wacom_set_device_mode(hdev, 2, 2, 3);
+ }
} else if (features->device_type == BTN_TOOL_PEN) {
if (features->type <= BAMBOO_PT && features->type != WIRELESS) {
return wacom_set_device_mode(hdev, 2, 2, 2);
@@ -1417,6 +1420,20 @@ static int wacom_probe(struct hid_device *hdev,
goto fail_allocate_inputs;
}
+ /*
+ * Bamboo Pad has a generic hid handling for the Pen, and we switch it
+ * into debug mode for the touch part.
+ * We ignore the other interfaces.
+ */
+ if (features->type == BAMBOO_PAD) {
+ if (features->pktlen == WACOM_PKGLEN_PENABLED) {
+ features->type = HID_GENERIC;
+ } else if (features->pktlen != WACOM_PKGLEN_BP_TOUCH) {
+ error = -ENODEV;
+ goto fail_shared_data;
+ }
+ }
+
/* set the default size in case we do not get them from hid */
wacom_set_default_phy(features);
@@ -1451,6 +1468,12 @@ static int wacom_probe(struct hid_device *hdev,
features->y_max = 4096;
}
+ /*
+ * Same thing for Bamboo PAD
+ */
+ if (features->type == BAMBOO_PAD)
+ features->device_type = BTN_TOOL_FINGER;
+
if (hdev->bus == BUS_BLUETOOTH)
features->quirks |= WACOM_QUIRK_BATTERY;
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 1a65079..8627581 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -1826,6 +1826,49 @@ static int wacom_bpt_irq(struct wacom_wac *wacom, size_t len)
return 0;
}
+static int wacom_bamboo_pad_irq(struct wacom_wac *wacom, size_t len)
+{
+ struct input_dev *input = wacom->input;
+ unsigned char *data = wacom->data;
+ unsigned char *finger_data, prefix;
+ unsigned id;
+ int x, y;
+ bool valid;
+
+ /* bit 2 in data[1] is set when there is touch information available */
+ if ((len != WACOM_PKGLEN_BP_TOUCH) ||
+ (data[0] != WACOM_REPORT_BP_TOUCH) ||
+ !(data[1] & 0x02))
+ return 0;
+
+ prefix = data[9];
+
+ for (id = 0; id < wacom->features.touch_max; id++) {
+ valid = !!(prefix & BIT(id)) &&
+ !wacom->shared->stylus_in_proximity;
+
+ input_mt_slot(input, id);
+ input_mt_report_slot_state(input, MT_TOOL_FINGER, valid);
+
+ if (!valid)
+ continue;
+
+ finger_data = data + 10 + id * 3;
+ x = finger_data[0] | ((finger_data[1] & 0x0f) << 8);
+ y = (finger_data[2] << 4) | (finger_data[1] >> 4);
+
+ input_report_abs(input, ABS_MT_POSITION_X, x);
+ input_report_abs(input, ABS_MT_POSITION_Y, y);
+ }
+
+ input_mt_sync_frame(input);
+
+ input_report_key(input, BTN_LEFT, prefix & 0x40);
+ input_report_key(input, BTN_RIGHT, prefix & 0x80);
+
+ return 1;
+}
+
static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len)
{
unsigned char *data = wacom->data;
@@ -1962,6 +2005,10 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)
sync = wacom_bpt_irq(wacom_wac, len);
break;
+ case BAMBOO_PAD:
+ sync = wacom_bamboo_pad_irq(wacom_wac, len);
+ break;
+
case WIRELESS:
sync = wacom_wireless_irq(wacom_wac, len);
break;
@@ -2300,6 +2347,13 @@ int wacom_setup_pentouch_input_capabilities(struct input_dev *input_dev,
0, 0);
}
break;
+ case BAMBOO_PAD:
+ __clear_bit(ABS_MISC, input_dev->absbit);
+ input_mt_init_slots(input_dev, features->touch_max,
+ INPUT_MT_POINTER);
+ __set_bit(BTN_LEFT, input_dev->keybit);
+ __set_bit(BTN_RIGHT, input_dev->keybit);
+ break;
}
return 0;
}
@@ -2953,6 +3007,12 @@ static const struct wacom_features wacom_features_0x30C =
{ "Wacom ISDv5 30C", .type = WACOM_24HDT, /* Touch */
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30A, .touch_max = 10,
.check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
+static const struct wacom_features wacom_features_0x318 =
+ { "Wacom USB Bamboo PAD", 4095, 4095, /* Touch */
+ .type = BAMBOO_PAD, 35, 48, .touch_max = 4 };
+static const struct wacom_features wacom_features_0x319 =
+ { "Wacom Wireless Bamboo PAD", 4095, 4095, /* Touch */
+ .type = BAMBOO_PAD, 35, 48, .touch_max = 4 };
static const struct wacom_features wacom_features_0x323 =
{ "Wacom Intuos P M", 21600, 13500, 1023, 31,
INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
@@ -3101,6 +3161,8 @@ const struct hid_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0x314) },
{ USB_DEVICE_WACOM(0x315) },
{ USB_DEVICE_WACOM(0x317) },
+ { USB_DEVICE_WACOM(0x318) },
+ { USB_DEVICE_WACOM(0x319) },
{ USB_DEVICE_WACOM(0x323) },
{ USB_DEVICE_WACOM(0x32A) },
{ USB_DEVICE_WACOM(0x32B) },
diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index 021ee1c..bf43e0f 100644
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -33,6 +33,7 @@
#define WACOM_PKGLEN_MTTPC 40
#define WACOM_PKGLEN_DTUS 68
#define WACOM_PKGLEN_PENABLED 8
+#define WACOM_PKGLEN_BP_TOUCH 32
/* wacom data size per MT contact */
#define WACOM_BYTES_PER_MT_PACKET 11
@@ -67,6 +68,7 @@
#define WACOM_REPORT_24HDT 1
#define WACOM_REPORT_WL 128
#define WACOM_REPORT_USB 192
+#define WACOM_REPORT_BP_TOUCH 16
/* device quirks */
#define WACOM_QUIRK_MULTI_INPUT 0x0001
@@ -122,6 +124,7 @@ enum {
BAMBOO_PT,
WACOM_24HDT,
WACOM_27QHDT,
+ BAMBOO_PAD,
TABLETPC, /* add new TPC below */
TABLETPCE,
TABLETPC2FG,
--
2.1.0
On Tue, Feb 17, 2015 at 02:27:13PM -0500, Benjamin Tissoires wrote:
> The stylus of this device works just fine out of the box.
> The touch is seen by default as a mouse with relative events and some
> gestures.
> Switching the default in raw mode allows us to retrieve the touch data
> and have a consistent user experience accross all the multitouch touchpads.
>
> Note that the buttons of this devices are reported through the touch
> interface. There is no 'Pad' interface. It seemed more natural to have
> the BTN_LEFT and BTN_RIGHT reported with the touch because they are
> placed under the touch interface and it looks like they belong to the
> touch part.
>
> Signed-off-by: Benjamin Tissoires <[email protected]>
> ---
>
> Hi,
>
> several things before we can merge this:
>
> Josep, Frederic:
> Would you mind testing this patch with your Bamboo pads? I bought the wireless
> variant and the USB one has a different ProductID. Hopefully, it will go
> smoothly with the current patch.
>
> Peter, Ping, Jason:
> Given the nature of the device, I did not exported the 2 buttons as a separate
> pad device.
> Do you back me up with this choice?
yeah, agree - this looks more like a touchpad than a touch-enabled tablet.
Cheers,
Peter
> Jiri:
> As mentioned to Josep and Frederic, this has not been tested against the USB
> (wired) version of the device. So please wait at least for one tested-by before
> considering including this patch.
>
> Thanks everyone!
> Benjamin
>
> drivers/hid/wacom_sys.c | 23 ++++++++++++++++++
> drivers/hid/wacom_wac.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++
> drivers/hid/wacom_wac.h | 3 +++
> 3 files changed, 88 insertions(+)
>
> diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
> index e1ec192..ef4d147 100644
> --- a/drivers/hid/wacom_sys.c
> +++ b/drivers/hid/wacom_sys.c
> @@ -410,6 +410,9 @@ static int wacom_query_tablet_data(struct hid_device *hdev,
> else if (features->type == WACOM_27QHDT) {
> return wacom_set_device_mode(hdev, 131, 3, 2);
> }
> + else if (features->type == BAMBOO_PAD) {
> + return wacom_set_device_mode(hdev, 2, 2, 3);
> + }
> } else if (features->device_type == BTN_TOOL_PEN) {
> if (features->type <= BAMBOO_PT && features->type != WIRELESS) {
> return wacom_set_device_mode(hdev, 2, 2, 2);
> @@ -1417,6 +1420,20 @@ static int wacom_probe(struct hid_device *hdev,
> goto fail_allocate_inputs;
> }
>
> + /*
> + * Bamboo Pad has a generic hid handling for the Pen, and we switch it
> + * into debug mode for the touch part.
> + * We ignore the other interfaces.
> + */
> + if (features->type == BAMBOO_PAD) {
> + if (features->pktlen == WACOM_PKGLEN_PENABLED) {
> + features->type = HID_GENERIC;
> + } else if (features->pktlen != WACOM_PKGLEN_BP_TOUCH) {
> + error = -ENODEV;
> + goto fail_shared_data;
> + }
> + }
> +
> /* set the default size in case we do not get them from hid */
> wacom_set_default_phy(features);
>
> @@ -1451,6 +1468,12 @@ static int wacom_probe(struct hid_device *hdev,
> features->y_max = 4096;
> }
>
> + /*
> + * Same thing for Bamboo PAD
> + */
> + if (features->type == BAMBOO_PAD)
> + features->device_type = BTN_TOOL_FINGER;
> +
> if (hdev->bus == BUS_BLUETOOTH)
> features->quirks |= WACOM_QUIRK_BATTERY;
>
> diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> index 1a65079..8627581 100644
> --- a/drivers/hid/wacom_wac.c
> +++ b/drivers/hid/wacom_wac.c
> @@ -1826,6 +1826,49 @@ static int wacom_bpt_irq(struct wacom_wac *wacom, size_t len)
> return 0;
> }
>
> +static int wacom_bamboo_pad_irq(struct wacom_wac *wacom, size_t len)
> +{
> + struct input_dev *input = wacom->input;
> + unsigned char *data = wacom->data;
> + unsigned char *finger_data, prefix;
> + unsigned id;
> + int x, y;
> + bool valid;
> +
> + /* bit 2 in data[1] is set when there is touch information available */
> + if ((len != WACOM_PKGLEN_BP_TOUCH) ||
> + (data[0] != WACOM_REPORT_BP_TOUCH) ||
> + !(data[1] & 0x02))
> + return 0;
> +
> + prefix = data[9];
> +
> + for (id = 0; id < wacom->features.touch_max; id++) {
> + valid = !!(prefix & BIT(id)) &&
> + !wacom->shared->stylus_in_proximity;
> +
> + input_mt_slot(input, id);
> + input_mt_report_slot_state(input, MT_TOOL_FINGER, valid);
> +
> + if (!valid)
> + continue;
> +
> + finger_data = data + 10 + id * 3;
> + x = finger_data[0] | ((finger_data[1] & 0x0f) << 8);
> + y = (finger_data[2] << 4) | (finger_data[1] >> 4);
> +
> + input_report_abs(input, ABS_MT_POSITION_X, x);
> + input_report_abs(input, ABS_MT_POSITION_Y, y);
> + }
> +
> + input_mt_sync_frame(input);
> +
> + input_report_key(input, BTN_LEFT, prefix & 0x40);
> + input_report_key(input, BTN_RIGHT, prefix & 0x80);
> +
> + return 1;
> +}
> +
> static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len)
> {
> unsigned char *data = wacom->data;
> @@ -1962,6 +2005,10 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)
> sync = wacom_bpt_irq(wacom_wac, len);
> break;
>
> + case BAMBOO_PAD:
> + sync = wacom_bamboo_pad_irq(wacom_wac, len);
> + break;
> +
> case WIRELESS:
> sync = wacom_wireless_irq(wacom_wac, len);
> break;
> @@ -2300,6 +2347,13 @@ int wacom_setup_pentouch_input_capabilities(struct input_dev *input_dev,
> 0, 0);
> }
> break;
> + case BAMBOO_PAD:
> + __clear_bit(ABS_MISC, input_dev->absbit);
> + input_mt_init_slots(input_dev, features->touch_max,
> + INPUT_MT_POINTER);
> + __set_bit(BTN_LEFT, input_dev->keybit);
> + __set_bit(BTN_RIGHT, input_dev->keybit);
> + break;
> }
> return 0;
> }
> @@ -2953,6 +3007,12 @@ static const struct wacom_features wacom_features_0x30C =
> { "Wacom ISDv5 30C", .type = WACOM_24HDT, /* Touch */
> .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30A, .touch_max = 10,
> .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
> +static const struct wacom_features wacom_features_0x318 =
> + { "Wacom USB Bamboo PAD", 4095, 4095, /* Touch */
> + .type = BAMBOO_PAD, 35, 48, .touch_max = 4 };
> +static const struct wacom_features wacom_features_0x319 =
> + { "Wacom Wireless Bamboo PAD", 4095, 4095, /* Touch */
> + .type = BAMBOO_PAD, 35, 48, .touch_max = 4 };
> static const struct wacom_features wacom_features_0x323 =
> { "Wacom Intuos P M", 21600, 13500, 1023, 31,
> INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
> @@ -3101,6 +3161,8 @@ const struct hid_device_id wacom_ids[] = {
> { USB_DEVICE_WACOM(0x314) },
> { USB_DEVICE_WACOM(0x315) },
> { USB_DEVICE_WACOM(0x317) },
> + { USB_DEVICE_WACOM(0x318) },
> + { USB_DEVICE_WACOM(0x319) },
> { USB_DEVICE_WACOM(0x323) },
> { USB_DEVICE_WACOM(0x32A) },
> { USB_DEVICE_WACOM(0x32B) },
> diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
> index 021ee1c..bf43e0f 100644
> --- a/drivers/hid/wacom_wac.h
> +++ b/drivers/hid/wacom_wac.h
> @@ -33,6 +33,7 @@
> #define WACOM_PKGLEN_MTTPC 40
> #define WACOM_PKGLEN_DTUS 68
> #define WACOM_PKGLEN_PENABLED 8
> +#define WACOM_PKGLEN_BP_TOUCH 32
>
> /* wacom data size per MT contact */
> #define WACOM_BYTES_PER_MT_PACKET 11
> @@ -67,6 +68,7 @@
> #define WACOM_REPORT_24HDT 1
> #define WACOM_REPORT_WL 128
> #define WACOM_REPORT_USB 192
> +#define WACOM_REPORT_BP_TOUCH 16
>
> /* device quirks */
> #define WACOM_QUIRK_MULTI_INPUT 0x0001
> @@ -122,6 +124,7 @@ enum {
> BAMBOO_PT,
> WACOM_24HDT,
> WACOM_27QHDT,
> + BAMBOO_PAD,
> TABLETPC, /* add new TPC below */
> TABLETPCE,
> TABLETPC2FG,
> --
> 2.1.0
>
On Feb 18 2015 or thereabouts, jsanchezf wrote:
> Hello Benjamin
>
> Following your instructions I managed to compile and install the wacom
> module properly (actually I had to run automake and autoconf to make it all
> work but no problems after that).
>
> The stylus is working just fine now. Unfortunately the touch pad part
> doesn't seem to be working at all, and Xorg isn't mapping it to an event
> file like it used to. The stylus event file is not seeing any data when I
> touch the pad either.
>
> By the way, I'm actually using the USB variant of the Bamboo Pad.
>
Yep, I know. That's why I asked you to test :)
So could you run "sudo hid-recorder /dev/hidraw*" while making some
inputs on the touchpad?
I'd like to check if your touchpad is actually switched to the debug
mode.
Cheers,
Benjamin
> Looking at the log file from Xorg, though, I can see how it's properly
> detecting the "Wacom USB Bamboo PAD Pen stylus" device and adding "Wacom
> USB Bamboo PAD Pen touch" as an extended input device. Here's the full log:
> http://pastebin.com/k3SqtQN5
>
> I should mention I have no Xorg configuration done whatsoever besides the
> monitor resolution setup (which is not really relevant
>
>
>
> 2015-02-17 20:27 GMT+01:00 Benjamin Tissoires <[email protected]
> >:
>
> > The stylus of this device works just fine out of the box.
> > The touch is seen by default as a mouse with relative events and some
> > gestures.
> > Switching the default in raw mode allows us to retrieve the touch data
> > and have a consistent user experience accross all the multitouch touchpads.
> >
> > Note that the buttons of this devices are reported through the touch
> > interface. There is no 'Pad' interface. It seemed more natural to have
> > the BTN_LEFT and BTN_RIGHT reported with the touch because they are
> > placed under the touch interface and it looks like they belong to the
> > touch part.
> >
> > Signed-off-by: Benjamin Tissoires <[email protected]>
> > ---
> >
> > Hi,
> >
> > several things before we can merge this:
> >
> > Josep, Frederic:
> > Would you mind testing this patch with your Bamboo pads? I bought the
> > wireless
> > variant and the USB one has a different ProductID. Hopefully, it will go
> > smoothly with the current patch.
> >
> > Peter, Ping, Jason:
> > Given the nature of the device, I did not exported the 2 buttons as a
> > separate
> > pad device.
> > Do you back me up with this choice?
> >
> > Jiri:
> > As mentioned to Josep and Frederic, this has not been tested against the
> > USB
> > (wired) version of the device. So please wait at least for one tested-by
> > before
> > considering including this patch.
> >
> > Thanks everyone!
> > Benjamin
> >
> > drivers/hid/wacom_sys.c | 23 ++++++++++++++++++
> > drivers/hid/wacom_wac.c | 62
> > +++++++++++++++++++++++++++++++++++++++++++++++++
> > drivers/hid/wacom_wac.h | 3 +++
> > 3 files changed, 88 insertions(+)
> >
> > diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
> > index e1ec192..ef4d147 100644
> > --- a/drivers/hid/wacom_sys.c
> > +++ b/drivers/hid/wacom_sys.c
> > @@ -410,6 +410,9 @@ static int wacom_query_tablet_data(struct hid_device
> > *hdev,
> > else if (features->type == WACOM_27QHDT) {
> > return wacom_set_device_mode(hdev, 131, 3, 2);
> > }
> > + else if (features->type == BAMBOO_PAD) {
> > + return wacom_set_device_mode(hdev, 2, 2, 3);
> > + }
> > } else if (features->device_type == BTN_TOOL_PEN) {
> > if (features->type <= BAMBOO_PT && features->type !=
> > WIRELESS) {
> > return wacom_set_device_mode(hdev, 2, 2, 2);
> > @@ -1417,6 +1420,20 @@ static int wacom_probe(struct hid_device *hdev,
> > goto fail_allocate_inputs;
> > }
> >
> > + /*
> > + * Bamboo Pad has a generic hid handling for the Pen, and we
> > switch it
> > + * into debug mode for the touch part.
> > + * We ignore the other interfaces.
> > + */
> > + if (features->type == BAMBOO_PAD) {
> > + if (features->pktlen == WACOM_PKGLEN_PENABLED) {
> > + features->type = HID_GENERIC;
> > + } else if (features->pktlen != WACOM_PKGLEN_BP_TOUCH) {
> > + error = -ENODEV;
> > + goto fail_shared_data;
> > + }
> > + }
> > +
> > /* set the default size in case we do not get them from hid */
> > wacom_set_default_phy(features);
> >
> > @@ -1451,6 +1468,12 @@ static int wacom_probe(struct hid_device *hdev,
> > features->y_max = 4096;
> > }
> >
> > + /*
> > + * Same thing for Bamboo PAD
> > + */
> > + if (features->type == BAMBOO_PAD)
> > + features->device_type = BTN_TOOL_FINGER;
> > +
> > if (hdev->bus == BUS_BLUETOOTH)
> > features->quirks |= WACOM_QUIRK_BATTERY;
> >
> > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> > index 1a65079..8627581 100644
> > --- a/drivers/hid/wacom_wac.c
> > +++ b/drivers/hid/wacom_wac.c
> > @@ -1826,6 +1826,49 @@ static int wacom_bpt_irq(struct wacom_wac *wacom,
> > size_t len)
> > return 0;
> > }
> >
> > +static int wacom_bamboo_pad_irq(struct wacom_wac *wacom, size_t len)
> > +{
> > + struct input_dev *input = wacom->input;
> > + unsigned char *data = wacom->data;
> > + unsigned char *finger_data, prefix;
> > + unsigned id;
> > + int x, y;
> > + bool valid;
> > +
> > + /* bit 2 in data[1] is set when there is touch information
> > available */
> > + if ((len != WACOM_PKGLEN_BP_TOUCH) ||
> > + (data[0] != WACOM_REPORT_BP_TOUCH) ||
> > + !(data[1] & 0x02))
> > + return 0;
> > +
> > + prefix = data[9];
> > +
> > + for (id = 0; id < wacom->features.touch_max; id++) {
> > + valid = !!(prefix & BIT(id)) &&
> > + !wacom->shared->stylus_in_proximity;
> > +
> > + input_mt_slot(input, id);
> > + input_mt_report_slot_state(input, MT_TOOL_FINGER, valid);
> > +
> > + if (!valid)
> > + continue;
> > +
> > + finger_data = data + 10 + id * 3;
> > + x = finger_data[0] | ((finger_data[1] & 0x0f) << 8);
> > + y = (finger_data[2] << 4) | (finger_data[1] >> 4);
> > +
> > + input_report_abs(input, ABS_MT_POSITION_X, x);
> > + input_report_abs(input, ABS_MT_POSITION_Y, y);
> > + }
> > +
> > + input_mt_sync_frame(input);
> > +
> > + input_report_key(input, BTN_LEFT, prefix & 0x40);
> > + input_report_key(input, BTN_RIGHT, prefix & 0x80);
> > +
> > + return 1;
> > +}
> > +
> > static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len)
> > {
> > unsigned char *data = wacom->data;
> > @@ -1962,6 +2005,10 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac,
> > size_t len)
> > sync = wacom_bpt_irq(wacom_wac, len);
> > break;
> >
> > + case BAMBOO_PAD:
> > + sync = wacom_bamboo_pad_irq(wacom_wac, len);
> > + break;
> > +
> > case WIRELESS:
> > sync = wacom_wireless_irq(wacom_wac, len);
> > break;
> > @@ -2300,6 +2347,13 @@ int wacom_setup_pentouch_input_capabilities(struct
> > input_dev *input_dev,
> > 0, 0);
> > }
> > break;
> > + case BAMBOO_PAD:
> > + __clear_bit(ABS_MISC, input_dev->absbit);
> > + input_mt_init_slots(input_dev, features->touch_max,
> > + INPUT_MT_POINTER);
> > + __set_bit(BTN_LEFT, input_dev->keybit);
> > + __set_bit(BTN_RIGHT, input_dev->keybit);
> > + break;
> > }
> > return 0;
> > }
> > @@ -2953,6 +3007,12 @@ static const struct wacom_features
> > wacom_features_0x30C =
> > { "Wacom ISDv5 30C", .type = WACOM_24HDT, /* Touch */
> > .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30A, .touch_max = 10,
> > .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
> > +static const struct wacom_features wacom_features_0x318 =
> > + { "Wacom USB Bamboo PAD", 4095, 4095, /* Touch */
> > + .type = BAMBOO_PAD, 35, 48, .touch_max = 4 };
> > +static const struct wacom_features wacom_features_0x319 =
> > + { "Wacom Wireless Bamboo PAD", 4095, 4095, /* Touch */
> > + .type = BAMBOO_PAD, 35, 48, .touch_max = 4 };
> > static const struct wacom_features wacom_features_0x323 =
> > { "Wacom Intuos P M", 21600, 13500, 1023, 31,
> > INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
> > @@ -3101,6 +3161,8 @@ const struct hid_device_id wacom_ids[] = {
> > { USB_DEVICE_WACOM(0x314) },
> > { USB_DEVICE_WACOM(0x315) },
> > { USB_DEVICE_WACOM(0x317) },
> > + { USB_DEVICE_WACOM(0x318) },
> > + { USB_DEVICE_WACOM(0x319) },
> > { USB_DEVICE_WACOM(0x323) },
> > { USB_DEVICE_WACOM(0x32A) },
> > { USB_DEVICE_WACOM(0x32B) },
> > diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
> > index 021ee1c..bf43e0f 100644
> > --- a/drivers/hid/wacom_wac.h
> > +++ b/drivers/hid/wacom_wac.h
> > @@ -33,6 +33,7 @@
> > #define WACOM_PKGLEN_MTTPC 40
> > #define WACOM_PKGLEN_DTUS 68
> > #define WACOM_PKGLEN_PENABLED 8
> > +#define WACOM_PKGLEN_BP_TOUCH 32
> >
> > /* wacom data size per MT contact */
> > #define WACOM_BYTES_PER_MT_PACKET 11
> > @@ -67,6 +68,7 @@
> > #define WACOM_REPORT_24HDT 1
> > #define WACOM_REPORT_WL 128
> > #define WACOM_REPORT_USB 192
> > +#define WACOM_REPORT_BP_TOUCH 16
> >
> > /* device quirks */
> > #define WACOM_QUIRK_MULTI_INPUT 0x0001
> > @@ -122,6 +124,7 @@ enum {
> > BAMBOO_PT,
> > WACOM_24HDT,
> > WACOM_27QHDT,
> > + BAMBOO_PAD,
> > TABLETPC, /* add new TPC below */
> > TABLETPCE,
> > TABLETPC2FG,
> > --
> > 2.1.0
> >
> >
On Feb 18 2015 or thereabouts, jsanchezf wrote:
> > So could you run "sudo hid-recorder /dev/hidraw*" while making some
> > inputs on the touchpad?
>
> Moving my finger and pressing the buttons on the touchpad seemed to show no
> events on hid-recorder. This is the full log for it:
> http://pastebin.com/YqZfkvLy
>
> I just realised maybe you meant stylus input, so this is another log with
> some stylus input on it: http://pastebin.com/WSCY6Zq0
>
Arf, it looks like the wacom driver ignores the debug interface.
Can you re-run hid-recorder on all interfaces with the stock 3.19 kernel
(or whichever you had that allowed the pen to work, but without my
latest patches).
Cheers,
Benjamin
>
>
> 2015-02-18 23:07 GMT+01:00 Benjamin Tissoires <[email protected]
> >:
>
> > On Feb 18 2015 or thereabouts, jsanchezf wrote:
> > > Hello Benjamin
> > >
> > > Following your instructions I managed to compile and install the wacom
> > > module properly (actually I had to run automake and autoconf to make it
> > all
> > > work but no problems after that).
> > >
> > > The stylus is working just fine now. Unfortunately the touch pad part
> > > doesn't seem to be working at all, and Xorg isn't mapping it to an event
> > > file like it used to. The stylus event file is not seeing any data when I
> > > touch the pad either.
> > >
> > > By the way, I'm actually using the USB variant of the Bamboo Pad.
> > >
> >
> > Yep, I know. That's why I asked you to test :)
> >
> > So could you run "sudo hid-recorder /dev/hidraw*" while making some
> > inputs on the touchpad?
> >
> > I'd like to check if your touchpad is actually switched to the debug
> > mode.
> >
> > Cheers,
> > Benjamin
> >
> > > Looking at the log file from Xorg, though, I can see how it's properly
> > > detecting the "Wacom USB Bamboo PAD Pen stylus" device and adding "Wacom
> > > USB Bamboo PAD Pen touch" as an extended input device. Here's the full
> > log:
> > > http://pastebin.com/k3SqtQN5
> > >
> > > I should mention I have no Xorg configuration done whatsoever besides the
> > > monitor resolution setup (which is not really relevant
> > >
> > >
> > >
> > > 2015-02-17 20:27 GMT+01:00 Benjamin Tissoires <
> > [email protected]
> > > >:
> > >
> > > > The stylus of this device works just fine out of the box.
> > > > The touch is seen by default as a mouse with relative events and some
> > > > gestures.
> > > > Switching the default in raw mode allows us to retrieve the touch data
> > > > and have a consistent user experience accross all the multitouch
> > touchpads.
> > > >
> > > > Note that the buttons of this devices are reported through the touch
> > > > interface. There is no 'Pad' interface. It seemed more natural to have
> > > > the BTN_LEFT and BTN_RIGHT reported with the touch because they are
> > > > placed under the touch interface and it looks like they belong to the
> > > > touch part.
> > > >
> > > > Signed-off-by: Benjamin Tissoires <[email protected]>
> > > > ---
> > > >
> > > > Hi,
> > > >
> > > > several things before we can merge this:
> > > >
> > > > Josep, Frederic:
> > > > Would you mind testing this patch with your Bamboo pads? I bought the
> > > > wireless
> > > > variant and the USB one has a different ProductID. Hopefully, it will
> > go
> > > > smoothly with the current patch.
> > > >
> > > > Peter, Ping, Jason:
> > > > Given the nature of the device, I did not exported the 2 buttons as a
> > > > separate
> > > > pad device.
> > > > Do you back me up with this choice?
> > > >
> > > > Jiri:
> > > > As mentioned to Josep and Frederic, this has not been tested against
> > the
> > > > USB
> > > > (wired) version of the device. So please wait at least for one
> > tested-by
> > > > before
> > > > considering including this patch.
> > > >
> > > > Thanks everyone!
> > > > Benjamin
> > > >
> > > > drivers/hid/wacom_sys.c | 23 ++++++++++++++++++
> > > > drivers/hid/wacom_wac.c | 62
> > > > +++++++++++++++++++++++++++++++++++++++++++++++++
> > > > drivers/hid/wacom_wac.h | 3 +++
> > > > 3 files changed, 88 insertions(+)
> > > >
> > > > diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
> > > > index e1ec192..ef4d147 100644
> > > > --- a/drivers/hid/wacom_sys.c
> > > > +++ b/drivers/hid/wacom_sys.c
> > > > @@ -410,6 +410,9 @@ static int wacom_query_tablet_data(struct
> > hid_device
> > > > *hdev,
> > > > else if (features->type == WACOM_27QHDT) {
> > > > return wacom_set_device_mode(hdev, 131, 3, 2);
> > > > }
> > > > + else if (features->type == BAMBOO_PAD) {
> > > > + return wacom_set_device_mode(hdev, 2, 2, 3);
> > > > + }
> > > > } else if (features->device_type == BTN_TOOL_PEN) {
> > > > if (features->type <= BAMBOO_PT && features->type !=
> > > > WIRELESS) {
> > > > return wacom_set_device_mode(hdev, 2, 2, 2);
> > > > @@ -1417,6 +1420,20 @@ static int wacom_probe(struct hid_device *hdev,
> > > > goto fail_allocate_inputs;
> > > > }
> > > >
> > > > + /*
> > > > + * Bamboo Pad has a generic hid handling for the Pen, and we
> > > > switch it
> > > > + * into debug mode for the touch part.
> > > > + * We ignore the other interfaces.
> > > > + */
> > > > + if (features->type == BAMBOO_PAD) {
> > > > + if (features->pktlen == WACOM_PKGLEN_PENABLED) {
> > > > + features->type = HID_GENERIC;
> > > > + } else if (features->pktlen != WACOM_PKGLEN_BP_TOUCH) {
> > > > + error = -ENODEV;
> > > > + goto fail_shared_data;
> > > > + }
> > > > + }
> > > > +
> > > > /* set the default size in case we do not get them from hid */
> > > > wacom_set_default_phy(features);
> > > >
> > > > @@ -1451,6 +1468,12 @@ static int wacom_probe(struct hid_device *hdev,
> > > > features->y_max = 4096;
> > > > }
> > > >
> > > > + /*
> > > > + * Same thing for Bamboo PAD
> > > > + */
> > > > + if (features->type == BAMBOO_PAD)
> > > > + features->device_type = BTN_TOOL_FINGER;
> > > > +
> > > > if (hdev->bus == BUS_BLUETOOTH)
> > > > features->quirks |= WACOM_QUIRK_BATTERY;
> > > >
> > > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> > > > index 1a65079..8627581 100644
> > > > --- a/drivers/hid/wacom_wac.c
> > > > +++ b/drivers/hid/wacom_wac.c
> > > > @@ -1826,6 +1826,49 @@ static int wacom_bpt_irq(struct wacom_wac
> > *wacom,
> > > > size_t len)
> > > > return 0;
> > > > }
> > > >
> > > > +static int wacom_bamboo_pad_irq(struct wacom_wac *wacom, size_t len)
> > > > +{
> > > > + struct input_dev *input = wacom->input;
> > > > + unsigned char *data = wacom->data;
> > > > + unsigned char *finger_data, prefix;
> > > > + unsigned id;
> > > > + int x, y;
> > > > + bool valid;
> > > > +
> > > > + /* bit 2 in data[1] is set when there is touch information
> > > > available */
> > > > + if ((len != WACOM_PKGLEN_BP_TOUCH) ||
> > > > + (data[0] != WACOM_REPORT_BP_TOUCH) ||
> > > > + !(data[1] & 0x02))
> > > > + return 0;
> > > > +
> > > > + prefix = data[9];
> > > > +
> > > > + for (id = 0; id < wacom->features.touch_max; id++) {
> > > > + valid = !!(prefix & BIT(id)) &&
> > > > + !wacom->shared->stylus_in_proximity;
> > > > +
> > > > + input_mt_slot(input, id);
> > > > + input_mt_report_slot_state(input, MT_TOOL_FINGER,
> > valid);
> > > > +
> > > > + if (!valid)
> > > > + continue;
> > > > +
> > > > + finger_data = data + 10 + id * 3;
> > > > + x = finger_data[0] | ((finger_data[1] & 0x0f) << 8);
> > > > + y = (finger_data[2] << 4) | (finger_data[1] >> 4);
> > > > +
> > > > + input_report_abs(input, ABS_MT_POSITION_X, x);
> > > > + input_report_abs(input, ABS_MT_POSITION_Y, y);
> > > > + }
> > > > +
> > > > + input_mt_sync_frame(input);
> > > > +
> > > > + input_report_key(input, BTN_LEFT, prefix & 0x40);
> > > > + input_report_key(input, BTN_RIGHT, prefix & 0x80);
> > > > +
> > > > + return 1;
> > > > +}
> > > > +
> > > > static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len)
> > > > {
> > > > unsigned char *data = wacom->data;
> > > > @@ -1962,6 +2005,10 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac,
> > > > size_t len)
> > > > sync = wacom_bpt_irq(wacom_wac, len);
> > > > break;
> > > >
> > > > + case BAMBOO_PAD:
> > > > + sync = wacom_bamboo_pad_irq(wacom_wac, len);
> > > > + break;
> > > > +
> > > > case WIRELESS:
> > > > sync = wacom_wireless_irq(wacom_wac, len);
> > > > break;
> > > > @@ -2300,6 +2347,13 @@ int
> > wacom_setup_pentouch_input_capabilities(struct
> > > > input_dev *input_dev,
> > > > 0, 0);
> > > > }
> > > > break;
> > > > + case BAMBOO_PAD:
> > > > + __clear_bit(ABS_MISC, input_dev->absbit);
> > > > + input_mt_init_slots(input_dev, features->touch_max,
> > > > + INPUT_MT_POINTER);
> > > > + __set_bit(BTN_LEFT, input_dev->keybit);
> > > > + __set_bit(BTN_RIGHT, input_dev->keybit);
> > > > + break;
> > > > }
> > > > return 0;
> > > > }
> > > > @@ -2953,6 +3007,12 @@ static const struct wacom_features
> > > > wacom_features_0x30C =
> > > > { "Wacom ISDv5 30C", .type = WACOM_24HDT, /* Touch */
> > > > .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30A, .touch_max = 10,
> > > > .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
> > > > +static const struct wacom_features wacom_features_0x318 =
> > > > + { "Wacom USB Bamboo PAD", 4095, 4095, /* Touch */
> > > > + .type = BAMBOO_PAD, 35, 48, .touch_max = 4 };
> > > > +static const struct wacom_features wacom_features_0x319 =
> > > > + { "Wacom Wireless Bamboo PAD", 4095, 4095, /* Touch */
> > > > + .type = BAMBOO_PAD, 35, 48, .touch_max = 4 };
> > > > static const struct wacom_features wacom_features_0x323 =
> > > > { "Wacom Intuos P M", 21600, 13500, 1023, 31,
> > > > INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
> > > > @@ -3101,6 +3161,8 @@ const struct hid_device_id wacom_ids[] = {
> > > > { USB_DEVICE_WACOM(0x314) },
> > > > { USB_DEVICE_WACOM(0x315) },
> > > > { USB_DEVICE_WACOM(0x317) },
> > > > + { USB_DEVICE_WACOM(0x318) },
> > > > + { USB_DEVICE_WACOM(0x319) },
> > > > { USB_DEVICE_WACOM(0x323) },
> > > > { USB_DEVICE_WACOM(0x32A) },
> > > > { USB_DEVICE_WACOM(0x32B) },
> > > > diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
> > > > index 021ee1c..bf43e0f 100644
> > > > --- a/drivers/hid/wacom_wac.h
> > > > +++ b/drivers/hid/wacom_wac.h
> > > > @@ -33,6 +33,7 @@
> > > > #define WACOM_PKGLEN_MTTPC 40
> > > > #define WACOM_PKGLEN_DTUS 68
> > > > #define WACOM_PKGLEN_PENABLED 8
> > > > +#define WACOM_PKGLEN_BP_TOUCH 32
> > > >
> > > > /* wacom data size per MT contact */
> > > > #define WACOM_BYTES_PER_MT_PACKET 11
> > > > @@ -67,6 +68,7 @@
> > > > #define WACOM_REPORT_24HDT 1
> > > > #define WACOM_REPORT_WL 128
> > > > #define WACOM_REPORT_USB 192
> > > > +#define WACOM_REPORT_BP_TOUCH 16
> > > >
> > > > /* device quirks */
> > > > #define WACOM_QUIRK_MULTI_INPUT 0x0001
> > > > @@ -122,6 +124,7 @@ enum {
> > > > BAMBOO_PT,
> > > > WACOM_24HDT,
> > > > WACOM_27QHDT,
> > > > + BAMBOO_PAD,
> > > > TABLETPC, /* add new TPC below */
> > > > TABLETPCE,
> > > > TABLETPC2FG,
> > > > --
> > > > 2.1.0
> > > >
> > > >
> >
On Feb 21 2015 or thereabouts, jsanchezf wrote:
> You mean the kernel that worked before the thing broke? That would be 3.16,
> without any patch whatsoever, is that right?
No, sorry. I meant a plain 3.18 (you need a 3.17 at least to have the
device handled by hid and 3.18 to have wacom picked up when your device
shows up).
Or, you can also just use the wacom out-of-the-tree driver, without my
patch to support the bamboo pad.
>
> Sorry, I don't have my tablet with me right now but I'll mail you the
> recorded data to you this afteenoon. Any particular motion, or something I
> should try? I'm assuming you just need touch input / pad buttons, right?
Yes. I am actually more interested in the description of the device, but
having some events will help too.
Cheers,
Benjamin
> On Feb 18 2015 or thereabouts, jsanchezf wrote:
> > > So could you run "sudo hid-recorder /dev/hidraw*" while making some
> > > inputs on the touchpad?
> >
> > Moving my finger and pressing the buttons on the touchpad seemed to show
> no
> > events on hid-recorder. This is the full log for it:
> > http://pastebin.com/YqZfkvLy
> >
> > I just realised maybe you meant stylus input, so this is another log with
> > some stylus input on it: http://pastebin.com/WSCY6Zq0
> >
>
> Arf, it looks like the wacom driver ignores the debug interface.
> Can you re-run hid-recorder on all interfaces with the stock 3.19 kernel
> (or whichever you had that allowed the pen to work, but without my
> latest patches).
>
> Cheers,
> Benjamin
>
> >
> >
> > 2015-02-18 23:07 GMT+01:00 Benjamin Tissoires <
> [email protected]
> > >:
> >
> > > On Feb 18 2015 or thereabouts, jsanchezf wrote:
> > > > Hello Benjamin
> > > >
> > > > Following your instructions I managed to compile and install the wacom
> > > > module properly (actually I had to run automake and autoconf to make
> it
> > > all
> > > > work but no problems after that).
> > > >
> > > > The stylus is working just fine now. Unfortunately the touch pad part
> > > > doesn't seem to be working at all, and Xorg isn't mapping it to an
> event
> > > > file like it used to. The stylus event file is not seeing any data
> when I
> > > > touch the pad either.
> > > >
> > > > By the way, I'm actually using the USB variant of the Bamboo Pad.
> > > >
> > >
> > > Yep, I know. That's why I asked you to test :)
> > >
> > > So could you run "sudo hid-recorder /dev/hidraw*" while making some
> > > inputs on the touchpad?
> > >
> > > I'd like to check if your touchpad is actually switched to the debug
> > > mode.
> > >
> > > Cheers,
> > > Benjamin
> > >
> > > > Looking at the log file from Xorg, though, I can see how it's properly
> > > > detecting the "Wacom USB Bamboo PAD Pen stylus" device and adding
> "Wacom
> > > > USB Bamboo PAD Pen touch" as an extended input device. Here's the full
> > > log:
> > > > http://pastebin.com/k3SqtQN5
> > > >
> > > > I should mention I have no Xorg configuration done whatsoever besides
> the
> > > > monitor resolution setup (which is not really relevant
> > > >
> > > >
> > > >
> > > > 2015-02-17 20:27 GMT+01:00 Benjamin Tissoires <
> > > [email protected]
> > > > >:
> > > >
> > > > > The stylus of this device works just fine out of the box.
> > > > > The touch is seen by default as a mouse with relative events and
> some
> > > > > gestures.
> > > > > Switching the default in raw mode allows us to retrieve the touch
> data
> > > > > and have a consistent user experience accross all the multitouch
> > > touchpads.
> > > > >
> > > > > Note that the buttons of this devices are reported through the touch
> > > > > interface. There is no 'Pad' interface. It seemed more natural to
> have
> > > > > the BTN_LEFT and BTN_RIGHT reported with the touch because they are
> > > > > placed under the touch interface and it looks like they belong to
> the
> > > > > touch part.
> > > > >
> > > > > Signed-off-by: Benjamin Tissoires <[email protected]>
> > > > > ---
> > > > >
> > > > > Hi,
> > > > >
> > > > > several things before we can merge this:
> > > > >
> > > > > Josep, Frederic:
> > > > > Would you mind testing this patch with your Bamboo pads? I bought
> the
> > > > > wireless
> > > > > variant and the USB one has a different ProductID. Hopefully, it
> will
> > > go
> > > > > smoothly with the current patch.
> > > > >
> > > > > Peter, Ping, Jason:
> > > > > Given the nature of the device, I did not exported the 2 buttons as
> a
> > > > > separate
> > > > > pad device.
> > > > > Do you back me up with this choice?
> > > > >
> > > > > Jiri:
> > > > > As mentioned to Josep and Frederic, this has not been tested against
> > > the
> > > > > USB
> > > > > (wired) version of the device. So please wait at least for one
> > > tested-by
> > > > > before
> > > > > considering including this patch.
> > > > >
> > > > > Thanks everyone!
> > > > > Benjamin
> > > > >
> > > > > drivers/hid/wacom_sys.c | 23 ++++++++++++++++++
> > > > > drivers/hid/wacom_wac.c | 62
> > > > > +++++++++++++++++++++++++++++++++++++++++++++++++
> > > > > drivers/hid/wacom_wac.h | 3 +++
> > > > > 3 files changed, 88 insertions(+)
> > > > >
> > > > > diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
> > > > > index e1ec192..ef4d147 100644
> > > > > --- a/drivers/hid/wacom_sys.c
> > > > > +++ b/drivers/hid/wacom_sys.c
> > > > > @@ -410,6 +410,9 @@ static int wacom_query_tablet_data(struct
> > > hid_device
> > > > > *hdev,
> > > > > else if (features->type == WACOM_27QHDT) {
> > > > > return wacom_set_device_mode(hdev, 131, 3,
> 2);
> > > > > }
> > > > > + else if (features->type == BAMBOO_PAD) {
> > > > > + return wacom_set_device_mode(hdev, 2, 2, 3);
> > > > > + }
> > > > > } else if (features->device_type == BTN_TOOL_PEN) {
> > > > > if (features->type <= BAMBOO_PT && features->type !=
> > > > > WIRELESS) {
> > > > > return wacom_set_device_mode(hdev, 2, 2, 2);
> > > > > @@ -1417,6 +1420,20 @@ static int wacom_probe(struct hid_device
> *hdev,
> > > > > goto fail_allocate_inputs;
> > > > > }
> > > > >
> > > > > + /*
> > > > > + * Bamboo Pad has a generic hid handling for the Pen, and we
> > > > > switch it
> > > > > + * into debug mode for the touch part.
> > > > > + * We ignore the other interfaces.
> > > > > + */
> > > > > + if (features->type == BAMBOO_PAD) {
> > > > > + if (features->pktlen == WACOM_PKGLEN_PENABLED) {
> > > > > + features->type = HID_GENERIC;
> > > > > + } else if (features->pktlen !=
> WACOM_PKGLEN_BP_TOUCH) {
> > > > > + error = -ENODEV;
> > > > > + goto fail_shared_data;
> > > > > + }
> > > > > + }
> > > > > +
> > > > > /* set the default size in case we do not get them from hid
> */
> > > > > wacom_set_default_phy(features);
> > > > >
> > > > > @@ -1451,6 +1468,12 @@ static int wacom_probe(struct hid_device
> *hdev,
> > > > > features->y_max = 4096;
> > > > > }
> > > > >
> > > > > + /*
> > > > > + * Same thing for Bamboo PAD
> > > > > + */
> > > > > + if (features->type == BAMBOO_PAD)
> > > > > + features->device_type = BTN_TOOL_FINGER;
> > > > > +
> > > > > if (hdev->bus == BUS_BLUETOOTH)
> > > > > features->quirks |= WACOM_QUIRK_BATTERY;
> > > > >
> > > > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> > > > > index 1a65079..8627581 100644
> > > > > --- a/drivers/hid/wacom_wac.c
> > > > > +++ b/drivers/hid/wacom_wac.c
> > > > > @@ -1826,6 +1826,49 @@ static int wacom_bpt_irq(struct wacom_wac
> > > *wacom,
> > > > > size_t len)
> > > > > return 0;
> > > > > }
> > > > >
> > > > > +static int wacom_bamboo_pad_irq(struct wacom_wac *wacom, size_t
> len)
> > > > > +{
> > > > > + struct input_dev *input = wacom->input;
> > > > > + unsigned char *data = wacom->data;
> > > > > + unsigned char *finger_data, prefix;
> > > > > + unsigned id;
> > > > > + int x, y;
> > > > > + bool valid;
> > > > > +
> > > > > + /* bit 2 in data[1] is set when there is touch information
> > > > > available */
> > > > > + if ((len != WACOM_PKGLEN_BP_TOUCH) ||
> > > > > + (data[0] != WACOM_REPORT_BP_TOUCH) ||
> > > > > + !(data[1] & 0x02))
> > > > > + return 0;
> > > > > +
> > > > > + prefix = data[9];
> > > > > +
> > > > > + for (id = 0; id < wacom->features.touch_max; id++) {
> > > > > + valid = !!(prefix & BIT(id)) &&
> > > > > + !wacom->shared->stylus_in_proximity;
> > > > > +
> > > > > + input_mt_slot(input, id);
> > > > > + input_mt_report_slot_state(input, MT_TOOL_FINGER,
> > > valid);
> > > > > +
> > > > > + if (!valid)
> > > > > + continue;
> > > > > +
> > > > > + finger_data = data + 10 + id * 3;
> > > > > + x = finger_data[0] | ((finger_data[1] & 0x0f) << 8);
> > > > > + y = (finger_data[2] << 4) | (finger_data[1] >> 4);
> > > > > +
> > > > > + input_report_abs(input, ABS_MT_POSITION_X, x);
> > > > > + input_report_abs(input, ABS_MT_POSITION_Y, y);
> > > > > + }
> > > > > +
> > > > > + input_mt_sync_frame(input);
> > > > > +
> > > > > + input_report_key(input, BTN_LEFT, prefix & 0x40);
> > > > > + input_report_key(input, BTN_RIGHT, prefix & 0x80);
> > > > > +
> > > > > + return 1;
> > > > > +}
> > > > > +
> > > > > static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len)
> > > > > {
> > > > > unsigned char *data = wacom->data;
> > > > > @@ -1962,6 +2005,10 @@ void wacom_wac_irq(struct wacom_wac
> *wacom_wac,
> > > > > size_t len)
> > > > > sync = wacom_bpt_irq(wacom_wac, len);
> > > > > break;
> > > > >
> > > > > + case BAMBOO_PAD:
> > > > > + sync = wacom_bamboo_pad_irq(wacom_wac, len);
> > > > > + break;
> > > > > +
> > > > > case WIRELESS:
> > > > > sync = wacom_wireless_irq(wacom_wac, len);
> > > > > break;
> > > > > @@ -2300,6 +2347,13 @@ int
> > > wacom_setup_pentouch_input_capabilities(struct
> > > > > input_dev *input_dev,
> > > > > 0, 0);
> > > > > }
> > > > > break;
> > > > > + case BAMBOO_PAD:
> > > > > + __clear_bit(ABS_MISC, input_dev->absbit);
> > > > > + input_mt_init_slots(input_dev, features->touch_max,
> > > > > + INPUT_MT_POINTER);
> > > > > + __set_bit(BTN_LEFT, input_dev->keybit);
> > > > > + __set_bit(BTN_RIGHT, input_dev->keybit);
> > > > > + break;
> > > > > }
> > > > > return 0;
> > > > > }
> > > > > @@ -2953,6 +3007,12 @@ static const struct wacom_features
> > > > > wacom_features_0x30C =
> > > > > { "Wacom ISDv5 30C", .type = WACOM_24HDT, /* Touch */
> > > > > .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30A, .touch_max =
> 10,
> > > > > .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE
> };
> > > > > +static const struct wacom_features wacom_features_0x318 =
> > > > > + { "Wacom USB Bamboo PAD", 4095, 4095, /* Touch */
> > > > > + .type = BAMBOO_PAD, 35, 48, .touch_max = 4 };
> > > > > +static const struct wacom_features wacom_features_0x319 =
> > > > > + { "Wacom Wireless Bamboo PAD", 4095, 4095, /* Touch */
> > > > > + .type = BAMBOO_PAD, 35, 48, .touch_max = 4 };
> > > > > static const struct wacom_features wacom_features_0x323 =
> > > > > { "Wacom Intuos P M", 21600, 13500, 1023, 31,
> > > > > INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
> > > > > @@ -3101,6 +3161,8 @@ const struct hid_device_id wacom_ids[] = {
> > > > > { USB_DEVICE_WACOM(0x314) },
> > > > > { USB_DEVICE_WACOM(0x315) },
> > > > > { USB_DEVICE_WACOM(0x317) },
> > > > > + { USB_DEVICE_WACOM(0x318) },
> > > > > + { USB_DEVICE_WACOM(0x319) },
> > > > > { USB_DEVICE_WACOM(0x323) },
> > > > > { USB_DEVICE_WACOM(0x32A) },
> > > > > { USB_DEVICE_WACOM(0x32B) },
> > > > > diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
> > > > > index 021ee1c..bf43e0f 100644
> > > > > --- a/drivers/hid/wacom_wac.h
> > > > > +++ b/drivers/hid/wacom_wac.h
> > > > > @@ -33,6 +33,7 @@
> > > > > #define WACOM_PKGLEN_MTTPC 40
> > > > > #define WACOM_PKGLEN_DTUS 68
> > > > > #define WACOM_PKGLEN_PENABLED 8
> > > > > +#define WACOM_PKGLEN_BP_TOUCH 32
> > > > >
> > > > > /* wacom data size per MT contact */
> > > > > #define WACOM_BYTES_PER_MT_PACKET 11
> > > > > @@ -67,6 +68,7 @@
> > > > > #define WACOM_REPORT_24HDT 1
> > > > > #define WACOM_REPORT_WL 128
> > > > > #define WACOM_REPORT_USB 192
> > > > > +#define WACOM_REPORT_BP_TOUCH 16
> > > > >
> > > > > /* device quirks */
> > > > > #define WACOM_QUIRK_MULTI_INPUT 0x0001
> > > > > @@ -122,6 +124,7 @@ enum {
> > > > > BAMBOO_PT,
> > > > > WACOM_24HDT,
> > > > > WACOM_27QHDT,
> > > > > + BAMBOO_PAD,
> > > > > TABLETPC, /* add new TPC below */
> > > > > TABLETPCE,
> > > > > TABLETPC2FG,
> > > > > --
> > > > > 2.1.0
> > > > >
> > > > >
> > >
Hi Benjamin,
Would unpatched 3.19 work as well? I don't really have 3.18 available
right now. I checked with 3.19 and hid-replay was able to capture data
from the touch input: http://pastebin.com/bThF7s5D let me know if
that's ok!
2015-02-21 14:21 GMT+01:00 Benjamin Tissoires <[email protected]>:
> On Feb 21 2015 or thereabouts, jsanchezf wrote:
>> You mean the kernel that worked before the thing broke? That would be 3.16,
>> without any patch whatsoever, is that right?
>
> No, sorry. I meant a plain 3.18 (you need a 3.17 at least to have the
> device handled by hid and 3.18 to have wacom picked up when your device
> shows up).
>
> Or, you can also just use the wacom out-of-the-tree driver, without my
> patch to support the bamboo pad.
>
>>
>> Sorry, I don't have my tablet with me right now but I'll mail you the
>> recorded data to you this afteenoon. Any particular motion, or something I
>> should try? I'm assuming you just need touch input / pad buttons, right?
>
> Yes. I am actually more interested in the description of the device, but
> having some events will help too.
>
> Cheers,
> Benjamin
>
>> On Feb 18 2015 or thereabouts, jsanchezf wrote:
>> > > So could you run "sudo hid-recorder /dev/hidraw*" while making some
>> > > inputs on the touchpad?
>> >
>> > Moving my finger and pressing the buttons on the touchpad seemed to show
>> no
>> > events on hid-recorder. This is the full log for it:
>> > http://pastebin.com/YqZfkvLy
>> >
>> > I just realised maybe you meant stylus input, so this is another log with
>> > some stylus input on it: http://pastebin.com/WSCY6Zq0
>> >
>>
>> Arf, it looks like the wacom driver ignores the debug interface.
>> Can you re-run hid-recorder on all interfaces with the stock 3.19 kernel
>> (or whichever you had that allowed the pen to work, but without my
>> latest patches).
>>
>> Cheers,
>> Benjamin
>>
>> >
>> >
>> > 2015-02-18 23:07 GMT+01:00 Benjamin Tissoires <
>> [email protected]
>> > >:
>> >
>> > > On Feb 18 2015 or thereabouts, jsanchezf wrote:
>> > > > Hello Benjamin
>> > > >
>> > > > Following your instructions I managed to compile and install the wacom
>> > > > module properly (actually I had to run automake and autoconf to make
>> it
>> > > all
>> > > > work but no problems after that).
>> > > >
>> > > > The stylus is working just fine now. Unfortunately the touch pad part
>> > > > doesn't seem to be working at all, and Xorg isn't mapping it to an
>> event
>> > > > file like it used to. The stylus event file is not seeing any data
>> when I
>> > > > touch the pad either.
>> > > >
>> > > > By the way, I'm actually using the USB variant of the Bamboo Pad.
>> > > >
>> > >
>> > > Yep, I know. That's why I asked you to test :)
>> > >
>> > > So could you run "sudo hid-recorder /dev/hidraw*" while making some
>> > > inputs on the touchpad?
>> > >
>> > > I'd like to check if your touchpad is actually switched to the debug
>> > > mode.
>> > >
>> > > Cheers,
>> > > Benjamin
>> > >
>> > > > Looking at the log file from Xorg, though, I can see how it's properly
>> > > > detecting the "Wacom USB Bamboo PAD Pen stylus" device and adding
>> "Wacom
>> > > > USB Bamboo PAD Pen touch" as an extended input device. Here's the full
>> > > log:
>> > > > http://pastebin.com/k3SqtQN5
>> > > >
>> > > > I should mention I have no Xorg configuration done whatsoever besides
>> the
>> > > > monitor resolution setup (which is not really relevant
>> > > >
>> > > >
>> > > >
>> > > > 2015-02-17 20:27 GMT+01:00 Benjamin Tissoires <
>> > > [email protected]
>> > > > >:
>> > > >
>> > > > > The stylus of this device works just fine out of the box.
>> > > > > The touch is seen by default as a mouse with relative events and
>> some
>> > > > > gestures.
>> > > > > Switching the default in raw mode allows us to retrieve the touch
>> data
>> > > > > and have a consistent user experience accross all the multitouch
>> > > touchpads.
>> > > > >
>> > > > > Note that the buttons of this devices are reported through the touch
>> > > > > interface. There is no 'Pad' interface. It seemed more natural to
>> have
>> > > > > the BTN_LEFT and BTN_RIGHT reported with the touch because they are
>> > > > > placed under the touch interface and it looks like they belong to
>> the
>> > > > > touch part.
>> > > > >
>> > > > > Signed-off-by: Benjamin Tissoires <[email protected]>
>> > > > > ---
>> > > > >
>> > > > > Hi,
>> > > > >
>> > > > > several things before we can merge this:
>> > > > >
>> > > > > Josep, Frederic:
>> > > > > Would you mind testing this patch with your Bamboo pads? I bought
>> the
>> > > > > wireless
>> > > > > variant and the USB one has a different ProductID. Hopefully, it
>> will
>> > > go
>> > > > > smoothly with the current patch.
>> > > > >
>> > > > > Peter, Ping, Jason:
>> > > > > Given the nature of the device, I did not exported the 2 buttons as
>> a
>> > > > > separate
>> > > > > pad device.
>> > > > > Do you back me up with this choice?
>> > > > >
>> > > > > Jiri:
>> > > > > As mentioned to Josep and Frederic, this has not been tested against
>> > > the
>> > > > > USB
>> > > > > (wired) version of the device. So please wait at least for one
>> > > tested-by
>> > > > > before
>> > > > > considering including this patch.
>> > > > >
>> > > > > Thanks everyone!
>> > > > > Benjamin
>> > > > >
>> > > > > drivers/hid/wacom_sys.c | 23 ++++++++++++++++++
>> > > > > drivers/hid/wacom_wac.c | 62
>> > > > > +++++++++++++++++++++++++++++++++++++++++++++++++
>> > > > > drivers/hid/wacom_wac.h | 3 +++
>> > > > > 3 files changed, 88 insertions(+)
>> > > > >
>> > > > > diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
>> > > > > index e1ec192..ef4d147 100644
>> > > > > --- a/drivers/hid/wacom_sys.c
>> > > > > +++ b/drivers/hid/wacom_sys.c
>> > > > > @@ -410,6 +410,9 @@ static int wacom_query_tablet_data(struct
>> > > hid_device
>> > > > > *hdev,
>> > > > > else if (features->type == WACOM_27QHDT) {
>> > > > > return wacom_set_device_mode(hdev, 131, 3,
>> 2);
>> > > > > }
>> > > > > + else if (features->type == BAMBOO_PAD) {
>> > > > > + return wacom_set_device_mode(hdev, 2, 2, 3);
>> > > > > + }
>> > > > > } else if (features->device_type == BTN_TOOL_PEN) {
>> > > > > if (features->type <= BAMBOO_PT && features->type !=
>> > > > > WIRELESS) {
>> > > > > return wacom_set_device_mode(hdev, 2, 2, 2);
>> > > > > @@ -1417,6 +1420,20 @@ static int wacom_probe(struct hid_device
>> *hdev,
>> > > > > goto fail_allocate_inputs;
>> > > > > }
>> > > > >
>> > > > > + /*
>> > > > > + * Bamboo Pad has a generic hid handling for the Pen, and we
>> > > > > switch it
>> > > > > + * into debug mode for the touch part.
>> > > > > + * We ignore the other interfaces.
>> > > > > + */
>> > > > > + if (features->type == BAMBOO_PAD) {
>> > > > > + if (features->pktlen == WACOM_PKGLEN_PENABLED) {
>> > > > > + features->type = HID_GENERIC;
>> > > > > + } else if (features->pktlen !=
>> WACOM_PKGLEN_BP_TOUCH) {
>> > > > > + error = -ENODEV;
>> > > > > + goto fail_shared_data;
>> > > > > + }
>> > > > > + }
>> > > > > +
>> > > > > /* set the default size in case we do not get them from hid
>> */
>> > > > > wacom_set_default_phy(features);
>> > > > >
>> > > > > @@ -1451,6 +1468,12 @@ static int wacom_probe(struct hid_device
>> *hdev,
>> > > > > features->y_max = 4096;
>> > > > > }
>> > > > >
>> > > > > + /*
>> > > > > + * Same thing for Bamboo PAD
>> > > > > + */
>> > > > > + if (features->type == BAMBOO_PAD)
>> > > > > + features->device_type = BTN_TOOL_FINGER;
>> > > > > +
>> > > > > if (hdev->bus == BUS_BLUETOOTH)
>> > > > > features->quirks |= WACOM_QUIRK_BATTERY;
>> > > > >
>> > > > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
>> > > > > index 1a65079..8627581 100644
>> > > > > --- a/drivers/hid/wacom_wac.c
>> > > > > +++ b/drivers/hid/wacom_wac.c
>> > > > > @@ -1826,6 +1826,49 @@ static int wacom_bpt_irq(struct wacom_wac
>> > > *wacom,
>> > > > > size_t len)
>> > > > > return 0;
>> > > > > }
>> > > > >
>> > > > > +static int wacom_bamboo_pad_irq(struct wacom_wac *wacom, size_t
>> len)
>> > > > > +{
>> > > > > + struct input_dev *input = wacom->input;
>> > > > > + unsigned char *data = wacom->data;
>> > > > > + unsigned char *finger_data, prefix;
>> > > > > + unsigned id;
>> > > > > + int x, y;
>> > > > > + bool valid;
>> > > > > +
>> > > > > + /* bit 2 in data[1] is set when there is touch information
>> > > > > available */
>> > > > > + if ((len != WACOM_PKGLEN_BP_TOUCH) ||
>> > > > > + (data[0] != WACOM_REPORT_BP_TOUCH) ||
>> > > > > + !(data[1] & 0x02))
>> > > > > + return 0;
>> > > > > +
>> > > > > + prefix = data[9];
>> > > > > +
>> > > > > + for (id = 0; id < wacom->features.touch_max; id++) {
>> > > > > + valid = !!(prefix & BIT(id)) &&
>> > > > > + !wacom->shared->stylus_in_proximity;
>> > > > > +
>> > > > > + input_mt_slot(input, id);
>> > > > > + input_mt_report_slot_state(input, MT_TOOL_FINGER,
>> > > valid);
>> > > > > +
>> > > > > + if (!valid)
>> > > > > + continue;
>> > > > > +
>> > > > > + finger_data = data + 10 + id * 3;
>> > > > > + x = finger_data[0] | ((finger_data[1] & 0x0f) << 8);
>> > > > > + y = (finger_data[2] << 4) | (finger_data[1] >> 4);
>> > > > > +
>> > > > > + input_report_abs(input, ABS_MT_POSITION_X, x);
>> > > > > + input_report_abs(input, ABS_MT_POSITION_Y, y);
>> > > > > + }
>> > > > > +
>> > > > > + input_mt_sync_frame(input);
>> > > > > +
>> > > > > + input_report_key(input, BTN_LEFT, prefix & 0x40);
>> > > > > + input_report_key(input, BTN_RIGHT, prefix & 0x80);
>> > > > > +
>> > > > > + return 1;
>> > > > > +}
>> > > > > +
>> > > > > static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len)
>> > > > > {
>> > > > > unsigned char *data = wacom->data;
>> > > > > @@ -1962,6 +2005,10 @@ void wacom_wac_irq(struct wacom_wac
>> *wacom_wac,
>> > > > > size_t len)
>> > > > > sync = wacom_bpt_irq(wacom_wac, len);
>> > > > > break;
>> > > > >
>> > > > > + case BAMBOO_PAD:
>> > > > > + sync = wacom_bamboo_pad_irq(wacom_wac, len);
>> > > > > + break;
>> > > > > +
>> > > > > case WIRELESS:
>> > > > > sync = wacom_wireless_irq(wacom_wac, len);
>> > > > > break;
>> > > > > @@ -2300,6 +2347,13 @@ int
>> > > wacom_setup_pentouch_input_capabilities(struct
>> > > > > input_dev *input_dev,
>> > > > > 0, 0);
>> > > > > }
>> > > > > break;
>> > > > > + case BAMBOO_PAD:
>> > > > > + __clear_bit(ABS_MISC, input_dev->absbit);
>> > > > > + input_mt_init_slots(input_dev, features->touch_max,
>> > > > > + INPUT_MT_POINTER);
>> > > > > + __set_bit(BTN_LEFT, input_dev->keybit);
>> > > > > + __set_bit(BTN_RIGHT, input_dev->keybit);
>> > > > > + break;
>> > > > > }
>> > > > > return 0;
>> > > > > }
>> > > > > @@ -2953,6 +3007,12 @@ static const struct wacom_features
>> > > > > wacom_features_0x30C =
>> > > > > { "Wacom ISDv5 30C", .type = WACOM_24HDT, /* Touch */
>> > > > > .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30A, .touch_max =
>> 10,
>> > > > > .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE
>> };
>> > > > > +static const struct wacom_features wacom_features_0x318 =
>> > > > > + { "Wacom USB Bamboo PAD", 4095, 4095, /* Touch */
>> > > > > + .type = BAMBOO_PAD, 35, 48, .touch_max = 4 };
>> > > > > +static const struct wacom_features wacom_features_0x319 =
>> > > > > + { "Wacom Wireless Bamboo PAD", 4095, 4095, /* Touch */
>> > > > > + .type = BAMBOO_PAD, 35, 48, .touch_max = 4 };
>> > > > > static const struct wacom_features wacom_features_0x323 =
>> > > > > { "Wacom Intuos P M", 21600, 13500, 1023, 31,
>> > > > > INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
>> > > > > @@ -3101,6 +3161,8 @@ const struct hid_device_id wacom_ids[] = {
>> > > > > { USB_DEVICE_WACOM(0x314) },
>> > > > > { USB_DEVICE_WACOM(0x315) },
>> > > > > { USB_DEVICE_WACOM(0x317) },
>> > > > > + { USB_DEVICE_WACOM(0x318) },
>> > > > > + { USB_DEVICE_WACOM(0x319) },
>> > > > > { USB_DEVICE_WACOM(0x323) },
>> > > > > { USB_DEVICE_WACOM(0x32A) },
>> > > > > { USB_DEVICE_WACOM(0x32B) },
>> > > > > diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
>> > > > > index 021ee1c..bf43e0f 100644
>> > > > > --- a/drivers/hid/wacom_wac.h
>> > > > > +++ b/drivers/hid/wacom_wac.h
>> > > > > @@ -33,6 +33,7 @@
>> > > > > #define WACOM_PKGLEN_MTTPC 40
>> > > > > #define WACOM_PKGLEN_DTUS 68
>> > > > > #define WACOM_PKGLEN_PENABLED 8
>> > > > > +#define WACOM_PKGLEN_BP_TOUCH 32
>> > > > >
>> > > > > /* wacom data size per MT contact */
>> > > > > #define WACOM_BYTES_PER_MT_PACKET 11
>> > > > > @@ -67,6 +68,7 @@
>> > > > > #define WACOM_REPORT_24HDT 1
>> > > > > #define WACOM_REPORT_WL 128
>> > > > > #define WACOM_REPORT_USB 192
>> > > > > +#define WACOM_REPORT_BP_TOUCH 16
>> > > > >
>> > > > > /* device quirks */
>> > > > > #define WACOM_QUIRK_MULTI_INPUT 0x0001
>> > > > > @@ -122,6 +124,7 @@ enum {
>> > > > > BAMBOO_PT,
>> > > > > WACOM_24HDT,
>> > > > > WACOM_27QHDT,
>> > > > > + BAMBOO_PAD,
>> > > > > TABLETPC, /* add new TPC below */
>> > > > > TABLETPCE,
>> > > > > TABLETPC2FG,
>> > > > > --
>> > > > > 2.1.0
>> > > > >
>> > > > >
>> > >