From 5a599654d8d9752fe37765acf3e9b7174c5ef322 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 23 May 2016 14:33:51 +1000 Subject: [PATCH] Drop the ALPS_RUSHMORE tag Was only used for the touchpad hysteresis, we can re-use the wobbly touchpad tag for this. Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede (cherry picked from commit e1915b53b5c9c8989535080de775a3e7e3e7c395) Signed-off-by: Peter Hutterer --- src/evdev-mt-touchpad.c | 3 --- src/evdev.c | 1 - src/evdev.h | 1 - udev/90-libinput-model-quirks.hwdb | 4 +--- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index 6c9cfab0..c5a03592 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -2074,9 +2074,6 @@ tp_init_hysteresis(struct tp_dispatch *tp) if (tp->device->model_flags & EVDEV_MODEL_CYAPA) goto want_hysteresis; - if (tp->device->model_flags & EVDEV_MODEL_ALPS_RUSHMORE) - goto want_hysteresis; - if (tp->semi_mt && (tp->device->model_flags & EVDEV_MODEL_SYNAPTICS_SERIAL_TOUCHPAD)) goto want_hysteresis; diff --git a/src/evdev.c b/src/evdev.c index 0241edf9..32fe2f29 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1735,7 +1735,6 @@ evdev_read_model_flags(struct evdev_device *device) { "LIBINPUT_MODEL_APPLE_INTERNAL_KEYBOARD", EVDEV_MODEL_APPLE_INTERNAL_KEYBOARD }, { "LIBINPUT_MODEL_CYBORG_RAT", EVDEV_MODEL_CYBORG_RAT }, { "LIBINPUT_MODEL_CYAPA", EVDEV_MODEL_CYAPA }, - { "LIBINPUT_MODEL_ALPS_RUSHMORE", EVDEV_MODEL_ALPS_RUSHMORE }, { "LIBINPUT_MODEL_LENOVO_T450_TOUCHPAD", EVDEV_MODEL_LENOVO_T450_TOUCHPAD }, { "LIBINPUT_MODEL_WOBBLY_TOUCHPAD", EVDEV_MODEL_WOBBLY_TOUCHPAD }, { NULL, EVDEV_MODEL_DEFAULT }, diff --git a/src/evdev.h b/src/evdev.h index db6d83fa..b900be62 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -113,7 +113,6 @@ enum evdev_device_model { EVDEV_MODEL_APPLE_INTERNAL_KEYBOARD = (1 << 13), EVDEV_MODEL_CYBORG_RAT = (1 << 14), EVDEV_MODEL_CYAPA = (1 << 15), - EVDEV_MODEL_ALPS_RUSHMORE = (1 << 16), EVDEV_MODEL_LENOVO_T450_TOUCHPAD= (1 << 17), EVDEV_MODEL_WOBBLY_TOUCHPAD = (1 << 18), }; diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb index 88f3243d..e4ea1da6 100644 --- a/udev/90-libinput-model-quirks.hwdb +++ b/udev/90-libinput-model-quirks.hwdb @@ -28,11 +28,9 @@ libinput:name:*AlpsPS/2 ALPS GlidePoint:fwversion:800 libinput:name:*AlpsPS/2 ALPS DualPoint TouchPad:fwversion:300 libinput:name:*AlpsPS/2 ALPS GlidePoint:fwversion:300 - LIBINPUT_MODEL_WOBBLY_TOUCHPAD=1 - libinput:name:*AlpsPS/2 ALPS DualPoint TouchPad:fwversion:310 libinput:name:*AlpsPS/2 ALPS GlidePoint:fwversion:310 - LIBINPUT_MODEL_ALPS_RUSHMORE=1 + LIBINPUT_MODEL_WOBBLY_TOUCHPAD=1 ########################################## # Apple