Merged revisions 4451-4455 via svnmerge from

http://svn.digium.com/svn/zaptel/branches/1.2

........
r4451 | tzafrir | 2008-08-04 18:11:01 +0300 (Mon, 04 Aug 2008) | 9 lines

Firmware update: 5959 (DTMF and BRI ID)
(From DAHDI rev. 4695)

* Fix some cases of double digits.
* Fix some rare cases of a BRI unit providing incorrect directionality.
* Extra debugging code in card_fxs.c to trace future DTMF issues.
* Properly note DAHDI (as opposed to Zaptel) ioctls.


........
r4452 | tzafrir | 2008-08-04 18:36:19 +0300 (Mon, 04 Aug 2008) | 2 lines

Make it formally bashism.

........
r4453 | tzafrir | 2008-08-04 18:38:10 +0300 (Mon, 04 Aug 2008) | 2 lines

Kbuild: A more robust check for the bri_dchan patch.

........
r4454 | tzafrir | 2008-08-04 18:39:01 +0300 (Mon, 04 Aug 2008) | 2 lines

Minor BRI initlization improvements.

........
r4455 | tzafrir | 2008-08-04 18:43:32 +0300 (Mon, 04 Aug 2008) | 7 lines

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.4@4456 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 4 insertions, 2 deletions

diff --git a/kernel/xpp/utils/lszaptel b/kernel/xpp/utils/lszaptel
index a836d98..d365ca1 100755
--- a/kernel/xpp/utils/lszaptel
+++ b/kernel/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++;
 	}
 }