[dahdi-commits] dahdi/tools.git branch "2.9.y" updated.

[SVN commits to the DAHDI project]

branch "2.9.y" has been updated
       via  bf0cfaa1031074b2ceb0640df1011df372e224e3 (commit)
       via  c39251ea129e6a75807e82c81c368eaee79c176a (commit)
      from  49361e5ce76022a1204f699488208842ee9200ef (commit)

Summary of changes:
 xpp/astribank_hexload.c |    9 +++++++++
 xpp/xpp_fxloader        |    6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit bf0cfaa1031074b2ceb0640df1011df372e224e3
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Thu Jul 31 14:54:49 2014 +0300

    xpp_fxloader: rename variable: default_law -> law
    
    The variable 'default_law' was the result of a partial renaming of the
    original variable 'law'. Let's keep all of them in sync.
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

diff --git a/xpp/xpp_fxloader b/xpp/xpp_fxloader
index 5c8bced..ce5133a 100644
--- a/xpp/xpp_fxloader
+++ b/xpp/xpp_fxloader
@@ -327,14 +327,14 @@ load_fw_device() {
 				fi
 				# Fallback to legacy xpp.conf
 				default_pri_protocol=''
-				default_law=''
+				law=''
 				if [ -r "$XPP_CONFIG" ]; then
 					default_pri_protocol=`awk '/^pri_protocol/ {print $2}' $XPP_CONFIG`
 					if [ "$default_pri_protocol" != '' ]; then
 						debug "ECHO($dev_short): Found legacy xpp.conf setting -- $default_pri_protocol"
 						# "E1" or empty (implied E1) means aLaw
 						if [ "$default_pri_protocol" != 'T1' ]; then
-							default_law='-A'
+							law='-A'
 						fi
 					fi
 				fi
@@ -343,7 +343,7 @@ load_fw_device() {
 			caps_num=`echo "$abtool_output" | grep 'ECHO ports' | sed -e 's/.*: *//'`
 			debug "ECHO($dev_short): $caps_num channels allowed."
 			if [ "$caps_num" != '0' ]; then
-				run_astribank_hexload -D "$dev" -O $default_law $pri_spec_params "$echo_file"
+				run_astribank_hexload -D "$dev" -O $law $pri_spec_params "$echo_file"
 			else
 				echo "WARNING: ECHO burning was skipped (no capabilities)"
 			fi

commit c39251ea129e6a75807e82c81c368eaee79c176a
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Thu Jul 31 17:57:32 2014 +0300

    xpp: astribank_hexload: allow empty span specs
    
    DAHDI 2.9.2 added support for -S (span specs). However if this option
    was not specified, it fails to run.
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

diff --git a/xpp/astribank_hexload.c b/xpp/astribank_hexload.c
index 582dd40..643fe57 100644
--- a/xpp/astribank_hexload.c
+++ b/xpp/astribank_hexload.c
@@ -39,6 +39,7 @@
 #define	DBG_MASK	0x80
 #define	MAX_HEX_LINES	64000
 #define HAVE_OCTASIC	1
+#define DEF_SPAN_SPEC_FORMAT	"*:%c1" /* %c: 'E' or 'T' */
 
 static char	*progname;
 
@@ -166,6 +167,7 @@ int main(int argc, char *argv[])
 #if HAVE_OCTASIC
 	int			opt_alaw = 0;
 	const char		*span_spec = NULL;
+	char			def_span_spec[sizeof(DEF_SPAN_SPEC_FORMAT)];
 #endif
 	int			opt_dest = 0;
 	int			opt_sum = 0;
@@ -252,6 +254,13 @@ int main(int argc, char *argv[])
 		ERR("Missing device path.\n");
 		usage();
 	}
+# ifdef HAVE_OCTASIC
+	if (!span_spec) {
+		snprintf(def_span_spec, sizeof(def_span_spec),
+				DEF_SPAN_SPEC_FORMAT, opt_alaw? 'E' : 'T');
+		span_spec = def_span_spec;
+	}
+#endif
 	if(opt_dest) {
 		/*
 		 * MPP Interface

-----------------------------------------------------------------------


-- 
dahdi/tools.git