From 0f750b25d7b23f8fb59cd61d35d89cbf3d1232c4 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Thu, 19 Nov 2009 19:15:55 +0000 Subject: Merged revisions 7601 via svnmerge from https://origsvn.digium.com/svn/dahdi/linux/trunk ........ r7601 | sruffell | 2009-11-19 10:11:20 -0600 (Thu, 19 Nov 2009) | 1 line wctdm24xxp: Honor the alawoverride parameter when using the VPMADT032. ........ git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.2@7604 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/wctdm24xxp/base.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 70aa969..6fe0f04 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -417,6 +417,9 @@ static int config_vpmadt032(struct vpmadt032 *vpm, struct wctdm *wc) return -1; } + vpm->companding = (wc->span.deflaw == DAHDI_LAW_MULAW) ? + ADT_COMP_ULAW : ADT_COMP_ALAW; + for (i = 0; i < vpm->options.channels; ++i) { vpm->curecstate[i].tap_length = 0; vpm->curecstate[i].nlp_type = vpm->options.vpmnlptype; -- cgit v1.2.3