[dahdi-commits] tzafrir: branch tools/tzafrir/perl-sysstate r7823 - in /tools/team/tzafrir/pe...

[SVN commits to the DAHDI project]

Author: tzafrir
Date: Sun Jan 10 08:27:19 2010
New Revision: 7823

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7823
Log:
Remove dependency of Dahdi::Span on Dahdi::Xpd

Remove the unneeded dependency of Dahdi::Span on Dahdi::Xpd . We already
have a simple way to get the XPD of a span.

This simplifies the dependency tree of the modules.

Modified:
    tools/team/tzafrir/perl-sysstate/xpp/lsdahdi
    tools/team/tzafrir/perl-sysstate/xpp/perl_modules/Dahdi/Span.pm

Modified: tools/team/tzafrir/perl-sysstate/xpp/lsdahdi
URL: http://svnview.digium.com/svn/dahdi/tools/team/tzafrir/perl-sysstate/xpp/lsdahdi?view=diff&rev=7823&r1=7822&r2=7823
==============================================================================
--- tools/team/tzafrir/perl-sysstate/xpp/lsdahdi (original)
+++ tools/team/tzafrir/perl-sysstate/xpp/lsdahdi Sun Jan 10 08:27:19 2010
@@ -22,7 +22,7 @@
 
 foreach my $span (Dahdi::spans()) {
 	my $spanno = $span->num;
-	my $xpd = $span->xpd;
+	my $xpd = Dahdi::Xpp::xpd_of_span($span);
 	my @lines;
 	my $index = 0;
 

Modified: tools/team/tzafrir/perl-sysstate/xpp/perl_modules/Dahdi/Span.pm
URL: http://svnview.digium.com/svn/dahdi/tools/team/tzafrir/perl-sysstate/xpp/perl_modules/Dahdi/Span.pm?view=diff&rev=7823&r1=7822&r2=7823
==============================================================================
--- tools/team/tzafrir/perl-sysstate/xpp/perl_modules/Dahdi/Span.pm (original)
+++ tools/team/tzafrir/perl-sysstate/xpp/perl_modules/Dahdi/Span.pm Sun Jan 10 08:27:19 2010
@@ -10,7 +10,6 @@
 use strict;
 use Dahdi::Utils;
 use Dahdi::Chans;
-use Dahdi::Xpp::Xpd;
 
 =head1 NAME
 
@@ -179,12 +178,6 @@
 	my $self = { NUM => $num };
 	bless $self, $pack;
 	$self->{TYPE} = "UNKNOWN";
-	my @xpds = Dahdi::Xpp::Xpd::xpds_by_spanno;
-	my $xpd = $xpds[$num];
-	if(defined $xpd) {
-		die "Spanno mismatch: $xpd->spanno, $num" unless $xpd->spanno == $num;
-		$self->{XPD} = $xpd;
-	}
 	open(F, "$proc_file") or die "Failed to open '$proc_file\n";
 	my $head = <F>;
 	chomp $head;