dahdi_genconf configuration separated from the kernel config.

* Using /etc/dahdi/genconf_parameters.
* A shiny new format (sample file included).
* xpp_fxloader is configured from /etc/dahdi/init.conf (like the init.d
  script).
* Yet some more string cleanups.


git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4484 a0bf4364-ded3-4de4-8d8a-66a801d63aff

1 files changed, 14 insertions, 25 deletions

diff --git a/xpp/xpp_fxloader b/xpp/xpp_fxloader
index 33afeff..2c56539 100644
--- a/xpp/xpp_fxloader
+++ b/xpp/xpp_fxloader
@@ -4,17 +4,17 @@
 #
 # This script can be run manually or from hotplug/udev.
 #
-# Firmware files should be located in $FIRMWARE_DIR which defaults:
+# Firmware files should be located in $XPP_FIRMWARE_DIR which defaults:
 # 	1. /usr/share/dahdi
-#	2. Can be overidden by setting $FIRMWARE_DIR in the environment
-#	3. Can be overidden by setting $FIRMWARE_DIR in /etc/default/zaptel
+#	2. Can be overidden by setting $XPP_FIRMWARE_DIR in the environment
+#	3. Can be overidden by setting $XPP_FIRMWARE_DIR in /etc/dahdi/init.conf
 #
 # Manual Run
 # ##########
 #
 #   path/to/xpp_fxloader load
 #
-# Make sure the firmware files are in $FIRMWARE_DIR
+# Make sure the firmware files are in $XPP_FIRMWARE_DIR
 #
 # UDEV Installation
 # #################
@@ -53,20 +53,9 @@ PATH="$PATH:/usr/local/sbin:/sbin:/usr/sbin"
 export PATH
 
 me=`basename $0`
-DEBIAN_DEFAULTS="/etc/default/zaptel"
-REDHAT_DEFAULTS="/etc/sysconfig/zaptel"
-
+DEFAULTS="/etc/dahdi/init.conf"
 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
-elif [ -r "$DEBIAN_DEFAULTS" ]; then
-	DEFAULTS="$DEBIAN_DEFAULTS"
-elif [ -r "$REDHAT_DEFAULTS" ]; then
-	DEFAULTS="$REDHAT_DEFAULTS"
-fi
-
 if [ -t 2 ]; then
 	LOGGER="logger -i -t '$me' -s"
 else
@@ -77,9 +66,9 @@ USBFS_PREFIX=/proc/bus/usb
 DEVUSB_PREFIX=/dev/bus/usb
 USB_PREFIX=
 
-FIRMWARE_DIR="${FIRMWARE_DIR:-/usr/share/dahdi}"
+XPP_FIRMWARE_DIR="${XPP_FIRMWARE_DIR:-/usr/share/dahdi}"
 
-FIRM_FXS=$FIRMWARE_DIR/FPGA_FXS.hex
+FIRM_FXS=$XPP_FIRMWARE_DIR/FPGA_FXS.hex
 
 FPGA_LOAD=${FPGA_LOAD:-/usr/sbin/fpga_load}
 USB_FW="${USB_FW:-USB_FW.hex}"
@@ -127,8 +116,8 @@ load_fw() {
   devices=`find_dev $v_id $p_id`
   for dev in $devices
   do
-    $LOGGER "USB Firmware $FIRMWARE_DIR/$fw into $dev"
-    do_fxload -D $dev -I $FIRMWARE_DIR/$fw || exit 1
+    $LOGGER "USB Firmware $XPP_FIRMWARE_DIR/$fw into $dev"
+    do_fxload -D $dev -I $XPP_FIRMWARE_DIR/$fw || exit 1
   done
 }
 
@@ -146,9 +135,9 @@ load_fpga() {
 	$LOGGER "FPGA Firmware into $dev"
 	sleep_if_race
 	(
-		$FPGA_LOAD -D "$dev" -I "$FIRMWARE_DIR/$fw" -i
+		$FPGA_LOAD -D "$dev" -I "$XPP_FIRMWARE_DIR/$fw" -i
 		echo $? >$status_fd
-	)>| $LOGGER
+	) | $LOGGER
 	status=`cat <$status_fd`
 	if [ "$status" != 0 ]; then
 		echo "fpga_load failed with status $status" | $LOGGER
@@ -280,15 +269,15 @@ then
 	prod_id=`echo "$PRODUCT" | cut -d/ -f2`
 	case "$PRODUCT" in
 	e4e4/11[345]0/*)
-		FIRM_USB="$FIRMWARE_DIR/$USB_FW"
+		FIRM_USB="$XPP_FIRMWARE_DIR/$USB_FW"
 		$LOGGER "Loading firmware '$FIRM_USB' into '$DEVICE'"
 		do_fxload -D "$DEVICE" -I "$FIRM_USB"
 		;;
 	e4e4/11[345]1/*)
 		if [ "$prod_id" = 1131 ]; then
-			FIRM_FPGA="$FIRMWARE_DIR/FPGA_FXS.hex"	# Legacy
+			FIRM_FPGA="$XPP_FIRMWARE_DIR/FPGA_FXS.hex"	# Legacy
 		else
-			FIRM_FPGA="$FIRMWARE_DIR/FPGA_$prod_id.hex"
+			FIRM_FPGA="$XPP_FIRMWARE_DIR/FPGA_$prod_id.hex"
 		fi
 		sleep_if_race
 		$FPGA_LOAD -D "$DEVICE" -I "$FIRM_FPGA" 2>&1 >/dev/null | $LOGGER