From ba32f0818ff04dbe4ae0e6600110a77471482cf1 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 28 Sep 2023 09:36:02 +1000 Subject: [PATCH] test: group the test devices and sort them Group the LITEST_FOO enum into sections for touchpads, mice, etc. This makes it easier to find whether a particular device may have a representation already. --- test/litest.h | 187 ++++++++++++++++++++++++++------------------------ 1 file changed, 99 insertions(+), 88 deletions(-) diff --git a/test/litest.h b/test/litest.h index 5fa1477c..1e23bf61 100644 --- a/test/litest.h +++ b/test/litest.h @@ -231,104 +231,115 @@ litest_fail_comparison_ptr(const char *file, enum litest_device_type { LITEST_NO_DEVICE = -1, - LITEST_SYNAPTICS_CLICKPAD_X220 = -1000, - LITEST_SYNAPTICS_TOUCHPAD, - LITEST_SYNAPTICS_TOPBUTTONPAD, - LITEST_BCM5974, - LITEST_KEYBOARD, - LITEST_TRACKPOINT, - LITEST_MOUSE, - LITEST_WACOM_TOUCH, + /* Touchpads and associated devices */ + LITEST_ACER_HAWAII_TOUCHPAD = -1000, + LITEST_AIPTEK, + LITEST_ALPS_3FG, + LITEST_ALPS_DUALPOINT, LITEST_ALPS_SEMI_MT, + LITEST_APPLETOUCH, + LITEST_ATMEL_HOVER, + LITEST_BCM5974, + LITEST_ELANTECH_TOUCHPAD, + LITEST_GENERIC_PRESSUREPAD, + LITEST_MAGIC_TRACKPAD, + LITEST_SYNAPTICS_CLICKPAD_X220, + LITEST_SYNAPTICS_HOVER_SEMI_MT, + LITEST_SYNAPTICS_I2C, + LITEST_SYNAPTICS_PHANTOMCLICKS, + LITEST_SYNAPTICS_PRESSUREPAD, + LITEST_SYNAPTICS_RMI4, + LITEST_SYNAPTICS_TOPBUTTONPAD, + LITEST_SYNAPTICS_TOUCHPAD, + LITEST_WACOM_FINGER, + + /* Touchscreens */ + LITEST_CALIBRATED_TOUCHSCREEN, + LITEST_GENERIC_MULTITOUCH_SCREEN, LITEST_GENERIC_SINGLETOUCH, LITEST_MS_SURFACE_COVER, - LITEST_QEMU_TABLET, - LITEST_XEN_VIRTUAL_POINTER, - LITEST_VMWARE_VIRTMOUSE, - LITEST_SYNAPTICS_HOVER_SEMI_MT, - LITEST_SYNAPTICS_TRACKPOINT_BUTTONS, - LITEST_PROTOCOL_A_SCREEN, - LITEST_WACOM_FINGER, - LITEST_KEYBOARD_BLACKWIDOW, - LITEST_WHEEL_ONLY, - LITEST_MOUSE_ROCCAT, - LITEST_LOGITECH_TRACKBALL, - LITEST_ATMEL_HOVER, - LITEST_ALPS_DUALPOINT, - LITEST_MOUSE_LOW_DPI, - LITEST_GENERIC_MULTITOUCH_SCREEN, - LITEST_NEXUS4_TOUCH_SCREEN, - LITEST_MAGIC_TRACKPAD, - LITEST_ELANTECH_TOUCHPAD, - LITEST_MOUSE_GLADIUS, - LITEST_MOUSE_WHEEL_CLICK_ANGLE, - LITEST_APPLE_KEYBOARD, - LITEST_ANKER_MOUSE_KBD, - LITEST_WACOM_BAMBOO, - LITEST_WACOM_CINTIQ, - LITEST_WACOM_INTUOS, - LITEST_WACOM_ISDV4, - LITEST_WALTOP, - LITEST_HUION_TABLET, - LITEST_CYBORG_RAT, - LITEST_YUBIKEY, - LITEST_SYNAPTICS_I2C, - LITEST_WACOM_CINTIQ_24HD, LITEST_MULTITOUCH_FUZZ_SCREEN, - LITEST_WACOM_INTUOS3_PAD, - LITEST_WACOM_INTUOS5_PAD, - LITEST_KEYBOARD_ALL_CODES, - LITEST_MAGICMOUSE, - LITEST_WACOM_EKR, - LITEST_WACOM_CINTIQ_24HDT_PAD, - LITEST_WACOM_CINTIQ_13HDT_PEN, - LITEST_WACOM_CINTIQ_13HDT_PAD, - LITEST_WACOM_CINTIQ_13HDT_FINGER, - LITEST_WACOM_CINTIQ_PRO16_PAD, - LITEST_WACOM_CINTIQ_PRO16_PEN, - LITEST_WACOM_CINTIQ_PRO16_FINGER, - LITEST_WACOM_HID4800_PEN, - LITEST_MOUSE_WHEEL_CLICK_COUNT, - LITEST_CALIBRATED_TOUCHSCREEN, - LITEST_ACER_HAWAII_KEYBOARD, - LITEST_ACER_HAWAII_TOUCHPAD, - LITEST_SYNAPTICS_RMI4, - LITEST_MOUSE_WHEEL_TILT, - LITEST_LID_SWITCH, - LITEST_LID_SWITCH_SURFACE3, - LITEST_APPLETOUCH, - LITEST_GPIO_KEYS, - LITEST_IGNORED_MOUSE, - LITEST_WACOM_MOBILESTUDIO_PRO_16_PAD, - LITEST_THINKPAD_EXTRABUTTONS, - LITEST_UCLOGIC_TABLET, - LITEST_KEYBOARD_BLADE_STEALTH, - LITEST_KEYBOARD_BLADE_STEALTH_VIDEOSWITCH, - LITEST_WACOM_BAMBOO_2FG_PAD, - LITEST_WACOM_BAMBOO_2FG_PEN, - LITEST_WACOM_BAMBOO_2FG_FINGER, - LITEST_HP_WMI_HOTKEYS, - LITEST_MS_NANO_TRANSCEIVER_MOUSE, - LITEST_AIPTEK, + LITEST_NEXUS4_TOUCH_SCREEN, + LITEST_PROTOCOL_A_SCREEN, LITEST_TOUCHSCREEN_INVALID_RANGE, LITEST_TOUCHSCREEN_MT_TOOL_TYPE, + LITEST_WACOM_TOUCH, + + /* Pointing devices and keyboards */ + LITEST_MOUSE, + LITEST_KEYBOARD, + LITEST_TRACKPOINT, + LITEST_ABSINFO_OVERRIDE, + LITEST_ACER_HAWAII_KEYBOARD, + LITEST_ANKER_MOUSE_KBD, + LITEST_APPLE_KEYBOARD, + LITEST_CYBORG_RAT, + LITEST_HP_WMI_HOTKEYS, + LITEST_IGNORED_MOUSE, + LITEST_KEYBOARD_ALL_CODES, + LITEST_KEYBOARD_BLACKWIDOW, + LITEST_KEYBOARD_BLADE_STEALTH, + LITEST_KEYBOARD_BLADE_STEALTH_VIDEOSWITCH, + LITEST_KEYBOARD_LOGITECH_MEDIA_KEYBOARD_ELITE, + LITEST_KEYBOARD_QUIRKED, + LITEST_LENOVO_SCROLLPOINT, + LITEST_LOGITECH_TRACKBALL, + LITEST_MAGICMOUSE, + LITEST_MOUSE_FORMAT_STRING, + LITEST_MOUSE_GLADIUS, + LITEST_MOUSE_LOW_DPI, + LITEST_MOUSE_ROCCAT, + LITEST_MOUSE_WHEEL_CLICK_ANGLE, + LITEST_MOUSE_WHEEL_CLICK_COUNT, + LITEST_MOUSE_WHEEL_TILT, + LITEST_MS_NANO_TRANSCEIVER_MOUSE, + LITEST_SONY_VAIO_KEYS, + LITEST_SYNAPTICS_TRACKPOINT_BUTTONS, + LITEST_THINKPAD_EXTRABUTTONS, + LITEST_VMWARE_VIRTMOUSE, + LITEST_WHEEL_ONLY, + LITEST_XEN_VIRTUAL_POINTER, + + /* Switches */ + LITEST_LID_SWITCH, + LITEST_LID_SWITCH_SURFACE3, + LITEST_TABLET_MODE_UNRELIABLE, + + /* Special devices */ LITEST_DELL_CANVAS_TOTEM, LITEST_DELL_CANVAS_TOTEM_TOUCH, - LITEST_WACOM_ISDV4_4200_PEN, - LITEST_ALPS_3FG, + LITEST_GPIO_KEYS, + LITEST_YUBIKEY, + + /* Tablets */ LITEST_ELAN_TABLET, - LITEST_ABSINFO_OVERRIDE, - LITEST_TABLET_MODE_UNRELIABLE, - LITEST_KEYBOARD_LOGITECH_MEDIA_KEYBOARD_ELITE, - LITEST_SONY_VAIO_KEYS, - LITEST_KEYBOARD_QUIRKED, - LITEST_SYNAPTICS_PRESSUREPAD, - LITEST_GENERIC_PRESSUREPAD, - LITEST_WACOM_ISDV4_524C_PEN, - LITEST_MOUSE_FORMAT_STRING, - LITEST_LENOVO_SCROLLPOINT, - LITEST_SYNAPTICS_PHANTOMCLICKS, + LITEST_HUION_TABLET, + LITEST_QEMU_TABLET, + LITEST_UCLOGIC_TABLET, + LITEST_WACOM_BAMBOO, + LITEST_WACOM_BAMBOO_2FG_FINGER, + LITEST_WACOM_BAMBOO_2FG_PAD, + LITEST_WACOM_BAMBOO_2FG_PEN, LITEST_WACOM_CALIBRATED_TABLET, + LITEST_WACOM_CINTIQ, + LITEST_WACOM_CINTIQ_13HDT_FINGER, + LITEST_WACOM_CINTIQ_13HDT_PAD, + LITEST_WACOM_CINTIQ_13HDT_PEN, + LITEST_WACOM_CINTIQ_24HD, + LITEST_WACOM_CINTIQ_24HDT_PAD, + LITEST_WACOM_CINTIQ_PRO16_FINGER, + LITEST_WACOM_CINTIQ_PRO16_PAD, + LITEST_WACOM_CINTIQ_PRO16_PEN, + LITEST_WACOM_EKR, + LITEST_WACOM_HID4800_PEN, + LITEST_WACOM_INTUOS, + LITEST_WACOM_INTUOS3_PAD, + LITEST_WACOM_INTUOS5_PAD, + LITEST_WACOM_ISDV4, + LITEST_WACOM_ISDV4_4200_PEN, + LITEST_WACOM_ISDV4_524C_PEN, + LITEST_WACOM_MOBILESTUDIO_PRO_16_PAD, + LITEST_WALTOP, }; #define LITEST_DEVICELESS -2