diff options
| author | Noe Rubinstein <nrubinstein@proformatique.com> | 2010-12-21 12:17:59 +0100 |
|---|---|---|
| committer | Noe Rubinstein <nrubinstein@proformatique.com> | 2010-12-21 12:17:59 +0100 |
| commit | 0d609959e683a9f872f5a9c8a26872e7ce2beb45 (patch) | |
| tree | d769148452a91ef83387dccf7fa42c3c5fceabaa | |
| parent | 82db93c4022c5030a7b18d65196fdbaa2df3f152 (diff) | |
patch dahdi-tools to configure xivovp and xivoxhfc
enables use of dahdi_hardware and dahdi_genconf
/!\ Other Xorcom Perl tools untested.
Note that spans are set to TE in conf, and the user has to change them
manually. It should be possible to change that in genconf_parameters,
but currently this feature is not supported for BRI. It would be quite
easy to implement but I'm not sure it's even worth it as I don't know
which method XiVO uses/will use to configure DAHDI.
| -rw-r--r-- | dahdi-tools-xivo.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/dahdi-tools-xivo.patch b/dahdi-tools-xivo.patch new file mode 100644 index 0000000..90bb463 --- /dev/null +++ b/dahdi-tools-xivo.patch @@ -0,0 +1,59 @@ +Index: xpp/perl_modules/Dahdi/Chans.pm +=================================================================== +--- xpp/perl_modules/Dahdi/Chans.pm (revision 9315) ++++ xpp/perl_modules/Dahdi/Chans.pm (working copy) +@@ -154,7 +154,7 @@ + # AP40[124]: Aligera AP40X cards + # APE40[124]: Aligera APE40X cards + $type = "PRI"; +- } elsif ($fqn =~ m{\b(WCBRI|B4|ZTHFC\d*|ztqoz\d*)/.*}) { ++ } elsif ($fqn =~ m{\b(WCBRI|B4|ZTHFC\d*|ztqoz\d*|XiVO_XHFC)/.*}) { + # WCBRI: The Digium Hx8 series cards with BRI module. + # B4: The Digium wcb4xxp DAHDI driver + # ZTHFC: HFC-s single-port card (zaphfc/vzaphfc) +Index: xpp/perl_modules/Dahdi/Span.pm +=================================================================== +--- xpp/perl_modules/Dahdi/Span.pm (revision 9315) ++++ xpp/perl_modules/Dahdi/Span.pm (working copy) +@@ -133,6 +133,7 @@ + 'HFC-S PCI A ISDN.* \[(NT|TE)\] ', + '(B4XXP) \(PCI\) Card', # Does not expose NT/TE type + '(WCBRI)', # has selectable NT/TE modes via dahdi_cfg ++ '(XiVO_XHFC)', # idem + ); + + my @pri_strings = ( +@@ -189,7 +190,7 @@ + foreach my $cardtype (@bri_strings) { + if($head =~ m/$cardtype/) { + my $termtype = $1; +- $termtype = 'TE' if ( $1 eq 'B4XXP' or $1 eq 'WCBRI' ); ++ $termtype = 'TE' if ( $1 eq 'B4XXP' or $1 eq 'WCBRI' or $1 eq 'XiVO_XHFC' ); + $self->{IS_DIGITAL} = 1; + $self->{IS_BRI} = 1; + $self->{TERMTYPE} = $termtype; +@@ -263,7 +264,7 @@ + # Infer some info from channel name: + my $first_chan = ($self->chans())[0] || die "$0: No channels in span #$num\n"; + my $chan_fqn = $first_chan->fqn(); +- if($chan_fqn =~ m(ZTHFC.*/|ztqoz.*/|XPP_BRI_.*|B4/.*|WCBRI/.*)) { # BRI ++ if($chan_fqn =~ m(ZTHFC.*/|ztqoz.*/|XPP_BRI_.*|B4/.*|WCBRI/.*|XiVO_XHFC)) { # BRI + if($chan_fqn =~ m(WCBRI/.*)) { # make sure to set termination resistors on hybrid cards + $self->{TERMINATION} = 'term'; + $self->{SOFTNTTE} = 'te'; +Index: xpp/perl_modules/Dahdi/Hardware/PCI.pm +=================================================================== +--- xpp/perl_modules/Dahdi/Hardware/PCI.pm (revision 9315) ++++ xpp/perl_modules/Dahdi/Hardware/PCI.pm (working copy) +@@ -155,6 +155,11 @@ + + # Aligera + '10ee:1004' => { DRIVER => 'ap400', DESCRIPTION => 'Aligera AP40X/APE40X 1E1/2E1/4E1 card' }, ++ ++ # XiVO IPBX OpenHardware (WARNING: Any device on the Tolapai's LEB/SSP ++ # controllers will be detected, including subsequent revisions) ++ '8086:503d' => { DRIVER => 'xivoxhfc', DESCRIPTION => 'XiVO IPBX OpenHardware, ISDN BRI interfaces (Cologne XHFC-4SU)' }, ++ '8086:503b' => { DRIVER => 'xivovp', DESCRIPTION => 'XiVO IPBX OpenHardware, FXO/FXS interfaces (Zarlink Ve890)' }, + ); + + $ENV{PATH} .= ":/usr/sbin:/sbin:/usr/bin:/bin"; |