All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jason Gerecke <killertofu@gmail.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Linux Input <linux-input@vger.kernel.org>,
	Ping Cheng <pinglinux@gmail.com>,
	Jason Gerecke <jgerecke@wacom.com>, Dima Zavin <dima@android.com>,
	Jason Gerecke <killertofu@gmail.com>
Subject: [PATCH 1/4] Revert to anonymous 'type A' MT protocol for touch
Date: Thu,  7 Jul 2011 14:04:57 -0700	[thread overview]
Message-ID: <1310072700-2829-1-git-send-email-killertofu@gmail.com> (raw)

Android (at least up to Gingerbread) does not understand the 'B' protocol
first made available in 2.6.36. As a workaround until this is fixed, we
drop back to using the 'A' protocol.

Signed-off-by: Jason Gerecke <killertofu@gmail.com>
---
 Now being sent upstream to LKML at the behest of Google.

 drivers/input/touchscreen/wacom_w8001.c |   33 ++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
index c14412e..7630806 100644
--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
@@ -151,8 +151,6 @@ static void parse_multi_touch(struct w8001 *w8001)
 	for (i = 0; i < 2; i++) {
 		bool touch = data[0] & (1 << i);
 
-		input_mt_slot(dev, i);
-		input_mt_report_slot_state(dev, MT_TOOL_FINGER, touch);
 		if (touch) {
 			x = (data[6 * i + 1] << 7) | data[6 * i + 2];
 			y = (data[6 * i + 3] << 7) | data[6 * i + 4];
@@ -163,9 +161,14 @@ static void parse_multi_touch(struct w8001 *w8001)
 
 			input_report_abs(dev, ABS_MT_POSITION_X, x);
 			input_report_abs(dev, ABS_MT_POSITION_Y, y);
+			input_report_abs(dev, ABS_MT_TOOL_TYPE, MT_TOOL_FINGER);
 			count++;
+
+			input_mt_sync(dev);
 		}
 	}
+	if (count == 0)
+		input_mt_sync(dev);
 
 	/* emulate single touch events when stylus is out of proximity.
 	 * This is to make single touch backward support consistent
@@ -173,8 +176,20 @@ static void parse_multi_touch(struct w8001 *w8001)
 	 */
 	if (w8001->type != BTN_TOOL_PEN &&
 			    w8001->type != BTN_TOOL_RUBBER) {
+		struct w8001_coord coord;
+
 		w8001->type = count == 1 ? BTN_TOOL_FINGER : KEY_RESERVED;
-		input_mt_report_pointer_emulation(dev, true);
+
+		parse_single_touch(data, &coord);
+		x = coord.x;
+		y = coord.y;
+		scale_touch_coordinates(w8001, &x, &y);
+
+		input_report_abs(dev, ABS_X, x);
+		input_report_abs(dev, ABS_Y, y);
+		input_report_key(dev, BTN_TOUCH, count > 0);
+		input_report_key(dev, BTN_TOOL_FINGER, count == 1);
+		input_report_key(dev, BTN_TOOL_DOUBLETAP, count == 2);
 	}
 
 	input_sync(dev);
@@ -228,6 +243,10 @@ static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
 			input_report_key(dev, BTN_STYLUS, 0);
 			input_report_key(dev, BTN_STYLUS2, 0);
 			input_report_key(dev, BTN_TOOL_RUBBER, 0);
+
+			/* No multi-touchpoints -> SYN_MT_REPORT; SYN_REPORT */
+			input_mt_sync(dev);
+
 			input_sync(dev);
 			w8001->type = BTN_TOOL_PEN;
 		}
@@ -236,10 +255,15 @@ static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
 	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:
+		/* No multi-touchpoints -> SYN_MT_REPORT; SYN_REPORT */
+		input_mt_sync(dev);
+
+		input_sync(dev);
+
 		w8001->type = coord->f2 ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
 		break;
 
@@ -455,7 +479,6 @@ static int w8001_setup(struct w8001 *w8001)
 		case 5:
 			w8001->pktlen = W8001_PKTLEN_TOUCH2FG;
 
-			input_mt_init_slots(dev, 2);
 			input_set_abs_params(dev, ABS_MT_POSITION_X,
 						0, touch.x, 0, 0);
 			input_set_abs_params(dev, ABS_MT_POSITION_Y,
-- 
1.7.5.2


             reply	other threads:[~2011-07-07 21:05 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-07 21:04 Jason Gerecke [this message]
2011-07-07 21:04 ` [PATCH 2/4] Use MT (in addition to single-touch) protocol for all events Jason Gerecke
2011-07-07 21:04 ` [PATCH 3/4] Fix hover in Android (Gingerbread) Jason Gerecke
2011-07-08  1:13   ` Jaya Kumar
2011-07-08 21:04     ` Jason Gerecke
2011-07-09  6:16       ` Dima Zavin
2011-07-09  6:15   ` Jeffrey Brown
2011-07-09  6:22     ` Dima Zavin
2011-07-07 21:05 ` [PATCH 4/4] Only report multi-touch when pen is out of range Jason Gerecke
2011-07-09  6:19   ` Jeffrey Brown
2011-07-07 21:35 ` [PATCH 1/4] Revert to anonymous 'type A' MT protocol for touch Dmitry Torokhov
2011-07-07 21:52   ` Dima Zavin
2011-07-07 22:32     ` Jason Gerecke
2011-08-03  4:31     ` Jiejing.Zhang 

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1310072700-2829-1-git-send-email-killertofu@gmail.com \
    --to=killertofu@gmail.com \
    --cc=dima@android.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=jgerecke@wacom.com \
    --cc=linux-input@vger.kernel.org \
    --cc=pinglinux@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.