diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2009-11-19 19:15:55 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2009-11-19 19:15:55 +0000 |
| commit | 0f750b25d7b23f8fb59cd61d35d89cbf3d1232c4 (patch) | |
| tree | afe02a11f99b363624251f514554c26fd9d38cad | |
| parent | 46c56582645dd5fff080df9a28fdf191af0be3b0 (diff) | |
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
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |