Skip to contentSkip to conversation

input - wacom_w8001: Add one finger touch support

PATCH In review Ping Cheng 2 participants 11 messages Dec 17, 2010 – Jan 3, 2011

Subsystems (2)
lore
Share & tools
lore

Ping Cheng

author
#0 lore raw

PATCH v2 3/3 input - wacom_w8001: Add one finger touch support

---
 drivers/input/touchscreen/wacom_w8001.c |   89 ++++++++++++++++++++++++++++---
 1 files changed, 82 insertions(+), 7 deletions(-)
drivers/input/touchscreen/wacom_w8001.c +82 -7
index 59664a8..763eb8f 100644
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2008 Jaya Kumar
  * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010 Ping Cheng, Wacom. <[email protected]>
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of this archive for
@@ -86,6 +87,12 @@ struct w8001 {
 	char phys[32];
 	int type;
 	unsigned int pktlen;
+	bool pen_in_prox;
+	bool has_touch;
+	int max_touch_x;
+	int max_touch_y;
+	int max_pen_x;
+	int max_pen_y;
 };
 
 static void parse_data(u8 *data, struct w8001_coord *coord)
@@ -112,6 +119,29 @@ static void parse_data(u8 *data, struct w8001_coord *coord)
 	coord->tilt_y = data[8] & 0x7F;
 }
 
+static void parse_single_touch(struct w8001 *w8001)
+{
+	struct input_dev *dev = w8001->dev;
+	unsigned char *data = w8001->data;
+
+	int x = (data[1] << 7) | data[2];
+	int y = (data[3] << 7) | data[4];
+	w8001->has_touch = data[0] & 0x1;
+
+	/* scale to pen maximum */
+	if (w8001->max_pen_x && w8001->max_pen_y && w8001->max_touch_x) {
+		x = x * w8001->max_pen_x / w8001->max_touch_x;
+		y = y * w8001->max_pen_y / w8001->max_touch_y;
+	}
+
+	input_report_abs(dev, ABS_X, x);
+	input_report_abs(dev, ABS_Y, y);
+	input_report_key(dev, BTN_TOUCH, w8001->has_touch);
+	input_report_key(dev, BTN_TOOL_FINGER, w8001->has_touch);
+
+	input_sync(dev);
+}
+
 static void parse_touch(struct w8001 *w8001)
 {
 	struct input_dev *dev = w8001->dev;
@@ -151,6 +181,15 @@ static void parse_touchquery(u8 *data, struct w8001_touch_query *query)
 	query->y = data[5] << 9;
 	query->y |= data[6] << 2;
 	query->y |= (data[2] >> 3) & 0x3;
+
+	/* Early days' one finger touch models need the following defaults */
+	if (!query->x && !query->y) {
+		query->x = 1024;
+		query->y = 1024;
+		if (query->panel_res)
+			query->x = query->y = (1 << query->panel_res);
+		query->panel_res = 10;
+	}
 }
 
 static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
