[dahdi-commits] sruffell: tools/trunk r4596 - in /tools/trunk: dahdi_cfg.c doc/system.conf

[SVN commits to the DAHDI project]

Author: sruffell
Date: Thu Jul 10 11:42:58 2008
New Revision: 4596

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4596
Log:
* Changed the 'echocanceler' system.conf parameter to 'echocanceller'
* Added a section to describe how to set up the echocancellers in system.conf.

Modified:
    tools/trunk/dahdi_cfg.c
    tools/trunk/doc/system.conf

Modified: tools/trunk/dahdi_cfg.c
URL: http://svn.digium.com/view/dahdi/tools/trunk/dahdi_cfg.c?view=diff&rev=4596&r1=4595&r2=4596
==============================================================================
--- tools/trunk/dahdi_cfg.c (original)
+++ tools/trunk/dahdi_cfg.c Thu Jul 10 11:42:58 2008
@@ -1264,7 +1264,7 @@
 	{ "preemp", pre_emp },
 	{ "channel", rad_chanconfig },
 	{ "channels", rad_chanconfig },
-	{ "echocanceler", setechocan },
+	{ "echocanceller", setechocan },
 };
 
 static char *readline()

Modified: tools/trunk/doc/system.conf
URL: http://svn.digium.com/view/dahdi/tools/trunk/doc/system.conf?view=diff&rev=4596&r1=4595&r2=4596
==============================================================================
--- tools/trunk/doc/system.conf (original)
+++ tools/trunk/doc/system.conf Thu Jul 10 11:42:58 2008
@@ -286,3 +286,24 @@
 #mulaw=1-10
 #deflaw=5
 #
+# Configuring modular echo cancellers
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# DAHDI uses modular echocancellers that are configured per channel.  
+# The echo cancellers are compiled and configured as part of the 
+# dahdi-linux package.  You can specify in this file the default echo
+# canceller to use for a given zap channel.  The default behavior is for there
+# to be no default echo cancellers.
+#
+# Valid echo cancellers are: jpah, kb1, mg2, sec2, and sec.
+# If compiled, 'hpec' is also a valid echo canceller.
+# 
+# To configure the default echo cancellers, use the format:
+# echocanceller=<echocanceller name>,<channel(s)>
+#
+# Example:
+# Configure channels 1 through 8 to use the mg2 echocanceller
+# echocanceller=mg2,1-8 
+#
+# And change channel 2 to use the kb1 echocanceller.
+# echocanceller=kb1,2
+#