[dahdi-commits] dahdi/tools.git branch "master" updated.

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  bb19620c5254ad17d52c24500918140cca1276d3 (commit)
       via  11310bde5373ff1642936f07f35a8cbeba50e3e4 (commit)
      from  b123bc87ddb6a8d12b6357387653528fa963b5a1 (commit)

Summary of changes:
 blacklist.sample                       |    2 ++
 modules.sample                         |    7 +++++++
 xpp/perl_modules/Dahdi/Chans.pm        |    2 +-
 xpp/perl_modules/Dahdi/Hardware/PCI.pm |    9 +++++++++
 xpp/perl_modules/Dahdi/Span.pm         |    2 ++
 5 files changed, 21 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit bb19620c5254ad17d52c24500918140cca1276d3
Author: Shaun Ruffell <sruffell at digium.com>
Date:   Mon Nov 11 15:39:20 2013 -0600

    wcte43x: Teach tools about the wcte43x driver.
    
    Signed-off-by: Shaun Ruffell <sruffell at digium.com>

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

commit 11310bde5373ff1642936f07f35a8cbeba50e3e4
Author: Shaun Ruffell <sruffell at digium.com>
Date:   Mon Nov 11 15:35:56 2013 -0600

    wcaxx: Teach tools about the wcaxx driver.
    
    Signed-off-by: Shaun Ruffell <sruffell at digium.com>

diff --git a/blacklist.sample b/blacklist.sample
index 1d03f95..a415c16 100644
--- a/blacklist.sample
+++ b/blacklist.sample
@@ -12,6 +12,7 @@ blacklist wcfxo
 blacklist wctdm
 blacklist wctc4xxp
 blacklist wcb4xxp
+blacklist wcaxx
 
 # 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 3d45a57..42d9a15 100644
--- a/modules.sample
+++ b/modules.sample
@@ -34,6 +34,9 @@ wcte11xp
 # Digium TDM410P/AEX410: up to 4 analog ports
 wctdm24xxp
 
+# Digium A4A/A4B/A8A/A8B
+wcaxx
+
 # X100P - Single port FXO interface
 # X101P - Single port FXO interface 
 wcfxo
diff --git a/xpp/perl_modules/Dahdi/Hardware/PCI.pm b/xpp/perl_modules/Dahdi/Hardware/PCI.pm
index 9afc337..194991a 100644
--- a/xpp/perl_modules/Dahdi/Hardware/PCI.pm
+++ b/xpp/perl_modules/Dahdi/Hardware/PCI.pm
@@ -97,6 +97,12 @@ my %pci_ids = (
 	'd161:800a'		=> { DRIVER => 'wcte13xp', DESCRIPTION => 'Wildcard TE133' },
 	'd161:800b'		=> { DRIVER => 'wcte13xp', DESCRIPTION => 'Wildcard TE134' },
 
+	# from wcaxx
+	'd161:800c'		=> { DRIVER => 'wcaxx', DESCRIPTION => 'Digium A8A' },
+	'd161:800d'		=> { DRIVER => 'wcaxx', DESCRIPTION => 'Digium A8B' },
+	'd161:800f'		=> { DRIVER => 'wcaxx', DESCRIPTION => 'Digium A4A' },
+	'd161:8010'		=> { DRIVER => 'wcaxx', DESCRIPTION => 'Digium A4B' },
+
 	# from wcb4xxp
 	'd161:b410'		=> { DRIVER => 'wcb4xxp', DESCRIPTION => 'Digium Wildcard B410P' },
 

-----------------------------------------------------------------------


-- 
dahdi/tools.git