Input: MT - handle semi-mt devices in core

rydberg · dtor · commit a0ef6a348a47 · 2013-04-07T21:02:32.000-07:00
Most semi-mt drivers use the slots in a manual way, but really only
need to treat the finger count manually. With this patch, a semi-mt
driver may use the input-mt core for everything else.

Signed-off-by: Henrik Rydberg &lt;rydberg@euromail.se&gt;
Signed-off-by: Dmitry Torokhov &lt;dmitry.torokhov@gmail.com&gt;
diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c
@@ -79,6 +79,8 @@ int input_mt_init_slots(struct input_dev *dev, unsigned int num_slots,
 	}
 	if (flags & INPUT_MT_DIRECT)
 		__set_bit(INPUT_PROP_DIRECT, dev->propbit);
+	if (flags & INPUT_MT_SEMI_MT)
+		__set_bit(INPUT_PROP_SEMI_MT, dev->propbit);
 	if (flags & INPUT_MT_TRACK) {
 		unsigned int n2 = num_slots * num_slots;
 		mt->red = kcalloc(n2, sizeof(*mt->red), GFP_KERNEL);
@@ -246,6 +248,7 @@ void input_mt_sync_frame(struct input_dev *dev)
 {
 	struct input_mt *mt = dev->mt;
 	struct input_mt_slot *s;
+	bool use_count = false;
 
 	if (!mt)
 		return;
@@ -259,7 +262,10 @@ void input_mt_sync_frame(struct input_dev *dev)
 		}
 	}
 
-	input_mt_report_pointer_emulation(dev, (mt->flags & INPUT_MT_POINTER));
+	if ((mt->flags & INPUT_MT_POINTER) && !(mt->flags & INPUT_MT_SEMI_MT))
+		use_count = true;
+
+	input_mt_report_pointer_emulation(dev, use_count);
 
 	mt->frame++;
 }
diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h
@@ -19,6 +19,7 @@
 #define INPUT_MT_DIRECT		0x0002	/* direct device, e.g. touchscreen */
 #define INPUT_MT_DROP_UNUSED	0x0004	/* drop contacts not seen in frame */
 #define INPUT_MT_TRACK		0x0008	/* use in-kernel tracking */
+#define INPUT_MT_SEMI_MT	0x0010	/* semi-mt device, finger count handled manually */
 
 /**
  * struct input_mt_slot - represents the state of an input MT slot

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@ int input_mt_init_slots(struct input_dev *dev, unsigned int num_slots,`
`79`	`79`	`}`
`80`	`80`	`if (flags & INPUT_MT_DIRECT)`
`81`	`81`	`__set_bit(INPUT_PROP_DIRECT, dev->propbit);`
	`82`	`+ if (flags & INPUT_MT_SEMI_MT)`
	`83`	`+ __set_bit(INPUT_PROP_SEMI_MT, dev->propbit);`
`82`	`84`	`if (flags & INPUT_MT_TRACK) {`
`83`	`85`	`unsigned int n2 = num_slots * num_slots;`
`84`	`86`	`mt->red = kcalloc(n2, sizeof(*mt->red), GFP_KERNEL);`
`@@ -246,6 +248,7 @@ void input_mt_sync_frame(struct input_dev *dev)`
`246`	`248`	`{`
`247`	`249`	`struct input_mt *mt = dev->mt;`
`248`	`250`	`struct input_mt_slot *s;`
	`251`	`+ bool use_count = false;`
`249`	`252`
`250`	`253`	`if (!mt)`
`251`	`254`	`return;`
`@@ -259,7 +262,10 @@ void input_mt_sync_frame(struct input_dev *dev)`
`259`	`262`	`}`
`260`	`263`	`}`
`261`	`264`
`262`		`- input_mt_report_pointer_emulation(dev, (mt->flags & INPUT_MT_POINTER));`
	`265`	`+ if ((mt->flags & INPUT_MT_POINTER) && !(mt->flags & INPUT_MT_SEMI_MT))`
	`266`	`+ use_count = true;`
	`267`	`+`
	`268`	`+ input_mt_report_pointer_emulation(dev, use_count);`
`263`	`269`
`264`	`270`	`mt->frame++;`
`265`	`271`	`}`