Skip to contentSkip to conversation

Input: wacom - Support EMR and MFT sensors of Cintiq Companion Hybrid

PATCH Superseded Jason Gerecke 3 participants 9 messages Aug 23, 2013 – Sep 3, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 Input: wacom - Support EMR and MFT sensors of Cintiq Companion Hybrid

Adds support for the sensors integrated in to the Cintiq Companion Hybrid. These sensors use by-and-large the same protocol as the Cintiq 24HD touch.

NOTE: The ExpressKeys on the Cintiq Companion Hybrid are wired to both the EMR controller and CPU GPIO pins. It may be necessary to disable their functionality in this driver if building a custom Android kernel for this device (lest two events be sent to userspace for every button press).

---
 drivers/input/tablet/wacom_sys.c |  2 +-
 drivers/input/tablet/wacom_wac.c | 49 +++++++++++++++++++++++++++++++++++++++-
 drivers/input/tablet/wacom_wac.h |  1 +
 3 files changed, 50 insertions(+), 2 deletions(-)
drivers/input/tablet/wacom_sys.c +1 -1
index 1ad3e07..8fa7af7 100644
@@ -548,7 +548,7 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat
 			/* MT Tablet PC touch */
 			return wacom_set_device_mode(intf, 3, 4, 4);
 		}
