[svn-commits] sruffell: branch linux/2.2 r7584 - in /linux/branches/2.2: ./ drivers/dahdi/v...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Nov 12 17:45:46 2009
New Revision: 7584

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7584
Log:
Merged revisions 7582 via svnmerge from 
https://origsvn.digium.com/svn/dahdi/linux/trunk

........
  r7582 | sruffell | 2009-11-12 17:19:13 -0600 (Thu, 12 Nov 2009) | 1 line
  
  wcte12xp, voicebus: Set the companding mode correctly on E1.
........

Modified:
    linux/branches/2.2/   (props changed)
    linux/branches/2.2/drivers/dahdi/voicebus/GpakCust.c
    linux/branches/2.2/drivers/dahdi/wcte12xp/base.c

Propchange: linux/branches/2.2/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: linux/branches/2.2/drivers/dahdi/voicebus/GpakCust.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/voicebus/GpakCust.c?view=diff&rev=7584&r1=7583&r2=7584
==============================================================================
--- linux/branches/2.2/drivers/dahdi/voicebus/GpakCust.c (original)
+++ linux/branches/2.2/drivers/dahdi/voicebus/GpakCust.c Thu Nov 12 17:45:46 2009
@@ -442,6 +442,7 @@
 	 * module. Instead, it uses tap_length to enable or disable the echo
 	 * cancellation. */
 	order->params.tap_length = (ecp->tap_length) ? 1 : 0;
+	order->params.companding = vpm->companding;
 	order->channel = channo;
 
 	vpmadt032_check_and_schedule_update(vpm, order);

Modified: linux/branches/2.2/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/wcte12xp/base.c?view=diff&rev=7584&r1=7583&r2=7584
==============================================================================
--- linux/branches/2.2/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/branches/2.2/drivers/dahdi/wcte12xp/base.c Thu Nov 12 17:45:46 2009
@@ -349,12 +349,14 @@
 		return -1;
 	}
 
+	vpm->companding = (TYPE_T1 == wc->spantype) ?
+				ADT_COMP_ULAW : ADT_COMP_ALAW;
 	for (channel = 0; channel < ARRAY_SIZE(vpm->curecstate); ++channel) {
 		vpm->curecstate[channel].tap_length = 0;
 		vpm->curecstate[channel].nlp_type = vpm->options.vpmnlptype;
 		vpm->curecstate[channel].nlp_threshold = vpm->options.vpmnlpthresh;
 		vpm->curecstate[channel].nlp_max_suppress = vpm->options.vpmnlpmaxsupp;
-		vpm->curecstate[channel].companding = (wc->spantype == TYPE_T1) ? ADT_COMP_ULAW : ADT_COMP_ALAW;
+		vpm->curecstate[channel].companding = vpm->companding;
 
 		vpm->setchanconfig_from_state(vpm, channel, &chanconfig);
 		if ((res = gpakConfigureChannel(vpm->dspid, channel, tdmToTdm, &chanconfig, &cstatus))) {