--- trunk/udev/udev-persistent-input.rules.magellan	2009/05/23 22:35:53	823
+++ trunk/udev/udev-persistent-input.rules.magellan	2009/10/13 10:46:20	884
@@ -1,5 +1,5 @@
 # /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.7 2009-05-23 22:35:53 niro Exp $
+# $Header: /root/magellan-cvs/src/udev/udev-persistent-input.rules.magellan,v 1.8 2009-10-13 10:46:20 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:
@@ -34,8 +34,8 @@
 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*", \
+# joystick (ABS_X || ABS_WHEEL || ABS_THROTTLE) && !BTN_TOUCH && !BTN_DIGI
+ATTRS{modalias}=="input:*-*a[068],*|input:*-*a*,[68],*m*", ATTRS{modalias}!="input:*-*k*14[0A],*r*", \
   ENV{ID_CLASS}="joystick", GOTO="serial"
 
 # fill empty serial number
@@ -49,7 +49,7 @@
   SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-event-if$attr{bInterfaceNumber}"
 
 # by-path
-IMPORT{program}="path_id %p"
+SUBSYSTEMS=="usb|platform", IMPORT{program}="path_id %p"
 ENV{ID_PATH}=="?*", KERNEL=="mouse*|js*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-path/$env{ID_PATH}-$env{ID_CLASS}"
 ENV{ID_PATH}=="?*", KERNEL=="event*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-path/$env{ID_PATH}-event-$env{ID_CLASS}"
 # allow empty class for platform and usb devices; platform supports only a single interface that way
@@ -57,4 +57,3 @@
   SYMLINK+="input/by-path/$env{ID_PATH}-event"
 
 LABEL="persistent_input_end"
-