]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Input: elantech - remove support for proprietary X driver
authorÉric Piel <E.A.B.Piel@tudelft.nl>
Tue, 17 May 2011 05:45:54 +0000 (22:45 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 17 May 2011 05:48:43 +0000 (22:48 -0700)
Apparently somewhere someone had a proprietary X driver. To get the
multitouch info, it uses some hack on the normal API instead of using
the multitouch protocol. Now that the multitouch info is transmitted
correctly it makes not much sense to keep it. Especially because it's
impossible to find this proprietary X driver anywhere, so the number of
users must be very low.

Signed-off-by: Éric Piel <eric.piel@tremplin-utc.net>
Reviewed-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/mouse/elantech.c

index 32648b34b1156cae4e8cc84192a7a3c5a03f64f2..32503565faf90faf229c4560d7fdfcda3f8c8561 100644 (file)
@@ -330,14 +330,6 @@ static void elantech_report_absolute_v2(struct psmouse *psmouse)
                 */
                input_report_abs(dev, ABS_X, x1 << 2);
                input_report_abs(dev, ABS_Y, y1 << 2);
-               /*
-                * For compatibility with the proprietary X Elantech driver
-                * report both coordinates as hat coordinates
-                */
-               input_report_abs(dev, ABS_HAT0X, x1);
-               input_report_abs(dev, ABS_HAT0Y, y1);
-               input_report_abs(dev, ABS_HAT1X, x2);
-               input_report_abs(dev, ABS_HAT1Y, y2);
 
                /* Unknown so just report sensible values */
                pres = 127;
@@ -524,10 +516,6 @@ static void elantech_set_input_params(struct psmouse *psmouse)
                input_mt_init_slots(dev, 2);
                input_set_abs_params(dev, ABS_MT_POSITION_X, ETP_XMIN_V2, ETP_XMAX_V2, 0, 0);
                input_set_abs_params(dev, ABS_MT_POSITION_Y, ETP_YMIN_V2, ETP_YMAX_V2, 0, 0);
-               input_set_abs_params(dev, ABS_HAT0X, ETP_2FT_XMIN, ETP_2FT_XMAX, 0, 0);
-               input_set_abs_params(dev, ABS_HAT0Y, ETP_2FT_YMIN, ETP_2FT_YMAX, 0, 0);
-               input_set_abs_params(dev, ABS_HAT1X, ETP_2FT_XMIN, ETP_2FT_XMAX, 0, 0);
-               input_set_abs_params(dev, ABS_HAT1Y, ETP_2FT_YMIN, ETP_2FT_YMAX, 0, 0);
                break;
        }
 }