Use autotagged externals

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

.version

@@ -1 +1 @@
-2.5.0.2
+2.5.0

ChangeLog

@@ -1,59 +1,3 @@
-2011-10-21  Shaun Ruffell <sruffell@digium.com> 
-
-	* dahdi-tools version 2.5.0.2 released.
-
-2011-10-21 22:12 +0000 [r10255-10256]  Shaun Ruffell <sruffell@digium.com>
-
-	* xpp/perl_modules/Dahdi/Span.pm: dahdi_genconf: Use 'dahdi_scan'
-	  to determine span_type for B410P cards. The wcb4xxp driver does
-	  not put enough information in the proc filesystem to determine if
-	  the ports are in TE or NT mode. Previously the ports would always
-	  just setup the dahdi-channels.conf file in TE mode. After this
-	  change the dahdi_scan utility is used to detect if the ports are
-	  in TE or NT mode and setup dahdi-channels.conf appropriately.
-	  Internal-Issue-ID: DAHTOOL-54 Signed-off-by: Shaun Ruffell
-	  <sruffell@digium.com> Origin:
-	  http://svnview.digium.com/svn/dahdi?view=rev&rev=10214
-
-	* xpp/perl_modules/Dahdi/Span.pm: dahdi_genconf: Assume spans with
-	  unknown term types are software selectable. Resolves a regression
-	  on the 2.5 branch that would result in: $ dahdi_genconf
-	  dahdi_genconf: missing default group (termtype=UNKNOWN) E1 / T1
-	  spans use software configuration to set CPE / NET mode. This
-	  patch will just assume that a termtype is software selectable if
-	  it was "UNKNOWN" when first scanning the span. Internal-Issue-ID:
-	  DAHTOOL-55 Signed-off-by: Shaun Ruffell <sruffell@digium.com>
-	  Tested-by: David Purdue <support@noojee.com.au> Origin:
-	  http://svnview.digium.com/svn/dahdi?view=rev&rev=10213
-
-2011-09-07 07:11 +0000 [r10188]  Tzafrir Cohen <tzafrir.cohen@xorcom.com>
-
-	* xpp/waitfor_xpds: xpp: waitfor_xpds: higher and configurable
-	  timeout On several pathological cases we may need to wait more
-	  than 40 seconds. Make that timeout configurable.
-
-2011-09-07  Shaun Ruffell <sruffell@digium.com> 
-
-	* dahdi-tools version 2.5.0.1 released.
-
-2011-09-07 07:11 +0000 [r10185-10188]  Tzafrir Cohen <tzafrir.cohen@xorcom.com>
-
-	* xpp/waitfor_xpds: xpp: waitfor_xpds: higher and configurable
-	  timeout On several pathological cases we may need to wait more
-	  than 40 seconds. Make that timeout configurable.
-
-	* xpp/README.Astribank: README.Astribank: HWEC and build
-	  instructions Signed-off-by: Tzafrir Cohen
-	  <tzafrir.cohen@xorcom.com>
-
-	* xpp/perl_modules/Dahdi/Span.pm: xpp: pri_termtype: match complete
-	  SPAN patterns Match complete span patterns, to avoid pattern
-	  'SPAN/1' from matching e.g. span 12 (SPAN/12). Signed-off-by:
-	  Tzafrir Cohen <tzafrir.cohen@xorcom.com>
-
-	* README: Extra README fixes: 'th' and ztcfg Signed-off-by: Tzafrir
-	  Cohen <tzafrir.cohen@xorcom.com>
-
 2011-08-05  Shaun Ruffell <sruffell@digium.com>
 
 	* dahdi-tools version 2.5.0 released.

xpp/README.Astribank

@@ -43,42 +43,27 @@ an FXO module of two ports.
 
 Building and Installation
 -------------------------
-Apart from the standard DAHDI build requirements, you also need:
+Apart from the standard DAHDI build requirements, you also need libusb
+development headers to build the fpga_load firmware loader. This is
+typically the package libusb-dev on Debian (and derivatives like Ubuntu)
+or libusb-devel on RedHat (and derivatives like CentOS/Trixbox).
 
-* *libusb development headers* to build the fpga_load firmware loader.
-  This is typically the package libusb-dev on Debian (and derivatives
-  like Ubuntu) or libusb-devel on RedHat (and derivatives like
-  CentOS/Trixbox).
-* *Echo Canceller Module firmware*: If you have an Astribank with an
-  echo canceller module, see the following section.
+Patch for BRI
+~~~~~~~~~~~~~
+(As of DAHDI 2.2 this patch is no longer needed. Furthermore, it does
+not apply. The same directory has a newer patch that applies. This
+section is kept in the document for the time being for the benefit of
+those with older versions)
 
-Follow the build instructions of DAHDI-linux and DAHDI-tools. But
-Basically, in dahdi-linux run:
+In order for the BRI module (xpd_bri.ko) to build, you still need an
+external patch: 
 
-  make
-  make install # as root
+http://updates.xorcom.com/astribank/bristuff/dahdi_bri_dchan.diff[]
 
-And later in dahdi-tools:
+You need to apply it to the dahdi-linux tarball before building:
 
