don't include the echo canceller headers in every module that includes zaptel.h... instead, only in zaptel.c

git-svn-id: http://svn.digium.com/svn/zaptel/trunk@867 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 35 insertions, 3 deletions

diff --git a/zaptel.c b/zaptel.c
index 4cc996d..d97961e 100644
--- a/zaptel.c
+++ b/zaptel.c
@@ -89,6 +89,38 @@
 #include <linux/moduleparam.h>
 #endif
 
+#ifdef AGGRESSIVE_SUPPRESSOR
+#define ZAPTEL_ECHO_AGGRESSIVE " (aggressive)"
+#else
+#define ZAPTEL_ECHO_AGGRESSIVE
+#endif
+
+#ifdef __KERNEL__
+/* Echo cancellation */
+#if defined(ECHO_CAN_STEVE)
+#define ZAPTEL_ECHO_CANCELLER "STEVE"
+#include "sec.h"
+#elif defined(ECHO_CAN_STEVE2)
+#define ZAPTEL_ECHO_CANCELLER "STEVE2"
+#include "sec-2.h"
+#elif defined(ECHO_CAN_MARK)
+#define ZAPTEL_ECHO_CANCELLER "MARK"
+#include "mec.h"
+#elif defined(ECHO_CAN_MARK2)
+#define ZAPTEL_ECHO_CANCELLER "MARK2"
+#include "mec2.h"
+#elif defined(ECHO_CAN_KB1)
+#define ZAPTEL_ECHO_CANCELLER "KB1"
+#include "kb1ec.h"
+#elif defined(ECHO_CAN_MG2)
+#define ZAPTEL_ECHO_CANCELLER "MG2"
+#include "mg2ec.h"
+#else
+#define ZAPTEL_ECHO_CANCELLER "MARK3"
+#include "mec3.h"
+#endif
+#endif
+
 /* Get helper arithmetic */
 #include "arith.h"
 #if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_FP)
@@ -932,7 +964,7 @@ static void close_channel(struct zt_chan *chan)
 {
 	unsigned long flags;
 	void *rxgain = NULL;
-	echo_can_state_t *ec = NULL;
+	struct echo_can_state *ec = NULL;
 	int oldconf;
 #ifdef CONFIG_ZAPATA_PPP
 	struct ppp_channel *ppp;
@@ -2026,7 +2058,7 @@ static int initialize_channel(struct zt_chan *chan)
 	int res;
 	unsigned long flags;
 	void *rxgain=NULL;
-	echo_can_state_t *ec=NULL;
+	struct echo_can_state *ec=NULL;
 	if ((res = zt_reallocbufs(chan, ZT_DEFAULT_BLOCKSIZE, ZT_DEFAULT_NUM_BUFS)))
 		return res;
 
@@ -3972,7 +4004,7 @@ static int zt_chan_ioctl(struct inode *inode, struct file *file, unsigned int cm
 	int ret;
 	int oldconf;
 	void *rxgain=NULL;
-	echo_can_state_t *ec, *tec;
+	struct echo_can_state *ec, *tec;
 
 	if (!chan)
 		return -ENOSYS;