[svn-commits] tzafrir: branch linux/tzafrir/sysfs r7762 - in /linux/team/tzafrir/sysfs: ./ ...

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Mon Jan  4 12:04:03 2010
New Revision: 7762

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7762
Log:
Merged revisions 7753 via svnmerge from 
https://origsvn.digium.com/svn/dahdi/linux/trunk

........
  r7753 | tzafrir | 2010-01-04 19:01:34 +0200 (Mon, 04 Jan 2010) | 14 lines
  
  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/team/tzafrir/sysfs/   (props changed)
    linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp.rules

Propchange: linux/team/tzafrir/sysfs/
------------------------------------------------------------------------------
    automerge = YES

Propchange: linux/team/tzafrir/sysfs/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan  4 12:04:03 2010
@@ -1,1 +1,1 @@
-/linux/trunk:1-7735
+/linux/trunk:1-7761

Modified: linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp.rules
URL: http://svnview.digium.com/svn/dahdi/linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp.rules?view=diff&rev=7762&r1=7761&r2=7762
==============================================================================
--- linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp.rules (original)
+++ linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp.rules Mon Jan  4 12:04:03 2010
@@ -1,18 +1,12 @@
-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}"
-# FIXME: move this line to a different file.
-#SUBSYSTEM=="dahdi_span" RUN+="%E{DAHDI_INIT_DIR}/span_hook"
+KERNEL=="xbus*", RUN+="%E{XPP_INIT_DIR}/astribank_hook udev $kernel $sysfs{status} $sysfs{connector}"
+#SUBSYSTEM=="dahdi_span", RUN+="%E{DAHDI_INIT_DIR}/span_hook"