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@xorcom.com>
xpp_fxloader: rename variable: default_law -> law
2014-08-04 09:35:52 +03:00 · 2014-08-04 09:35:52 +03:00 · 2014-08-01 16:04:00 -05:00 · 2014-08-01 15:53:48 -05:00 · 2014-07-23 16:53:38 -05:00 · 2014-07-23 16:52:59 -05:00
7 changed files with 57 additions and 15 deletions
--- a/dahdi_cfg.c
+++ b/dahdi_cfg.c
@@ -109,7 +109,7 @@ static int fiftysixkhdlc[DAHDI_MAX_CHANNELS];

 static int spans=0;

-static int fo_real = 1;
+static int dry_run = 0;

 static int verbose = 0;

@@ -826,8 +826,9 @@ static int apply_fiftysix(void)
 	int chanfd;

 	for (x = 1; x < DAHDI_MAX_CHANNELS; x++) {
-		if (skip_channel(x))
+		if (skip_channel(x) || !cc[x].sigtype)
 			continue;
+
 		chanfd = open("/dev/dahdi/channel", O_RDWR);
 		if (chanfd == -1) {
 			fprintf(stderr, 
@@ -1590,7 +1591,7 @@ int main(int argc, char *argv[])
 			force++;
 			break;
 		case 't':
-			fo_real = 0;
+			dry_run = 1;
 			break;
 		case 's':
 			stopmode = 1;
@@ -1683,9 +1684,9 @@ finish:
 	if (verbose) {
 		printconfig(fd);
 	}
-	if (!fo_real) 
-		exit(0);

+	if (dry_run)
+		exit(0);
 	
 	if (debug & DEBUG_APPLY) {
 		printf("About to open Master device\n");
--- a/modules.sample
+++ b/modules.sample
@@ -15,6 +15,8 @@ wct4xxp

 # Digium TE435
 # Digium TE235
+# Digium TE436
+# Digium TE236
 wcte43x

 # Digium TE120P: PCI single-port T1/E1/J1
--- a/tonezone.c
+++ b/tonezone.c
@@ -89,18 +89,19 @@ static int build_tone(void *data, size_t size, struct tone_zone_sound *t, int *c
 	int firstnobang = -1;
 	int freq1, freq2, time;
 	int modulate = 0;
-	float gain;
+	float db, gain;
 	int used = 0;
 	dup = strdup(t->data);
 	s = strtok(dup, ",");
 	while(s && strlen(s)) {
 		/* Handle optional ! which signifies don't start here*/
-		if (s[0] == '!') 
+		if (s[0] == '!') {
 			s++;
-		else if (firstnobang < 0) {
+		} else if (firstnobang < 0) {
 			PRINT_DEBUG("First no bang: %s\n", s);
 			firstnobang = *count;
 		}
+
 		if (sscanf(s, "%d+%d/%d", &freq1, &freq2, &time) == 3) {
 			/* f1+f2/time format */
 			PRINT_DEBUG("f1+f2/time format: %d, %d, %d\n", freq1, freq2, time);
@@ -111,18 +112,31 @@ static int build_tone(void *data, size_t size, struct tone_zone_sound *t, int *c
 		} else if (sscanf(s, "%d+%d", &freq1, &freq2) == 2) {
 			PRINT_DEBUG("f1+f2 format: %d, %d\n", freq1, freq2);
 			time = 0;
+			db = 1.0;
 		} else if (sscanf(s, "%d*%d", &freq1, &freq2) == 2) {
 			PRINT_DEBUG("f1+f2 format: %d, %d\n", freq1, freq2);
 			modulate = 1;
 			time = 0;
+			db = 1.0;
 		} else if (sscanf(s, "%d/%d", &freq1, &time) == 2) {
 			PRINT_DEBUG("f1/time format: %d, %d\n", freq1, time);
 			freq2 = 0;
+			db = 1.0;
+		} else if (sscanf(s, "%d@/%d", &freq1, &time) == 2) {
+			/* The "@" character has been added to enable an
+ 			 * approximately -20db tone generation of any frequency This has been done
+ 			 * primarily to generate the Australian congestion tone.
+			 * Example: "425/375,0/375,425@/375,0/375" 
+			 */
+			PRINT_DEBUG("f1 reduced amplitude/time format: %d, %d\n", freq1,time);
+			db = 0.3;
+			freq2 = 0;
 		} else if (sscanf(s, "%d", &freq1) == 1) {
 			PRINT_DEBUG("f1 format: %d\n", freq1);
 			firstnobang = *count;
 			freq2 = 0;
 			time = 0;
+			db = 1.0;
 		} else {
 			fprintf(stderr, "tone component '%s' of '%s' is a syntax error\n", s,t->data);
 			return -1;
@@ -137,7 +151,7 @@ static int build_tone(void *data, size_t size, struct tone_zone_sound *t, int *c
 		td = data;

 		/* Bring it down -8 dbm */
-		gain = pow(10.0, (LEVEL - 3.14) / 20.0) * 65536.0 / 2.0;
+		gain = db*(pow(10.0, (LEVEL - 3.14) / 20.0) * 65536.0 / 2.0);

 		td->fac1 = 2.0 * cos(2.0 * M_PI * (freq1 / 8000.0)) * 32768.0;
 		td->init_v2_1 = sin(-4.0 * M_PI * (freq1 / 8000.0)) * gain;
--- 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
--- a/xpp/perl_modules/Dahdi/Hardware/PCI.pm
+++ b/xpp/perl_modules/Dahdi/Hardware/PCI.pm
@@ -105,6 +105,7 @@ my %pci_ids = (

 	# from wcte435/235
 	'd161:800e'		=> { DRIVER => 'wcte43x', DESCRIPTION => 'Wildcard TE435/235' },
+	'd161:8013'		=> { DRIVER => 'wcte43x', DESCRIPTION => 'Wildcard TE436/236' },

 	# from wcb4xxp
 	'd161:b410'		=> { DRIVER => 'wcb4xxp', DESCRIPTION => 'Digium Wildcard B410P' },
--- 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
--- a/zonedata.c
+++ b/zonedata.c
@@ -59,11 +59,18 @@ struct tone_zone builtin_zones[] =
 	  .description = "Australia",
 	  .ringcadence = {  400, 200, 400, 2000 },
 	  .tones = {
-			{ DAHDI_TONE_DIALTONE, "413+438" },
+				  
+			{ DAHDI_TONE_DIALTONE, "415+440" },
 			{ DAHDI_TONE_BUSY, "425/375,0/375" },
 			{ DAHDI_TONE_RINGTONE, "413+438/400,0/200,413+438/400,0/2000" },
-			/* XXX Congestion: Should reduce by 10 db every other cadence XXX */
-			{ DAHDI_TONE_CONGESTION, "425/375,0/375,420/375,0/375" },
+			/* The Australian congestion tone is 425Hz, 375ms On, 375ms Off, with the
+			 * second cadence being half the amplitude of the first; so the first cadence
+			 * is approximately -10dB with the second one being -20dB.  Using the update
+			 * ToneZone.c file, this can be accomplished by adding the "@" symbol in front
+			 * of the frequency to reduce amplification, as in the following entry for
+			 * Congestion:
+			 */
+			{ DAHDI_TONE_CONGESTION, "425/375,0/375,425@/375,0/375" },
 			{ DAHDI_TONE_CALLWAIT, "425/100,0/200,425/200,0/4400" },
 			{ DAHDI_TONE_DIALRECALL, "413+428" },
 			{ DAHDI_TONE_RECORDTONE, "!425/1000,!0/15000,425/360,0/15000" },
@@ -928,6 +935,8 @@ struct tone_zone builtin_zones[] =
 			{ DAHDI_TONE_RECORDTONE, "1400/400,0/15000" },
 			{ DAHDI_TONE_INFO, "950/330,1440/330,1800/330,0/1000" },
 			{ DAHDI_TONE_STUTTER, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
+			/* DIALRECALL - not specified */
+			{ DAHDI_TONE_DIALRECALL, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
@@ -948,6 +957,8 @@ struct tone_zone builtin_zones[] =
 			/* This should actually be 950+1400+1800, but we only support 2 tones at a time */
 			{ DAHDI_TONE_INFO,       "!950+1400/300,!0/1000,!950+1400/300,!0/1000,!950+1400/1000,0" },
 			{ DAHDI_TONE_STUTTER,    "!450/100,!0/100,!450/100,!0/100,!450/100,!0/100,!450/100,!0/100,!450/100,!0/100,!450/100,!0/100,450" },
+			/* DIALRECALL - not specified */
+			{ DAHDI_TONE_DIALRECALL, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
 		},
 		.dtmf_high_level = -10,
 		.dtmf_low_level = -10,
@@ -996,6 +1007,8 @@ struct tone_zone builtin_zones[] =
 			{ DAHDI_TONE_INFO, "950/333,1400/333,1800/333,0/1000" },
 			/* STUTTER TONE - not specified */
 			{ DAHDI_TONE_STUTTER, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
+			/* DIALRECALL - not specified */
+			{ DAHDI_TONE_DIALRECALL, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
 		},
 		.dtmf_high_level = -10,
 		.dtmf_low_level = -10,
@@ -1044,6 +1057,8 @@ struct tone_zone builtin_zones[] =
 			{ DAHDI_TONE_INFO, "950/330,1450/330,1850/330,0/1000" },
 			/* STUTTER TONE */
 			{ DAHDI_TONE_STUTTER, "380+420" },
+			/* DIALRECALL - not specified */
+			{ DAHDI_TONE_DIALRECALL, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
 		},
 		.dtmf_high_level = -10,
 		.dtmf_low_level = -10,
Author	SHA1	Message	Date
Tzafrir Cohen	d4537e46ce	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@xorcom.com>	2014-08-04 09:35:52 +03:00
Tzafrir Cohen	60401c5f49	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@xorcom.com>	2014-08-04 09:35:52 +03:00
Armen Karlozian	a109763160	tonezone: Fix congestion tone for Australia The Congestion tone in Australia must be reduced by 10 to 15 dB at every other cadence and the frequencies for both at cadences are 425 Hz. From: Armen Karlozian <armeniki@hotmail.com> Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>	2014-08-01 16:04:00 -05:00
Shaun Ruffell	6c40704fec	zonedata: Ensure all zones have a default DAHDI_TONE_DIALRECALL. The default 'us' tone is most likely better than silence when Asterisk tries to generate the recall tone on a DAHDI channel. Internal-Issue-ID: DAHTOOL-63 Reported-By: Igor Kravets Signed-off-by: Shaun Ruffell <sruffell@digium.com> Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>	2014-08-01 15:53:48 -05:00
Russ Meyerriecks	95e9dd71d8	dahdi_cfg: Reduce mass ioctls on non-existing channels Logic was calling DAHDI_SPECIFY ioctl on all channels up to maximum channel limit. Added a short circuit to prevent the ioctl on channels that aren't configured. Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com> Acked-by: Shaun Ruffell <sruffell@digium.com>	2014-07-23 16:53:38 -05:00
Russ Meyerriecks	df47721962	dahdi_cfg: minor: Rename fo_real to dry_run Minor readability change Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com> Acked-by: Shaun Ruffell <sruffell@digium.com>	2014-07-23 16:52:59 -05:00
Russ Meyerriecks	4e14561508	wcte43xp: Teach tools about te436 and te236 products Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com> Signed-off-by: Shaun Ruffell <sruffell@digium.com>	2014-07-18 10:41:54 -05:00