summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wctdm24xxp/base.c7
-rw-r--r--zaptel-base.c6
2 files changed, 5 insertions, 8 deletions
diff --git a/wctdm24xxp/base.c b/wctdm24xxp/base.c
index 4630c6e..6a94433 100644
--- a/wctdm24xxp/base.c
+++ b/wctdm24xxp/base.c
@@ -1523,9 +1523,12 @@ static inline void wctdm_vpm_check(struct wctdm *wc, int x)
}
}
-static int wctdm_echocan(struct zt_chan *chan, int eclen)
+#include "adt_lec.c"
+
+static int wctdm_echocan_with_params(struct zt_chan *chan, struct zt_echocanparams *ecp, struct zt_echocanparam *p)
{
struct wctdm *wc = chan->pvt;
+
if (wc->vpm) {
int channel;
int unit;
@@ -3100,7 +3103,7 @@ static int wctdm_initialize(struct wctdm *wc)
wc->span.watchdog = wctdm_watchdog;
wc->span.dacs= wctdm_dacs;
#ifdef VPM_SUPPORT
- wc->span.echocan = wctdm_echocan;
+ wc->span.echocan_with_params = wctdm_echocan_with_params;
#endif
init_waitqueue_head(&wc->span.maintq);
diff --git a/zaptel-base.c b/zaptel-base.c
index 96e25f2..a7feff6 100644
--- a/zaptel-base.c
+++ b/zaptel-base.c
@@ -408,12 +408,6 @@ static struct zt_zone *tone_zones[ZT_TONE_ZONE_MAX];
#define NUM_SIGS 10
-#ifdef AGGRESSIVE_SUPPRESSOR
-#define ZAPTEL_ECHO_AGGRESSIVE " (aggressive)"
-#else
-#define ZAPTEL_ECHO_AGGRESSIVE ""
-#endif
-
/* Echo cancellation */
#if defined(ECHO_CAN_HPEC)
#include "hpec/hpec_zaptel.h"