[svn-commits] tzafrir: branch tools/2.2 r8591 - in /tools/branches/2.2: ./ xpp/xpp_fxloader

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Mon May  3 09:17:14 2010
New Revision: 8591

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8591
Log:
xpp_fxloader: make sure 1163 is not missed.

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

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

Propchange: tools/branches/2.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May  3 09:17:14 2010
@@ -1,1 +1,1 @@
-/tools/trunk:8529
+/tools/trunk:8529,8589

Propchange: tools/branches/2.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon May  3 09:17:14 2010
@@ -1,1 +1,1 @@
-/tools/trunk:1-6678,6823,6829-6830,6832-6833,6835,6837-6886,6889-6982,6985-6998,7000-7011,7013-7042,7044,7046-7131,7133,7135-7136,7139-7217,7219-7255,7257-7460,7462-7476,7558,7596,7609,7752,7754,7792,8529
+/tools/trunk:1-6678,6823,6829-6830,6832-6833,6835,6837-6886,6889-6982,6985-6998,7000-7011,7013-7042,7044,7046-7131,7133,7135-7136,7139-7217,7219-7255,7257-7460,7462-7476,7558,7596,7609,7752,7754,7792,8529,8589

Modified: tools/branches/2.2/xpp/xpp_fxloader
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.2/xpp/xpp_fxloader?view=diff&rev=8591&r1=8590&r2=8591
==============================================================================
--- tools/branches/2.2/xpp/xpp_fxloader (original)
+++ tools/branches/2.2/xpp/xpp_fxloader Mon May  3 09:17:14 2010
@@ -211,7 +211,7 @@
 }
 
 reset_fpga() {
-  totaldevs=`numdevs e4e4 '11[3456][012]'`
+  totaldevs=`numdevs e4e4 '11[3456][0123]'`
   devices=`find_dev e4e4 '11[3456][12]'`
   debug "Reseting devices [$totaldevs devices]"
   for dev in $devices
@@ -221,7 +221,7 @@
 	run_astribank_tool -D "$dev" -r full 2>&1 >/dev/null
   done
   if [ "$1" = 'wait' ]; then
-	  wait_renumeration $totaldevs e4e4 '11[3456]0'
+	  wait_renumeration $totaldevs e4e4 '11[3456][03]'
   fi
 }