From bb19620c5254ad17d52c24500918140cca1276d3 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Mon, 11 Nov 2013 15:39:20 -0600 Subject: [PATCH] wcte43x: Teach tools about the wcte43x driver. Signed-off-by: Shaun Ruffell --- blacklist.sample | 1 + modules.sample | 4 ++++ xpp/perl_modules/Dahdi/Chans.pm | 2 +- xpp/perl_modules/Dahdi/Hardware/PCI.pm | 3 +++ xpp/perl_modules/Dahdi/Span.pm | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/blacklist.sample b/blacklist.sample index a415c16..f054e28 100644 --- a/blacklist.sample +++ b/blacklist.sample @@ -13,6 +13,7 @@ blacklist wctdm blacklist wctc4xxp blacklist wcb4xxp blacklist wcaxx +blacklist wcte43x # Some mISDN drivers may try to attach to cards supported by DAHDI. If you # have a card which is *not* supported by DAHDI but supported by one of the diff --git a/modules.sample b/modules.sample index 42d9a15..5a65952 100644 --- a/modules.sample +++ b/modules.sample @@ -13,6 +13,10 @@ # Digium TE420: PCI-Express quad-port T1/E1/J1 wct4xxp +# Digium TE435 +# Digium TE235 +wcte43x + # Digium TE120P: PCI single-port T1/E1/J1 # Digium TE121: PCI-Express single-port T1/E1/J1 # Digium TE122: PCI single-port T1/E1/J1 diff --git a/xpp/perl_modules/Dahdi/Chans.pm b/xpp/perl_modules/Dahdi/Chans.pm index a5ac4ce..8a43f58 100644 --- a/xpp/perl_modules/Dahdi/Chans.pm +++ b/xpp/perl_modules/Dahdi/Chans.pm @@ -143,7 +143,7 @@ sub new($$$$$$) { $type = "FXO"; # likely Rhino } elsif ($fqn =~ m{---/.*}) { $type = "EMPTY"; # likely Rhino, empty slot. - } elsif ($fqn =~ m{\b(TE[24]|WCT1|WCT13x|Tor2|TorISA|WP[TE]1|cwain[12]|R[124]T1|AP40[124]|APE40[124])/.*}) { + } elsif ($fqn =~ m{\b(WCTE|TE[24]|WCT1|WCT13x|Tor2|TorISA|WP[TE]1|cwain[12]|R[124]T1|AP40[124]|APE40[124])/.*}) { # TE[24]: Digium wct4xxp # WCT1: Digium single span card drivers? # Tor2: Tor PCI cards diff --git a/xpp/perl_modules/Dahdi/Hardware/PCI.pm b/xpp/perl_modules/Dahdi/Hardware/PCI.pm index 194991a..00a13ca 100644 --- a/xpp/perl_modules/Dahdi/Hardware/PCI.pm +++ b/xpp/perl_modules/Dahdi/Hardware/PCI.pm @@ -103,6 +103,9 @@ my %pci_ids = ( 'd161:800f' => { DRIVER => 'wcaxx', DESCRIPTION => 'Digium A4A' }, 'd161:8010' => { DRIVER => 'wcaxx', DESCRIPTION => 'Digium A4B' }, + # from wcte435/235 + 'd161:800e' => { DRIVER => 'wcte43x', DESCRIPTION => 'Wildcard TE435/235' }, + # from wcb4xxp 'd161:b410' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'Digium Wildcard B410P' }, diff --git a/xpp/perl_modules/Dahdi/Span.pm b/xpp/perl_modules/Dahdi/Span.pm index 465587f..3a0d3bd 100644 --- a/xpp/perl_modules/Dahdi/Span.pm +++ b/xpp/perl_modules/Dahdi/Span.pm @@ -147,6 +147,8 @@ my @pri_strings = ( 'Wildcard TE133', # wcte13xp 'Wildcard TE134', # wcte13xp 'T[248]XXP \(PCI\) Card ', # wct4xxp + 'WCTE43X \(PCI\) Card ', # wcte43xp + 'WCTE23X \(PCI\) Card ', # wcte43xp 'R[24]T1 \(PCI\) Card', # rxt1 'Rhino R1T1 (E1)/PRA Card', # r1t1 'Rhino R1T1 (T1)/PRI Card', # r1t1