[dahdi-commits] tzafrir: linux/trunk r7753 - /linux/trunk/drivers/dahdi/xpp/xpp.rules

[SVN commits to the DAHDI project]

Author: tzafrir
Date: Mon Jan  4 11:01:34 2010
New Revision: 7753

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7753
Log:
Fix udev rules to work with more recent kernels.

Note that this change will not work on most older systems (e.g.:
Centos5, with its udev 0.95) if the matching change of xpp_fxloader in
tools (r7752) is not applied.

* Replace deprecated 'BUS' with 'SUBSYSTEM'
* Sysfs{} should be replaced with ATTR{}. Sadly the former is not
  supported in recent udev, and the latter is not supported in udev
  0.95. Workaround: use PRODUCT from the environment.
* Use a single rule.
* While we're at it, add the missing comma to the astribank_hook line
  (which surprisingly worked without it).

Modified:
    linux/trunk/drivers/dahdi/xpp/xpp.rules

Modified: linux/trunk/drivers/dahdi/xpp/xpp.rules
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/xpp.rules?view=diff&rev=7753&r1=7752&r2=7753
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xpp.rules (original)
+++ linux/trunk/drivers/dahdi/xpp/xpp.rules Mon Jan  4 11:01:34 2010
@@ -1,16 +1,11 @@
-BUS!="usb", ACTION!="add", GOTO="xpp_usb_add_end"
-KERNEL=="*_ep*", GOTO="xpp_usb_add_end"
-KERNEL=="[0-9]*", GOTO="xpp_usb_add_end"
-
 # Load firmware into the Xorcom Astribank device:
-SYSFS{idVendor}=="e4e4", SYSFS{idProduct}=="11[3456][013]", \
-	RUN+="/usr/share/dahdi/xpp_fxloader udev $sysfs{idVendor}/$sysfs{idProduct}/$sysfs{bcdDevice}"
-
-LABEL="xpp_usb_add_end"
+SUBSYSTEM=="usb", ACTION=="add", \
+ENV{PRODUCT}=="e4e4/11[3456][013]/*", ENV{DEVTYPE}!="usb_interface", \
+	RUN+="/usr/share/dahdi/xpp_fxloader udev $env{PRODUCT}"
 
 # Hotplug hook for Astribank up/down
 # If you need this functionality, copy the astribank_hook.sample
 # to $XPP_INIT_DIR/astribank_hook
 #
 # By default XPP_INIT_DIR="/usr/share/dahdi"
-KERNEL=="xbus*" RUN+="%E{XPP_INIT_DIR}/astribank_hook udev $kernel $sysfs{status} $sysfs{connector}"
+KERNEL=="xbus*", RUN+="%E{XPP_INIT_DIR}/astribank_hook udev $kernel $sysfs{status} $sysfs{connector}"