--- trunk/udev/udev-persistent-input.rules.magellan	2007/05/17 19:23:35	188
+++ trunk/udev/udev-persistent-input.rules.magellan	2008/12/22 20:31:37	717
@@ -1,12 +1,29 @@
 # /etc/udev/rules/60-persistent-input.rules:  device naming rules for udev
-# $Header: /root/magellan-cvs/src/udev/udev-persistent-input.rules.magellan,v 1.2 2007-05-17 19:23:23 niro Exp $
+# $Header: /root/magellan-cvs/src/udev/udev-persistent-input.rules.magellan,v 1.5 2008-12-22 20:31:37 niro Exp $
+#
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+# %n - the "kernel number" of the device.
+#      For example, 'sda3' has a "kernel number" of '3'
+# %k - the kernel name for the device.
+# %M - the kernel major number for the device
+# %m - the kernel minor number for the device
+# %b - the bus id for the device
+# %c - the string returned by the PROGRAM. (Note, this doesn't work within
+#      the PROGRAM field for the obvious reason.)
+# %s{filename} - the content of a sysfs attribute.
+# %% - the '%' char itself.
+#
+# Try not to modify this file, if you wish to change things, create a new rule
+# file that can be run before this one.
+#
 
-ACTION!="add", GOTO="persistent_input_end"
+ACTION!="add|change", 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 -x"
+SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export"
 SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceProtocol}=="01", ENV{ID_CLASS}="kbd"
 SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceProtocol}=="02", ENV{ID_CLASS}="mouse"
 
@@ -15,6 +32,7 @@
 DRIVERS=="atkbd", ENV{ID_CLASS}="kbd"
 DRIVERS=="psmouse", ENV{ID_CLASS}="mouse"
 ATTRS{name}=="*dvb*|*DVB*|* IR *", ENV{ID_CLASS}="ir"
+# 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"
 
 # fill empty serial number