[Linux-kernel-commits] [8855] trunk/drivers/input/touchscreen/ad7879.c: [#6017] Implement EV_KEY: BTN_TOUCH reporting on AD7879/AD7877 touch

Wed, 26 May 2010 06:43:06 -0700

Title: [8855] trunk/drivers/input/touchscreen/ad7879.c: [#6017] Implement EV_KEY:BTN_TOUCH reporting on AD7879/AD7877 touch
Revision
8855
Author
hennerich
Date
2010-05-26 09:45:09 -0400 (Wed, 26 May 2010)

Log Message

[#6017] Implement EV_KEY:BTN_TOUCH reporting on AD7879/AD7877 touch
screen drivers
Some input users such as Android or X require BTN_TOUCH events.
Implement EV_KEY:BTN_TOUCH and make sure that the release event 
is not erroneous scheduled without a preceding valid touch.


Modified Paths

Diff

Modified: trunk/drivers/input/touchscreen/ad7879.c (8854 => 8855)


--- trunk/drivers/input/touchscreen/ad7879.c	2010-05-26 13:32:00 UTC (rev 8854)
+++ trunk/drivers/input/touchscreen/ad7879.c	2010-05-26 13:45:09 UTC (rev 8855)
@@ -140,7 +140,7 @@
 	return ts->bdata.bops->write(ts->bdata.client, reg, val);
 }
 
-static void ad7879_report(struct ad7879 *ts)
+static int ad7879_report(struct ad7879 *ts)
 {
 	struct input_dev *input_dev = ts->input;
 	unsigned Rt;
@@ -167,11 +167,17 @@
 		Rt /= z1;
 		Rt = (Rt + 2047) >> 12;
 
+		if (!timer_pending(&ts->timer))
+			input_report_key(input_dev, BTN_TOUCH, 1);
+
 		input_report_abs(input_dev, ABS_X, x);
 		input_report_abs(input_dev, ABS_Y, y);
 		input_report_abs(input_dev, ABS_PRESSURE, Rt);
 		input_sync(input_dev);
+		return 0;
 	}
+
+	return -EINVAL;
 }
 
 static void ad7879_work(struct work_struct *work)
@@ -180,8 +186,8 @@
 
 	/* use keventd context to read the result registers */
 	ad7879_multi_read(ts, AD7879_REG_XPLUS, AD7879_NR_SENSE, ts->conversion_data);
-	ad7879_report(ts);
-	mod_timer(&ts->timer, jiffies + TS_PEN_UP_TIMEOUT);
+	if (!ad7879_report(ts))
+		mod_timer(&ts->timer, jiffies + TS_PEN_UP_TIMEOUT);
 }
 
 static void ad7879_ts_event_release(struct ad7879 *ts)
@@ -189,6 +195,7 @@
 	struct input_dev *input_dev = ts->input;
 
 	input_report_abs(input_dev, ABS_PRESSURE, 0);
+	input_report_key(input_dev, BTN_TOUCH, 0);
 	input_sync(input_dev);
 }
 
@@ -474,6 +481,8 @@
 	input_dev->dev.parent = dev;
 	input_dev->id.bustype = bustype;
 
+	__set_bit(EV_KEY, input_dev->evbit);
+	__set_bit(BTN_TOUCH, input_dev->keybit);
 	__set_bit(EV_ABS, input_dev->evbit);
 	__set_bit(ABS_X, input_dev->absbit);
 	__set_bit(ABS_Y, input_dev->absbit);

_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to