diff options
author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-06-17 12:38:20 +0000 |
---|---|---|
committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-06-17 12:38:20 +0000 |
commit | 9b3e78c5c997fe9363c473f1161ff9c554dcfe69 (patch) | |
tree | 859a756e6e219c8ce1fcf2c3181da512eeac6cd3 /xpp/utils/genzaptelconf | |
parent | b5755da0d40e72fad44756bc009fcf688c3380cc (diff) |
* Echo canceller not disablerd
* card_fxo.c: Fixed an unreleased spinlock
* utils/Makefile: No more C++ flags
* utils/Makefile: An install target
* fpga_load: usb1 support
* genzaptelconf: Support for more cards (Any Sangoma A20x testers?)
* xpp_fxloder: The new USB ID, even for manual loads...
* xpp_zap.c: Print module fetures in a better format at load time.
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1114 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/utils/genzaptelconf')
-rwxr-xr-x | xpp/utils/genzaptelconf | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/xpp/utils/genzaptelconf b/xpp/utils/genzaptelconf index 7bcc20e..fe5c9e4 100755 --- a/xpp/utils/genzaptelconf +++ b/xpp/utils/genzaptelconf @@ -31,6 +31,11 @@ # TODO: either ditch them or convert to perl # Don't override variables here. Override them in /etc/default/zaptel # +# 0.5.3: +# * Experimental support for Sangoman analog cards (A20x) +# * fixed timeout for Astribank load +# 0.5.2: +# * Now it should detect most PRI cards and even wcusb # 0.5.1: # * Initial support for ztgsm (Junghanns's PCI GSM card) # * Wait for the xpp module to register if just loaded @@ -51,7 +56,7 @@ # * hence we can reduce the list of modules # /etc/default/zaptel may override the following variables -VERSION=0.5.1 +VERSION=0.5.3 VERSION_FULL="$VERSION $Id$" lc_country=us base_exten=6000 @@ -87,7 +92,7 @@ tmp_dir= # A list of all modules: # - the list of modules which will be probed (in this order) if -d is used # - The module that will be deleted from /etc/modules , if -d -M is used -ALL_MODULES="zaphfc qozap ztgsm wctdm wctdm24xxp wcfxo wcfxs pciradio tor2 torisa wct1xxp wct4xxp wcte11xp wcusb xpp_usb" +ALL_MODULES="zaphfc qozap ztgsm wctdm wctdm24xxp wcfxo wcfxs pciradio tor2 torisa wct1xxp wct4xxp wcte11xp wanpipe wcusb xpp_usb" # read default configuration from /etc/default/zaptel if [ -r $ZAPTEL_BOOT ]; then . $ZAPTEL_BOOT; fi @@ -469,16 +474,21 @@ wait_for_xpp() { if [ -d /proc/xpp ] && \ [ "`cat /sys/module/xpp/parameters/zap_autoreg`" = 'Y' ] then + out_on_timeout=0 # wait for the XPDs to register: - for i in `seq 10`; do + for i in `seq 30`; do sleep 1 if ! grep -q 0 /proc/xpp/*/*/zt_registration 2>/dev/null then # There are either no XPDs or all of them are # registered. Nothing to do + out_on_timeout=1 break fi done + if [ "$out_on_timeout" != 0 ] + then echo >&2 "Warning: time out waiting for xpp init." + fi fi } @@ -633,7 +643,7 @@ EOF # in case this is a real channel. chan_num=`echo $line |awk '{print $1}'` case "$line" in - *WCTDM/*) + *WCTDM/*|*/WRTDM/*) # this can be either FXS or FXO maybe_fxs=0 maybe_fxo=0 @@ -643,6 +653,8 @@ EOF then # An installed module won't accept both FXS and FXO signalling types: # this is an empty slot. + # TODO: I believe that the Sangoma A20x will reject both and thus + # print nothing here. echo "$rem_char channel $chan_num, WCTDM, no module." continue fi @@ -654,6 +666,9 @@ EOF print_pattern $chan_num fxs $mode || \ echo "$rem_char channel $chan_num, WCFXO, inactive." ;; + *WCUSB/*) + print_pattern $chan_num fxo $mode + ;; *XPP_FXO/*) print_pattern $chan_num fxs $mode ;; @@ -666,7 +681,7 @@ EOF *XPP_IN/*) print_pattern -a input $chan_num fxo $mode ;; - *ZTHFC*/*|*ztqoz*/*|*ztgsm/*|*WCT1/*) # should also be used for other PRI channels + *ZTHFC*/*|*ztqoz*/*|*ztgsm/*|*TE4/*|*TE2/*|*WCT1/*|*Tor2/*|*TorISA/*) # should also be used for other PRI channels if [ "`cat $tmp_dir/span_begin`" = "-1" ] then echo $chan_num >$tmp_dir/span_begin @@ -687,7 +702,7 @@ EOF # what switch type? Any meaning to it? echo 'gsm' >$tmp_dir/span_signalling ;; - *WCT1/*) + *TE4/*|*TE2/*|*WCT1/*|*Tor2/*|*TorISA/*) echo 'esf' >$tmp_dir/span_framing echo 'b8zs' >$tmp_dir/span_coding echo 'national' >$tmp_dir/span_switchtype |