diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2015-03-17 16:06:41 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2015-03-18 07:25:31 +1000 |
| commit | 5378a020a003cbdfa565d43c9e01997b570059c9 (patch) | |
| tree | a95490105250dee95cdc8486c7ef0bcadbc21b28 /src/synapticsstr.h | |
| parent | 00db769067fa0703f96284bd50ea384efd47e2de (diff) | |
Revert "Support the new Lenovo X1 Carbon 3rd trackpoint buttons"
This reverts commit 064445364b4775b25ba49c2250b22b169f291147.
The Lenovo *50 series, including the X1 Carbon 3rd always require multiple
kernel patches to enable the touchpad buttons. This patch in synaptics only
addresses the re-routing of the top buttons.
The final iteration of the kernel patches also route the trackpoint buttons
through the trackpoint device, rendering this patch unnecessary. These patches
are queued for 4.0.
See kernel patch series up to commit cdd9dc195916ef5644cfac079094c3c1d1616e4c
Author: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Date: Sun Mar 8 22:35:41 2015 -0700
Input: synaptics - re-route tracksticks buttons on the Lenovo 2015 series
Currently in Dmitry's for-linus branch.
Distributions running older kernels or the kernel stable series which has
partial backports of the above patch series are encouraged to leave the
0644453 commit in and undo this revert.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'src/synapticsstr.h')
| -rw-r--r-- | src/synapticsstr.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/synapticsstr.h b/src/synapticsstr.h index 91c41fc..f8ab14e 100644 --- a/src/synapticsstr.h +++ b/src/synapticsstr.h @@ -289,7 +289,6 @@ struct _SynapticsPrivateRec { int repeatButtons; /* buttons for repeat */ int nextRepeat; /* Time when to trigger next auto repeat event */ int lastButtons; /* last state of the buttons */ - int lastTrackpointButtons; /* last state of the trackpoint buttons */ int prev_z; /* previous z value, for palm detection */ int prevFingers; /* previous numFingers, for transition detection */ int avg_width; /* weighted average of previous fingerWidth values */ @@ -309,7 +308,6 @@ struct _SynapticsPrivateRec { Bool has_pressure; /* device reports pressure */ Bool has_width; /* device reports finger width */ Bool has_scrollbuttons; /* device has physical scrollbuttons */ - Bool has_trackpoint_buttons;/* device has trackpoint buttons wired to touchpad */ Bool has_semi_mt; /* device is only semi-multitouch capable */ Bool has_mt_palm_detect; /* device reports per finger width and pressure */ |