From 85bdb0a816513035abce34281a608b3c7fc32f13 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Mon, 18 May 2015 15:13:23 +0200 Subject: [PATCH] Rename MODEL_SYSTEM76_CLEVO to MODEL_CLEVO_W740SU The System76 Galago Ultra Pro is a rebranded Clevo W740SU with changed firmware strings. To my knowledge, the Clevo W740SU and all its rebrands possess smooth touchpads. In the original bug report[1], a Galago Ultra Pro was returned to the original DMI strings by flashing another firmware. This resulted in the model identified as MODEL_SYSTEM76_CLEVO. Since the actual manufacturer of the W740SU is Clevo and the CLEVO hwdb entry already properly identifies other W740SU rebrands like the Schenker S413, the model should be renamed to match. [1]: https://bugs.freedesktop.org/show_bug.cgi?id=90170#c3 https://bugs.freedesktop.org/show_bug.cgi?id=90353 Signed-off-by: Jan Alexander Steffens (heftig) --- src/evdev-mt-touchpad-buttons.c | 2 +- src/evdev.c | 2 +- src/evdev.h | 2 +- udev/90-libinput-model-quirks.hwdb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/evdev-mt-touchpad-buttons.c b/src/evdev-mt-touchpad-buttons.c index d6acbf0..43e983b 100644 --- a/src/evdev-mt-touchpad-buttons.c +++ b/src/evdev-mt-touchpad-buttons.c @@ -656,9 +656,9 @@ tp_click_get_default_method(struct tp_dispatch *tp) switch (device->model) { case EVDEV_MODEL_CHROMEBOOK: case EVDEV_MODEL_SYSTEM76_BONOBO: - case EVDEV_MODEL_SYSTEM76_CLEVO: case EVDEV_MODEL_SYSTEM76_GALAGO: case EVDEV_MODEL_SYSTEM76_KUDU: + case EVDEV_MODEL_CLEVO_W740SU: return LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER; default: break; diff --git a/src/evdev.c b/src/evdev.c index 4ce9250..5f1a943 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1449,9 +1449,9 @@ evdev_read_model(struct evdev_device *device) { "LIBINPUT_MODEL_LENOVO_X230", EVDEV_MODEL_LENOVO_X230 }, { "LIBINPUT_MODEL_CHROMEBOOK", EVDEV_MODEL_CHROMEBOOK }, { "LIBINPUT_MODEL_SYSTEM76_BONOBO", EVDEV_MODEL_SYSTEM76_BONOBO }, - { "LIBINPUT_MODEL_SYSTEM76_CLEVO", EVDEV_MODEL_SYSTEM76_CLEVO }, { "LIBINPUT_MODEL_SYSTEM76_GALAGO", EVDEV_MODEL_SYSTEM76_GALAGO }, { "LIBINPUT_MODEL_SYSTEM76_KUDU", EVDEV_MODEL_SYSTEM76_KUDU }, + { "LIBINPUT_MODEL_CLEVO_W740SU", EVDEV_MODEL_CLEVO_W740SU }, { NULL, EVDEV_MODEL_DEFAULT }, }; const struct model_map *m = model_map; diff --git a/src/evdev.h b/src/evdev.h index 20c0b55..4281a15 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -98,9 +98,9 @@ enum evdev_device_model { EVDEV_MODEL_LENOVO_X230, EVDEV_MODEL_CHROMEBOOK, EVDEV_MODEL_SYSTEM76_BONOBO, - EVDEV_MODEL_SYSTEM76_CLEVO, EVDEV_MODEL_SYSTEM76_GALAGO, EVDEV_MODEL_SYSTEM76_KUDU, + EVDEV_MODEL_CLEVO_W740SU, }; struct mt_slot { diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb index 0cdf2b2..048e5cc 100644 --- a/udev/90-libinput-model-quirks.hwdb +++ b/udev/90-libinput-model-quirks.hwdb @@ -55,7 +55,7 @@ libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnSystem76*pvrbonp5* # Clevo libinput:name:SynPS/2 Synaptics TouchPad:dmi:*pnW740SU*rnW740SU* - LIBINPUT_MODEL_SYSTEM76_CLEVO=1 + LIBINPUT_MODEL_CLEVO_W740SU=1 # Galago Ultra Pro libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnSystem76*pvrgalu1* -- 2.4.1