@@ -199,6 +238,7 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
 				   unsigned char data, unsigned int flags)
 {
 	struct w8001 *w8001 = serio_get_drvdata(serio);
+	struct input_dev *dev = w8001->dev;
 	struct w8001_coord coord;
 	unsigned char tmp;
 
@@ -213,9 +253,15 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
 
 	case W8001_PKTLEN_TOUCH93 - 1:
 	case W8001_PKTLEN_TOUCH9A - 1:
-		/* ignore one-finger touch packet. */
-		if (w8001->pktlen == w8001->idx)
+		tmp = (w8001->data[0] & W8001_TOUCH_BYTE);
+		if (tmp != W8001_TOUCH_BYTE)
+			break;
+
+		if (w8001->pktlen == w8001->idx) {
 			w8001->idx = 0;
+			if (!w8001->pen_in_prox)
+				parse_single_touch(w8001);
+		}
 		break;
 
 	/* Pen coordinates packet */
@@ -228,9 +274,18 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
 		if (tmp == W8001_TOUCH_BYTE)
 			break;
 
+		if (w8001->has_touch) {
+			/* send touch data out first */
+			w8001->has_touch = 0;
+			input_report_key(dev, BTN_TOUCH, 0);
+			input_report_key(dev, BTN_TOOL_FINGER, 0);
+			input_sync(dev);
+		}
+
 		w8001->idx = 0;
 		parse_data(w8001->data, &coord);
 		report_pen_events(w8001, &coord);
+		w8001->pen_in_prox = coord.rdy ? true : false;
 		break;
 
 	/* control packet */
@@ -274,6 +329,24 @@ static int w8001_command(struct w8001 *w8001, unsigned char command,
 	return rc;
 }
 
+static void w8001_setup_single_touch(struct w8001 *w8001)
+{
+	struct input_dev *dev = w8001->dev;
+	int px = w8001->max_touch_x, py = w8001->max_touch_y;
+
+	__set_bit(BTN_TOUCH, dev->keybit);
+	__set_bit(BTN_TOOL_FINGER, dev->keybit);
+
+	/* scale to pen maximum */
+	if (w8001->max_pen_x && w8001->max_pen_y) {
+		px = w8001->max_pen_x;
+		py = w8001->max_pen_y;
+	}
+
+	input_set_abs_params(dev, ABS_X, 0, px, 0, 0);
+	input_set_abs_params(dev, ABS_Y, 0, py, 0, 0);
+}
+
 static int w8001_setup(struct w8001 *w8001)
 {
 	struct input_dev *dev = w8001->dev;
@@ -289,6 +362,7 @@ static int w8001_setup(struct w8001 *w8001)
 	/* penabled? */
 	error = w8001_command(w8001, W8001_CMD_QUERY, true);
 	if (!error) {
+		__set_bit(BTN_TOUCH, dev->keybit);
 		__set_bit(BTN_TOOL_PEN, dev->keybit);
 		__set_bit(BTN_TOOL_RUBBER, dev->keybit);
 		__set_bit(BTN_STYLUS, dev->keybit);
@@ -302,6 +376,8 @@ static int w8001_setup(struct w8001 *w8001)
 			input_set_abs_params(dev, ABS_TILT_X, 0, coord.tilt_x, 0, 0);
 			input_set_abs_params(dev, ABS_TILT_Y, 0, coord.tilt_y, 0, 0);
 		}
+		w8001->max_pen_x = coord.x;
+		w8001->max_pen_y = coord.y;
 	}
 
 	/* touch enabled? */
@@ -314,20 +390,20 @@ static int w8001_setup(struct w8001 *w8001)
 		struct w8001_touch_query touch;
 
 		parse_touchquery(w8001->response, &touch);
-
-		input_set_abs_params(dev, ABS_X, 0, touch.x, 0, 0);
-		input_set_abs_params(dev, ABS_Y, 0, touch.y, 0, 0);
-		__set_bit(BTN_TOOL_FINGER, dev->keybit);
+		w8001->max_touch_x = touch.x;
+		w8001->max_touch_y = touch.y;
 
 		switch (touch.sensor_id) {
 		case 0:
 		case 2:
 			w8001->pktlen = W8001_PKTLEN_TOUCH93;
+			w8001_setup_single_touch(w8001);
 			break;
 		case 1:
 		case 3:
 		case 4:
 			w8001->pktlen = W8001_PKTLEN_TOUCH9A;
+			w8001_setup_single_touch(w8001);
 			break;
 		case 5:
 			w8001->pktlen = W8001_PKTLEN_TOUCH2FG;
@@ -396,7 +472,6 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
 	input_dev->dev.parent = &serio->dev;
 
 	input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-	__set_bit(BTN_TOUCH, input_dev->keybit);
 
 	serio_set_drvdata(serio, w8001);
 	err = serio_open(serio, drv);
Signature · 1 line
1.7.3.3
maintainer
#1 lore raw

Hi Ping,

Quoted 18 lines · Ping Cheng
---
 drivers/input/touchscreen/wacom_w8001.c |   89 ++++++++++++++++++++++++++++---
 1 files changed, 82 insertions(+), 7 deletions(-)
drivers/input/touchscreen/wacom_w8001.c +1 -0
index 59664a8..763eb8f 100644
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2008 Jaya Kumar
  * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010 Ping Cheng, Wacom. <[email protected]>
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of this archive for

drivers/input/touchscreen/wacom_w8001.c struct w8001 { · line 91

Quoted 5 lines
drivers/input/touchscreen/wacom_w8001.c +2 -0
@@ -86,6 +87,12 @@ struct w8001 {
 	char phys[32];
 	int type;
 	unsigned int pktlen;
+	bool pen_in_prox;
+	bool has_touch;

We already have type, why do we need these 2 fields a well?

Actually, I tried massaging the patch a bit, could you please tell me if the patch below still works for you?

Thanks.

Signature · 13 lines
Dmitry


Input: wacom_w8001 - add one finger touch support

From: Ping Cheng <[email protected]>

Signed-off-by: Ping Cheng <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
---

 drivers/input/touchscreen/wacom_w8001.c |  123 +++++++++++++++++++++++++------
 1 files changed, 101 insertions(+), 22 deletions(-)
drivers/input/touchscreen/wacom_w8001.c +101 -22
index 4774c09..ce8c8e1 100644
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2008 Jaya Kumar
  * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010 Ping Cheng, Wacom. <[email protected]>
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of this archive for
@@ -63,11 +64,11 @@ struct w8001_coord {
 
 /* touch query reply packet */
 struct w8001_touch_query {
+	u16 x;
+	u16 y;
 	u8 panel_res;
 	u8 capacity_res;
 	u8 sensor_id;
-	u16 x;
-	u16 y;
 };
 
 /*
@@ -86,9 +87,13 @@ struct w8001 {
 	char phys[32];
 	int type;
 	unsigned int pktlen;
+	u16 max_touch_x;
+	u16 max_touch_y;
+	u16 max_pen_x;
+	u16 max_pen_y;
 };
 
-static void parse_data(u8 *data, struct w8001_coord *coord)
+static void parse_pen_data(u8 *data, struct w8001_coord *coord)
 {
 	memset(coord, 0, sizeof(*coord));
 
@@ -112,7 +117,14 @@ static void parse_data(u8 *data, struct w8001_coord *coord)
 	coord->tilt_y = data[8] & 0x7F;
 }
 
-static void parse_touch(struct w8001 *w8001)
+static void parse_single_touch(u8 *data, struct w8001_coord *coord)
+{
+	coord->x = (data[1] << 7) | data[2];
+	coord->y = (data[3] << 7) | data[4];
+	coord->tsw = data[0] & 0x01;
+}
+
+static void parse_multi_touch(struct w8001 *w8001)
 {
 	struct input_dev *dev = w8001->dev;
 	unsigned char *data = w8001->data;
@@ -124,8 +136,8 @@ static void parse_touch(struct w8001 *w8001)
 		input_mt_slot(dev, i);
 		input_mt_report_slot_state(dev, MT_TOOL_FINGER, touch);
 		if (touch) {
-			int x = (data[6 * i + 1] << 7) | (data[6 * i + 2]);
-			int y = (data[6 * i + 3] << 7) | (data[6 * i + 4]);
+			int x = (data[6 * i + 1] << 7) | data[6 * i + 2];
+			int y = (data[6 * i + 3] << 7) | data[6 * i + 4];
 			/* data[5,6] and [11,12] is finger capacity */
 
 			input_report_abs(dev, ABS_MT_POSITION_X, x);
@@ -151,6 +163,15 @@ static void parse_touchquery(u8 *data, struct w8001_touch_query *query)
 	query->y = data[5] << 9;
 	query->y |= data[6] << 2;
 	query->y |= (data[2] >> 3) & 0x3;
+
+	/* Early days' single-finger touch models need the following defaults */
+	if (!query->x && !query->y) {
+		query->x = 1024;
+		query->y = 1024;
+		if (query->panel_res)
+			query->x = query->y = (1 << query->panel_res);
+		query->panel_res = 10;
+	}
 }
 
 static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
@@ -160,16 +181,15 @@ static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
 	/*
 	 * We have 1 bit for proximity (rdy) and 3 bits for tip, side,
 	 * side2/eraser. If rdy && f2 are set, this can be either pen + side2,
-	 * or eraser. assume
+	 * or eraser. Assume:
 	 * - if dev is already in proximity and f2 is toggled → pen + side2
 	 * - if dev comes into proximity with f2 set → eraser
 	 * If f2 disappears after assuming eraser, fake proximity out for
 	 * eraser and in for pen.
 	 */
 
-	if (!w8001->type) {
-		w8001->type = coord->f2 ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
-	} else if (w8001->type == BTN_TOOL_RUBBER) {
+	switch (w8001->type) {
+	case BTN_TOOL_RUBBER:
 		if (!coord->f2) {
 			input_report_abs(dev, ABS_PRESSURE, 0);
 			input_report_key(dev, BTN_TOUCH, 0);
@@ -179,8 +199,21 @@ static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
 			input_sync(dev);
 			w8001->type = BTN_TOOL_PEN;
 		}
-	} else {
+		break;
+
+	case BTN_TOOL_FINGER:
+		input_report_key(dev, BTN_TOUCH, 0);
+		input_report_key(dev, BTN_TOOL_FINGER, 0);
+		input_sync(dev);
+		/* fall through */
+
+	case KEY_RESERVED:
+		w8001->type = coord->f2 ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
+		break;
+
+	default:
 		input_report_key(dev, BTN_STYLUS2, coord->f2);
+		break;
 	}
 
 	input_report_abs(dev, ABS_X, coord->x);
@@ -192,7 +225,30 @@ static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
 	input_sync(dev);
 
 	if (!coord->rdy)
-		w8001->type = 0;
+		w8001->type = KEY_RESERVED;
+}
+
+static void report_single_touch(struct w8001 *w8001, struct w8001_coord *coord)
+{
+	struct input_dev *dev = w8001->dev;
+	unsigned int x = coord->x;
+	unsigned int y = coord->y;
+
+	/* scale to pen maximum */
+	if (w8001->max_pen_x && w8001->max_touch_x)
+		x = x * w8001->max_pen_x / w8001->max_touch_x;
+
+	if (w8001->max_pen_y && w8001->max_touch_y)
+		y = y * w8001->max_pen_y / w8001->max_touch_y;
+
+	input_report_abs(dev, ABS_X, x);
+	input_report_abs(dev, ABS_Y, y);
+	input_report_key(dev, BTN_TOUCH, coord->tsw);
+	input_report_key(dev, BTN_TOOL_FINGER, coord->tsw);
+
+	input_sync(dev);
+
+	w8001->type = coord->tsw ? BTN_TOOL_FINGER : KEY_RESERVED;
 }
 
 static irqreturn_t w8001_interrupt(struct serio *serio,
@@ -213,9 +269,18 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
 
 	case W8001_PKTLEN_TOUCH93 - 1:
 	case W8001_PKTLEN_TOUCH9A - 1:
-		/* ignore one-finger touch packet. */
-		if (w8001->pktlen == w8001->idx)
+		tmp = w8001->data[0] & W8001_TOUCH_BYTE;
+		if (tmp != W8001_TOUCH_BYTE)
+			break;
+
+		if (w8001->pktlen == w8001->idx) {
 			w8001->idx = 0;
+			if (w8001->type != BTN_TOOL_PEN &&
+			    w8001->type != BTN_TOOL_RUBBER) {
+				parse_single_touch(w8001->data, &coord);
+				report_single_touch(w8001, &coord);
+			}
+		}
 		break;
 
 	/* Pen coordinates packet */
@@ -224,18 +289,18 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
 		if (unlikely(tmp == W8001_TAB_BYTE))
 			break;
 
-		tmp = (w8001->data[0] & W8001_TOUCH_BYTE);
+		tmp = w8001->data[0] & W8001_TOUCH_BYTE;
 		if (tmp == W8001_TOUCH_BYTE)
 			break;
 
 		w8001->idx = 0;
-		parse_data(w8001->data, &coord);
+		parse_pen_data(w8001->data, &coord);
 		report_pen_events(w8001, &coord);
 		break;
 
 	/* control packet */
 	case W8001_PKTLEN_TPCCTL - 1:
-		tmp = (w8001->data[0] & W8001_TOUCH_MASK);
+		tmp = w8001->data[0] & W8001_TOUCH_MASK;
 		if (tmp == W8001_TOUCH_BYTE)
 			break;
 
@@ -248,7 +313,7 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
 	/* 2 finger touch packet */
 	case W8001_PKTLEN_TOUCH2FG - 1:
 		w8001->idx = 0;
-		parse_touch(w8001);
+		parse_multi_touch(w8001);
 		break;
 	}
 
@@ -278,6 +343,7 @@ static int w8001_setup(struct w8001 *w8001)
 {
 	struct input_dev *dev = w8001->dev;
 	struct w8001_coord coord;
+	struct w8001_touch_query touch;
 	int error;
 
 	error = w8001_command(w8001, W8001_CMD_STOP, false);
@@ -289,11 +355,15 @@ static int w8001_setup(struct w8001 *w8001)
 	/* penabled? */
 	error = w8001_command(w8001, W8001_CMD_QUERY, true);
 	if (!error) {
+		__set_bit(BTN_TOUCH, dev->keybit);
 		__set_bit(BTN_TOOL_PEN, dev->keybit);
 		__set_bit(BTN_TOOL_RUBBER, dev->keybit);
 		__set_bit(BTN_STYLUS, dev->keybit);
 		__set_bit(BTN_STYLUS2, dev->keybit);
-		parse_data(w8001->response, &coord);
+
+		parse_pen_data(w8001->response, &coord);
+		w8001->max_pen_x = coord.x;
+		w8001->max_pen_y = coord.y;
 
 		input_set_abs_params(dev, ABS_X, 0, coord.x, 0, 0);
 		input_set_abs_params(dev, ABS_Y, 0, coord.y, 0, 0);
@@ -312,24 +382,34 @@ static int w8001_setup(struct w8001 *w8001)
 	 * second byte is empty, which indicates touch is not supported.
 	 */
 	if (!error && w8001->response[1]) {
-		struct w8001_touch_query touch;
+		__set_bit(BTN_TOUCH, dev->keybit);
+		__set_bit(BTN_TOOL_FINGER, dev->keybit);
 
 		parse_touchquery(w8001->response, &touch);
+		w8001->max_touch_x = touch.x;
+		w8001->max_touch_y = touch.y;
+
+		/* scale to pen maximum */
+		if (w8001->max_pen_x && w8001->max_pen_y) {
+			touch.x = w8001->max_pen_x;
+			touch.y = w8001->max_pen_y;
+		}
 
 		input_set_abs_params(dev, ABS_X, 0, touch.x, 0, 0);
 		input_set_abs_params(dev, ABS_Y, 0, touch.y, 0, 0);
-		__set_bit(BTN_TOOL_FINGER, dev->keybit);
 
 		switch (touch.sensor_id) {
 		case 0:
 		case 2:
 			w8001->pktlen = W8001_PKTLEN_TOUCH93;
 			break;
+
 		case 1:
 		case 3:
 		case 4:
 			w8001->pktlen = W8001_PKTLEN_TOUCH9A;
 			break;
+
 		case 5:
 			w8001->pktlen = W8001_PKTLEN_TOUCH2FG;
 
@@ -397,7 +477,6 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
 	input_dev->dev.parent = &serio->dev;
 
 	input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-	__set_bit(BTN_TOUCH, input_dev->keybit);
 
 	serio_set_drvdata(serio, w8001);
 	err = serio_open(serio, drv);

--
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

maintainer
#2 lore raw
Quoted 29 lines · Dmitry Torokhov

Hi Ping,

Quoted 18 lines · Ping Cheng
---
 drivers/input/touchscreen/wacom_w8001.c |   89 ++++++++++++++++++++++++++++---
 1 files changed, 82 insertions(+), 7 deletions(-)
drivers/input/touchscreen/wacom_w8001.c +1 -0
index 59664a8..763eb8f 100644
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2008 Jaya Kumar
  * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010 Ping Cheng, Wacom. <[email protected]>
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of this archive for

drivers/input/touchscreen/wacom_w8001.c struct w8001 { · line 91

Quoted 5 lines
drivers/input/touchscreen/wacom_w8001.c +2 -0
@@ -86,6 +87,12 @@ struct w8001 {
 	char phys[32];
 	int type;
 	unsigned int pktlen;
+	bool pen_in_prox;
+	bool has_touch;

We already have type, why do we need these 2 fields a well?

Quoted 5 lines

Actually, I tried massaging the patch a bit, could you please tell me if the patch below still works for you?

Thanks.

And while we are at it could you please try this patch as well...

Thank you!

Signature · 12 lines
Dmitry

Input: wacom_w8001 - add single-touch pointer emulation

Let's emit single-touch compatible events for the 2-finger panels so that
they can be used with legacy clients.

Signed-off-by: Dmitry Torokhov <[email protected]>
---

 drivers/input/touchscreen/wacom_w8001.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/input/touchscreen/wacom_w8001.c +4 -0
index ce8c8e1..01489f7 100644
@@ -145,6 +145,7 @@ static void parse_multi_touch(struct w8001 *w8001)
 		}
 	}
 
+	input_mt_report_pointer_emulation(dev, true);
 	input_sync(dev);
 }
 
@@ -420,6 +421,9 @@ static int w8001_setup(struct w8001 *w8001)
 						0, touch.y, 0, 0);
 			input_set_abs_params(dev, ABS_MT_TOOL_TYPE,
 						0, MT_TOOL_MAX, 0, 0);
+
+			__set_bit(BTN_TOOL_DOUBLETAP, dev->keybit);
+
 			break;
 		}
 	}
author
#5 lore raw
In reply to Dmitry Torokhov

Dmitry,

Thank you for your effort in updating the patch. Most changes work for me. I do have comments related to raw touch data scaling for MT and single touch legacy client support. Details are inline.

Ping

Quoted 108 lines · Dmitry Torokhov

Hi Ping,

Quoted 18 lines · Ping Cheng

---
 drivers/input/touchscreen/wacom_w8001.c |   89 ++++++++++++++++++++++++++++---

 1 files changed, 82 insertions(+), 7 deletions(-)
drivers/input/touchscreen/wacom_w8001.c +1 -0
index 59664a8..763eb8f 100644
@@ -3,6 +3,7 @@
   *
   * Copyright (c) 2008 Jaya Kumar
   * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010 Ping Cheng, Wacom. <[email protected]>
   *
   * This file is subject to the terms and conditions of the GNU General Public
   * License. See the file COPYING in the main directory of this archive for

drivers/input/touchscreen/wacom_w8001.c struct w8001 { · line 91

Quoted 5 lines
drivers/input/touchscreen/wacom_w8001.c +2 -0
@@ -86,6 +87,12 @@ struct w8001 {
       char phys[32];
       int type;
       unsigned int pktlen;
+     bool pen_in_prox;
+     bool has_touch;

We already have type, why do we need these 2 fields a well?

Actually, I tried massaging the patch a bit, could you please tell me if the patch below still works for you?

Thanks.

--
Dmitry

Input: wacom_w8001 - add one finger touch support

From: Ping Cheng <[email protected]>

---

 drivers/input/touchscreen/wacom_w8001.c |  123 +++++++++++++++++++++++++------

 1 files changed, 101 insertions(+), 22 deletions(-)
drivers/input/touchscreen/wacom_w8001.c +16 -4
index 4774c09..ce8c8e1 100644
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2008 Jaya Kumar
  * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010 Ping Cheng, Wacom. <[email protected]>
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of this archive for
@@ -63,11 +64,11 @@ struct w8001_coord {
 
  /* touch query reply packet */
  struct w8001_touch_query {
+       u16 x;
+       u16 y;
        u8 panel_res;
        u8 capacity_res;
        u8 sensor_id;
-       u16 x;
-       u16 y;
  };
 
  /*
@@ -86,9 +87,13 @@ struct w8001 {
        char phys[32];
        int type;
        unsigned int pktlen;
+       u16 max_touch_x;
+       u16 max_touch_y;
+       u16 max_pen_x;
+       u16 max_pen_y;
  };
 
-static void parse_data(u8 *data, struct w8001_coord *coord)
+static void parse_pen_data(u8 *data, struct w8001_coord *coord)
  {
        memset(coord, 0, sizeof(*coord));
 
@@ -112,7 +117,14 @@ static void parse_data(u8 *data, struct w8001_coord *coord)
        coord->tilt_y = data[8] & 0x7F;
  }
 
-static void parse_touch(struct w8001 *w8001)
+static void parse_single_touch(u8 *data, struct w8001_coord *coord)
+{
+       coord->x = (data[1] << 7) | data[2];
+       coord->y = (data[3] << 7) | data[4];
+       coord->tsw = data[0] & 0x01;
+}
+
+static void parse_multi_touch(struct w8001 *w8001)
  {
        struct input_dev *dev = w8001->dev;
        unsigned char *data = w8001->data;

drivers/input/touchscreen/wacom_w8001.c static void parse_touch(struct w8001 *w8001) · line 140

Quoted 7 lines
drivers/input/touchscreen/wacom_w8001.c +2 -2
@@ -124,8 +136,8 @@ static void parse_touch(struct w8001 *w8001)
                input_mt_slot(dev, i);
                input_mt_report_slot_state(dev, MT_TOOL_FINGER, touch);
                if (touch) {
-                       int x = (data[6 * i + 1] << 7) | (data[6 * i + 2]);
-                       int y = (data[6 * i + 3] << 7) | (data[6 * i + 4]);
+                       int x = (data[6 * i + 1] << 7) | data[6 * i + 2];
+                       int y = (data[6 * i + 3] << 7) | data[6 * i + 4];

Since you scaled MT max_touch_x/y to max_pen_x/y, you would need to scale the x and y here as well. I didn't scale MT touch data since MT protocol can report touch resolution on its own. See more comments below.

Quoted 172 lines
drivers/input/touchscreen/wacom_w8001.c +50 -6
                        /* data[5,6] and [11,12] is finger capacity */
 
                        input_report_abs(dev, ABS_MT_POSITION_X, x);
@@ -151,6 +163,15 @@ static void parse_touchquery(u8 *data, struct w8001_touch_query *query)
        query->y = data[5] << 9;
        query->y |= data[6] << 2;
        query->y |= (data[2] >> 3) & 0x3;
+
+       /* Early days' single-finger touch models need the following defaults */
+       if (!query->x && !query->y) {
+               query->x = 1024;
+               query->y = 1024;
+               if (query->panel_res)
+                       query->x = query->y = (1 << query->panel_res);
+               query->panel_res = 10;
+       }
  }
 
  static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
@@ -160,16 +181,15 @@ static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
        /*
         * We have 1 bit for proximity (rdy) and 3 bits for tip, side,
         * side2/eraser. If rdy && f2 are set, this can be either pen + side2,
-        * or eraser. assume
+        * or eraser. Assume:
         * - if dev is already in proximity and f2 is toggled → pen + side2
         * - if dev comes into proximity with f2 set → eraser
         * If f2 disappears after assuming eraser, fake proximity out for
         * eraser and in for pen.
         */
 
-       if (!w8001->type) {
-               w8001->type = coord->f2 ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
-       } else if (w8001->type == BTN_TOOL_RUBBER) {
+       switch (w8001->type) {
+       case BTN_TOOL_RUBBER:
                if (!coord->f2) {
                        input_report_abs(dev, ABS_PRESSURE, 0);
                        input_report_key(dev, BTN_TOUCH, 0);
@@ -179,8 +199,21 @@ static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
                        input_sync(dev);
                        w8001->type = BTN_TOOL_PEN;
                }
-       } else {
+               break;
+
+       case BTN_TOOL_FINGER:
+               input_report_key(dev, BTN_TOUCH, 0);
+               input_report_key(dev, BTN_TOOL_FINGER, 0);
+               input_sync(dev);
+               /* fall through */
+
+       case KEY_RESERVED:
+               w8001->type = coord->f2 ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
+               break;
+
+       default:
                input_report_key(dev, BTN_STYLUS2, coord->f2);
+               break;
        }
 
        input_report_abs(dev, ABS_X, coord->x);
@@ -192,7 +225,30 @@ static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
        input_sync(dev);
 
        if (!coord->rdy)
-               w8001->type = 0;
+               w8001->type = KEY_RESERVED;
+}
+
+static void report_single_touch(struct w8001 *w8001, struct w8001_coord *coord)
+{
+       struct input_dev *dev = w8001->dev;
+       unsigned int x = coord->x;
+       unsigned int y = coord->y;
+
+       /* scale to pen maximum */
+       if (w8001->max_pen_x && w8001->max_touch_x)
+               x = x * w8001->max_pen_x / w8001->max_touch_x;
+
+       if (w8001->max_pen_y && w8001->max_touch_y)
+               y = y * w8001->max_pen_y / w8001->max_touch_y;
+
+       input_report_abs(dev, ABS_X, x);
+       input_report_abs(dev, ABS_Y, y);
+       input_report_key(dev, BTN_TOUCH, coord->tsw);
+       input_report_key(dev, BTN_TOOL_FINGER, coord->tsw);
+
+       input_sync(dev);
+
+       w8001->type = coord->tsw ? BTN_TOOL_FINGER : KEY_RESERVED;
  }
 
  static irqreturn_t w8001_interrupt(struct serio *serio,
@@ -213,9 +269,18 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
 

       case W8001_PKTLEN_TOUCH93 - 1:
       case W8001_PKTLEN_TOUCH9A - 1:
-               /* ignore one-finger touch packet. */
-               if (w8001->pktlen == w8001->idx)
+               tmp = w8001->data[0] & W8001_TOUCH_BYTE;
+               if (tmp != W8001_TOUCH_BYTE)
+                       break;
+
+               if (w8001->pktlen == w8001->idx) { w8001->idx = 0;
+                       if (w8001->type != BTN_TOOL_PEN &&
+                           w8001->type != BTN_TOOL_RUBBER) {
+                               parse_single_touch(w8001->data, &coord);
+                               report_single_touch(w8001, &coord);
+                       }
+               }
               break;

       /* Pen coordinates packet */

drivers/input/touchscreen/wacom_w8001.c +2 -2
@@ -224,18 +289,18 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
                if (unlikely(tmp == W8001_TAB_BYTE))
                        break;
 
-               tmp = (w8001->data[0] & W8001_TOUCH_BYTE);
+               tmp = w8001->data[0] & W8001_TOUCH_BYTE;
                if (tmp == W8001_TOUCH_BYTE)
                        break;
 
                w8001->idx = 0;
-               parse_data(w8001->data, &coord);
+               parse_pen_data(w8001->data, &coord);
                report_pen_events(w8001, &coord);
                break;
 
        /* control packet */

       case W8001_PKTLEN_TPCCTL - 1:
-               tmp = (w8001->data[0] & W8001_TOUCH_MASK);
+               tmp = w8001->data[0] & W8001_TOUCH_MASK; if (tmp == W8001_TOUCH_BYTE) break;

drivers/input/touchscreen/wacom_w8001.c +0 -0
@@ -248,7 +313,7 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
        /* 2 finger touch packet */

       case W8001_PKTLEN_TOUCH2FG - 1:
               w8001->idx = 0;
-               parse_touch(w8001);
+               parse_multi_touch(w8001);
               break;
       }

drivers/input/touchscreen/wacom_w8001.c +6 -1
@@ -278,6 +343,7 @@ static int w8001_setup(struct w8001 *w8001)
  {
        struct input_dev *dev = w8001->dev;
        struct w8001_coord coord;
+       struct w8001_touch_query touch;
        int error;
 
        error = w8001_command(w8001, W8001_CMD_STOP, false);
@@ -289,11 +355,15 @@ static int w8001_setup(struct w8001 *w8001)
        /* penabled? */
        error = w8001_command(w8001, W8001_CMD_QUERY, true);
        if (!error) {
+               __set_bit(BTN_TOUCH, dev->keybit);
                __set_bit(BTN_TOOL_PEN, dev->keybit);
                __set_bit(BTN_TOOL_RUBBER, dev->keybit);
                __set_bit(BTN_STYLUS, dev->keybit);
                __set_bit(BTN_STYLUS2, dev->keybit);
-               parse_data(w8001->response, &coord);
+
+               parse_pen_data(w8001->response, &coord);
+               w8001->max_pen_x = coord.x;
+               w8001->max_pen_y = coord.y;
 
                input_set_abs_params(dev, ABS_X, 0, coord.x, 0, 0);
                input_set_abs_params(dev, ABS_Y, 0, coord.y, 0, 0);

drivers/input/touchscreen/wacom_w8001.c static int w8001_setup(struct w8001 *w8001) · line 386

Quoted 6 lines
drivers/input/touchscreen/wacom_w8001.c +2 -1
@@ -312,24 +382,34 @@ static int w8001_setup(struct w8001 *w8001)
         * second byte is empty, which indicates touch is not supported.
         */
        if (!error && w8001->response[1]) {
-               struct w8001_touch_query touch;
+               __set_bit(BTN_TOUCH, dev->keybit);
+               __set_bit(BTN_TOOL_FINGER, dev->keybit);

I do not think we want to set BTN_TOUCH and BTN_TOOL_FINGER for MT device since we do not need to support single touch for this MT device. Please refer to my comments for your other patch in the next email.

drivers/input/touchscreen/wacom_w8001.c static int w8001_setup(struct w8001 *w8001) · line 396

Quoted 9 lines
drivers/input/touchscreen/wacom_w8001.c +8 -0
                parse_touchquery(w8001->response, &touch);
+               w8001->max_touch_x = touch.x;
+               w8001->max_touch_y = touch.y;
+
+               /* scale to pen maximum */
+               if (w8001->max_pen_x && w8001->max_pen_y) {
+                       touch.x = w8001->max_pen_x;
+                       touch.y = w8001->max_pen_y;
+               }

If we scale touch for both single and MT, we need to scale the raw (x,y) for both too. I purposely did not want to scale MT touch since they can be supported in different resolution from pen by MT protocol now.

Quoted 22 lines
drivers/input/touchscreen/wacom_w8001.c +0 -1
                input_set_abs_params(dev, ABS_X, 0, touch.x, 0, 0);
                input_set_abs_params(dev, ABS_Y, 0, touch.y, 0, 0);
-               __set_bit(BTN_TOOL_FINGER, dev->keybit);
 
                switch (touch.sensor_id) {

               case 0:
               case 2:
                       w8001->pktlen = W8001_PKTLEN_TOUCH93; break;
+
               case 1:
               case 3:
               case 4:
                       w8001->pktlen = W8001_PKTLEN_TOUCH9A; break;
+
               case 5:
                       w8001->pktlen = W8001_PKTLEN_TOUCH2FG;

drivers/input/touchscreen/wacom_w8001.c static int w8001_connect(struct serio *serio, struct serio_driver *drv) · line 482

Quoted 7 lines
drivers/input/touchscreen/wacom_w8001.c +0 -1
@@ -397,7 +477,6 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->dev.parent = &serio->dev;
 
        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-       __set_bit(BTN_TOUCH, input_dev->keybit);
 
        serio_set_drvdata(serio, w8001);
        err = serio_open(serio, drv);

--
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

author
#3 lore raw
In reply to Dmitry Torokhov
Quoted 40 lines · Dmitry Torokhov
Quoted 29 lines · Dmitry Torokhov

Hi Ping,

Quoted 18 lines · Ping Cheng

---
 drivers/input/touchscreen/wacom_w8001.c |   89 ++++++++++++++++++++++++++++---

 1 files changed, 82 insertions(+), 7 deletions(-)
drivers/input/touchscreen/wacom_w8001.c +1 -0
index 59664a8..763eb8f 100644
@@ -3,6 +3,7 @@
   *
   * Copyright (c) 2008 Jaya Kumar
   * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010 Ping Cheng, Wacom. <[email protected]>
   *
   * This file is subject to the terms and conditions of the GNU General Public
   * License. See the file COPYING in the main directory of this archive for

drivers/input/touchscreen/wacom_w8001.c struct w8001 { · line 91

Quoted 5 lines
drivers/input/touchscreen/wacom_w8001.c +2 -0
@@ -86,6 +87,12 @@ struct w8001 {
     char phys[32];
     int type;
     unsigned int pktlen;
+   bool pen_in_prox;
+   bool has_touch;

We already have type, why do we need these 2 fields a well?

Quoted 5 lines

Actually, I tried massaging the patch a bit, could you please tell me if the patch below still works for you?

Thanks.

And while we are at it could you please try this patch as well...

Thank you!

Quoted 7 lines

--
Dmitry

Input: wacom_w8001 - add single-touch pointer emulation

Let's emit single-touch compatible events for the 2-finger panels so that they can be used with legacy clients.

Depending on which legacy clients we are talking about, this patch may introduce issue instead of support. We added mt_report_pointer_emulation for Bamboo since it is a touchpad, that can be driven by xf86-input-synaptics in relative mode. This device is a touchscreen, that should be run in absolute mode. If we emulate ST events, which X driver do we expect it to use? xf86-input-wacom does not process emulated single touch data once we know MT is supported. That's why I didn't want to add ST emulation for this device.

We expect clients that support this MT device will be in MT format since this driver is new and the clients have to run inputattach to enable the port before they can talk to the device. The client must have a reason to do so. Do you see any legacy clients would like to walk the extra mile to use this driver?

Ping

Quoted 21 lines

---

 drivers/input/touchscreen/wacom_w8001.c |    4 ++++

 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/input/touchscreen/wacom_w8001.c +1 -0
index ce8c8e1..01489f7 100644
@@ -145,6 +145,7 @@ static void parse_multi_touch(struct w8001 *w8001)
                }
        }
 
+       input_mt_report_pointer_emulation(dev, true);
        input_sync(dev);
  }
 

drivers/input/touchscreen/wacom_w8001.c static int w8001_setup(struct w8001 *w8001) · line 429

Quoted 9 lines
drivers/input/touchscreen/wacom_w8001.c +3 -0
@@ -420,6 +421,9 @@ static int w8001_setup(struct w8001 *w8001)
                                                0, touch.y, 0, 0);
                        input_set_abs_params(dev, ABS_MT_TOOL_TYPE,
                                                0, MT_TOOL_MAX, 0, 0);
+
+                       __set_bit(BTN_TOOL_DOUBLETAP, dev->keybit);
+
                        break;
                }
        }

--
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

author
#6 lore raw
In reply to Ping Cheng
Quoted 5 lines · Ping Cheng

Dmitry,

Thank you for your effort in updating the patch. Most changes work for me. I do have comments related to raw touch data scaling for MT and single touch legacy client support. Details are inline.

After revisited the change you made, I think I can accept both suggestions. The legacy client support may introduce issue. But it won't hurt too much, I hope ;). The MT scaling offers a consistent support between one and two finger touch, which is good.

So, the only change left is to scale the raw x,y of 2FGT to max_pen. I can make a version 3 of this patch for you or you can change those two lines if you don't mind. Just let me know.

Thank you.

Ping

Quoted 345 lines
Quoted 108 lines · Dmitry Torokhov

Hi Ping,

Quoted 18 lines · Ping Cheng

---
 drivers/input/touchscreen/wacom_w8001.c |   89 ++++++++++++++++++++++++++++---

 1 files changed, 82 insertions(+), 7 deletions(-)
drivers/input/touchscreen/wacom_w8001.c +1 -0
index 59664a8..763eb8f 100644
@@ -3,6 +3,7 @@
   *
   * Copyright (c) 2008 Jaya Kumar
   * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010 Ping Cheng, Wacom. <[email protected]>
   *
   * This file is subject to the terms and conditions of the GNU General Public
   * License. See the file COPYING in the main directory of this archive for

drivers/input/touchscreen/wacom_w8001.c struct w8001 { · line 91

Quoted 5 lines
drivers/input/touchscreen/wacom_w8001.c +2 -0
@@ -86,6 +87,12 @@ struct w8001 {
       char phys[32];
       int type;
       unsigned int pktlen;
+     bool pen_in_prox;
+     bool has_touch;

We already have type, why do we need these 2 fields a well?

Actually, I tried massaging the patch a bit, could you please tell me if the patch below still works for you?

Thanks.

--
Dmitry

Input: wacom_w8001 - add one finger touch support

From: Ping Cheng <[email protected]>

---

 drivers/input/touchscreen/wacom_w8001.c |  123 +++++++++++++++++++++++++------

 1 files changed, 101 insertions(+), 22 deletions(-)
drivers/input/touchscreen/wacom_w8001.c +16 -4
index 4774c09..ce8c8e1 100644
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2008 Jaya Kumar
  * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010 Ping Cheng, Wacom. <[email protected]>
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of this archive for
@@ -63,11 +64,11 @@ struct w8001_coord {
 
  /* touch query reply packet */
  struct w8001_touch_query {
+       u16 x;
+       u16 y;
        u8 panel_res;
        u8 capacity_res;
        u8 sensor_id;
-       u16 x;
-       u16 y;
  };
 
  /*
@@ -86,9 +87,13 @@ struct w8001 {
        char phys[32];
        int type;
        unsigned int pktlen;
+       u16 max_touch_x;
+       u16 max_touch_y;
+       u16 max_pen_x;
+       u16 max_pen_y;
  };
 
-static void parse_data(u8 *data, struct w8001_coord *coord)
+static void parse_pen_data(u8 *data, struct w8001_coord *coord)
  {
        memset(coord, 0, sizeof(*coord));
 
@@ -112,7 +117,14 @@ static void parse_data(u8 *data, struct w8001_coord *coord)
        coord->tilt_y = data[8] & 0x7F;
  }
 
-static void parse_touch(struct w8001 *w8001)
+static void parse_single_touch(u8 *data, struct w8001_coord *coord)
+{
+       coord->x = (data[1] << 7) | data[2];
+       coord->y = (data[3] << 7) | data[4];
+       coord->tsw = data[0] & 0x01;
+}
+
+static void parse_multi_touch(struct w8001 *w8001)
  {
        struct input_dev *dev = w8001->dev;
        unsigned char *data = w8001->data;

drivers/input/touchscreen/wacom_w8001.c static void parse_touch(struct w8001 *w8001) · line 140

Quoted 7 lines
drivers/input/touchscreen/wacom_w8001.c +2 -2
@@ -124,8 +136,8 @@ static void parse_touch(struct w8001 *w8001)
                input_mt_slot(dev, i);
                input_mt_report_slot_state(dev, MT_TOOL_FINGER, touch);
                if (touch) {
-                       int x = (data[6 * i + 1] << 7) | (data[6 * i + 2]);
-                       int y = (data[6 * i + 3] << 7) | (data[6 * i + 4]);
+                       int x = (data[6 * i + 1] << 7) | data[6 * i + 2];
+                       int y = (data[6 * i + 3] << 7) | data[6 * i + 4];

Since you scaled MT max_touch_x/y to max_pen_x/y, you would need to scale the x and y here as well. I didn't scale MT touch data since MT protocol can report touch resolution on its own. See more comments below.

Quoted 172 lines
drivers/input/touchscreen/wacom_w8001.c +50 -6
                        /* data[5,6] and [11,12] is finger capacity */
 
                        input_report_abs(dev, ABS_MT_POSITION_X, x);
@@ -151,6 +163,15 @@ static void parse_touchquery(u8 *data, struct w8001_touch_query *query)
        query->y = data[5] << 9;
        query->y |= data[6] << 2;
        query->y |= (data[2] >> 3) & 0x3;
+
+       /* Early days' single-finger touch models need the following defaults */
+       if (!query->x && !query->y) {
+               query->x = 1024;
+               query->y = 1024;
+               if (query->panel_res)
+                       query->x = query->y = (1 << query->panel_res);
+               query->panel_res = 10;
+       }
  }
 
  static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
@@ -160,16 +181,15 @@ static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
        /*
         * We have 1 bit for proximity (rdy) and 3 bits for tip, side,
         * side2/eraser. If rdy && f2 are set, this can be either pen + side2,
-        * or eraser. assume
+        * or eraser. Assume:
         * - if dev is already in proximity and f2 is toggled → pen + side2
         * - if dev comes into proximity with f2 set → eraser
         * If f2 disappears after assuming eraser, fake proximity out for
         * eraser and in for pen.
         */
 
-       if (!w8001->type) {
-               w8001->type = coord->f2 ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
-       } else if (w8001->type == BTN_TOOL_RUBBER) {
+       switch (w8001->type) {
+       case BTN_TOOL_RUBBER:
                if (!coord->f2) {
                        input_report_abs(dev, ABS_PRESSURE, 0);
                        input_report_key(dev, BTN_TOUCH, 0);
@@ -179,8 +199,21 @@ static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
                        input_sync(dev);
                        w8001->type = BTN_TOOL_PEN;
                }
-       } else {
+               break;
+
+       case BTN_TOOL_FINGER:
+               input_report_key(dev, BTN_TOUCH, 0);
+               input_report_key(dev, BTN_TOOL_FINGER, 0);
+               input_sync(dev);
+               /* fall through */
+
+       case KEY_RESERVED:
+               w8001->type = coord->f2 ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
+               break;
+
+       default:
                input_report_key(dev, BTN_STYLUS2, coord->f2);
+               break;
        }
 
        input_report_abs(dev, ABS_X, coord->x);
@@ -192,7 +225,30 @@ static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
        input_sync(dev);
 
        if (!coord->rdy)
-               w8001->type = 0;
+               w8001->type = KEY_RESERVED;
+}
+
+static void report_single_touch(struct w8001 *w8001, struct w8001_coord *coord)
+{
+       struct input_dev *dev = w8001->dev;
+       unsigned int x = coord->x;
+       unsigned int y = coord->y;
+
+       /* scale to pen maximum */
+       if (w8001->max_pen_x && w8001->max_touch_x)
+               x = x * w8001->max_pen_x / w8001->max_touch_x;
+
+       if (w8001->max_pen_y && w8001->max_touch_y)
+               y = y * w8001->max_pen_y / w8001->max_touch_y;
+
+       input_report_abs(dev, ABS_X, x);
+       input_report_abs(dev, ABS_Y, y);
+       input_report_key(dev, BTN_TOUCH, coord->tsw);
+       input_report_key(dev, BTN_TOOL_FINGER, coord->tsw);
+
+       input_sync(dev);
+
+       w8001->type = coord->tsw ? BTN_TOOL_FINGER : KEY_RESERVED;
  }
 
  static irqreturn_t w8001_interrupt(struct serio *serio,
@@ -213,9 +269,18 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
 

       case W8001_PKTLEN_TOUCH93 - 1:
       case W8001_PKTLEN_TOUCH9A - 1:
-               /* ignore one-finger touch packet. */
-               if (w8001->pktlen == w8001->idx)
+               tmp = w8001->data[0] & W8001_TOUCH_BYTE;
+               if (tmp != W8001_TOUCH_BYTE)
+                       break;
+
+               if (w8001->pktlen == w8001->idx) { w8001->idx = 0;
+                       if (w8001->type != BTN_TOOL_PEN &&
+                           w8001->type != BTN_TOOL_RUBBER) {
+                               parse_single_touch(w8001->data, &coord);
+                               report_single_touch(w8001, &coord);
+                       }
+               }
               break;

       /* Pen coordinates packet */

drivers/input/touchscreen/wacom_w8001.c +2 -2
@@ -224,18 +289,18 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
                if (unlikely(tmp == W8001_TAB_BYTE))
                        break;
 
-               tmp = (w8001->data[0] & W8001_TOUCH_BYTE);
+               tmp = w8001->data[0] & W8001_TOUCH_BYTE;
                if (tmp == W8001_TOUCH_BYTE)
                        break;
 
                w8001->idx = 0;
-               parse_data(w8001->data, &coord);
+               parse_pen_data(w8001->data, &coord);
                report_pen_events(w8001, &coord);
                break;
 
        /* control packet */

       case W8001_PKTLEN_TPCCTL - 1:
-               tmp = (w8001->data[0] & W8001_TOUCH_MASK);
+               tmp = w8001->data[0] & W8001_TOUCH_MASK; if (tmp == W8001_TOUCH_BYTE) break;

drivers/input/touchscreen/wacom_w8001.c +0 -0
@@ -248,7 +313,7 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
        /* 2 finger touch packet */

       case W8001_PKTLEN_TOUCH2FG - 1:
               w8001->idx = 0;
-               parse_touch(w8001);
+               parse_multi_touch(w8001);
               break;
       }

drivers/input/touchscreen/wacom_w8001.c +6 -1
@@ -278,6 +343,7 @@ static int w8001_setup(struct w8001 *w8001)
  {
        struct input_dev *dev = w8001->dev;
        struct w8001_coord coord;
+       struct w8001_touch_query touch;
        int error;
 
        error = w8001_command(w8001, W8001_CMD_STOP, false);
@@ -289,11 +355,15 @@ static int w8001_setup(struct w8001 *w8001)
        /* penabled? */
        error = w8001_command(w8001, W8001_CMD_QUERY, true);
        if (!error) {
+               __set_bit(BTN_TOUCH, dev->keybit);
                __set_bit(BTN_TOOL_PEN, dev->keybit);
                __set_bit(BTN_TOOL_RUBBER, dev->keybit);
                __set_bit(BTN_STYLUS, dev->keybit);
                __set_bit(BTN_STYLUS2, dev->keybit);
-               parse_data(w8001->response, &coord);
+
+               parse_pen_data(w8001->response, &coord);
+               w8001->max_pen_x = coord.x;
+               w8001->max_pen_y = coord.y;
 
                input_set_abs_params(dev, ABS_X, 0, coord.x, 0, 0);
                input_set_abs_params(dev, ABS_Y, 0, coord.y, 0, 0);

drivers/input/touchscreen/wacom_w8001.c static int w8001_setup(struct w8001 *w8001) · line 386

Quoted 6 lines
drivers/input/touchscreen/wacom_w8001.c +2 -1
@@ -312,24 +382,34 @@ static int w8001_setup(struct w8001 *w8001)
         * second byte is empty, which indicates touch is not supported.
         */
        if (!error && w8001->response[1]) {
-               struct w8001_touch_query touch;
+               __set_bit(BTN_TOUCH, dev->keybit);
+               __set_bit(BTN_TOOL_FINGER, dev->keybit);

I do not think we want to set BTN_TOUCH and BTN_TOOL_FINGER for MT device since we do not need to support single touch for this MT device. Please refer to my comments for your other patch in the next email.

drivers/input/touchscreen/wacom_w8001.c static int w8001_setup(struct w8001 *w8001) · line 396

Quoted 9 lines
drivers/input/touchscreen/wacom_w8001.c +8 -0
                parse_touchquery(w8001->response, &touch);
+               w8001->max_touch_x = touch.x;
+               w8001->max_touch_y = touch.y;
+
+               /* scale to pen maximum */
+               if (w8001->max_pen_x && w8001->max_pen_y) {
+                       touch.x = w8001->max_pen_x;
+                       touch.y = w8001->max_pen_y;
+               }

If we scale touch for both single and MT, we need to scale the raw (x,y) for both too. I purposely did not want to scale MT touch since they can be supported in different resolution from pen by MT protocol now.

Quoted 23 lines
drivers/input/touchscreen/wacom_w8001.c +0 -1
                input_set_abs_params(dev, ABS_X, 0, touch.x, 0, 0);
                input_set_abs_params(dev, ABS_Y, 0, touch.y, 0, 0);
-               __set_bit(BTN_TOOL_FINGER, dev->keybit);
 
                switch (touch.sensor_id) {

               case 0:
               case 2:
                       w8001->pktlen = W8001_PKTLEN_TOUCH93; break;
+
               case 1:
               case 3:
               case 4:
                       w8001->pktlen = W8001_PKTLEN_TOUCH9A; break;
+
               case 5:
                       w8001->pktlen = W8001_PKTLEN_TOUCH2FG;

drivers/input/touchscreen/wacom_w8001.c +0 -0
@@ -397,7 +477,6 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->dev.parent = &serio->dev;
 
Quoted 7 lines

drivers/input/touchscreen/wacom_w8001.c static int w8001_connect(struct serio *serio, struct serio_driver *drv) · line 482

Quoted 6 lines
drivers/input/touchscreen/wacom_w8001.c +0 -1
        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-       __set_bit(BTN_TOUCH, input_dev->keybit);
 
        serio_set_drvdata(serio, w8001);
        err = serio_open(serio, drv);

--
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

maintainer
#10 lore raw
In reply to Ping Cheng
Quoted 122 lines · Ping Cheng

Dmitry,

Thank you for your effort in updating the patch. Most changes work for me. I do have comments related to raw touch data scaling for MT and single touch legacy client support. Details are inline.

Ping

Quoted 112 lines · Dmitry Torokhov

Hi Ping,

Quoted 18 lines · Ping Cheng

---
 drivers/input/touchscreen/wacom_w8001.c |   89 ++++++++++++++++++++++++++++---

 1 files changed, 82 insertions(+), 7 deletions(-)
drivers/input/touchscreen/wacom_w8001.c +1 -0
index 59664a8..763eb8f 100644
@@ -3,6 +3,7 @@
   *
   * Copyright (c) 2008 Jaya Kumar
   * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010 Ping Cheng, Wacom. <[email protected]>
   *
   * This file is subject to the terms and conditions of the GNU General Public
   * License. See the file COPYING in the main directory of this archive for

drivers/input/touchscreen/wacom_w8001.c struct w8001 { · line 91

Quoted 5 lines
drivers/input/touchscreen/wacom_w8001.c +2 -0
@@ -86,6 +87,12 @@ struct w8001 {
       char phys[32];
       int type;
       unsigned int pktlen;
+     bool pen_in_prox;
+     bool has_touch;

We already have type, why do we need these 2 fields a well?

Actually, I tried massaging the patch a bit, could you please tell me if the patch below still works for you?

Thanks.

--
Dmitry

Input: wacom_w8001 - add one finger touch support

From: Ping Cheng <[email protected]>

---

 drivers/input/touchscreen/wacom_w8001.c |  123 +++++++++++++++++++++++++------

 1 files changed, 101 insertions(+), 22 deletions(-)
drivers/input/touchscreen/wacom_w8001.c +16 -5
index 4774c09..ce8c8e1 100644
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2008 Jaya Kumar
  * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010 Ping Cheng, Wacom. <[email protected]>
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of this archive for
@@ -63,11 +64,11 @@ struct w8001_coord {
 
  /* touch query reply packet */
  struct w8001_touch_query {
+       u16 x;
+       u16 y;
        u8 panel_res;
        u8 capacity_res;
        u8 sensor_id;
-       u16 x;
-       u16 y;
  };
 
  /*
@@ -86,9 +87,13 @@ struct w8001 {
        char phys[32];
        int type;
        unsigned int pktlen;
+       u16 max_touch_x;
+       u16 max_touch_y;
+       u16 max_pen_x;
+       u16 max_pen_y;
  };
 
-static void parse_data(u8 *data, struct w8001_coord *coord)
+static void parse_pen_data(u8 *data, struct w8001_coord *coord)
  {
        memset(coord, 0, sizeof(*coord));
 
@@ -112,7 +117,14 @@ static void parse_data(u8 *data, struct w8001_coord *coord)
        coord->tilt_y = data[8] & 0x7F;
  }
 
-static void parse_touch(struct w8001 *w8001)
+static void parse_single_touch(u8 *data, struct w8001_coord *coord)
+{
+       coord->x = (data[1] << 7) | data[2];
+       coord->y = (data[3] << 7) | data[4];
+       coord->tsw = data[0] & 0x01;
+}
+
+static void parse_multi_touch(struct w8001 *w8001)
  {
        struct input_dev *dev = w8001->dev;
        unsigned char *data = w8001->data;
@@ -124,8 +136,8 @@ static void parse_touch(struct w8001 *w8001)
                input_mt_slot(dev, i);
                input_mt_report_slot_state(dev, MT_TOOL_FINGER, touch);
                if (touch) {
-                       int x = (data[6 * i + 1] << 7) | (data[6 * i + 2]);
Quoted 8 lines

drivers/input/touchscreen/wacom_w8001.c static void parse_touch(struct w8001 *w8001) · line 140

Quoted 3 lines
drivers/input/touchscreen/wacom_w8001.c +2 -1
-                       int y = (data[6 * i + 3] << 7) | (data[6 * i + 4]);
+                       int x = (data[6 * i + 1] << 7) | data[6 * i + 2];
+                       int y = (data[6 * i + 3] << 7) | data[6 * i + 4];

Since you scaled MT max_touch_x/y to max_pen_x/y, you would need to scale the x and y here as well. I didn't scale MT touch data since MT protocol can report touch resolution on its own. See more comments below.

Hmm, it depends on whether there are multitouch devices that are also penabled. Are there such devices? If not then we won't actually scale anyting.

Quoted 170 lines
Quoted 170 lines
drivers/input/touchscreen/wacom_w8001.c +50 -6
                        /* data[5,6] and [11,12] is finger capacity */
 
                        input_report_abs(dev, ABS_MT_POSITION_X, x);
@@ -151,6 +163,15 @@ static void parse_touchquery(u8 *data, struct w8001_touch_query *query)
        query->y = data[5] << 9;
        query->y |= data[6] << 2;
        query->y |= (data[2] >> 3) & 0x3;
+
+       /* Early days' single-finger touch models need the following defaults */
+       if (!query->x && !query->y) {
+               query->x = 1024;
+               query->y = 1024;
+               if (query->panel_res)
+                       query->x = query->y = (1 << query->panel_res);
+               query->panel_res = 10;
+       }
  }
 
  static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
@@ -160,16 +181,15 @@ static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
        /*
         * We have 1 bit for proximity (rdy) and 3 bits for tip, side,
         * side2/eraser. If rdy && f2 are set, this can be either pen + side2,
-        * or eraser. assume
+        * or eraser. Assume:
         * - if dev is already in proximity and f2 is toggled → pen + side2
         * - if dev comes into proximity with f2 set → eraser
         * If f2 disappears after assuming eraser, fake proximity out for
         * eraser and in for pen.
         */
 
-       if (!w8001->type) {
-               w8001->type = coord->f2 ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
-       } else if (w8001->type == BTN_TOOL_RUBBER) {
+       switch (w8001->type) {
+       case BTN_TOOL_RUBBER:
                if (!coord->f2) {
                        input_report_abs(dev, ABS_PRESSURE, 0);
                        input_report_key(dev, BTN_TOUCH, 0);
@@ -179,8 +199,21 @@ static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
                        input_sync(dev);
                        w8001->type = BTN_TOOL_PEN;
                }
-       } else {
+               break;
+
+       case BTN_TOOL_FINGER:
+               input_report_key(dev, BTN_TOUCH, 0);
+               input_report_key(dev, BTN_TOOL_FINGER, 0);
+               input_sync(dev);
+               /* fall through */
+
+       case KEY_RESERVED:
+               w8001->type = coord->f2 ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
+               break;
+
+       default:
                input_report_key(dev, BTN_STYLUS2, coord->f2);
+               break;
        }
 
        input_report_abs(dev, ABS_X, coord->x);
@@ -192,7 +225,30 @@ static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
        input_sync(dev);
 
        if (!coord->rdy)
-               w8001->type = 0;
+               w8001->type = KEY_RESERVED;
+}
+
+static void report_single_touch(struct w8001 *w8001, struct w8001_coord *coord)
+{
+       struct input_dev *dev = w8001->dev;
+       unsigned int x = coord->x;
+       unsigned int y = coord->y;
+
+       /* scale to pen maximum */
+       if (w8001->max_pen_x && w8001->max_touch_x)
+               x = x * w8001->max_pen_x / w8001->max_touch_x;
+
+       if (w8001->max_pen_y && w8001->max_touch_y)
+               y = y * w8001->max_pen_y / w8001->max_touch_y;
+
+       input_report_abs(dev, ABS_X, x);
+       input_report_abs(dev, ABS_Y, y);
+       input_report_key(dev, BTN_TOUCH, coord->tsw);
+       input_report_key(dev, BTN_TOOL_FINGER, coord->tsw);
+
+       input_sync(dev);
+
+       w8001->type = coord->tsw ? BTN_TOOL_FINGER : KEY_RESERVED;
  }
 
  static irqreturn_t w8001_interrupt(struct serio *serio,
@@ -213,9 +269,18 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
 

       case W8001_PKTLEN_TOUCH93 - 1:
       case W8001_PKTLEN_TOUCH9A - 1:
-               /* ignore one-finger touch packet. */
-               if (w8001->pktlen == w8001->idx)
+               tmp = w8001->data[0] & W8001_TOUCH_BYTE;
+               if (tmp != W8001_TOUCH_BYTE)
+                       break;
+
+               if (w8001->pktlen == w8001->idx) { w8001->idx = 0;
+                       if (w8001->type != BTN_TOOL_PEN &&
+                           w8001->type != BTN_TOOL_RUBBER) {
+                               parse_single_touch(w8001->data, &coord);
+                               report_single_touch(w8001, &coord);
+                       }
+               }
               break;

       /* Pen coordinates packet */

drivers/input/touchscreen/wacom_w8001.c +2 -2
@@ -224,18 +289,18 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
                if (unlikely(tmp == W8001_TAB_BYTE))
                        break;
 
-               tmp = (w8001->data[0] & W8001_TOUCH_BYTE);
+               tmp = w8001->data[0] & W8001_TOUCH_BYTE;
                if (tmp == W8001_TOUCH_BYTE)
                        break;
 
                w8001->idx = 0;
-               parse_data(w8001->data, &coord);
+               parse_pen_data(w8001->data, &coord);
                report_pen_events(w8001, &coord);
                break;
 
        /* control packet */

       case W8001_PKTLEN_TPCCTL - 1:
-               tmp = (w8001->data[0] & W8001_TOUCH_MASK);
+               tmp = w8001->data[0] & W8001_TOUCH_MASK; if (tmp == W8001_TOUCH_BYTE) break;

drivers/input/touchscreen/wacom_w8001.c +0 -0
@@ -248,7 +313,7 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
        /* 2 finger touch packet */

       case W8001_PKTLEN_TOUCH2FG - 1:
               w8001->idx = 0;
-               parse_touch(w8001);
+               parse_multi_touch(w8001);
               break;
       }

drivers/input/touchscreen/wacom_w8001.c +6 -1
@@ -278,6 +343,7 @@ static int w8001_setup(struct w8001 *w8001)
  {
        struct input_dev *dev = w8001->dev;
        struct w8001_coord coord;
+       struct w8001_touch_query touch;
        int error;
 
        error = w8001_command(w8001, W8001_CMD_STOP, false);
@@ -289,11 +355,15 @@ static int w8001_setup(struct w8001 *w8001)
        /* penabled? */
        error = w8001_command(w8001, W8001_CMD_QUERY, true);
        if (!error) {
+               __set_bit(BTN_TOUCH, dev->keybit);
                __set_bit(BTN_TOOL_PEN, dev->keybit);
                __set_bit(BTN_TOOL_RUBBER, dev->keybit);
                __set_bit(BTN_STYLUS, dev->keybit);
                __set_bit(BTN_STYLUS2, dev->keybit);
-               parse_data(w8001->response, &coord);
+
+               parse_pen_data(w8001->response, &coord);
+               w8001->max_pen_x = coord.x;
+               w8001->max_pen_y = coord.y;
 
Quoted 14 lines

drivers/input/touchscreen/wacom_w8001.c static int w8001_setup(struct w8001 *w8001) · line 386

Quoted 9 lines
drivers/input/touchscreen/wacom_w8001.c +2 -1
                input_set_abs_params(dev, ABS_X, 0, coord.x, 0, 0);
                input_set_abs_params(dev, ABS_Y, 0, coord.y, 0, 0);
@@ -312,24 +382,34 @@ static int w8001_setup(struct w8001 *w8001)
         * second byte is empty, which indicates touch is not supported.
         */
        if (!error && w8001->response[1]) {
-               struct w8001_touch_query touch;
+               __set_bit(BTN_TOUCH, dev->keybit);
+               __set_bit(BTN_TOOL_FINGER, dev->keybit);

I do not think we want to set BTN_TOUCH and BTN_TOOL_FINGER for MT device since we do not need to support single touch for this MT device. Please refer to my comments for your other patch in the next email.

I guess for touchscreens we may say that we may omit BTN_TOOL_FINGER if finger is the only "tool" that is supported, to keep in line with current touchscreen drivers. BTN_TOUCH is needed for legacy.

Quoted 11 lines

drivers/input/touchscreen/wacom_w8001.c static int w8001_setup(struct w8001 *w8001) · line 396

Quoted 10 lines
drivers/input/touchscreen/wacom_w8001.c +8 -0
                parse_touchquery(w8001->response, &touch);
+               w8001->max_touch_x = touch.x;
+               w8001->max_touch_y = touch.y;
+
+               /* scale to pen maximum */
+               if (w8001->max_pen_x && w8001->max_pen_y) {
+                       touch.x = w8001->max_pen_x;
+                       touch.y = w8001->max_pen_y;
+               }
Quoted 4 lines

If we scale touch for both single and MT, we need to scale the raw (x,y) for both too. I purposely did not want to scale MT touch since they can be supported in different resolution from pen by MT protocol now.

I am really not sure if this is good thing that MT has it's own min/max/resolution. It is more implementation atrifact that it has... My gut feelig is that we shoudl keep it in sync with ST values, especially if we want to perform pointer emulation.

Signature · 5 lines
Dmitry
--
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
maintainer
#4 lore raw
In reply to Ping Cheng
Quoted 59 lines · Ping Cheng
Quoted 40 lines · Dmitry Torokhov
Quoted 29 lines · Dmitry Torokhov

Hi Ping,

Quoted 18 lines · Ping Cheng

---
 drivers/input/touchscreen/wacom_w8001.c |   89 ++++++++++++++++++++++++++++---

 1 files changed, 82 insertions(+), 7 deletions(-)
drivers/input/touchscreen/wacom_w8001.c +1 -0
index 59664a8..763eb8f 100644
@@ -3,6 +3,7 @@
   *
   * Copyright (c) 2008 Jaya Kumar
   * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010 Ping Cheng, Wacom. <[email protected]>
   *
   * This file is subject to the terms and conditions of the GNU General Public
   * License. See the file COPYING in the main directory of this archive for

drivers/input/touchscreen/wacom_w8001.c struct w8001 { · line 91

Quoted 5 lines
drivers/input/touchscreen/wacom_w8001.c +2 -0
@@ -86,6 +87,12 @@ struct w8001 {
     char phys[32];
     int type;
     unsigned int pktlen;
+   bool pen_in_prox;
+   bool has_touch;

We already have type, why do we need these 2 fields a well?

Quoted 5 lines

Actually, I tried massaging the patch a bit, could you please tell me if the patch below still works for you?

Thanks.

And while we are at it could you please try this patch as well...

Thank you!

Quoted 7 lines

--
Dmitry

Input: wacom_w8001 - add single-touch pointer emulation

Let's emit single-touch compatible events for the 2-finger panels so that they can be used with legacy clients.

Depending on which legacy clients we are talking about, this patch may introduce issue instead of support. We added mt_report_pointer_emulation for Bamboo since it is a touchpad, that can be driven by xf86-input-synaptics in relative mode. This device is a touchscreen, that should be run in absolute mode. If we emulate ST events, which X driver do we expect it to use? xf86-input-wacom does not process emulated single touch data once we know MT is supported. That's why I didn't want to add ST emulation for this device.

Quoted 6 lines

We expect clients that support this MT device will be in MT format since this driver is new and the clients have to run inputattach to enable the port before they can talk to the device. The client must have a reason to do so. Do you see any legacy clients would like to walk the extra mile to use this driver?

Anything that is using mousedev / PS/2 protocol can use this device if we provide ST emulation. It won't be pretty but some level of fucntionality will be available which is handy for bootsrapping.

Thanks.

Signature · 5 lines
Dmitry
--
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
maintainer
#7 lore raw
In reply to Ping Cheng
Quoted 7 lines · Ping Cheng
Quoted 5 lines · Ping Cheng

Dmitry,

Thank you for your effort in updating the patch. Most changes work for me. I do have comments related to raw touch data scaling for MT and single touch legacy client support. Details are inline.

Quoted 8 lines

After revisited the change you made, I think I can accept both suggestions. The legacy client support may introduce issue. But it won't hurt too much, I hope ;). The MT scaling offers a consistent support between one and two finger touch, which is good.

So, the only change left is to scale the raw x,y of 2FGT to max_pen. I can make a version 3 of this patch for you or you can change those two lines if you don't mind. Just let me know.

If there are such devices that have pen + 2FGT then please adjust the patch as you should be able to test it ;)

Also, if you [re]send me inputattach part for 8001 I shoudl try adding it to inputattach (it's not there yet, is it?).

Signature · 1 line
Dmitry
author
#8 lore raw
Quoted 13 lines · Dmitry Torokhov
Quoted 12 lines · Ping Cheng
Quoted 5 lines · Ping Cheng

Dmitry,

Thank you for your effort in updating the patch. Most changes work for me. I do have comments related to raw touch data scaling for MT and single touch legacy client support. Details are inline.

After revisited the change you made, I think I can accept both suggestions. The legacy client support may introduce issue. But it won't hurt too much, I hope ;).  The MT scaling offers a consistent support between one and two finger touch, which is good.

Quoted 6 lines
Quoted 3 lines

So, the only change left is to scale the raw x,y of 2FGT to max_pen. I can make a version 3 of this patch for you or you can change those two lines if you don't mind. Just let me know.

If there are such devices that have pen + 2FGT then please adjust the patch as you should be able to test it ;)

Yes, there are pen + 2FGT devices in the market now. Will update the patch soon.

Quoted 2 lines

Also, if you [re]send me inputattach part for 8001 I shoudl try adding it to inputattach (it's not there yet, is it?).

No, inputattach is not part of this patchset. I am not sure which inputattach.c source my patch should be based on. The one under your repo looks a bit old....

Ping
--
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

maintainer
#9 lore raw
Quoted 22 lines · Ping Cheng
Quoted 13 lines · Dmitry Torokhov
Quoted 12 lines · Ping Cheng
Quoted 5 lines · Ping Cheng

Dmitry,

Thank you for your effort in updating the patch. Most changes work for me. I do have comments related to raw touch data scaling for MT and single touch legacy client support. Details are inline.

After revisited the change you made, I think I can accept both suggestions. The legacy client support may introduce issue. But it won't hurt too much, I hope ;).  The MT scaling offers a consistent support between one and two finger touch, which is good.

Quoted 6 lines
Quoted 3 lines

So, the only change left is to scale the raw x,y of 2FGT to max_pen. I can make a version 3 of this patch for you or you can change those two lines if you don't mind. Just let me know.

If there are such devices that have pen + 2FGT then please adjust the patch as you should be able to test it ;)

Quoted 9 lines

Yes, there are pen + 2FGT devices in the market now. Will update the patch soon.

Quoted 2 lines

Also, if you [re]send me inputattach part for 8001 I shoudl try adding it to inputattach (it's not there yet, is it?).

No, inputattach is not part of this patchset. I am not sure which inputattach.c source my patch should be based on. The one under your repo looks a bit old....

The one on the sourceforge should be recent.

Signature · 5 lines
Dmitry
--
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