[svn-commits] tzafrir: branch tools/2.3 r9484 - in /tools/branches/2.3: ./ xpp/xpp_fxloader

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Tue Nov 16 05:41:40 2010
New Revision: 9484

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9484
Log:
xpp_fxloader: Don't try to load FPGA firmware twice

When called from udev to load the FPGA firmware, make sure that this is
not the event generated for the first end-point of the existing two, as
we need to talk with the second one.

This is probably better done in the udev rules, but will be slightly
more complicated to apply only to the FPGA loading and not to USB
firmware loading.

Merged revisions 9482 via svnmerge from 
http://svn.digium.com/svn/dahdi/tools/trunk

Modified:
    tools/branches/2.3/   (props changed)
    tools/branches/2.3/xpp/xpp_fxloader

Propchange: tools/branches/2.3/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 16 05:41:40 2010
@@ -1,1 +1,1 @@
-/tools/trunk:1-8509,8528-8529,8535,8580,8589,8630,8638,8741,8827,8854,8923-8924,8951,8954,8964
+/tools/trunk:1-8509,8528-8529,8535,8580,8589,8630,8638,8741,8827,8854,8923-8924,8951,8954,8964,9482

Modified: tools/branches/2.3/xpp/xpp_fxloader
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.3/xpp/xpp_fxloader?view=diff&rev=9484&r1=9483&r2=9484
==============================================================================
--- tools/branches/2.3/xpp/xpp_fxloader (original)
+++ tools/branches/2.3/xpp/xpp_fxloader Tue Nov 16 05:41:40 2010
@@ -349,6 +349,9 @@
 		run_fxload -D "$DEVICE" -I "$FIRM_USB"
 		;;
 	e4e4/11[3456]1/*)
+		# There are potentially two separate udev events, for
+		# each of the two endpoints. Ignore the first interface:
+		case "$DEVPATH" in *.0) exit 0;; esac
 		if [ "$prod_id" = 1131 ]; then
 			FIRM_FPGA="FPGA_FXS.hex"	# Legacy
 		else