[zaptel-commits] tzafrir: branch 1.2 r1649 - /branches/1.2/xpp/

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Tue Nov 28 07:36:31 2006
New Revision: 1649

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1649
Log:
 r1558 at 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.  

Modified:
    branches/1.2/xpp/   (props changed)
    branches/1.2/xpp/init_card_3_23
    branches/1.2/xpp/init_card_4_23

Propchange: branches/1.2/xpp/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Nov 28 07:36:31 2006
@@ -1,4 +1,4 @@
 283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/trunk/xpp:2600
-f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.4/xpp:1557
+f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.4/xpp:1558
 f558416c-6c06-0410-9f27-dde2687782d0:/team/tzafrir/xpp_1.2/xpp:1554
 f558416c-6c06-0410-9f27-dde2687782d0:/trunk/xpp:1453

Modified: branches/1.2/xpp/init_card_3_23
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/init_card_3_23?view=diff&rev=1649&r1=1648&r2=1649
==============================================================================
--- branches/1.2/xpp/init_card_3_23 (original)
+++ branches/1.2/xpp/init_card_3_23 Tue Nov 28 07:36:31 2006
@@ -45,7 +45,13 @@
 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'"

Modified: branches/1.2/xpp/init_card_4_23
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/init_card_4_23?view=diff&rev=1649&r1=1648&r2=1649
==============================================================================
--- branches/1.2/xpp/init_card_4_23 (original)
+++ branches/1.2/xpp/init_card_4_23 Tue Nov 28 07:36:31 2006
@@ -42,13 +42,16 @@
 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 @@
 	. $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