-		else if (features->type == WACOM_24HDT) {
+		else if (features->type == WACOM_24HDT || features->type == ASTERIX) {
 			return wacom_set_device_mode(intf, 18, 3, 2);
 		}
 	} else if (features->device_type == BTN_TOOL_PEN) {
drivers/input/tablet/wacom_wac.c +48 -1

85 lines not on this page · raw message

drivers/input/tablet/wacom_wac.h +1 -0
index dfc9e08..f47a5c1 100644
@@ -80,6 +80,7 @@ enum {
 	WACOM_22HD,
 	DTK,
 	WACOM_24HD,
+	ASTERIX,
 	CINTIQ,
 	WACOM_BEE,
 	WACOM_13HD,
Signature · 1 line
1.8.3.4
#1 lore raw

PATCH 2/3 Input: wacom - Provide a range for the ABS_MISC axis

Android marks found axes as 'valid' only if they have a minimum and maximum value that aren't equal. Since we don't actually assign any range information for ABS_MISC, Android doesn't bother to mark it such. This prevents userspace from being able to make use of tool serial information.

---
 drivers/input/tablet/wacom_wac.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/input/tablet/wacom_wac.c +2 -0
index 8ccfe91..869e9c9 100644
@@ -1468,6 +1468,8 @@ static void wacom_abs_set_axis(struct input_dev *input_dev,
 {
 	struct wacom_features *features = &wacom_wac->features;
 
+	input_set_abs_params(input_dev, ABS_MISC, INT_MIN, INT_MAX, 0, 0);
+
 	if (features->device_type == BTN_TOOL_PEN) {
 		input_set_abs_params(input_dev, ABS_X, 0, features->x_max,
 				     features->x_fuzz, 0);
Signature · 1 line
1.8.3.4
maintainer
#2 lore raw

Re: [PATCH 2/3] Input: wacom - Provide a range for the ABS_MISC axis

Hi Jason,

Quoted 5 lines · Jason Gerecke

Android marks found axes as 'valid' only if they have a minimum and maximum value that aren't equal. Since we don't actually assign any range information for ABS_MISC, Android doesn't bother to mark it such. This prevents userspace from being able to make use of tool serial information.

That should be fixed in Android code. Min/max are filled on best effort basis and 0/0 is effectively unknown.

Thanks.

Signature · 1 line
Dmitry
#3 lore raw

Re: [PATCH 2/3] Input: wacom - Provide a range for the ABS_MISC axis

Quoted 10 lines · Dmitry Torokhov

Hi Jason,

Quoted 5 lines · Jason Gerecke

Android marks found axes as 'valid' only if they have a minimum and maximum value that aren't equal. Since we don't actually assign any range information for ABS_MISC, Android doesn't bother to mark it such. This prevents userspace from being able to make use of tool serial information.

Quoted 7 lines

That should be fixed in Android code. Min/max are filled on best effort basis and 0/0 is effectively unknown.

Thanks.

--
Dmitry

If userspace is written with the assumption that 0/0 == unknown, then this patch changes nothing since the consumer will expect any value between INT_MIN and INT_MAX anyway. Furthermore, if some userspace program strictly interprets 0/0 to mean "will always be equal to 0", then this patch actually provides it with the correct range. Either way, setting the values to INT_MIN and INT_MAX does nothing more than explicitly state the correct range.

I agree that Google should re-visit the function which does this "valid" filtering, but I don't see a problem with this patch.

Jason
---
Now instead of four in the eights place /
you’ve got three, ‘Cause you added one /
(That is to say, eight) to the two, /
But you can’t take seven from three, /
So you look at the sixty-fours....
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#4 lore raw

PATCH 3/3 Input: wacom - Send proper tablet state info when pen leaves proximity

In reply to Jason Gerecke

The EMR sensor of Intuos4 and newer devices can send a packet with 0x20 in its second byte which contains only location information. This packet is sent when the pen is too far away to reliably obtain other information. Because only the location is updated userspace will continue to see stale information for other values, most notably TOUCH, PRESSURE, and DISTANCE.

This patch ensures userspace is not left with stale device state information when the pen re-enters proximity (possibly leading to the assumption the pen is still in contact even though it is actually hovering).

---
 drivers/input/tablet/wacom_wac.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/input/tablet/wacom_wac.c +7 -0
index 869e9c9..f67a75a 100644
@@ -425,6 +425,13 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
 			(features->type == WACOM_21UX2))
 		return 1;
 
+	/* Range Report */
+	if ((data[1] & 0xfe) == 0x20) {
+		input_report_key(input, BTN_TOUCH, 0);
+		input_report_abs(input, ABS_PRESSURE, 0);
+		input_report_abs(input, ABS_DISTANCE, wacom->features.distance_max);
+	}
+
 	/* Exit report */
 	if ((data[1] & 0xfe) == 0x80) {
 		if (features->quirks == WACOM_QUIRK_MULTI_INPUT)
Signature · 1 line
1.8.3.4
maintainer
#5 lore raw
In reply to Jason Gerecke

Hi Jason,

Quoted 45 lines · Jason Gerecke

Adds support for the sensors integrated in to the Cintiq Companion Hybrid. These sensors use by-and-large the same protocol as the Cintiq 24HD touch.

NOTE: The ExpressKeys on the Cintiq Companion Hybrid are wired to both the EMR controller and CPU GPIO pins. It may be necessary to disable their functionality in this driver if building a custom Android kernel for this device (lest two events be sent to userspace for every button press).

---
 drivers/input/tablet/wacom_sys.c |  2 +-
 drivers/input/tablet/wacom_wac.c | 49 +++++++++++++++++++++++++++++++++++++++-
 drivers/input/tablet/wacom_wac.h |  1 +
 3 files changed, 50 insertions(+), 2 deletions(-)
drivers/input/tablet/wacom_sys.c +1 -1
index 1ad3e07..8fa7af7 100644
@@ -548,7 +548,7 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat
 			/* MT Tablet PC touch */
 			return wacom_set_device_mode(intf, 3, 4, 4);
 		}
-		else if (features->type == WACOM_24HDT) {
+		else if (features->type == WACOM_24HDT || features->type == ASTERIX) {
 			return wacom_set_device_mode(intf, 18, 3, 2);
 		}
 	} else if (features->device_type == BTN_TOOL_PEN) {
drivers/input/tablet/wacom_wac.c +1 -1
index 541197b..8ccfe91 100644
@@ -475,7 +475,7 @@ static void wacom_intuos_general(struct wacom_wac *wacom)
 	/* general pen packet */
 	if ((data[1] & 0xb8) == 0xa0) {
 		t = (data[6] << 2) | ((data[7] >> 6) & 3);
-		if (features->type >= INTUOS4S && features->type <= WACOM_24HD) {
+		if (features->type >= INTUOS4S && features->type <= ASTERIX) {
 			t = (t << 1) | (data[1] & 1);
 		}
 		input_report_abs(input, ABS_PRESSURE, t);
@@ -619,6 +619,25 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
 			} else {

drivers/input/tablet/wacom_wac.c static int wacom_intuos_irq(struct wacom_wac *wacom) · line 629

Quoted 10 lines
drivers/input/tablet/wacom_wac.c +8 -0
 				input_report_abs(input, ABS_MISC, 0);
 			}
+		} else if (features->type == ASTERIX) {
+			/*
+			 * Do not send hardware buttons under Android. They
+			 * are already sent to the system through GPIO (and
+			 * have different meaning).
+			 */
+
+#if 1

Should this be removed.

drivers/input/tablet/wacom_wac.c static int wacom_intuos_irq(struct wacom_wac *wacom) · line 639

Quoted 10 lines
drivers/input/tablet/wacom_wac.c +10 -0
+			input_report_key(input, BTN_1, (data[4] & 0x01));
+			input_report_key(input, BTN_2, (data[4] & 0x02));
+			input_report_key(input, BTN_3, (data[4] & 0x04));
+			input_report_key(input, BTN_4, (data[4] & 0x08));
+
+			input_report_key(input, BTN_5, (data[4] & 0x10));  // Right
+			input_report_key(input, BTN_6, (data[4] & 0x20));  // Up
+			input_report_key(input, BTN_7, (data[4] & 0x40));  // Left
+			input_report_key(input, BTN_8, (data[4] & 0x80));  // Down
+			input_report_key(input, BTN_0, (data[3] & 0x01));  // Center

C-style comments are still preferred in the kernel.

Quoted 65 lines
drivers/input/tablet/wacom_wac.c +29 -0
+#endif
 		} else if (features->type >= INTUOS5S && features->type <= INTUOS5L) {
 			int i;
 
@@ -1325,6 +1344,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)
 	case WACOM_22HD:
 	case WACOM_24HD:
 	case DTK:
+	case ASTERIX:
 		sync = wacom_intuos_irq(wacom_wac);
 		break;
 
@@ -1763,6 +1783,24 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
 					      0, 0);
 		}
 		break;
+
+	case ASTERIX:
+		__set_bit(BTN_1, input_dev->keybit);
+		__set_bit(BTN_2, input_dev->keybit);
+		__set_bit(BTN_3, input_dev->keybit);
+		__set_bit(BTN_4, input_dev->keybit);
+
+		__set_bit(BTN_5, input_dev->keybit);
+		__set_bit(BTN_6, input_dev->keybit);
+		__set_bit(BTN_7, input_dev->keybit);
+		__set_bit(BTN_8, input_dev->keybit);
+		__set_bit(BTN_0, input_dev->keybit);
+
+		input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
+		__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);
+
+		wacom_setup_cintiq(wacom_wac);
+		break;
 	}
 	return 0;
 }
