[zaptel-commits] branch 1.2 r1227 - /branches/1.2/xpp/utils/genzaptelconf

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Fri Jul 14 14:59:56 2006
New Revision: 1227

URL: http://svn.digium.com/view/zaptel?rev=1227&view=rev
Log:
genzaptelconf: use /proc/xpp/XBUS-*/wait_for_xpds rather than a timeout loop

Modified:
    branches/1.2/xpp/utils/genzaptelconf

Modified: branches/1.2/xpp/utils/genzaptelconf
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/utils/genzaptelconf?rev=1227&r1=1226&r2=1227&view=diff
==============================================================================
--- branches/1.2/xpp/utils/genzaptelconf (original)
+++ branches/1.2/xpp/utils/genzaptelconf Fri Jul 14 14:59:56 2006
@@ -485,21 +485,8 @@
 	   [ "`cat /sys/module/xpp/parameters/zap_autoreg`" = 'Y' ]
 	then
 		# wait for the XPDs to register:
-		# TODO: replace this loop with 'cat /proc/xpp/XBUS-*/waitfor_xpds
-		success=0
-		for i in `seq 30`; do
-			if ! grep -q 0 /proc/xpp/*/*/zt_registration 2>/dev/null
-			then
-				# There are either no XPDs or all of them are 
-				# registered. Nothing to do
-				success=1
-				break
-			fi
-			sleep 1
-		done
-		if [ "$success" = 0 ]; then
-			echo 1>&2 "$0: WARNING: some XPD's are not registered yet (timeout)"
-		fi
+		# TODO: improve error reporting and produce a messagee here
+		cat /proc/xpp/XBUS-*/wait_for_xpds 2>/dev/null >/dev/null  || true
 	fi
 }