[svn-commits] sruffell: linux/trunk r8162 - in /linux/trunk: drivers/dahdi/ include/dahdi/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Fri Feb 26 19:16:23 2010
New Revision: 8162

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8162
Log:
dahdi: Add option to disable the EC disable tone detection algorithm.

Define CONFIG_DAHDI_NO_ECHOCAN_DISABLE in include/dahdi/dahdi_config.h in
order to prevent the tone detector from disabling software echocan.

I slightly modified the noechodisable.patch.

(closes issue #16805)
Reported by: sles
Patches:
      noechodisable.patch uploaded by sles (license 991)

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c
    linux/trunk/include/dahdi/dahdi_config.h

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=8162&r1=8161&r2=8162
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Fri Feb 26 19:16:23 2010
@@ -6181,6 +6181,7 @@
 	for (x=0;x<DAHDI_CHUNKSIZE;x++)
 		getlin[x] = DAHDI_XLAW(txb[x], ms);
 
+#ifndef CONFIG_DAHDI_NO_ECHOCAN_DISABLE
 	if (ms->ec_state && (ms->ec_state->status.mode == ECHO_MODE_ACTIVE) && !ms->ec_state->features.CED_tx_detect) {
 		for (x = 0; x < DAHDI_CHUNKSIZE; x++) {
 			if (echo_can_disable_detector_update(&ms->ec_state->txecdis, getlin[x])) {
@@ -6190,6 +6191,7 @@
 			}
 		}
 	}
+#endif
 
 	if ((!ms->confmute && !ms->dialing) || (ms->flags & DAHDI_FLAG_PSEUDO)) {
 		/* Handle conferencing on non-clear channel and non-HDLC channels */
@@ -7213,6 +7215,7 @@
 		putlin[x] = DAHDI_XLAW(rxb[x], ms);
 	}
 
+#ifndef CONFIG_DAHDI_NO_ECHOCAN_DISABLE
 	if (ms->ec_state && (ms->ec_state->status.mode == ECHO_MODE_ACTIVE) && !ms->ec_state->features.CED_rx_detect) {
 		for (x = 0; x < DAHDI_CHUNKSIZE; x++) {
 			if (echo_can_disable_detector_update(&ms->ec_state->rxecdis, putlin[x])) {
@@ -7222,6 +7225,7 @@
 			}
 		}
 	}
+#endif
 
 	/* if doing rx tone decoding */
 	if (ms->rxp1 && ms->rxp2 && ms->rxp3)

Modified: linux/trunk/include/dahdi/dahdi_config.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/dahdi_config.h?view=diff&rev=8162&r1=8161&r2=8162
==============================================================================
--- linux/trunk/include/dahdi/dahdi_config.h (original)
+++ linux/trunk/include/dahdi/dahdi_config.h Fri Feb 26 19:16:23 2010
@@ -119,6 +119,13 @@
  */
 #define CONFIG_DAHDI_CORE_TIMER
 
+/*
+ * Define CONFIG_DAHDI_NO_ECHOCAN_DISABLE to prevent the 2100Hz tone detector
+ * from disabling any installed software echocan.
+ *
+ */
+/* #define CONFIG_DAHDI_NO_ECHOCAN_DISABLE */
+
 /* 
  * Uncomment if you happen have an early TDM400P Rev H which 
  * sometimes forgets its PCI ID to have wcfxs match essentially all