Use autotagged externals

git-svn-id: http://svn.astersk.org/svn/dahdi/tools/tags/2.6.1@10667 17933a7a-c749-41c5-a318-cba88f637d49

.version

@@ -0,0 +1 @@
+2.6.1

xpp/README.Astribank

@@ -634,13 +634,7 @@ Asterisk Level Information
 
   * the chan_dahdi.so file exists but it is not loaded. Try to load it manually:
 
-       asterisk -rx 'module load chan_dahdi.so'
-
-  * In some cases chan_dahdi failed to load properly and needs to be unloaded
-    before re-loading:
-
-       asterisk -rx 'module unload chan_dahdi.so'
-       asterisk -rx 'module   load chan_dahdi.so'
+       asterisk -rx 'load module chan_dahdi.so'
 
 - You see "pseudo" channel only. It means that you have not configured any
   channels. If you have configured channels in chan_dahdi.conf, you may

xpp/perl_modules/Dahdi/Hardware/PCI.pm

@@ -41,7 +41,6 @@ my %pci_ids = (
 	'd161:0210/0003'	=> { DRIVER => 'wct4xxp', DESCRIPTION => 'Wildcard TE210P (3rd Gen)' },
 	'd161:0205'		=> { DRIVER => 'wct4xxp', DESCRIPTION => 'Wildcard TE205P ' },
 	'd161:0210'		=> { DRIVER => 'wct4xxp', DESCRIPTION => 'Wildcard TE210P ' },
-	'd161:1820'		=> { DRIVER => 'wct4xxp', DESCRIPTION => 'Wildcard TE820 (5th Gen)' },
 
 	# from wctdm24xxp
 	'd161:2400'		=> { DRIVER => 'wctdm24xxp', DESCRIPTION => 'Wildcard TDM2400P' },

xpp/waitfor_xpds

@@ -29,53 +29,14 @@ set -e
 # For lab testing
 mydir=`dirname $0`
 PATH="${mydir}:${PATH}"
-XPP_WAIT_AB_TIMEOUT=100
+XPP_WAIT_AB_TIMEOUT=80
 
 [ -r /etc/dahdi/init.conf ] && . /etc/dahdi/init.conf
 
 ab_list() {
-	find /sys/devices -name idVendor 2>/dev/null | \
-		xargs grep -H  'e4e4' 2>/dev/null | \
-		sed -e 's/idVendor.*/idProduct/' | xargs grep -H '11[3456]' | \
-		sed 's,/[^/]*$,,' || :
-}
-
-ab_serial_nums() {
-	ab_list | \
-		sed 's,$,/serial,' | \
-		xargs grep -H '' 2>/dev/null | \
-		sed 's,.*/serial:,,' | \
-		sed 's/^$/NO-SERIAL/' | \
-		sort -u
-}
-
-detected_serial_nums() {
-	cat /sys/bus/astribanks/devices/*/transport/serial 2> /dev/null | \
-		sed 's/^$/NO-SERIAL/' | \
-		sort -u || :
-}
-
-calc_union() {
-	echo "$@" | tr -s ' ' '\n' | sort -u
-}
-
-detected_ab_list() {
 	# Only check /sys info (don't use /proc anymore).
-	find /sys/bus/astribanks/devices/*/ -name waitfor_xpds 2> /dev/null || :
-}
-
-waitfor_ab_initialization() {
-	oldab=''
-	while
-		if ! ab=`detected_ab_list`; then
-			exit 1
-		fi
-		test "$oldab" != "$ab"
-	do
-		oldab="$ab"
-		cat $ab
-		#echo -n 1>&2 "_"
-	done
+	ab=`find /sys/bus/astribanks/devices/xbus-*/ -name waitfor_xpds 2> /dev/null || :`
+	echo $ab
 }
 
 # Any hardware?
@@ -94,25 +55,10 @@ if ! astribank_is_starting; then
 	exit 0
 fi
 
-serial_nums=`ab_serial_nums`
-
-# Loop until detected (hopefully) all astribanks and they are initialized
+# Wait for driver and first device
 echo -n 1>&2 "Astribanks detection "
 tries="$XPP_WAIT_AB_TIMEOUT"
-last_detected=0
-while
-	new_serial_nums=`ab_serial_nums`
-	detected_serial_nums=`detected_serial_nums`
-	curr_union=`calc_union $curr_union $serial_nums $new_serial_nums`
-	num_detected=`detected_ab_list | wc -l`
-	if [ "$num_detected" != "$last_detected" ]; then
-		# Visual feedback (number of detected AB so far)
-		echo -n 1>&2 "[$num_detected]"
-		last_detected="$num_detected"
-		waitfor_ab_initialization > /dev/null
-	fi
-	# Break only when we have something and it's stable
-	test "$curr_union" != "$detected_serial_nums" -o "$detected_serial_nums" = ''
+while [ ! -e "/sys/bus/astribanks/devices/xbus-00" ]
 do
 	if [ "$tries" -le 0 ]; then
 		echo 1>&2 "TIMEOUT"
@@ -121,15 +67,21 @@ do
 	echo -n 1>&2 "."
 	sleep 1
 	: $((tries-=1))
-	serial_nums="$new_serial_nums"
 done
-
-# Finished: Show a nice output
 echo ""
-cat /sys/bus/astribanks/devices/*/waitfor_xpds 2> /dev/null || :
 
 # Wait for device to stabilize and XPD's to finish initalizations
 echo 1>&2 "Astribanks initializing spans"
+while
+	if ! ab=`ab_list`; then
+		exit 1
+	fi
+	test "$oldab" != "$ab"
+do
+	oldab="$ab"
+	cat $ab
+done
+
 if [ "$XPP_HOTPLUG_DAHDI" = yes ]; then
 	if [ "$CALLED_FROM_ATRIBANK_HOOK" = '' ]; then
 		# Now we can wait until the hotplug run would remove the semaphore