From 5b68efc40a339a8ae3d9d137c7b9af809c3f5519 Mon Sep 17 00:00:00 2001
From: tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>
Date: Thu, 17 May 2007 19:34:32 +0000
Subject: * Tested with zaptel-1.2.17.1 * Add D-Channel TX, RX and BAD frames
 count in /proc/xpp/XBUS-*/XPD-*/bri_info * Adjust output of xpp_sync script.
 Pad for 8 port BRI. * Added a debugging module parport_debug (not compiled by
 default). * Added an optional patch to zaptel:     - compiles only if
 ZAPTEL_SYNC_TICK is defined     - Allow interested driver to register for
 "sync" notification.     - Does not affect drivers that do not use this
 feature. * Added external synchronization feature:     - Only if
 ZAPTEL_SYNC_TICK feature is compiled in     - Than XPP may be synchronized by
 another card (e.g: an Astribank       with FXS can be synchronized by a
 Digium PRI card).     - May be enabled/disabled in runtime via the
 'sync_tick_active' module       parameter to the xpp.ko module. * Fixed a
 potential bug in D-Channel hexdump printing. * New visual indications in BRI
 leds:     - Constant ON RED/GREEN: Shows the port type -- NT/TE.     - Very
 fast "double blink": Layer1 work, no D-Channel yet.     - Steady blinking
 (1/2 sec): D-Channel trafic detected. * xpp_fxloader moved to
 /usr/share/zaptel . * adj_clock removed: never really used. * Debugfs code
 now disabled by default. * Now we have Zaptel::Hardware and a sample
 zaptel_hardware script (not   (installed by default). * We also have a sample
 perl zapconf (not installed by default) which   aims at replacing
 genzaptelconf (sans the modules detection).

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2529 5390a7c7-147a-4af0-8ec9-7488f05a26cb
---
 xpp/utils/zconf/Zaptel/Chans.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'xpp/utils/zconf/Zaptel/Chans.pm')

diff --git a/xpp/utils/zconf/Zaptel/Chans.pm b/xpp/utils/zconf/Zaptel/Chans.pm
index 3364060..eef922f 100644
--- a/xpp/utils/zconf/Zaptel/Chans.pm
+++ b/xpp/utils/zconf/Zaptel/Chans.pm
@@ -22,25 +22,26 @@ sub AUTOLOAD {
 	}
 }
 
-sub new($$$$$) {
+sub new($$$$$$) {
 	my $pack = shift or die "Wasn't called as a class method\n";
 	my $span = shift or die "Missing a span parameter\n";
 	my $num = shift or die "Missing a channel number parameter\n";
 	my $fqn = shift or die "Missing a channel fqn parameter\n";
-	my $info = shift;
+	my $signalling = shift || '';
+	my $info = shift || '';
 	my $self = {};
 	bless $self, $pack;
 	$self->span($span);
 	$self->num($num);
 	$self->fqn($fqn);
+	$self->signalling($signalling);
 	$self->info($info);
 	my $type;
 	if($fqn =~ m|\bXPP_(\w+)/.*$|) {
 		$type = $1;		# One of our AB
-	} elsif(defined $info) {
-		$type = (split(/\s+/, $info))[0];
-		$type = 'FXS' if $type =~ /^FXS/;
-		$type = 'FXO' if $type =~ /^FXO/;
+	} elsif(defined $signalling) {
+		$type = 'FXS' if $signalling =~ /^FXS/;
+		$type = 'FXO' if $signalling =~ /^FXO/;
 	} else {
 		$type = undef;
 	}
-- 
cgit v1.2.3