[svn-commits] sruffell: linux/trunk r5230 - /linux/trunk/drivers/dahdi/wcb4xxp/base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Wed Nov  5 13:17:16 2008
New Revision: 5230

URL: http://svn.digium.com/view/dahdi?view=rev&rev=5230
Log:
Allow the wcb4xxp to take all the signalling types.

Modified:
    linux/trunk/drivers/dahdi/wcb4xxp/base.c

Modified: linux/trunk/drivers/dahdi/wcb4xxp/base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=5230&r1=5229&r2=5230
==============================================================================
--- linux/trunk/drivers/dahdi/wcb4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcb4xxp/base.c Wed Nov  5 13:17:16 2008
@@ -2099,13 +2099,13 @@
 		bspan->span.channels = WCB4XXP_CHANNELS_PER_SPAN;
 		bspan->span.flags = 0;
 
-		if(0 /* FIXME: some config parameter for europe/north america */) {
-			bspan->span.deflaw = DAHDI_LAW_MULAW;
-			bspan->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_B8ZS | DAHDI_CONFIG_D4 | DAHDI_CONFIG_ESF;
-		} else {
-			bspan->span.deflaw = DAHDI_LAW_ALAW;
-			bspan->span.linecompat = DAHDI_CONFIG_HDB3 | DAHDI_CONFIG_CCS | DAHDI_CONFIG_CRC4;
-		}
+		bspan->span.deflaw = DAHDI_LAW_ALAW;
+		/* For simplicty, we'll accept all line modes since BRI
+		 * ignores this setting anyway.*/
+		bspan->span.linecompat = DAHDI_CONFIG_AMI | 
+			DAHDI_CONFIG_B8ZS | DAHDI_CONFIG_D4 | 
+			DAHDI_CONFIG_ESF | DAHDI_CONFIG_HDB3 |
+			DAHDI_CONFIG_CCS | DAHDI_CONFIG_CRC4;
 
 		sprintf(bspan->span.name, "B4/%d/%d", b4->cardno, i+1);
 		sprintf(bspan->span.desc, "B4XXP (PCI) Card %d Span %d", b4->cardno, i+1);