tonezone: Fix regression in Australian tone patch

Initialize db to 1.0 instead of doing it in a few, but not all, logic contexts.

Reported-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>
Signed-off-by: Shaun Ruffell <sruffell@digium.com>

dahdi.init

@@ -144,14 +144,6 @@ hotplug_exit_after_load() {
 
 # Initialize the Xorcom Astribank (xpp/) using perl utiliites:
 xpp_startup() {
-	if [ "$ASTERISK_SUPPORTS_DAHDI_HOTPLUG" = yes ]; then
-		aas_param='/sys/module/dahdi/parameters/auto_assign_spans'
-		aas=`cat "$aas_param" 2>/dev/null`
-		if [ "$aas" = 0 ]; then
-			echo 1>&2 "Don't wait for Astribanks (use Asterisk hotplug-support)"
-			return 0
-		fi
-	fi
 	# do nothing if there are no astribank devices:
 	if ! /usr/share/dahdi/waitfor_xpds; then return 0; fi
 

init.conf.sample

@@ -17,7 +17,6 @@
 #XPP_FIRMWARE_DIR=/usr/share/dahdi
 #XPP_HOTPLUG_DISABLED=yes
 #XPP_HOTPLUG_DAHDI=yes
-#ASTERISK_SUPPORTS_DAHDI_HOTPLUG=yes
 
 # Disable udev handling:
 #DAHDI_UDEV_DISABLE_DEVICES=yes

xpp/astribank_hook

@@ -16,8 +16,6 @@ PATH="$dir:/usr/sbin:/sbin:/usr/bin:/bin"
 
 set -e
 
-LOCK="/var/lock/twinstar_startup"
-
 [ -r /etc/dahdi/init.conf ] && . /etc/dahdi/init.conf
 
 # For lab testing
@@ -34,38 +32,17 @@ if [ "$XPP_HOTPLUG_DAHDI" != yes ]; then
 fi
 
 export XPPORDER_CONF="$dahdi_conf/xpp_order"
+if [ ! -r "$XPPORDER_CONF" ]; then
+	(
+		echo "Skip($ACTION): No '$XPPORDER_CONF'"
+		echo "Removing uneeded startup semaphore"
+		astribank_is_starting -v -r 2>&1
+	) 2>&1 | $LOGGER
+	exit 0
+fi
 export DAHDI_CFG_CMD="dahdi_cfg -c $dahdi_conf/system.conf"
 export CALLED_FROM_ATRIBANK_HOOK=yes
 
-can_full_async() {
-	# Can we work aynchronously:
-	#    - Need modern Asterisk that accept hotplug DAHDI devices.
-	#    - Need DAHDI with "auto_assign_spans" == 0
-	if [ "$ASTERISK_SUPPORTS_DAHDI_HOTPLUG" = yes ]; then
-		aas_param='/sys/module/dahdi/parameters/auto_assign_spans'
-		aas=`cat "$aas_param" 2>/dev/null`
-		if [ "$aas" = 0 ]; then
-			return 0
-		else
-			$LOGGER "No async operation ($aas_param != 0)"
-		fi
-	else
-		$LOGGER "No async operation (ASTERISK_SUPPORTS_DAHDI_HOTPLUG!=yes)"
-	fi
-	return 1
-}
-
-check_xpporder_conf() {
-	if [ ! -r "$XPPORDER_CONF" ]; then
-		(
-			echo "Skip($ACTION): No '$XPPORDER_CONF'"
-			echo "Removing uneeded startup semaphore"
-			astribank_is_starting -v -r 2>&1
-		) 2>&1 | $LOGGER
-		exit 0
-	fi
-}
-
 clean_lines() {
 	sed -e 's/#.*//' -e 'y/\t/ /' -e 's/^ *//' -e 's/ *$//' -e '$s/$/\n/' "$XPPORDER_CONF"
 }
@@ -87,6 +64,10 @@ matched_devices() {
 	done
 }
 
+NUM_WANTED=`clean_lines | sed '/^$/d' | wc -l`
+NUM_GOOD=`matched_devices | wc -l`
+LOCK="/var/lock/twinstar_startup"
+
 # Wait until udev finished processing our requests
 # so we know the device files were actually created
 # before trying dahdi_cfg et-al.
@@ -96,10 +77,10 @@ wait_for_udev() {
 	echo "Waiting for udev to settle down..."
 	if [ -x /sbin/udevsettle ]; then
 		# Old system, stand-alone udevsettle command
-		/sbin/udevsettle --timeout="$UDEV_SETTLE_MAX_TIME"
+		time /sbin/udevsettle --timeout="$UDEV_SETTLE_MAX_TIME"
 	elif [ -x /sbin/udevadm ]; then
 		# Assume modern system, udevadm has settle parameter
-		if ! /sbin/udevadm settle --timeout="$UDEV_SETTLE_MAX_TIME"
+		if ! time /sbin/udevadm settle --timeout="$UDEV_SETTLE_MAX_TIME"
 		then
 			echo "udevadm failed ($?)."
 			echo "Fallback to sleep $UDEV_SETTLE_MAX_TIME seconds."
@@ -129,9 +110,13 @@ start_dahdi() {
 	rm -f "$LOCK"
 }
 
-old_synchronous_start() {
-	NUM_GOOD=`matched_devices | wc -l`
-	NUM_WANTED=`clean_lines | sed '/^$/d' | wc -l`
+#echo "$0: $ACTION($XBUS_NAME)" | $LOGGER
+case "$ACTION" in
+add)
+	;;
+remove)
+	;;
+online)
 	echo "$ACTION($XBUS_NAME): $NUM_GOOD/$NUM_WANTED from $XPPORDER_CONF" | $LOGGER
 	if [ "$NUM_GOOD" -eq "$NUM_WANTED" ]; then
 		(
@@ -157,11 +142,8 @@ old_synchronous_start() {
 			fi
 		) < /dev/null 2>&1 | $LOGGER &
 	fi
-}
-
-old_synchronous_stop() {
-	NUM_GOOD=`matched_devices | wc -l`
-	NUM_WANTED=`clean_lines | sed '/^$/d' | wc -l`
+	;;
+offline)
 	echo "$ACTION($XBUS_NAME): $NUM_GOOD/$NUM_WANTED from $XPPORDER_CONF" | $LOGGER
 	if [ "$NUM_GOOD" -eq 0 ]; then
 		echo "All Astribanks offline" | $LOGGER
@@ -170,59 +152,6 @@ old_synchronous_stop() {
 		fi
 		rm -f "$LOCK"
 	fi
-}
-
-ab_list() {
-	find /sys/devices -name idVendor 2>/dev/null | \
-		xargs grep -H  'e4e4' 2>/dev/null | \
-		sed -e 's/idVendor.*/idProduct/' | xargs grep -H '11[3456]' | \
-		sed 's,/[^/]*$,,' || :
-}
-
-tws_watchdog_enable() {
-	devdir="/sys$DEVPATH"
-	label=`cat "$devdir/label"`
-	connector=`cat "$devdir/connector"`
-	xbus=`echo "$devdir" | sed 's,.*/,,'`
-	prefix="${xbus}: [${label}] @${connector}"
-	TWS_NOAUTOJUMPFILE="$TWS_DIR/twinstar_no_autojump"
-	if [ -e "$TWS_NOAUTOJUMPFILE" ]; then
-		$LOGGER "$prefix: ignore wd (found $TWS_NOAUTOJUMPFILE)"
-	else
-		# Re-arm Astribank watchdog
-		transportdir="$devdir/transport"
-		busnum=`cat "$transportdir/busnum" 2>/dev/null || :`
-		devnum=`cat "$transportdir/devnum" 2>/dev/null || :`
-		devaddr=`printf "%03d/%03d" "$busnum" "$devnum"`
-		$LOGGER "$prefix: enabling twinstar watchdog"
-		astribank_tool -D "$devaddr" -w 1 2>&1 | $LOGGER
-	fi
-}
-
-#echo "$0: $ACTION($XBUS_NAME)" | $LOGGER
-case "$ACTION" in
-add)
-	;;
-remove)
-	ab=`ab_list | wc -l`
-	if [ "$ab" -eq 0 ]; then
-		$LOGGER "$prefix: No more Astribanks -- remove astribank_is_starting semaphore"
-		astribank_is_starting -v -r 2>&1 | $LOGGER
-	fi
-	;;
-online)
-	if can_full_async; then
-		tws_watchdog_enable
-	else
-		old_synchronous_start
-	fi
-	;;
-offline)
-	if can_full_async; then
-		:	# Nothing to do
-	else
-		old_synchronous_stop
-	fi
 	;;
 *)
 	echo "$0: Unknown ACTION='$ACTION'" | $LOGGER

