[dahdi-commits] tzafrir: branch tools/2.4 r9744 - in /tools/branches/2.4: ./ xpp/perl_modules...

[SVN commits to the DAHDI project]

Author: tzafrir
Date: Tue Feb  8 08:42:23 2011
New Revision: 9744

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9744
Log:
dahdi-perl: more left-over $span->xpd

Replace the remaining $span->xpd with xpd_of_span().

Following up on r9648.

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

Modified:
    tools/branches/2.4/   (props changed)
    tools/branches/2.4/xpp/perl_modules/Dahdi/Chans.pm
    tools/branches/2.4/xpp/perl_modules/Dahdi/Config/Gen/System.pm

Propchange: tools/branches/2.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb  8 08:42:23 2011
@@ -1,1 +1,1 @@
-/tools/trunk:1-9220,9313,9426,9452,9458,9473,9482,9485,9648,9699
+/tools/trunk:1-9220,9313,9426,9452,9458,9473,9482,9485,9648,9699,9731

Modified: tools/branches/2.4/xpp/perl_modules/Dahdi/Chans.pm
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.4/xpp/perl_modules/Dahdi/Chans.pm?view=diff&rev=9744&r1=9743&r2=9744
==============================================================================
--- tools/branches/2.4/xpp/perl_modules/Dahdi/Chans.pm (original)
+++ tools/branches/2.4/xpp/perl_modules/Dahdi/Chans.pm Tue Feb  8 08:42:23 2011
@@ -229,7 +229,7 @@
 	return undef unless defined $self->type && $self->type eq 'FXO';
 	return $self->{BATTERY} if defined $self->{BATTERY};
 
-	my $xpd = $span->xpd;
+	my $xpd = Dahdi::Xpp::xpd_of_span($span);
 	my $index = $self->index;
 	return undef if !$xpd;
 
@@ -251,7 +251,7 @@
 	my $on = shift;
 	my $span = $self->span or die;
 
-	my $xpd = $span->xpd;
+	my $xpd = Dahdi::Xpp::xpd_of_span($span);
 	my $index = $self->index;
 	return undef if !$xpd;
 

Modified: tools/branches/2.4/xpp/perl_modules/Dahdi/Config/Gen/System.pm
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.4/xpp/perl_modules/Dahdi/Config/Gen/System.pm?view=diff&rev=9744&r1=9743&r2=9744
==============================================================================
--- tools/branches/2.4/xpp/perl_modules/Dahdi/Config/Gen/System.pm (original)
+++ tools/branches/2.4/xpp/perl_modules/Dahdi/Config/Gen/System.pm Tue Feb  8 08:42:23 2011
@@ -137,7 +137,7 @@
 	if ($span->is_bri()) {
 		my $use_bristuff = 0;
 		my $cfg_hardhdlc = $gconfig->{'bri_hardhdlc'};
-		my $xpd = $span->xpd();
+		my $xpd = Dahdi::Xpp::xpd_of_span($span);
 		if(!defined($cfg_hardhdlc) || $cfg_hardhdlc =~ /AUTO/i) {
 			# Autodetect
 			if(defined($xpd)) {