From 2380c99c5f66369079bb0dbde745a2eae19bd3b6 Mon Sep 17 00:00:00 2001 From: Russ Meyerriecks Date: Tue, 28 May 2013 17:06:10 -0500 Subject: [PATCH] Add support for Digium's new te13x line of cards Signed-off-by: Russ Meyerriecks --- blacklist.sample | 1 + modules.sample | 4 ++++ xpp/perl_modules/Dahdi/Chans.pm | 2 +- xpp/perl_modules/Dahdi/Hardware/PCI.pm | 4 ++++ xpp/perl_modules/Dahdi/Span.pm | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/blacklist.sample b/blacklist.sample index f4a28a8..1d03f95 100644 --- a/blacklist.sample +++ b/blacklist.sample @@ -4,6 +4,7 @@ blacklist wct4xxp blacklist wcte12xp +blacklist wcte13xp blacklist wct1xxp blacklist wcte11xp blacklist wctdm24xxp diff --git a/modules.sample b/modules.sample index 96053b3..3d45a57 100644 --- a/modules.sample +++ b/modules.sample @@ -18,6 +18,10 @@ wct4xxp # Digium TE122: PCI single-port T1/E1/J1 wcte12xp +# Digium TE131: PCI-Express single-port T1/E1/J1 +# Digium TE132: PCI single-port T1/E1/J1 +wcte13xp + # Digium T100P: PCI single-port T1 # Digium E100P: PCI single-port E1 wct1xxp diff --git a/xpp/perl_modules/Dahdi/Chans.pm b/xpp/perl_modules/Dahdi/Chans.pm index e045c7d..a5ac4ce 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|Tor2|TorISA|WP[TE]1|cwain[12]|R[124]T1|AP40[124]|APE40[124])/.*}) { + } elsif ($fqn =~ m{\b(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 bb96810..9afc337 100644 --- a/xpp/perl_modules/Dahdi/Hardware/PCI.pm +++ b/xpp/perl_modules/Dahdi/Hardware/PCI.pm @@ -93,6 +93,10 @@ my %pci_ids = ( 'd161:8000' => { DRIVER => 'wcte12xp', DESCRIPTION => 'Wildcard TE121' }, 'd161:8001' => { DRIVER => 'wcte12xp', DESCRIPTION => 'Wildcard TE122' }, + # from wcte13xp + 'd161:800a' => { DRIVER => 'wcte13xp', DESCRIPTION => 'Wildcard TE133' }, + 'd161:800b' => { DRIVER => 'wcte13xp', DESCRIPTION => 'Wildcard TE134' }, + # 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 7cd7d14..465587f 100644 --- a/xpp/perl_modules/Dahdi/Span.pm +++ b/xpp/perl_modules/Dahdi/Span.pm @@ -144,6 +144,8 @@ my @pri_strings = ( 'Wildcard TE120P', # wcte12xp 'Wildcard TE121', # wcte12xp 'Wildcard TE122', # wcte12xp + 'Wildcard TE133', # wcte13xp + 'Wildcard TE134', # wcte13xp 'T[248]XXP \(PCI\) Card ', # wct4xxp 'R[24]T1 \(PCI\) Card', # rxt1 'Rhino R1T1 (E1)/PRA Card', # r1t1