Merge xpp rev. 3495:

------------------------------------------------------------------------
r2243 | tzafrir | 2007-02-28 02:05:59 +0200 (Wed, 28 Feb 2007) | 4 lines

* xpp rev. 3495: fix a race in the FXO driver of recent weeks.
* Add the Astribank BRI driver (though still needs bristuffed zaptel
  to build and thus will not build by default)

------------------------------------------------------------------------
r2239 | tzafrir | 2007-02-27 08:14:18 +0200 (Tue, 27 Feb 2007) | 18 lines

Xorcom rev. 3491:
 * Version of xpp modules is set from xpp/.version, rather than "unknown".
 * Astribank devices are now initialized in parallel: faster startup
   when there are multiple Astribanks.
 * Re-added support for the old format of /proc/xpp/sync write:
   (echo N 0 > /proc/xpp/sync ) . The new format (SYNC=NN) is preffered.
 * Firmware update to fix a PCM issue.
 * Fixed a build issue with kernel 2.6.8 .
 * Fixed missing initialization in Zaptel::Xpp::Xbus .
 * genzaptelconf will now set FXS ports as LS by default. To set them as 
   KS, use fxs_default_start=ks in /etc/default/zaptel / /etc/sysconfig/zaptel
   (Also a workaround for #7755 ).
 * Groundwork for sync from zaptel master span: if zaptel is built with
   ZAPTEL_SYNC_TIC (see zaptel/team/tzafrir/sync ), xpp will report its 
   drift from the zaptel sync master.
 * USB firmware update: had bad lines checksums (and fxload did not report).
 * fpga_load can now better report bad hex file checksum ;-) .

------------------------------------------------------------------------
r2223 | tzafrir | 2007-02-24 03:05:05 +0200 (Sat, 24 Feb 2007) | 3 lines

Add the Zaptel and Zaptel::Xpp perl modules, and some simple 
utilities that use them. disabled by default for now.

------------------------------------------------------------------------
r2222 | tzafrir | 2007-02-24 02:55:05 +0200 (Sat, 24 Feb 2007) | 2 lines

Make the xpp/utils/Makefile in 1.2 closer to the one in 1.4 .


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2247 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 18 insertions, 10 deletions

diff --git a/xpp/utils/genzaptelconf b/xpp/utils/genzaptelconf
index a5fb0b0..c5dedd4 100755
--- a/xpp/utils/genzaptelconf
+++ b/xpp/utils/genzaptelconf
@@ -37,6 +37,9 @@
 VERSION=0.5.8
 rcsid='$Id$'
 lc_country=us
+# set to: ls, ks or gs for (Loopstart, Kewlstart and GroundStart)
+#         on FXS channels (FXO signalling).
+fxs_default_start=ls
 base_exten=6000
 # If set: no context changes are made in zapata-channels.conf
 #context_manual=yes
@@ -267,17 +270,22 @@ print_pattern() {
 	local chan=$1
 	local sig=$2 #fxs/fxo
 	local mode=$3
-	local method='ks'
-
-	# Coutries in which we need to use busydetect:
-	# United Arab Emirats, Israel, Slovenia
-	case "$lc_country" in
-	ae|il|si) 
-	  if [ "$sig" = 'fxs' ]; then 
+	local method
+	
+	if [ "$sig" = 'fxs' ]; then
+		# Coutries in which we need to use busydetect:
+		# United Arab Emirats, Israel, Slovenia
+		case "$lc_country" in
+		ae|il|si) 
 			method=ls
-		fi
-		;;
-	esac
+			;;
+		*)
+			method=ks
+			;;
+		esac
+	else
+		method="$fxs_default_start"
+	fi
 	case "$mode" in
 	list)
 		case "$sig" in