[zaptel-commits] tzafrir: branch 1.4 r4514 - in /branches/1.4: ./ kernel/xpp/utils/zconf/Zaptel/

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Mon Sep  8 15:40:05 2008
New Revision: 4514

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4514
Log:
Minor FXS/FXO type fixes in case probe was not done.

Merged revisions 4512 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

Modified:
    branches/1.4/   (props changed)
    branches/1.4/kernel/xpp/utils/zconf/Zaptel/Chans.pm

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/kernel/xpp/utils/zconf/Zaptel/Chans.pm
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/xpp/utils/zconf/Zaptel/Chans.pm?view=diff&rev=4514&r1=4513&r2=4514
==============================================================================
--- branches/1.4/kernel/xpp/utils/zconf/Zaptel/Chans.pm (original)
+++ branches/1.4/kernel/xpp/utils/zconf/Zaptel/Chans.pm Mon Sep  8 15:40:05 2008
@@ -157,8 +157,8 @@
 		# Junghanns GSM card
 		$type = "GSM";
 	} elsif(defined $signalling) {
-		$type = 'FXS' if $signalling =~ /^FXS/;
-		$type = 'FXO' if $signalling =~ /^FXO/;
+		$type = 'FXO' if $signalling =~ /^FXS/;
+		$type = 'FXS' if $signalling =~ /^FXO/;
 	} else {
 		$type = undef;
 	}
@@ -216,6 +216,7 @@
 	my $self = shift or die;
 	my $span = $self->span or die;
 
+	return undef if (not defined $self->type);
 	return undef unless $self->type eq 'FXO';
 	return $self->{BATTERY} if defined $self->{BATTERY};