[svn-commits] tzafrir: tools/trunk r4601 - /tools/trunk/xpp/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Thu Jul 10 13:49:57 2008
New Revision: 4601

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4601
Log:
Generate the echocanceller=mg2,NNN in system.conf for the user as well.

Modified:
    tools/trunk/xpp/dahdi_genconf
    tools/trunk/xpp/genconf_parameters

Modified: tools/trunk/xpp/dahdi_genconf
URL: http://svn.digium.com/view/dahdi/tools/trunk/xpp/dahdi_genconf?view=diff&rev=4601&r1=4600&r2=4601
==============================================================================
--- tools/trunk/xpp/dahdi_genconf (original)
+++ tools/trunk/xpp/dahdi_genconf Thu Jul 10 13:49:57 2008
@@ -72,6 +72,7 @@
 my $bri_sig_style = 'bri_ptmp';
 my $brint_overlap = 'no';
 my $pri_termtype = 'SPAN/* TE';
+my $echo_can = 'mg2';
 
 my %dahdi_default_vars = (
 		GENCONF_FILE		=> \$file,
@@ -95,6 +96,7 @@
 		bri_sig_style		=> \$bri_sig_style,
 		brint_overlap		=> \$brint_overlap,
 		pri_termtype		=> \$pri_termtype,
+		echo_can		=> \$echo_can,
 		);
 
 sub map_dahdi_defaults {
@@ -180,6 +182,14 @@
 		printf "# astbanktype: output\n";
 	}
 	printf "$sig=$num\n";
+	print_echo_can($num);
+}
+
+sub print_echo_can($) {
+	my $chans = shift; # channel or range of channels.
+	return if ($echo_can eq 'none');
+
+	print "echocanceller=$echo_can,$chans\n";
 }
 
 my $bri_te_last_timing = 1;
@@ -211,6 +221,7 @@
 	printf "bchan=%s\n", bchan_range($span);
 	my $dchan = $span->dchan();
 	printf "dchan=%d\n", $dchan->num();
+	print_echo_can(bchan_range($span));
 }
 
 sub gen_dahdiconf($) {

Modified: tools/trunk/xpp/genconf_parameters
URL: http://svn.digium.com/view/dahdi/tools/trunk/xpp/genconf_parameters?view=diff&rev=4601&r1=4600&r2=4601
==============================================================================
--- tools/trunk/xpp/genconf_parameters (original)
+++ tools/trunk/xpp/genconf_parameters Thu Jul 10 13:49:57 2008
@@ -33,6 +33,17 @@
 #brint_overlap
 #bri_sig_style		bri_ptmp
 
+# The echo canceller to use. If you have a hardware echo canceller, just 
+# leave it be, as this one won't be used anyway.
+#
+# The default is mg2, but it may change in the future. E.g: a packager
+# that bundles a better echo canceller may set it as the default, or
+# dahdi_genconf will scan for the "best" echo canceller.
+#
+#echo_can		hpec
+#echo_can		oslec
+#echo_can		none  # to aboid echo cancellers altogether
+
 # pri_types contains a list of settings:
 # Currently the only setting is for TE or NT (the default is TE)
 #