diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-05-13 20:01:23 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-05-13 20:01:23 +0000 |
| commit | 8eeb67728cc1db4007233f862c61376a094c9d41 (patch) | |
| tree | 7db845e07d7a01a47427e8817aba6715251f0841 /xpp/utils/xpp_fxloader | |
| parent | aee310d11e62a33c09bf7db1d034db8986155fae (diff) | |
xpp r5723: Includes, among others:
* New firmware protocol version: 3.0 .
* New numbers for the device types: (e.g. in card_init* scripts)
- FXS: 1 (was: 3)
- FXO: 2 (was: 4)
- BRI: 3 (was: 6 for TE, 7 for NT)
- PRI: 4 (was: 9)
* Init scripts of FXS and FXO modules are now written in Perl as well
(be sure to have File::Basename, e.g: perl-modules in Debian).
* calibrate_slics merged into init_card_1_30 .
* Module parameter print_dbg replaced with debug . Same meaning.
* init_fxo_modes removed: content moved into init_card_2_30, verified
at build time.
* Code tested with sparse. Most warnings were fixed.
* Set ZT_SIG_DACS for the bchans in the PRI and BRI modules to not get
ignored by ztscan.
* Handle null config_desc we get from some crazy USB controllers.
* genzaptelconf: Fix reporting of empty slots in list mode.
* xpp_blink can now blink a single analog port.
* "slics" has been renamed "chipregs".
* Fixed a small typo in fpga_load(8).
* Fixed bashism in xpp_fxloader.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4264 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/utils/xpp_fxloader')
| -rw-r--r-- | xpp/utils/xpp_fxloader | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/xpp/utils/xpp_fxloader b/xpp/utils/xpp_fxloader index 1cbd6b7..5a26560 100644 --- a/xpp/utils/xpp_fxloader +++ b/xpp/utils/xpp_fxloader @@ -56,6 +56,8 @@ me=`basename $0` DEBIAN_DEFAULTS="/etc/default/zaptel" REDHAT_DEFAULTS="/etc/sysconfig/zaptel" +status_fd=3 + if [ -r "$DEBIAN_DEFAULTS" -a -r "$REDHAT_DEFAULTS" ]; then echo 1>&2 "$0: Both '$DEBIAN_DEFAULTS' and '$REDHAT_DEFAULTS' exist" exit 1 @@ -143,9 +145,12 @@ load_fpga() { $LOGGER "FPGA Firmware into $dev" sleep_if_race - $FPGA_LOAD -D "$dev" -I "$FIRMWARE_DIR/$fw" -i | $LOGGER - status=$PIPESTATUS - if [ $status != 0 ]; then + ( + $FPGA_LOAD -D "$dev" -I "$FIRMWARE_DIR/$fw" -i + echo $? >$status_fd + )>| $LOGGER + status=`cat <$status_fd` + if [ "$status" != 0 ]; then echo "fpga_load failed with status $status" | $LOGGER exit 77 fi |