-  ./configure
-  make
-  make install # as root
-
-
-Echo Canceller Firmware
-~~~~~~~~~~~~~~~~~~~~~~~
-If you install from source, you should copy OCT6104E-256D.ima to the
-source tree (before running make install:
-
-  wget http://updates.xorcom.com/astribank/hwec/OCT6104E-256D.ima
-  mv OCT6104E-256D.ima drivers/dahdi/xpp/firmwares/
-
-Alternatively, if you have already installed DAHDI-linux (e.g. from a
-binary package that does not include the firmware) you can just copy
-it directly to the target directory, /usr/share/dahdi using:
-
-  cd /usr/share/dahdi
-  wget http://updates.xorcom.com/astribank/hwec/OCT6104E-256D.ima
+  wget http://updates.xorcom.com/astribank/bristuff/dahdi_bri_dchan.diff
+  patch -p1 <dahdi_bri_dchan.diff
 
 
 Installation Scenarios

xpp/perl_modules/Dahdi/Span.pm

@@ -131,7 +131,7 @@ my @bri_strings = (
 		'(?:quad|octo)BRI PCI ISDN Card.* \[(NT|TE)\]',
 		'octoBRI \[(NT|TE)\] ',
 		'HFC-S PCI A ISDN.* \[(NT|TE)\] ',
-		'(B4XXP) \(PCI\) Card', # Use dahdi_scan to determine TE/NT mode
+		'(B4XXP) \(PCI\) Card', # Does not expose NT/TE type
 		'(WCBRI)', # has selectable NT/TE modes via dahdi_cfg
 		);
 
@@ -177,28 +177,6 @@ sub init_proto($$) {
 	$self->{TYPE} = "${proto}_$self->{TERMTYPE}";
 }
 
-sub get_digital_spantype {
-	my $span_no = shift;
-	my @lines = split /\n/, `dahdi_scan`;
-	my $found_span = 0;
-	foreach my $line (@lines) {
-		if (! $found_span) {
-			if ($line =~ m/\[$span_no\]/) {
-				$found_span = 1;
-			}
-		} else {
-			if ($line !~ m/^\[/) {
-				if ($line =~ m/digital-(TE|NT)/ ){
-					return $1;
-				}
-			} else {
-				$found_span = 0;
-			}
-		}
-	}
-	die "Cannot determine digital spantype";
-}
-
 sub new($$) {
 	my $pack = shift or die "Wasn't called as a class method\n";
 	my $proc_file = shift or die "Missing a proc file parameter\n";
@@ -213,16 +191,10 @@ sub new($$) {
 	$self->{IS_DIGITAL} = 0;
 	$self->{IS_BRI} = 0;
 	$self->{IS_PRI} = 0;
-	$self->{TERMTYPE} = "UNKNOWN";
 	foreach my $cardtype (@bri_strings) {
 		if($head =~ m/$cardtype/) {
 			my $termtype = $1;
-			if ($1 eq 'B4XXP') {
-				$termtype = get_digital_spantype($num);
-			}
-			if ($1 eq 'WCBRI') {
-				$termtype = 'TE';
-			}
+			$termtype = 'TE' if ( $1 eq 'B4XXP' or $1 eq 'WCBRI' );
 			$self->{IS_DIGITAL} = 1;
 			$self->{IS_BRI} = 1;
 			$self->{TERMTYPE} = $termtype;
@@ -258,11 +230,6 @@ sub new($$) {
 			last;
 		}
 	}
-
-	if (($self->is_soft_term_type == 0) and ($self->termtype eq "UNKNOWN")) {
-		$self->{IS_SOFT_TERM_TYPE} = 1;
-	}
-
 	($self->{NAME}, $self->{DESCRIPTION}) = (split(/\s+/, $head, 4))[2, 3];
 	$self->{IS_DAHDI_SYNC_MASTER} =
 		($self->{DESCRIPTION} =~ /\(MASTER\)/) ? 1 : 0;
@@ -401,7 +368,7 @@ SPEC:
 		#print STDERR "match: $match\n";
 		foreach my $pattern (@patlist) {
 			#print STDERR "testmatch: $pattern =~ $match\n";
-			if($pattern =~ /^$match$/) {
+			if($pattern =~ $match) {
 				#print STDERR "MATCH '$pattern' ~ '$match' termtype=$termtype\n";
 				$match_termtype = $termtype;
 				last SPEC;

xpp/waitfor_xpds

@@ -29,7 +29,6 @@ set -e
 # For lab testing
 mydir=`dirname $0`
 PATH="${mydir}:${PATH}"
-XPP_WAIT_AB_TIMEOUT=80
 
 [ -r /etc/dahdi/init.conf ] && . /etc/dahdi/init.conf
 
@@ -57,7 +56,7 @@ fi
 
 # Wait for driver and first device
 echo -n 1>&2 "Astribanks detection "
-tries="$XPP_WAIT_AB_TIMEOUT"
+tries=40
 while [ ! -e "/sys/bus/astribanks/devices/xbus-00" ]
 do
 	if [ "$tries" -le 0 ]; then