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

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Thu Jul 10 16:38:59 2008
New Revision: 4603

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4603
Log:
Support using 'hardhdlc=' instead of 'dchan=' for BRI devices.

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=4603&r1=4602&r2=4603
==============================================================================
--- tools/trunk/xpp/dahdi_genconf (original)
+++ tools/trunk/xpp/dahdi_genconf Thu Jul 10 16:38:59 2008
@@ -73,6 +73,7 @@
 my $brint_overlap = 'no';
 my $pri_termtype = 'SPAN/* TE';
 my $echo_can = 'mg2';
+my $bri_hardhdlc= 'no';
 
 my %dahdi_default_vars = (
 		GENCONF_FILE		=> \$file,
@@ -97,6 +98,7 @@
 		brint_overlap		=> \$brint_overlap,
 		pri_termtype		=> \$pri_termtype,
 		echo_can		=> \$echo_can,
+		bri_hardhdlc		=> \$bri_hardhdlc,
 		);
 
 sub map_dahdi_defaults {
@@ -208,6 +210,11 @@
 	my $span_yellow = $span->yellow();
 	$span_yellow = (defined $span_yellow) ? ",$span_yellow" : '';
 
+	my $dchan_type = 'dchan';
+	if ($span->is_bri() && ($bri_hardhdlc eq 'yes')) {
+		$dchan_type = 'hardhdlc';
+	}
+
 	$timing = ($termtype eq 'NT') ? 0 : $bri_te_last_timing++;
 	printf "span=%d,%d,%d,%s,%s%s%s\n",
 			$num,
@@ -220,7 +227,7 @@
 	printf "# termtype: %s\n", lc($termtype);
 	printf "bchan=%s\n", bchan_range($span);
 	my $dchan = $span->dchan();
-	printf "dchan=%d\n", $dchan->num();
+	printf "$dchan_type=%d\n", $dchan->num();
 	print_echo_can(bchan_range($span));
 }
 

Modified: tools/trunk/xpp/genconf_parameters
URL: http://svn.digium.com/view/dahdi/tools/trunk/xpp/genconf_parameters?view=diff&rev=4603&r1=4602&r2=4603
==============================================================================
--- tools/trunk/xpp/genconf_parameters (original)
+++ tools/trunk/xpp/genconf_parameters Thu Jul 10 16:38:59 2008
@@ -44,6 +44,12 @@
 #echo_can		oslec
 #echo_can		none  # to aboid echo cancellers altogether
 
+# bri_hardhdlc: If this parameter is set to 'yes', in the entries for
+# BRI cards 'hardhdlc' will be used instead of 'dchan' (an alias for
+# 'fcshdlc').
+#
+#bri_hardhdlc		yes
+
 # pri_types contains a list of settings:
 # Currently the only setting is for TE or NT (the default is TE)
 #