xpp/astribank_is_starting.c

@@ -125,8 +125,6 @@ static int absem_detected(void)
 	if((absem = absem_get(0)) < 0) {
 		if(debug)
 			fprintf(stderr, "%s: absem does not exist\n", progname);
-		if(verbose)
-			printf("No Astribanks are initializing\n");
 		return absem;
 	}
 	if(debug)

xpp/waitfor_xpds

@@ -52,7 +52,7 @@ ab_serial_nums() {
 }
 
 detected_serial_nums() {
-	for i in `ls -1d /sys/bus/astribanks/devices/*/transport 2>/dev/null`; do
+	for i in /sys/bus/astribanks/devices/*/transport; do
 		s=`cat "$i/serial" 2>/dev/null` || :
 		if [ "$s" = '' ]; then
 			echo "NO-SERIAL"
@@ -94,13 +94,14 @@ if ! dahdi_hardware="`which dahdi_hardware 2>/dev/null`"; then
 	echo >&2 "$0: Missing dahdi_hardware"
 	exit 0
 fi
-
-# Just make sure
+if ! astribank_is_starting="`which astribank_is_starting 2>/dev/null`"; then
+	echo >&2 "$0: Missing astribank_is_starting"
+	exit 0
+fi
 if [ "`$dahdi_hardware | grep xpp_usb`" != "" ]; then
 	astribank_is_starting -v -a
 fi
 if ! astribank_is_starting; then
-	# No Astribanks ever seen -- nothing to do
 	exit 0
 fi
 
@@ -148,16 +149,13 @@ cat /sys/bus/astribanks/devices/*/waitfor_xpds 2> /dev/null || :
 
 # Wait for device to stabilize and XPD's to finish initalizations
 echo 1>&2 "Astribanks initializing spans"
-if [ "$XPP_HOTPLUG_DAHDI" = yes -a "$CALLED_FROM_ATRIBANK_HOOK" = '' -a \
-		"$ASTERISK_SUPPORTS_DAHDI_HOTPLUG" != 'yes'  ]; then
-	if [ -f /etc/dahdi/xpp_order ]; then
+if [ "$XPP_HOTPLUG_DAHDI" = yes ]; then
+	if [ "$CALLED_FROM_ATRIBANK_HOOK" = '' ]; then
 		# Now we can wait until the hotplug run would remove the semaphore
 		echo -n 1>&2 "Other DAHDI initializations... "
 		astribank_is_starting -v -w 1>&2
-	else
-		echo 1>&2 "WARNING: No ASTERISK_SUPPORTS_DAHDI_HOTPLUG" \
-			" and no /etc/dahdi/xpp_order"
 	fi
+else
+	# Non-hotplug -- Sequential initialization, remove semaphore
+	astribank_is_starting -v -r 1>&2
 fi
-# All Astribanks initialized -- remove semaphore
-astribank_is_starting -v -r 1>&2

xpp/xpp_fxloader

@@ -319,9 +319,8 @@ load_fw_device() {
 					if [ "$pri_spec_wildcard" != '' ]; then
 						debug "ECHO($dev_short): Found definitions for wildcard -- $pri_spec_wildcard"
 					fi
-					pri_spec_params=""
-					if [ "$pri_spec$pri_spec_wildcard" != '' ]; then
-						pri_spec=`echo "$pri_spec_wildcard $pri_spec" | tr -s ' \t\n' ','`
+					pri_spec=`echo "$pri_spec_wildcard $pri_spec" | tr -s ' \t\n' ','`
+					if [ "$pri_spec" != '' ]; then
 						pri_spec_params="-S $pri_spec"
 						debug "ECHO($dev_short): pri_spec_params='$pri_spec_params'"
 					fi