diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2018-05-30 11:14:52 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2018-05-31 13:09:37 +1000 |
| commit | a55693f87c58c24b6866ed0f38c5470124be3df7 (patch) | |
| tree | 8d0831cca01c27c5aea48f18f3d83ded85fbae63 | |
| parent | a9ef4ba1f33bf88c273eafd6d5e519e70419450b (diff) | |
udev: drop the JUMPING_SEMI_MT quirk, no-one uses it
Obsolete since 342bc510164e89d7c9a742406fb98f9deabf5c8f when we disabled MT on
all semi-mt touchpads.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/evdev.c | 1 | ||||
| -rw-r--r-- | src/evdev.h | 1 | ||||
| -rw-r--r-- | test/litest-device-synaptics-hover.c | 10 | ||||
| -rw-r--r-- | udev/libinput-model-quirks.c | 40 |
4 files changed, 0 insertions, 52 deletions
diff --git a/src/evdev.c b/src/evdev.c index 2a7743e4..625413c7 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1266,7 +1266,6 @@ evdev_read_model_flags(struct evdev_device *device) MODEL(WACOM_TOUCHPAD), MODEL(ALPS_TOUCHPAD), MODEL(SYNAPTICS_SERIAL_TOUCHPAD), - MODEL(JUMPING_SEMI_MT), MODEL(BOUNCING_KEYS), MODEL(CYBORG_RAT), MODEL(HP_STREAM11_TOUCHPAD), diff --git a/src/evdev.h b/src/evdev.h index 0d325fad..82094824 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -110,7 +110,6 @@ enum evdev_device_model { EVDEV_MODEL_WACOM_TOUCHPAD = (1 << 7), EVDEV_MODEL_ALPS_TOUCHPAD = (1 << 8), EVDEV_MODEL_SYNAPTICS_SERIAL_TOUCHPAD = (1 << 9), - EVDEV_MODEL_JUMPING_SEMI_MT = (1 << 10), EVDEV_MODEL_BOUNCING_KEYS = (1 << 11), EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = (1 << 12), EVDEV_MODEL_LENOVO_CARBON_X1_6TH = (1 << 13), diff --git a/test/litest-device-synaptics-hover.c b/test/litest-device-synaptics-hover.c index 2cade172..17529015 100644 --- a/test/litest-device-synaptics-hover.c +++ b/test/litest-device-synaptics-hover.c @@ -102,15 +102,6 @@ static struct input_absinfo absinfo[] = { { .value = -1 } }; -static const char udev_rule[] = -"ACTION==\"remove\", GOTO=\"synaptics_semi_mt_end\"\n" -"KERNEL!=\"event*\", GOTO=\"synaptics_semi_mt_end\"\n" -"\n" -"ATTRS{name}==\"SynPS/2 Synaptics TouchPad\",\\\n" -" ENV{LIBINPUT_MODEL_JUMPING_SEMI_MT}=\"1\"\n" -"\n" -"LABEL=\"synaptics_semi_mt_end\""; - TEST_DEVICE("synaptics-hover", .type = LITEST_SYNAPTICS_HOVER_SEMI_MT, .features = LITEST_TOUCHPAD | LITEST_SEMI_MT | LITEST_BUTTON, @@ -120,5 +111,4 @@ TEST_DEVICE("synaptics-hover", .id = &input_id, .events = events, .absinfo = absinfo, - .udev_rule = udev_rule, ) diff --git a/udev/libinput-model-quirks.c b/udev/libinput-model-quirks.c index 728f182f..020be6a2 100644 --- a/udev/libinput-model-quirks.c +++ b/udev/libinput-model-quirks.c @@ -51,43 +51,6 @@ prop_value(struct udev_device *device, return prop_value; } -static void -handle_touchpad_synaptics(struct udev_device *device) -{ - const char *product, *props; - int bus, vid, pid, version; - int prop; - - product = prop_value(device, "PRODUCT"); - if (!product) - return; - - if (sscanf(product, "%x/%x/%x/%x", &bus, &vid, &pid, &version) != 4) - return; - - if (bus != BUS_I8042 || vid != 0x2 || pid != 0x7) - return; - - props = prop_value(device, "PROP"); - if (sscanf(props, "%x", &prop) != 1) - return; - if (prop & (1 << INPUT_PROP_SEMI_MT)) - printf("LIBINPUT_MODEL_JUMPING_SEMI_MT=1\n"); -} - -static void -handle_touchpad(struct udev_device *device) -{ - const char *name = NULL; - - name = prop_value(device, "NAME"); - if (!name) - return; - - if (strstr(name, "Synaptics ") != NULL) - handle_touchpad_synaptics(device); -} - /** * For a non-zero fuzz on the x/y axes, print that fuzz as property and * reset the kernel's fuzz to 0. @@ -165,9 +128,6 @@ int main(int argc, char **argv) handle_absfuzz(device); - if (prop_value(device, "ID_INPUT_TOUCHPAD")) - handle_touchpad(device); - rc = 0; out: |