[svn-commits] mattf: linux/trunk r7284 - in /linux/trunk/drivers/dahdi: voicebus/ wctdm24xx...

[SVN commits to the Digium repositories]

Author: mattf
Date: Wed Sep 30 11:34:11 2009
New Revision: 7284

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7284
Log:
Update echocan API so it only uses channel offset in free routine

Modified:
    linux/trunk/drivers/dahdi/voicebus/GpakCust.c
    linux/trunk/drivers/dahdi/voicebus/GpakCust.h
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c
    linux/trunk/drivers/dahdi/wcte12xp/base.c

Modified: linux/trunk/drivers/dahdi/voicebus/GpakCust.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/GpakCust.c?view=diff&rev=7284&r1=7283&r2=7284
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/GpakCust.c (original)
+++ linux/trunk/drivers/dahdi/voicebus/GpakCust.c Wed Sep 30 11:34:11 2009
@@ -370,10 +370,9 @@
 }
 EXPORT_SYMBOL(vpmadt032_echocan_create);
 
-void vpmadt032_echocan_free(struct vpmadt032 *vpm, struct dahdi_chan *chan,
+void vpmadt032_echocan_free(struct vpmadt032 *vpm, int channo,
 	struct dahdi_echocan_state *ec)
 {
-	int channo = chan->chanpos - 1;
 	adt_lec_init_defaults(&vpm->desiredecstate[channo], 0);
 	vpm->desiredecstate[channo].nlp_type = vpm->options.vpmnlptype;
 	vpm->desiredecstate[channo].nlp_threshold = vpm->options.vpmnlpthresh;

Modified: linux/trunk/drivers/dahdi/voicebus/GpakCust.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/GpakCust.h?view=diff&rev=7284&r1=7283&r2=7284
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/GpakCust.h (original)
+++ linux/trunk/drivers/dahdi/voicebus/GpakCust.h Wed Sep 30 11:34:11 2009
@@ -145,7 +145,7 @@
 void vpmadt032_free(struct vpmadt032 *vpm);
 int vpmadt032_echocan_create(struct vpmadt032 *vpm, int channo,
 	struct dahdi_echocanparams *ecp, struct dahdi_echocanparam *p);
-void vpmadt032_echocan_free(struct vpmadt032 *vpm, struct dahdi_chan *chan,
+void vpmadt032_echocan_free(struct vpmadt032 *vpm, int channo,
 	struct dahdi_echocan_state *ec);
 
 struct GpakEcanParms;

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=7284&r1=7283&r2=7284
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Wed Sep 30 11:34:11 2009
@@ -1738,7 +1738,7 @@
 			       unit, channel);
 		wctdm_vpm_out(wc, unit, channel, 0x01);
 	} else if (wc->vpmadt032) {
-		vpmadt032_echocan_free(wc->vpmadt032, chan, ec);
+		vpmadt032_echocan_free(wc->vpmadt032, chan->chanpos - 1, ec);
 	}
 }
 

Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=7284&r1=7283&r2=7284
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Wed Sep 30 11:34:11 2009
@@ -1166,7 +1166,7 @@
 	if (!wc->vpmadt032)
 		return;
 
-	vpmadt032_echocan_free(wc->vpmadt032, chan, ec);
+	vpmadt032_echocan_free(wc->vpmadt032, chan->chanpos - 1, ec);
 }
 
 static void set_span_devicetype(struct t1 *wc)