udev: hwdb: replace ID_INPUT_JOYSTICK_INTEGRATION

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

Follow up: a4381cae8bfacb1160967ac499c2919da7ff8c2b.

diff --git a/hwdb.d/70-joystick.hwdb b/hwdb.d/70-joystick.hwdb
index c38ef0fa341d84cf37797c6d19a39ea51616a4eb..ec5006332e7d48763c8b7149c3fe78a0e78a08c2 100644 (file)
--- a/hwdb.d/70-joystick.hwdb
+++ b/hwdb.d/70-joystick.hwdb
@@ -26,10 +26,10 @@
 #
 # Permitted keys:
 #   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:
-#   ID_INPUT_JOYSTICK_INTEGRATION=external
+#   ID_INTEGRATION=external
 #
 #   By default i8042, i2c, and rmi devices are assumed to be internal,
 #   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.
 # this will make this usb joystick to behave as internal.
 #joystick:usb:vffffp0000*
-# ID_INPUT_JOYSTICK_INTEGRATION=internal
+# ID_INTEGRATION=internal

diff --git a/hwdb.d/parse_hwdb.py b/hwdb.d/parse_hwdb.py
index 9e39911ae09a95bed6da6588d4fe90ed8e0bdc8b..c39c133788450bed6a1b12d0361bdfc77c346084 100755 (executable)
--- a/hwdb.d/parse_hwdb.py
+++ b/hwdb.d/parse_hwdb.py
@@ -183,7 +183,7 @@ def property_grammar():
              ('ID_MM_DEVICE_IGNORE', Or((Literal('0'), Literal('1')))),
              ('ID_NET_AUTO_LINK_LOCAL_ONLY', Or((Literal('0'), Literal('1')))),
              ('POINTINGSTICK_SENSITIVITY', INTEGER),
-             ('ID_INPUT_JOYSTICK_INTEGRATION', Or(('internal', 'external'))),
+             ('ID_INTEGRATION', Or(('internal', 'external'))),
              ('ID_INPUT_TOUCHPAD_INTEGRATION', Or(('internal', 'external'))),
              ('XKB_FIXED_LAYOUT', xkb_setting),
              ('XKB_FIXED_VARIANT', xkb_setting),

diff --git a/rules.d/65-integration.rules b/rules.d/65-integration.rules
index 4517ebcfe96a99b0998329b3f977ce9364c95939..5f26416eb5cb548c3e170cb86c9aad24a622434d 100644 (file)
--- a/rules.d/65-integration.rules
+++ b/rules.d/65-integration.rules
@@ -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}=="removable|unknown", ENV{ID_INTEGRATION}="external"
 
-# libinput compatibility variables, must be loaded before 70-(joystick|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}"
+# libinput compatibility, must be loaded before 70-touchpad.rules to allow hwdb quirks to override.
 ENV{ID_INPUT_TOUCHPAD}=="1", ENV{ID_INPUT_TOUCHPAD_INTEGRATION}="$env{ID_INTEGRATION}"
-LABEL="integration_libinput_end"
 
 LABEL="integration_end"

diff --git a/rules.d/70-joystick.rules b/rules.d/70-joystick.rules
index 00e7ab49f3b55c56ddc6f560d3b90703d0f7d060..34c369a78db71ba7bf54a1e5c7b5ef5301bc0d75 100644 (file)
--- a/rules.d/70-joystick.rules
+++ b/rules.d/70-joystick.rules
@@ -8,9 +8,4 @@ KERNEL!="event*", GOTO="joystick_end"
 KERNELS=="input*", ENV{ID_BUS}!="", \
         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"