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 <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index b582f65..e278dd9 100644 (file)
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -2042,9 +2042,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 5e41e38..cfb4a91 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1805,7 +1805,6 @@ evdev_read_model_flags(struct evdev_device *device)
                MODEL(APPLE_INTERNAL_KEYBOARD),
                MODEL(CYBORG_RAT),
                MODEL(CYAPA),
-               MODEL(ALPS_RUSHMORE),
                MODEL(LENOVO_T450_TOUCHPAD),
                MODEL(WOBBLY_TOUCHPAD),
                MODEL(TRACKBALL),

diff --git a/src/evdev.h b/src/evdev.h
index 8dafc2b..4fe2cb9 100644 (file)
--- 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),
        EVDEV_MODEL_TRACKBALL = (1 << 19),

diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb
index ddbcb92..eb2c00d 100644 (file)
--- 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