[Asterisk-cvs] zaptel zaptel.c,1.83,1.84 zconfig.h,1.9,1.10

[malcolmd at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv17379

Modified Files:
	zaptel.c zconfig.h 
Log Message:
Add option to cause Zaptel to ignore the 2100 Hz echo cancel 
disable tone


Index: zaptel.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- zaptel.c	29 Jun 2004 04:27:14 -0000	1.83
+++ zaptel.c	2 Jul 2004 13:04:54 -0000	1.84
@@ -4394,6 +4394,7 @@
 	/* Okay, now we've got something to transmit */
 	for (x=0;x<ZT_CHUNKSIZE;x++)
 		getlin[x] = ZT_XLAW(txb[x], ms);
+#ifndef NO_ECHOCAN_DISABLE
 	if (ms->ec) {
 		for (x=0;x<ZT_CHUNKSIZE;x++) {
 			/* Check for echo cancel disabling tone */
@@ -4409,6 +4410,7 @@
 			}
 		}
 	}
+#endif
 	if ((!ms->confmute && !ms->dialing) || (ms->flags & ZT_FLAG_PSEUDO)) {
 		/* Handle conferencing on non-clear channel and non-HDLC channels */
 		switch(ms->confmode & ZT_CONF_MODE_MASK) {
@@ -5131,6 +5133,7 @@
 		putlin[x] = ZT_XLAW(rxb[x], ms);
 	}
 
+#ifndef NO_ECHOCAN_DISABLE
 	if (ms->ec) {
 		for (x=0;x<ZT_CHUNKSIZE;x++) {
 			if (echo_can_disable_detector_update(&ms->rxecdis, putlin[x])) {
@@ -5145,6 +5148,7 @@
 			}
 		}
 	}
+#endif	
 	/* if doing rx tone decoding */
 	if (ms->rxp1 && ms->rxp2 && ms->rxp3)
 	{

Index: zconfig.h
===================================================================
RCS file: /usr/cvsroot/zaptel/zconfig.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- zconfig.h	30 Jun 2004 13:34:36 -0000	1.9
+++ zconfig.h	2 Jul 2004 13:04:54 -0000	1.10
@@ -55,6 +55,13 @@
  */
 /* #define AGGRESSIVE_SUPPRESSOR */
 
+/*
+ * Define to turn off the echo canceler disable tone detector,
+ * which will cause zaptel to ignore the 2100 Hz echo cancel disable
+ * tone.
+ */
+/* #define NO_ECHOCAN_DISABLE */
+
 /* We now use the linux kernel config to detect which options to use */
 /* You can still override them below */
 #if defined(CONFIG_HDLC) || defined(CONFIG_HDLC_MODULE)