[svn-commits] mattf: linux/trunk r8939 - /linux/trunk/drivers/dahdi/wcb4xxp/base.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Fri Jul 16 11:25:01 2010
New Revision: 8939

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8939
Log:
Add alawoverride parameter to the wcb4xxp module to allow for ulaw and alaw mode.

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

Modified: linux/trunk/drivers/dahdi/wcb4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=8939&r1=8938&r2=8939
==============================================================================
--- linux/trunk/drivers/dahdi/wcb4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcb4xxp/base.c Fri Jul 16 11:25:01 2010
@@ -94,6 +94,7 @@
 static int vpmsupport = 1;
 static int timer_1_ms = 2000;
 static int timer_3_ms = 30000;
+static int alawoverride = 1;
 
 #if !defined(mmiowb)
 #define mmiowb() barrier()
@@ -690,7 +691,10 @@
 
 		b = ec_read(b4, i, 0x20);
 		b &= 0xe0;
-		b |= 0x13;
+		b |= 0x12;
+		if (alawoverride) {
+			b |= 0x01;
+		}
 		ec_write(b4, i, 0x20, b);
 		if (DBG)
 			dev_info(b4->dev, "reg 0x20 is 0x%02x\n", b);
@@ -2950,6 +2954,7 @@
 module_param(vpmsupport, int, S_IRUGO);
 module_param(timer_1_ms, int, S_IRUGO | S_IWUSR);
 module_param(timer_3_ms, int, S_IRUGO | S_IWUSR);
+module_param(alawoverride, int, S_IRUGO | S_IWUSR);
 
 MODULE_PARM_DESC(debug, "bitmap: 1=general 2=dtmf 4=regops 8=fops 16=ec 32=st state 64=hdlc 128=alarm");
 MODULE_PARM_DESC(spanfilter, "debug filter for spans. bitmap: 1=port 1, 2=port 2, 4=port 3, 8=port 4");