chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4d36578
)
rules: input - fix comments
author
Kay Sievers
<kay.sievers@vrfy.org>
Mon, 27 Apr 2009 01:50:48 +0000
(
03:50
+0200)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Mon, 27 Apr 2009 01:50:48 +0000
(
03:50
+0200)
rules/rules.d/60-persistent-input.rules
patch
|
blob
|
history
diff --git
a/rules/rules.d/60-persistent-input.rules
b/rules/rules.d/60-persistent-input.rules
index fa691939f812e70bd2028e822d231d4ef1aebbf9..9b0e75fb987b9d572969b404859366fc061f0aa2 100644
(file)
--- a/
rules/rules.d/60-persistent-input.rules
+++ b/
rules/rules.d/60-persistent-input.rules
@@
-4,8
+4,9
@@
ACTION!="add|change", GOTO="persistent_input_end"
SUBSYSTEM!="input", GOTO="persistent_input_end"
KERNEL=="input[0-9]*", GOTO="persistent_input_end"
SUBSYSTEM!="input", GOTO="persistent_input_end"
KERNEL=="input[0-9]*", GOTO="persistent_input_end"
-# usb devices
SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p"
SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p"
+
+# well defined boot-subclass usb devices
SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceProtocol}=="01", ENV{ID_CLASS}="kbd", GOTO="serial"
SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceProtocol}=="02", ENV{ID_CLASS}="mouse", GOTO="serial"
SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceProtocol}=="01", ENV{ID_CLASS}="kbd", GOTO="serial"
SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceProtocol}=="02", ENV{ID_CLASS}="mouse", GOTO="serial"
@@
-14,6
+15,7
@@
DRIVERS=="pcspkr", ENV{ID_CLASS}="spkr", GOTO="serial"
DRIVERS=="atkbd", ENV{ID_CLASS}="kbd", GOTO="serial"
DRIVERS=="psmouse", ENV{ID_CLASS}="mouse", GOTO="serial"
ATTRS{name}=="*dvb*|*DVB*|* IR *", ENV{ID_CLASS}="ir", GOTO="serial"
DRIVERS=="atkbd", ENV{ID_CLASS}="kbd", GOTO="serial"
DRIVERS=="psmouse", ENV{ID_CLASS}="mouse", GOTO="serial"
ATTRS{name}=="*dvb*|*DVB*|* IR *", ENV{ID_CLASS}="ir", GOTO="serial"
+
# joystick (ABS_X || ABS_WHEEL || ABS_THROTTLE) && !BTN_TOUCH
ATTRS{modalias}=="input:*-*a[068],*|input:*-*a*,[68],*m*", ATTRS{modalias}!="input:*-*k*14A,*r*", \
ENV{ID_CLASS}="joystick", GOTO="serial"
# joystick (ABS_X || ABS_WHEEL || ABS_THROTTLE) && !BTN_TOUCH
ATTRS{modalias}=="input:*-*a[068],*|input:*-*a*,[68],*m*", ATTRS{modalias}!="input:*-*k*14A,*r*", \
ENV{ID_CLASS}="joystick", GOTO="serial"
@@
-24,7
+26,7
@@
LABEL="serial", ENV{ID_CLASS}=="?*", ENV{ID_SERIAL}=="", ENV{ID_SERIAL}="noseria
# by-id links
KERNEL=="mouse*|js*", ENV{ID_BUS}=="?*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_CLASS}"
KERNEL=="event*", ENV{ID_BUS}=="?*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-event-$env{ID_CLASS}"
# by-id links
KERNEL=="mouse*|js*", ENV{ID_BUS}=="?*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_CLASS}"
KERNEL=="event*", ENV{ID_BUS}=="?*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-event-$env{ID_CLASS}"
-# allow empty class for USB devices,
and append
the interface number
+# allow empty class for USB devices,
by appending
the interface number
SUBSYSTEMS=="usb", ENV{ID_BUS}=="?*", ENV{ID_CLASS}=="", ATTRS{bInterfaceNumber}=="?*", \
SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-event-if$attr{bInterfaceNumber}"
SUBSYSTEMS=="usb", ENV{ID_BUS}=="?*", ENV{ID_CLASS}=="", ATTRS{bInterfaceNumber}=="?*", \
SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-event-if$attr{bInterfaceNumber}"