r1558@boole: tzafrir | 2006-11-06 21:07:29 +0200

 Fixes for card init scripts from rev 2633:
   * Don't log card init scripts to /tmp/results .
   * Document how to trace, though.
   * init_card_4_23: don't re-open the slics file.  


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1564 5390a7c7-147a-4af0-8ec9-7488f05a26cb

2 files changed, 15 insertions, 6 deletions

diff --git a/xpp/init_card_3_23 b/xpp/init_card_3_23
index 07b059a..f000ec8 100755
--- a/xpp/init_card_3_23
+++ b/xpp/init_card_3_23
@@ -45,7 +45,13 @@ INIT_DIR=`dirname $0`
 export XPP_BASE=/proc/xpp
 LOGGER="logger -s -t $me"
 
-exec 2> /tmp/results
+## If you wish to trace this script:
+#exec 2> /tmp/xpp_init_$XPD_NAME
+## Altenativly, if you have multiple XPDs:
+#exec 2> /tmp/xpp_init_$XBUS_NAME_$XPD_NAME
+#set -x
+
+# redirect script output to the "slics" (registers command) file:
 exec 1> "$XPP_BASE/$XPD_BUS/$XPD_NAME/slics"
 
 $LOGGER -p kern.info "$XPD_BUS/$XPD_NAME: Calibrating '$0'"
diff --git a/xpp/init_card_4_23 b/xpp/init_card_4_23
index a0e17bd..76beaff 100755
--- a/xpp/init_card_4_23
+++ b/xpp/init_card_4_23
@@ -42,13 +42,16 @@ me=`basename $0`
 INIT_DIR=`dirname $0`
 XPP_BASE=/proc/xpp
 export XPP_BASE
-SLICS="$XPP_BASE/$XPD_BUS/$XPD_NAME/slics"
 LOGGER="logger -s -t $me"
 
-# set -x
-exec 2> /tmp/results #FIXME: temporary debugging file
+## If you wish to trace this script:
+#exec 2> /tmp/xpp_init_$XPD_NAME
+## Altenativly, if you have multiple XPDs:
+#exec 2> /tmp/xpp_init_$XBUS_NAME_$XPD_NAME
+#set -x
+
 # redirect script output to the "slics" (registers command) file:
-exec 1> $SLICS
+exec 1> "$XPP_BASE/$XPD_BUS/$XPD_NAME/slics"
 
 $LOGGER -p kern.info "$XPD_BUS/$XPD_NAME: Initializing '$0'"
 
@@ -62,7 +65,7 @@ set_daa_country_params() {
 	. $INIT_DIR/init_fxo_modes
 	fi
 	# Our register numbers are HEXADECIMAL!
-	cat <<EOF >$SLICS
+	cat <<EOF
 31 WD 10 $reg16
 31 WD 1A $reg26
 31 WD 1E $reg30