From ce253b3046826c28d09b9e57aa6d8b014c24d822 Mon Sep 17 00:00:00 2001
From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Date: Sun, 27 Sep 2009 12:57:43 +0000
Subject: 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


git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@7221 a0bf4364-ded3-4de4-8d8a-66a801d63aff
---
 xpp/xpp_fxloader | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'xpp/xpp_fxloader')

diff --git a/xpp/xpp_fxloader b/xpp/xpp_fxloader
index 6aa25e4..e5380ad 100644
--- a/xpp/xpp_fxloader
+++ b/xpp/xpp_fxloader
@@ -84,6 +84,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=
@@ -135,7 +140,7 @@ run_fxload() {
 }
 
 run_astribank_hexload() {
-	$LOGGER "Running: $ASTRIBANK_HEXLOAD $*"
+	debug "Running: $ASTRIBANK_HEXLOAD $*"
 	$ASTRIBANK_HEXLOAD "$@" | $LOGGER
 	status=$PIPESTATUS
 	if [ $status != 0 ]; then
@@ -145,7 +150,7 @@ run_astribank_hexload() {
 }
 
 run_astribank_tool() {
-	$LOGGER "Running: $ASTRIBANK_TOOL $*"
+	debug "Running: $ASTRIBANK_TOOL $*"
 	$ASTRIBANK_TOOL "$@" | $LOGGER
 	status=$PIPESTATUS
 	if [ $status != 0 ]; then
@@ -163,7 +168,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
 }
@@ -171,13 +176,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"
 }
 
 #
@@ -239,10 +244,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
-- 
cgit v1.2.3