diff options
author | Matthew Fredrickson <creslin@digium.com> | 2009-09-30 16:34:11 +0000 |
---|---|---|
committer | Matthew Fredrickson <creslin@digium.com> | 2009-09-30 16:34:11 +0000 |
commit | d8052050454fd6d0ab8430384cb7131715087266 (patch) | |
tree | 84f2793c099af88f89303c01b042eab49ea9d4b4 | |
parent | 39ae2779179aafdf65240e27c62d967106ffb328 (diff) |
Update echocan API so it only uses channel offset in free routine
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@7284 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r-- | drivers/dahdi/voicebus/GpakCust.c | 3 | ||||
-rw-r--r-- | drivers/dahdi/voicebus/GpakCust.h | 2 | ||||
-rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 2 | ||||
-rw-r--r-- | drivers/dahdi/wcte12xp/base.c | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/drivers/dahdi/voicebus/GpakCust.c b/drivers/dahdi/voicebus/GpakCust.c index b3228df..ca85e5d 100644 --- a/drivers/dahdi/voicebus/GpakCust.c +++ b/drivers/dahdi/voicebus/GpakCust.c @@ -370,10 +370,9 @@ int vpmadt032_echocan_create(struct vpmadt032 *vpm, int channo, } 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; diff --git a/drivers/dahdi/voicebus/GpakCust.h b/drivers/dahdi/voicebus/GpakCust.h index 9b4f6a8..0546bfb 100644 --- a/drivers/dahdi/voicebus/GpakCust.h +++ b/drivers/dahdi/voicebus/GpakCust.h @@ -145,7 +145,7 @@ struct vpmadt032 *vpmadt032_alloc(struct vpmadt032_options *options, 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; diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 51a2c65..e3053d2 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -1738,7 +1738,7 @@ static void echocan_free(struct dahdi_chan *chan, struct dahdi_echocan_state *ec 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); } } diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index 676282d..8e031fe 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -1166,7 +1166,7 @@ static void echocan_free(struct dahdi_chan *chan, struct dahdi_echocan_state *ec 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) |