diff options
Diffstat (limited to 'xpp/utils')
| -rwxr-xr-x | xpp/utils/genzaptelconf | 24 | ||||
| -rw-r--r-- | xpp/utils/xpp_fxloader | 14 |
2 files changed, 30 insertions, 8 deletions
diff --git a/xpp/utils/genzaptelconf b/xpp/utils/genzaptelconf index a000ec0..3e89915 100755 --- a/xpp/utils/genzaptelconf +++ b/xpp/utils/genzaptelconf @@ -295,6 +295,9 @@ print_pattern() { # sadly, both input ports and output ports go into the same span as # the FXS ports. Thus we need to separate between them. See also # the zapata.conf section: + + echo ";;; line=\"$line\"" >> $zapata_file + if [ "$astbank_type" != '' ]; then echo "# astbanktype: $astbank_type" >>$zaptel_file; fi @@ -369,7 +372,14 @@ print_pattern() { esac reset_values="$reset_values cidsignalling cidstart" fi - echo ";;; line=\"$line\"" >> $zapata_file + case "$line" in + *XPP_FXO*) + if [ "$xpp_fxo_rxgain" != '' ]; then + echo "rxgain=$xpp_fxo_rxgain" >> $zapata_file + reset_values="$reset_values rxgain" + fi + ;; + esac # if kewlstart is not used, busydetect has to be employed: if [ "$method" = 'ls' ] then @@ -576,13 +586,11 @@ reset_zapata_entry() { for arg in "$@"; do case "$arg" in busydetect) echo "busydetect=no" >>$conf_file;; - callerid) echo "callerid=" >>$conf_file;; - cidstart) echo "cidstart=" >>$conf_file;; - cidsignalling) echo "cidsignalling=" >>$conf_file;; context) echo "context=default" >>$conf_file;; - group) echo "group=" >>$conf_file;; immediate) echo "immediate=no" >>$conf_file;; - mailbox) echo "mailbox=" >>$conf_file;; + rxgain) echo "rxgain=0" >>$conf_file;; + txgain) echo "txgain=0" >>$conf_file;; + *) echo "$arg=" >>$conf_file;; esac done } @@ -692,7 +700,7 @@ EOF # in case this is a real channel. chan_num=`echo $line |awk '{print $1}'` case "$line" in - *WCTDM/*|*/WRTDM/*|*OPVXA1200/*) + *WCTDM/*|*\ WRTDM/*|*OPVXA1200/*) # TDM400P/2400P and similar cards (Sangoma A200, OpenVox A1200) # this can be either FXS or FXO maybe_fxs=0 @@ -812,7 +820,7 @@ EOF list) echo "# ??: $line";; files) echo "# ??: $line" >>$zaptel_file - echo "; ??: $line" >>$zaptel_file + echo "; ??: $line" >>$zapata_file esac ;; esac diff --git a/xpp/utils/xpp_fxloader b/xpp/utils/xpp_fxloader index 8c54370..b14f746 100644 --- a/xpp/utils/xpp_fxloader +++ b/xpp/utils/xpp_fxloader @@ -75,6 +75,17 @@ REENUM_SLEEP_TIME=3 # only used on manual runs FPGA_LOAD="/usr/sbin/fpga_load" +# With Kernels older that 2.6.10 it seems to be possible +# to trigger a race condition by running fxload or fpga_load +# immediately after the detection of the device. +KERNEL_HAS_USB_RACE=0 +case "`uname -r`" in 2.6.[89]*) KERNEL_HAS_USB_RACE=1;; esac +sleep_if_race() { + if [ "$KERNEL_HAS_USB_RACE" = '1' ]; then + sleep 2 + fi +} + find_dev() { v_id=$1 p_id=$2 @@ -83,6 +94,7 @@ find_dev() { } do_fxload() { + sleep_if_race ( fxload -t fx2 $* 2>&1 1>/dev/null || exit 1 ) | $LOGGER } @@ -120,6 +132,7 @@ load_fpga() { firm_ver=`hexfile_version $FIRMWARE_DIR/$fw` $LOGGER "FPGA Firmware $FIRMWARE_DIR/$fw into $dev" + sleep_if_race $FPGA_LOAD -D "$dev" -I "$FIRMWARE_DIR/$fw" 2>&1 >/dev/null | $LOGGER status=$PIPESTATUS if [ $status != 0 ]; then @@ -193,6 +206,7 @@ then else FIRM_FPGA="$FIRMWARE_DIR/FPGA_$prod_id.hex" fi + sleep_if_race $FPGA_LOAD -D "$DEVICE" -I "$FIRM_FPGA" 2>&1 >/dev/null | $LOGGER ;; esac |