Commit b9ec4088 authored by Peter Hutterer's avatar Peter Hutterer

evdev: drop the check for tablet vs joystick

libwacom has been unsetting ID_INPUT_JOYSTICK for known tablets since 2015
(libwacom 0.12) so this comment is outdated. And the input-id udev builtin
never labels something as tablet *and* joystick. Which means: systemd sets
either tablet or joystick. For tablets that are known to libwacom the joystick
bit gets corrected and we only see the tablet bits.

Tablets unknown to libwacom remain as joysticks and are ignored but that's the
behavior we had anyway.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent eededbeb
Pipeline #177030 passed with stages
in 16 minutes and 8 seconds
......@@ -1810,11 +1810,7 @@ evdev_configure_device(struct evdev_device *device)
evdev_disable_accelerometer_axes(device);
}
/* libwacom *adds* TABLET, TOUCHPAD but leaves JOYSTICK in place, so
make sure we only ignore real joystick devices */
const unsigned int joystick_tag = EVDEV_UDEV_TAG_JOYSTICK;
const unsigned int joystick_or_tablet_tag = EVDEV_UDEV_TAG_JOYSTICK|EVDEV_UDEV_TAG_TABLET;
if ((udev_tags & joystick_or_tablet_tag) == joystick_tag) {
if (udev_tags & EVDEV_UDEV_TAG_JOYSTICK) {
evdev_log_info(device, "device is a joystick, ignoring\n");
return NULL;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment