HID: hid-multitouch: refactor last_field_index

the current implementation requires the devices to report
HID_DG_CONTACTCOUNT to set the last_field_index value.
However, devices reporting in serial mode (DWAV and PenMount)
do not send this field.
Other devices (3M) add other fields in the reports descriptor
that are not multitouch related at the end, thus the need to
add a special case in the default case when handling events.

A first work around has been set up but with PenMount devices,
we have reached the limit.

The idea is to calculate the last_field_index by relying only on
multitouch fields the device send. This allows us to remove
the handling of non-multitouch events in hid-multitouch, and
guarantee that the function mt_emit_event is always called.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Reviewed-and-tested-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 11 insertions, 12 deletions

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 0175f8583095..6005e7888b14 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -210,6 +210,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                         /* touchscreen emulation */
                         set_abs(hi->input, ABS_X, field, cls->sn_move);
                         td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
                         return 1;
                 case HID_GD_Y:
                         if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
@@ -221,6 +222,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                         /* touchscreen emulation */
                         set_abs(hi->input, ABS_Y, field, cls->sn_move);
                         td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
                         return 1;
                 }
                 return 0;
@@ -229,18 +231,22 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                 switch (usage->hid) {
                 case HID_DG_INRANGE:
                         td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
                         return 1;
                 case HID_DG_CONFIDENCE:
                         td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
                         return 1;
                 case HID_DG_TIPSWITCH:
                         hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);
                         input_set_capability(hi->input, EV_KEY, BTN_TOUCH);
                         td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
                         return 1;
                 case HID_DG_CONTACTID:
                         input_mt_init_slots(hi->input, td->maxcontacts);
                         td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
                         return 1;
                 case HID_DG_WIDTH:
                         hid_map_usage(hi, usage, bit, max,
@@ -248,6 +254,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                         set_abs(hi->input, ABS_MT_TOUCH_MAJOR, field,
                                 cls->sn_width);
                         td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
                         return 1;
                 case HID_DG_HEIGHT:
                         hid_map_usage(hi, usage, bit, max,
@@ -257,6 +264,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                         input_set_abs_params(hi->input,
                                         ABS_MT_ORIENTATION, 0, 1, 0, 0);
                         td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
                         return 1;
                 case HID_DG_TIPPRESSURE:
                         if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
@@ -269,13 +277,15 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                         set_abs(hi->input, ABS_PRESSURE, field,
                                 cls->sn_pressure);
                         td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
                         return 1;
                 case HID_DG_CONTACTCOUNT:
-                        td->last_field_index = field->report->maxfield - 1;
+                        td->last_field_index = field->index;
                         return 1;
                 case HID_DG_CONTACTMAX:
                         /* we don't set td->last_slot_field as contactcount and
                          * contact max are global to the report */
+                        td->last_field_index = field->index;
                         return -1;
                 }
                 /* let hid-input decide for the others */
@@ -424,23 +434,12 @@ static int mt_event(struct hid_device *hid, struct hid_field *field,
                         break;
 
                 default:
-                        if (td->last_field_index
-                                && field->index == td->last_field_index)
-                                /* we reach here when the last field in the
-                                 * report is not related to multitouch.
-                                 * This is not good. As a temporary solution,
-                                 * we trigger our mt event completion and
-                                 * ignore the field.
-                                 */
-                                break;
                         /* fallback to the generic hidinput handling */
                         return 0;
                 }
 
                 if (usage->hid == td->last_slot_field) {
                         mt_complete_slot(td);
-                        if (!td->last_field_index)
-                                mt_emit_event(td, field->hidinput->input);
                 }
 
                 if (field->index == td->last_field_index