summaryrefslogtreecommitdiff
path: root/drivers/dahdi/wcb4xxp
diff options
context:
space:
mode:
authorMatthew Fredrickson <creslin@digium.com>2010-07-16 16:25:01 +0000
committerMatthew Fredrickson <creslin@digium.com>2010-07-16 16:25:01 +0000
commitaab6c824fa9d6d9951c0ee89612c22276bb034ff (patch)
tree08e42947502d7505a766f86a3a7116d5a5089699 /drivers/dahdi/wcb4xxp
parent27d34d2f1d6e78c66a00d1cc29569a6743fa1c08 (diff)
Add alawoverride parameter to the wcb4xxp module to allow for ulaw and alaw mode.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8939 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wcb4xxp')
-rw-r--r--drivers/dahdi/wcb4xxp/base.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/dahdi/wcb4xxp/base.c b/drivers/dahdi/wcb4xxp/base.c
index ae2425c..c1770b6 100644
--- a/drivers/dahdi/wcb4xxp/base.c
+++ b/drivers/dahdi/wcb4xxp/base.c
@@ -94,6 +94,7 @@ static int alarmdebounce = 500;
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 @@ static void ec_init(struct b4xxp *b4)
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(alarmdebounce, int, S_IRUGO | S_IWUSR);
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");