summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig) <jan.steffens@gmail.com>2015-05-18 15:13:23 +0200
committerPeter Hutterer <peter.hutterer@who-t.net>2015-05-21 11:31:55 +1000
commite39dca063bb27546c52970ba4a83d28d05563893 (patch)
tree389d657552b86d20792194a35d6b60b9f24479c8
parented5d43da36c338887ef5d22ebf2dd3eeced3afd6 (diff)
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) <jan.steffens@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/evdev-mt-touchpad-buttons.c2
-rw-r--r--src/evdev.c2
-rw-r--r--src/evdev.h2
-rw-r--r--udev/90-libinput-model-quirks.hwdb2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/evdev-mt-touchpad-buttons.c b/src/evdev-mt-touchpad-buttons.c
index d6acbf0a..43e983b2 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 4ce92501..5f1a943c 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 20c0b556..4281a159 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 0cdf2b2b..048e5cc6 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*