HID: hid-multitouch: refactor last_field_index

[android-x86/kernel.git] / drivers / hid / hid-multitouch.c

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index f27447b..c1a2274 100644 (file)
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -223,6 +223,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                        set_abs(hi->input, ABS_MT_POSITION_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)
@@ -232,6 +233,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                        set_abs(hi->input, ABS_MT_POSITION_Y, field,
                                cls->sn_move);
                        td->last_slot_field = usage->hid;
+                       td->last_field_index = field->index;
                        return 1;
                }
                return 0;
@@ -245,6 +247,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                                ABS_MT_TOUCH_MINOR);
                        set_abs(hi->input, ABS_MT_TOUCH_MINOR, field, 0);
                        td->last_slot_field = usage->hid;
+                       td->last_field_index = field->index;
                        return 1;
                case HID_DG_CONFIDENCE:
                        hid_map_usage(hi, usage, bit, max, EV_KEY,
@@ -253,6 +256,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                                ABS_MT_TOUCH_MINOR);
                        set_abs(hi->input, ABS_MT_TOUCH_MINOR, field, 0);
                        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,
@@ -261,6 +265,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                                ABS_MT_TOUCH_MAJOR);
                        set_abs(hi->input, ABS_MT_TOUCH_MAJOR, field, 0);
                        td->last_slot_field = usage->hid;
+                       td->last_field_index = field->index;
                        return 1;
                case HID_DG_CONTACTID:
                        hid_map_usage(hi, usage, bit, max, EV_KEY,
@@ -269,6 +274,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                                ABS_MT_TRACKING_ID);
                        set_abs(hi->input, ABS_MT_TRACKING_ID, field, 0);
                        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, EV_KEY,
@@ -277,6 +283,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                                ABS_MT_WIDTH_MAJOR);
                        set_abs(hi->input, ABS_MT_WIDTH_MAJOR, field, 0);
                        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,
@@ -285,6 +292,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                                ABS_MT_WIDTH_MINOR);
                        set_abs(hi->input, ABS_MT_WIDTH_MINOR, field, 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)
@@ -297,13 +305,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 */
@@ -463,23 +473,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