SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udev: hwdb: replace ID_INPUT_JOYSTICK_INTEGRATION

Browse Source 
Actually ID_INPUT_JOYSTICK_INTEGRATION was never used anywhere, replace
it with ID_INTEGRATION.

Follow up: a4381cae8b.
This commit is contained in:
David Santamaría Rogado
2026-02-20 18:34:00 +01:00
parent 8471eca549
commit e0684a9abc
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwdb.d/70-joystick.hwdb
+3 -3
View File
@@ -26,10 +26,10 @@
# #
# Permitted keys: # Permitted keys:
# Specify if a joystick is a built-in one or external: # Specify if a joystick is a built-in one or external:
# ID_INPUT_JOYSTICK_INTEGRATION=internal|external # ID_INTEGRATION=internal|external
# #
# If the property is missing, user-space can assume: # If the property is missing, user-space can assume:
# ID_INPUT_JOYSTICK_INTEGRATION=external # ID_INTEGRATION=external
# #
# By default i8042, i2c, and rmi devices are assumed to be internal, # By default i8042, i2c, and rmi devices are assumed to be internal,
# bluetooth devices are assumed to be external, usb devices are assumed # bluetooth devices are assumed to be external, usb devices are assumed
@@ -38,4 +38,4 @@
# Example entry; vid: ffff, pid: 0000; both must be lowercase. # Example entry; vid: ffff, pid: 0000; both must be lowercase.
# this will make this usb joystick to behave as internal. # this will make this usb joystick to behave as internal.
#joystick:usb:vffffp0000* #joystick:usb:vffffp0000*
# ID_INPUT_JOYSTICK_INTEGRATION=internal # ID_INTEGRATION=internal
hwdb.d/parse_hwdb.py
+1 -1
View File
@@ -183,7 +183,7 @@ def property_grammar():
('ID_MM_DEVICE_IGNORE', Or((Literal('0'), Literal('1')))), ('ID_MM_DEVICE_IGNORE', Or((Literal('0'), Literal('1')))),
('ID_NET_AUTO_LINK_LOCAL_ONLY', Or((Literal('0'), Literal('1')))), ('ID_NET_AUTO_LINK_LOCAL_ONLY', Or((Literal('0'), Literal('1')))),
('POINTINGSTICK_SENSITIVITY', INTEGER), ('POINTINGSTICK_SENSITIVITY', INTEGER),
('ID_INPUT_JOYSTICK_INTEGRATION', Or(('internal', 'external'))), ('ID_INTEGRATION', Or(('internal', 'external'))),
('ID_INPUT_TOUCHPAD_INTEGRATION', Or(('internal', 'external'))), ('ID_INPUT_TOUCHPAD_INTEGRATION', Or(('internal', 'external'))),
('XKB_FIXED_LAYOUT', xkb_setting), ('XKB_FIXED_LAYOUT', xkb_setting),
('XKB_FIXED_VARIANT', xkb_setting), ('XKB_FIXED_VARIANT', xkb_setting),
rules.d/65-integration.rules
+1 -4
View File
@@ -16,10 +16,7 @@ ENV{ID_BUS}=="bluetooth", ENV{ID_INTEGRATION}="external"
ENV{ID_BUS}=="usb", DRIVERS=="usb", ATTRS{maxchild}=="0", ATTRS{removable}=="fixed", ENV{ID_INTEGRATION}="internal" ENV{ID_BUS}=="usb", DRIVERS=="usb", ATTRS{maxchild}=="0", ATTRS{removable}=="fixed", ENV{ID_INTEGRATION}="internal"
ENV{ID_BUS}=="usb", DRIVERS=="usb", ATTRS{maxchild}=="0", ATTRS{removable}=="removable|unknown", ENV{ID_INTEGRATION}="external" ENV{ID_BUS}=="usb", DRIVERS=="usb", ATTRS{maxchild}=="0", ATTRS{removable}=="removable|unknown", ENV{ID_INTEGRATION}="external"
# libinput compatibility variables, must be loaded before 70-(joystick|touchpad).rules to allow hwdb quirks to override. # libinput compatibility, must be loaded before 70-touchpad.rules to allow hwdb quirks to override.
ENV{ID_INPUT}=="", GOTO="integration_libinput_end"
ENV{ID_INPUT_JOYSTICK}=="1", ENV{ID_INPUT_JOYSTICK_INTEGRATION}="$env{ID_INTEGRATION}"
ENV{ID_INPUT_TOUCHPAD}=="1", ENV{ID_INPUT_TOUCHPAD_INTEGRATION}="$env{ID_INTEGRATION}" ENV{ID_INPUT_TOUCHPAD}=="1", ENV{ID_INPUT_TOUCHPAD_INTEGRATION}="$env{ID_INTEGRATION}"
LABEL="integration_libinput_end"
LABEL="integration_end" LABEL="integration_end"
rules.d/70-joystick.rules
-5
View File
@@ -8,9 +8,4 @@ KERNEL!="event*", GOTO="joystick_end"
KERNELS=="input*", ENV{ID_BUS}!="", \ KERNELS=="input*", ENV{ID_BUS}!="", \
IMPORT{builtin}="hwdb 'joystick:$env{ID_BUS}:v$attr{id/vendor}p$attr{id/product}:name:$attr{name}:'" IMPORT{builtin}="hwdb 'joystick:$env{ID_BUS}:v$attr{id/vendor}p$attr{id/product}:name:$attr{name}:'"
# Spread the hwdb override to ID_INTEGRATION, in the future we could remove the
# joystick hwdb entirely or retain it using the generic ID_INTEGRATION instead
# specific ID_INPUT_JOYSTICK_INTEGRATION.
ENV{ID_INPUT_JOYSTICK_INTEGRATION}!="", ENV{ID_INTEGRATION}="$env{ID_INPUT_JOYSTICK_INTEGRATION}"
LABEL="joystick_end" LABEL="joystick_end"