Add channel alarms in Zaptel-perl and lszaptel specifically.

* Zaptel::Chans now provides a method alarms() for a list (or number of)
  alarms. 
* lszaptel uses it for a more correct display of channel status.
* Also update PCI hardware list.


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4455 5390a7c7-147a-4af0-8ec9-7488f05a26cb

3 files changed, 36 insertions, 5 deletions

diff --git a/xpp/utils/lszaptel b/xpp/utils/lszaptel
index a836d98..d365ca1 100755
--- a/xpp/utils/lszaptel
+++ b/xpp/utils/lszaptel
@@ -36,8 +36,10 @@ foreach my $span (Zaptel::spans()) {
 		my ($type) = map { $type_map{$_} or $_ } $chan->type || ("unknown");
 		my $batt = "";
 		$batt = "(battery)" if $chan->battery;
-		printf "%3d %-10s %-10s %s %s\n",
-			$chan->num, $type, $chan->signalling, $chan->info, $batt;
+		my @alarms = $chan->alarms;
+		my $alarm_str = join(" ", @alarms);
+		printf "%3d %-10s %-10s %s %s %s\n",
+			$chan->num, $type, $chan->signalling, $chan->info, $batt, $alarm_str;
 		$index++;
 	}
 }
diff --git a/xpp/utils/zconf/Zaptel/Chans.pm b/xpp/utils/zconf/Zaptel/Chans.pm
index 6f83f77..aa552a2 100644
--- a/xpp/utils/zconf/Zaptel/Chans.pm
+++ b/xpp/utils/zconf/Zaptel/Chans.pm
@@ -17,6 +17,12 @@ Zaptel::Chans - Perl interface to a Zaptel channel information
 This package allows access from perl to information about a Zaptel
 channel. It is part of the Zaptel Perl package.
 
+=head1 alarms()
+
+In an array context returns a list of alarm strings (RED, BLUE, etc.)
+for this channel (an empty list == false if there are no alarms).
+In scalar context returns the number of alarms for a specific channel.
+
 =head1 battery()
 
 Returns 1 if channel reports to have battery (A remote PBX connected to
@@ -54,6 +60,8 @@ Returns the type of the channel: 'FXS', 'FXO', 'EMPTY', etc.
 
 =cut
 
+my @alarm_types = qw(BLUE YELLOW RED LOOP RECOVERING NOTOPEN);
+
 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";
@@ -69,18 +77,29 @@ sub new($$$$$$) {
 	$num or die "Missing a channel number parameter\n";
 	$fqn or die "Missing a channel fqn parameter\n";
 	my $signalling = '';
+	my @alarms = ();
 	my $info = '';
 	if(defined $rest) {
+		# remarks in parenthesis (In use), (no pcm)
+		while($rest =~ s/(\([^)]+\))\s*//) {
+			$info .= " $1";
+		}
+		# Alarms
+		foreach my $alarm (@alarm_types) {
+			if($rest =~ s/\s*(\b${alarm}\b)\s*//) {
+				push(@alarms, $1);
+			}
+		}
 		if($rest =~ s/^\s*(\w+)\s*//) {
 			$signalling = $1;
 		}
-		if($rest =~ s/(.*)//) {
-			$info = $1;
-		}
+		die "Unrecognized garbage '$rest' in $fqn\n"
+			if length($rest);
 	}
 	$self->{NUM} = $num;
 	$self->{FQN} = $fqn;
 	$self->{SIGNALLING} = $signalling;
+	$self->{ALARMS} = \@alarms;
 	$self->{INFO} = $info;
 	my $type;
 	if($fqn =~ m|\bXPP_(\w+)/.*$|) {
@@ -184,6 +203,13 @@ sub battery($) {
 	return $line->battery;
 }
 
+sub alarms($) {
+	my $self = shift or die;
+	my @alarms = @{$self->{ALARMS}};
+
+	return @alarms;
+}
+
 sub blink($$) {
 	my $self = shift or die;
 	my $on = shift;
diff --git a/xpp/utils/zconf/Zaptel/Hardware/PCI.pm b/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
index a63b09f..c03b0d1 100644
--- a/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
+++ b/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
@@ -118,6 +118,9 @@ my %pci_ids = (
 	'1923:0100'	=> { DRIVER => 'wanpipe', DESCRIPTION => 'Sangoma Technologies Corp. A104d QUAD T1/E1 AFT card' },
 	'1923:0300'	=> { DRIVER => 'wanpipe', DESCRIPTION => 'Sangoma Technologies Corp. A101 single-port T1/E1' },
 	'1923:0400'	=> { DRIVER => 'wanpipe', DESCRIPTION => 'Sangoma Technologies Corp. A104u Quad T1/E1 AFT' },
+
+	# Yeastar (from output of modinfo):
+	'e159:0001/2151' => { DRIVER => 'ystdm8xx', DESCRIPTION => 'Yeastar YSTDM8xx'},
 	);
 
 $ENV{PATH} .= ":/usr/sbin:/sbin:/usr/bin:/bin";