diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-11-04 17:33:46 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-11-04 17:33:46 +0000 |
| commit | 1588ee041e01dc31a75046dcf442da2fdc68ed66 (patch) | |
| tree | cd5f0859df3d28f7b17bc7629dff3f9574a8e504 /xpp/xpp_fxloader | |
| parent | 91dfb30679d4412323565cb8ea61795c2d78264a (diff) | |
xpp: reduce the clutter of firmware loading
Make the new XPP tools much less verbose:
* demote messages to be debug
* Convert multi-line messages to be single-line messages
Making xpp_fxloader run in debug mode can be done by setting
DEBUG=yes
in /etc/dahdi/init.conf
Merged revisions 7221 via svnmerge from
http://svn.digium.com/svn/dahdi/tools/trunk
git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/branches/2.2@7474 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'xpp/xpp_fxloader')
| -rw-r--r-- | xpp/xpp_fxloader | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/xpp/xpp_fxloader b/xpp/xpp_fxloader index ea159de..2f42126 100644 --- a/xpp/xpp_fxloader +++ b/xpp/xpp_fxloader @@ -82,6 +82,11 @@ else LOGGER="logger -i -t '$me'" fi +debug() { + [ "$DEBUG" != "" ] && $LOGGER "$@" + return 0 +} + USBFS_PREFIX=/proc/bus/usb DEVUSB_PREFIX=/dev/bus/usb USB_PREFIX= @@ -133,7 +138,7 @@ run_fxload() { } run_astribank_hexload() { - $LOGGER "Running: $ASTRIBANK_HEXLOAD $*" + debug "Running: $ASTRIBANK_HEXLOAD $*" $ASTRIBANK_HEXLOAD "$@" | $LOGGER status=$PIPESTATUS if [ $status != 0 ]; then @@ -143,7 +148,7 @@ run_astribank_hexload() { } run_astribank_tool() { - $LOGGER "Running: $ASTRIBANK_TOOL $*" + debug "Running: $ASTRIBANK_TOOL $*" $ASTRIBANK_TOOL "$@" | $LOGGER status=$PIPESTATUS if [ $status != 0 ]; then @@ -161,7 +166,7 @@ load_usb_fw() { for dev in $devices do ver=$(awk '/\$Id:/ { print $4 }' $FIRMWARE_DIR/$fw) - $LOGGER "USB Firmware $FIRMWARE_DIR/$fw (Version=$ver) into $dev" + debug "USB Firmware $FIRMWARE_DIR/$fw (Version=$ver) into $dev" run_fxload -D $dev -I $FIRMWARE_DIR/$fw || exit 1 done } @@ -169,13 +174,13 @@ load_usb_fw() { load_fw_device() { dev=$1 fw=$2 - $LOGGER "FPGA loading $fw into $dev" + debug "FPGA loading $fw into $dev" run_astribank_hexload -D "$dev" -F "$FIRMWARE_DIR/$fw" pic_files=`echo "$FIRMWARE_DIR"/PIC_TYPE_[1-4].hex` - $LOGGER "PIC burning into $dev: $pic_files" + debug "PIC burning into $dev: $pic_files" run_astribank_hexload -D "$dev" -p $pic_files run_astribank_tool -D "$dev" -n # Do renumeration! - $LOGGER "PIC burning finished $pic_files" + debug "PIC burning finished $pic_files" } # @@ -237,10 +242,10 @@ wait_renumeration() { reset_fpga() { totaldevs=`numdevs e4e4 '11[3456][012]'` devices=`find_dev e4e4 '11[3456][12]'` - $LOGGER "Reseting devices [$totaldevs devices]" + debug "Reseting devices [$totaldevs devices]" for dev in $devices do - $LOGGER "Resetting FPGA Firmware on $dev" + debug "Resetting FPGA Firmware on $dev" sleep_if_race run_astribank_tool -D "$dev" -r full 2>&1 >/dev/null done |