[zaptel-commits] kpfleming: branch 1.4 r3665 - in /branches/1.4: wctdm24xxp/base.c zaptel-base.c

[SVN commits to the Zaptel project]

Author: kpfleming
Date: Fri Jan 11 14:51:50 2008
New Revision: 3665

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3665
Log:
remove some macros that are no longer needed

Modified:
    branches/1.4/wctdm24xxp/base.c
    branches/1.4/zaptel-base.c

Modified: branches/1.4/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp/base.c?view=diff&rev=3665&r1=3664&r2=3665
==============================================================================
--- branches/1.4/wctdm24xxp/base.c (original)
+++ branches/1.4/wctdm24xxp/base.c Fri Jan 11 14:51:50 2008
@@ -1523,9 +1523,12 @@
 	}
 }
 
-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 @@
 	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);
 

Modified: branches/1.4/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/zaptel-base.c?view=diff&rev=3665&r1=3664&r2=3665
==============================================================================
--- branches/1.4/zaptel-base.c (original)
+++ branches/1.4/zaptel-base.c Fri Jan 11 14:51:50 2008
@@ -407,12 +407,6 @@
 
 #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)