From b6e8aef4fb25b1334cb0ffa81b363d65078b8155 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 20 Sep 2021 11:53:45 +1000 Subject: [PATCH] touchpad: mark USB touchpads as internal by default External touchpads using USB are vanishingly few, built-in touchpads that use USB are comparatively common. So let's default to internal, for vendors like Logitech and Wacom that only make external touchpads we have special conditions in place anyway. Fixes #664 Signed-off-by: Peter Hutterer --- src/evdev-mt-touchpad.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index 4ddc9e07..6c97bce1 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -2729,22 +2729,15 @@ evdev_tag_touchpad(struct evdev_device *device, /* The hwdb is the authority on integration, these heuristics are * the fallback only (they precede the hwdb too). * - * Simple approach: USB is unknown, with the exception - * of Apple where internal touchpads are connected over USB and it - * doesn't have external USB touchpads anyway. - * + * Simple approach: * Bluetooth touchpads are considered external, anything else is - * internal. + * internal. Except the ones from some vendors that only make external + * touchpads. */ bustype = libevdev_get_id_bustype(device->evdev); vendor = libevdev_get_id_vendor(device->evdev); switch (bustype) { - case BUS_USB: - if (evdev_device_has_model_quirk(device, - QUIRK_MODEL_APPLE_TOUCHPAD)) - evdev_tag_touchpad_internal(device); - break; case BUS_BLUETOOTH: evdev_tag_touchpad_external(device); break;