@@ -2117,6 +2155,13 @@ static const struct wacom_features wacom_features_0xDF =
 static const struct wacom_features wacom_features_0x6004 =
 	{ "ISD-V4",               WACOM_PKGLEN_GRAPHIRE,  12800,  8000,  255,
 	  0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+static const struct wacom_features wacom_features_0x0307 =
+	{ "Wacom ISDv5 307", WACOM_PKGLEN_INTUOS,  59552,  33848, 2047,
+	  63, ASTERIX, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
+	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x309 };
+static const struct wacom_features wacom_features_0x0309 =
+	{ "Wacom ISDv5 309", .type = WACOM_24HDT, /* Touch */
+	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x0307, .touch_max = 10 };
 
 #define USB_DEVICE_WACOM(prod)					\
 	USB_DEVICE(USB_VENDOR_ID_WACOM, prod),			\
@@ -2247,6 +2292,8 @@ const struct usb_device_id wacom_ids[] = {
 	{ USB_DEVICE_WACOM(0xF8) },
 	{ USB_DEVICE_DETAILED(0xF6, USB_CLASS_HID, 0, 0) },
 	{ USB_DEVICE_WACOM(0xFA) },
+	{ USB_DEVICE_WACOM(0x0307) },
+	{ USB_DEVICE_DETAILED(0x0309, USB_CLASS_HID, 0, 0) },
 	{ USB_DEVICE_LENOVO(0x6004) },
 	{ }
 };
drivers/input/tablet/wacom_wac.h +0 -0
index dfc9e08..f47a5c1 100644

drivers/input/tablet/wacom_wac.h enum { · line 86

Quoted 7 lines
drivers/input/tablet/wacom_wac.h +1 -0
@@ -80,6 +80,7 @@ enum {
 	WACOM_22HD,
 	DTK,
 	WACOM_24HD,
+	ASTERIX,
 	CINTIQ,
 	WACOM_BEE,
 	WACOM_13HD,

Thanks.

Signature · 1 line
Dmitry
#6 lore raw

PATCH v2 1/3 Input: wacom - Support EMR and MFT sensors of Cintiq Companion Hybrid

In reply to Jason Gerecke

Adds support for the sensors integrated in to the Cintiq Companion Hybrid. These sensors use by-and-large the same protocol as the Cintiq 24HD touch.

NOTE: The ExpressKeys on the Cintiq Companion Hybrid are wired to both the EMR controller and CPU GPIO pins. It may be necessary to disable their functionality in this driver if building a custom Android kernel for this device (lest two events be sent to userspace for every button press).

---
Changes in v2:
* Remove "#if 1" block surrounding conditional ExpressKey reporting
* Change to C-style comments

 drivers/input/tablet/wacom_sys.c |  2 +-
 drivers/input/tablet/wacom_wac.c | 46 +++++++++++++++++++++++++++++++++++++++-
 drivers/input/tablet/wacom_wac.h |  1 +
 3 files changed, 47 insertions(+), 2 deletions(-)
drivers/input/tablet/wacom_sys.c +1 -1
index 1ad3e07..8fa7af7 100644
@@ -548,7 +548,7 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat
 			/* MT Tablet PC touch */
 			return wacom_set_device_mode(intf, 3, 4, 4);
 		}
-		else if (features->type == WACOM_24HDT) {
+		else if (features->type == WACOM_24HDT || features->type == ASTERIX) {
 			return wacom_set_device_mode(intf, 18, 3, 2);
 		}
 	} else if (features->device_type == BTN_TOOL_PEN) {
drivers/input/tablet/wacom_wac.c +45 -1

82 lines not on this page · raw message

drivers/input/tablet/wacom_wac.h +1 -0
index dfc9e08..f47a5c1 100644
@@ -80,6 +80,7 @@ enum {
 	WACOM_22HD,
 	DTK,
 	WACOM_24HD,
+	ASTERIX,
 	CINTIQ,
 	WACOM_BEE,
 	WACOM_13HD,
Signature · 1 line
1.8.3.4
#7 lore raw
Quoted 15 lines · Jason Gerecke

Adds support for the sensors integrated in to the Cintiq Companion Hybrid. These sensors use by-and-large the same protocol as the Cintiq 24HD touch.

NOTE: The ExpressKeys on the Cintiq Companion Hybrid are wired to both the EMR controller and CPU GPIO pins. It may be necessary to disable their functionality in this driver if building a custom Android kernel for this device (lest two events be sent to userspace for every button press).

---
Changes in v2:
* Remove "#if 1" block surrounding conditional ExpressKey reporting
* Change to C-style comments

[...]

Quoted 14 lines
drivers/input/tablet/wacom_wac.h +1 -0
index dfc9e08..f47a5c1 100644
@@ -80,6 +80,7 @@ enum {
 	WACOM_22HD,
 	DTK,
 	WACOM_24HD,
+	ASTERIX,
 	CINTIQ,
 	WACOM_BEE,
 	WACOM_13HD,
Signature · 1 line
1.8.3.4

I assume ASTERIX is some internal codename - can we use the commonly used name instead?

Cheers,
Peter

#8 lore raw

PATCH v3 1/3 Input: wacom - Support EMR and MFT sensors of Cintiq Companion Hybrid

In reply to Jason Gerecke

Adds support for the sensors integrated in to the Cintiq Companion Hybrid. These sensors use by-and-large the same protocol as the Cintiq 24HD touch.

NOTE: The ExpressKeys on the Cintiq Companion Hybrid are wired to both the EMR controller and CPU GPIO pins. It may be necessary to disable their functionality in this driver if building a custom Android kernel for this device (lest two events be sent to userspace for every button press).

---
Changes in v3:
* Change type name from 'ASTERIX' to 'CINTIQ_HYBRID'

Changes in v2:
* Remove "#if 1" block surrounding conditional ExpressKey reporting
* Change to C-style comments

 drivers/input/tablet/wacom_sys.c |  2 +-
 drivers/input/tablet/wacom_wac.c | 46 +++++++++++++++++++++++++++++++++++++++-
 drivers/input/tablet/wacom_wac.h |  1 +
 3 files changed, 47 insertions(+), 2 deletions(-)
drivers/input/tablet/wacom_sys.c +1 -1
index 1ad3e07..0750d2a 100644
@@ -548,7 +548,7 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat
 			/* MT Tablet PC touch */
 			return wacom_set_device_mode(intf, 3, 4, 4);
 		}
-		else if (features->type == WACOM_24HDT) {
+		else if (features->type == WACOM_24HDT || features->type == CINTIQ_HYBRID) {
 			return wacom_set_device_mode(intf, 18, 3, 2);
 		}
 	} else if (features->device_type == BTN_TOOL_PEN) {
drivers/input/tablet/wacom_wac.c +45 -1

82 lines not on this page · raw message

drivers/input/tablet/wacom_wac.h +1 -0
index dfc9e08..90ce10d 100644
@@ -80,6 +80,7 @@ enum {
 	WACOM_22HD,
 	DTK,
 	WACOM_24HD,
+	CINTIQ_HYBRID,
 	CINTIQ,
 	WACOM_BEE,
 	WACOM_13HD,
Signature · 1 line
1.8.3.4