[zaptel-commits] mattf: branch mattf/zaptel-1.4-vpmadt032fwupdate r3944 - in /team/mattf/zapte...
SVN commits to the Zaptel project
zaptel-commits at lists.digium.com
Wed Mar 5 16:25:04 CST 2008
Author: mattf
Date: Wed Mar 5 16:25:03 2008
New Revision: 3944
URL: http://svn.digium.com/view/zaptel?view=rev&rev=3944
Log:
Merged revisions 3881,3883,3885,3888,3892,3899,3904,3916,3919-3921,3932,3939 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r3881 | kpfleming | 2008-02-26 17:43:29 -0600 (Tue, 26 Feb 2008) | 2 lines
properly initialize the buffer used for holding generated tone samples... this should fix issue #11855 and solve problems with DTMF generation
................
r3883 | sruffell | 2008-02-26 19:13:05 -0600 (Tue, 26 Feb 2008) | 3 lines
Increase the battery debounce from 64ms to 1 second.
................
r3885 | sruffell | 2008-02-27 12:30:56 -0600 (Wed, 27 Feb 2008) | 4 lines
Set the default tone zone to to the first loaded zone by default.
Should prevent the crash reported in issue 0012053.
................
r3888 | tzafrir | 2008-02-27 15:57:44 -0600 (Wed, 27 Feb 2008) | 3 lines
* torisa.c: Report the correct E1/T1 .
* tor2.c: fix a typo in the span description string.
................
r3892 | sruffell | 2008-02-28 00:01:47 -0600 (Thu, 28 Feb 2008) | 6 lines
Undoing the change in revision 3883 until there can be more thought about the
best place to configure the battery debounce time. Too short and erroneous
alarms are generated. Too long, and asterisk won't detect when the remote
side disconnects.
................
r3899 | dbailey | 2008-02-28 08:37:26 -0600 (Thu, 28 Feb 2008) | 2 lines
Change DTMF and MF level parameters to match country specs
................
r3904 | tzafrir | 2008-02-28 10:12:08 -0600 (Thu, 28 Feb 2008) | 2 lines
Remove some unused variables.
................
r3916 | tzafrir | 2008-03-03 04:57:00 -0600 (Mon, 03 Mar 2008) | 3 lines
* Document 'mulaw', 'alaw' and 'deflaw' in the sample config file.
* Fix spacing in the README.
................
r3919 | tzafrir | 2008-03-03 15:01:34 -0600 (Mon, 03 Mar 2008) | 2 lines
Fix setting versions in test_kernel_git.
................
r3920 | tzafrir | 2008-03-03 15:33:16 -0600 (Mon, 03 Mar 2008) | 11 lines
Blocked revisions 3917 via svnmerge
........
r3917 | tzafrir | 2008-03-03 22:44:01 +0200 (Mon, 03 Mar 2008) | 4 lines
No need for userspace 'make clean' here. Kbuild takes care of it.
Closes issue #12118 .
........
................
r3921 | tzafrir | 2008-03-03 16:04:02 -0600 (Mon, 03 Mar 2008) | 5 lines
* Pass some extra variables explicitly in the 2.4 build.
* Clean up the 2.4 kernel GNUMakefile.
Should hopefully fix issue #12056.
................
r3932 | kpfleming | 2008-03-04 17:58:35 -0600 (Tue, 04 Mar 2008) | 9 lines
don't add an unnecessary delayed battery transition on FXS ports when we know the other end is already on-hook
(closes issue #9660)
Reported by: mmacvicar
Patches:
zaptel-base-c_patch_1_4_rev3121 uploaded by meneault (license 260)
Tested by: jmhunter
................
r3939 | tzafrir | 2008-03-05 15:16:47 -0600 (Wed, 05 Mar 2008) | 2 lines
Hopefully a fix for issue #12150 .
................
Modified:
team/mattf/zaptel-1.4-vpmadt032fwupdate/ (props changed)
team/mattf/zaptel-1.4-vpmadt032fwupdate/Makefile
team/mattf/zaptel-1.4-vpmadt032fwupdate/README
team/mattf/zaptel-1.4-vpmadt032fwupdate/build_tools/test_kernel_git
team/mattf/zaptel-1.4-vpmadt032fwupdate/hdlcstress.c
team/mattf/zaptel-1.4-vpmadt032fwupdate/hdlctest.c
team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/GNUmakefile
team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/tor2.c
team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/torisa.c
team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/zconf/Zaptel/Span.pm
team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/zaptel-base.c
team/mattf/zaptel-1.4-vpmadt032fwupdate/tonezone.c
team/mattf/zaptel-1.4-vpmadt032fwupdate/zaptel.conf.sample
team/mattf/zaptel-1.4-vpmadt032fwupdate/zonedata.c
Propchange: team/mattf/zaptel-1.4-vpmadt032fwupdate/
------------------------------------------------------------------------------
--- branch-1.2-blocked (original)
+++ branch-1.2-blocked Wed Mar 5 16:25:03 2008
@@ -1,1 +1,1 @@
-/branches/1.2:917,937,1073,1206,1613,2018,2434,2583,2668,2750,2789,2868,2871,2878,3083,3098-3099,3201,3509,3645,3833,3847
+/branches/1.2:917,937,1073,1206,1613,2018,2434,2583,2668,2750,2789,2868,2871,2878,3083,3098-3099,3201,3509,3645,3833,3847,3917
Propchange: team/mattf/zaptel-1.4-vpmadt032fwupdate/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 5 16:25:03 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-3873
+/branches/1.4:1-3943
Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/Makefile
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/Makefile?view=diff&rev=3944&r1=3943&r2=3944
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/Makefile (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/Makefile Wed Mar 5 16:25:03 2008
@@ -165,6 +165,8 @@
CFLAGS+=-DSTANDALONE_ZAPATA
ifeq ($(BUILDVER),linux24)
KMAKE = $(MAKE) -C kernel HOTPLUG_FIRMWARE=no \
+ HOSTCC=$(HOSTCC) ARCH=$(ARCH) KSRC=$(KSRC) LD=$(LD) CC=$(CC) \
+ UNAME_M=$(UNAME_M) \
BUILD_TOPDIR_MODULES="$(BUILD_TOPDIR_MODULES)" BUILD_SUBDIR_MODULES="$(BUILD_SUBDIR_MODULES)"
else
KMAKE = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)/kernel \
Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/README
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/README?view=diff&rev=3944&r1=3943&r2=3944
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/README (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/README Wed Mar 5 16:25:03 2008
@@ -384,9 +384,7 @@
* 16: DEBUG_ECHOCAN
* 32: DEBUG_RBS
* 64: DEBUG_FRAMER
- +
- +
- The xpp modules use 'print_dbg' instead of 'debug' . Refer to
+ The 'xpp' modules use 'print_dbg' instead of 'debug' . Refer to
README.Astribank.
deftaps (zaptel)::
Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/build_tools/test_kernel_git
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/build_tools/test_kernel_git?view=diff&rev=3944&r1=3943&r2=3944
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/build_tools/test_kernel_git (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/build_tools/test_kernel_git Wed Mar 5 16:25:03 2008
@@ -28,7 +28,7 @@
if grep -q "^$var=" $CONF_FILE 2>/dev/null; then
sed -i -e "s|^$var=.*|$var=\"$val\"|" $CONF_FILE
else
- echo "$var=\"$value\"" >>$CONF_FILE
+ echo "$var=\"$val\"" >>$CONF_FILE
fi
}
Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/hdlcstress.c
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/hdlcstress.c?view=diff&rev=3944&r1=3943&r2=3944
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/hdlcstress.c (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/hdlcstress.c Wed Mar 5 16:25:03 2008
@@ -75,7 +75,6 @@
{
int res;
int x;
- int out;
unsigned char outbuf[BLOCK_SIZE];
int pos=0;
unsigned int fcs = PPP_INITFCS;
@@ -113,17 +112,12 @@
int main(int argc, char *argv[])
{
- int fd2;
- int ires, res, x;
- int i;
+ int res, x;
ZT_PARAMS tp;
ZT_BUFFERINFO bi;
int bs = BLOCK_SIZE;
unsigned char c=0;
- unsigned char inbuf[BLOCK_SIZE];
unsigned char outbuf[BLOCK_SIZE];
- unsigned int fcs;
- static int packets=0;
if (argc < 2) {
fprintf(stderr, "Usage: markhdlctest <tor device>\n");
exit(1);
Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/hdlctest.c
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/hdlctest.c?view=diff&rev=3944&r1=3943&r2=3944
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/hdlctest.c (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/hdlctest.c Wed Mar 5 16:25:03 2008
@@ -130,17 +130,13 @@
int main(int argc, char *argv[])
{
int fd;
- int fd2;
- int ires, res, x;
- int i;
+ int res, x;
ZT_PARAMS tp;
ZT_BUFFERINFO bi;
int bs = BLOCK_SIZE;
int pos = 0;
unsigned char inbuf[BLOCK_SIZE];
unsigned char outbuf[BLOCK_SIZE];
- unsigned int fcs;
- static int packets=0;
int bytes=0;
int out;
unsigned int olddata1;
Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/GNUmakefile
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/GNUmakefile?view=diff&rev=3944&r1=3943&r2=3944
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/GNUmakefile (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/GNUmakefile Wed Mar 5 16:25:03 2008
@@ -67,7 +67,10 @@
KFLAGS+=-DSTANDALONE_ZAPATA
-MOD_DIR:=$(DESTDIR)/lib/modules/$(KVERS)/misc
+MOD_DIR:=/lib/modules/$(KVERS)/misc
+
+MAKE_SUBDIR = $(MAKE) CC=$(CC) LD=$(LD) \
+ KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
all: modules
@@ -99,7 +102,7 @@
modules: $(ALL_MODULES)
wct4xxp/wct4xxp.o:
- $(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+ $(MAKE_SUBDIR) -C wct4xxp
tor2.o: tor2-hw.h tor2fw.h
@@ -110,10 +113,10 @@
wctdm.o: wctdm.h
wctdm24xxp/wctdm24xxp.o:
- $(MAKE) -C wctdm24xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+ $(MAKE_SUBDIR) -C wctdm24xxp
wcte12xp/wcte12xp.o:
- $(MAKE) -C wcte12xp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+ $(MAKE_SUBDIR) -C wcte12xp
pciradio.o: radfw.h
@@ -125,30 +128,11 @@
$(filter-out zaptel.o,$(BUILD_TOPDIR_MODULES:%=%.o)) zaptel-base.o: %.o: %.c zaptel.h
$(CC) $(KFLAGS) -o $@ -c $<
-install: all devices install-modules install-programs install-firmware
- @echo "###################################################"
- @echo "###"
- @echo "### Zaptel installed successfully."
- @echo "### If you have not done so before, install init scripts with:"
- @echo "###"
- @echo "### make config"
- @echo "###"
- @echo "###################################################"
-
-BASENAMES=$(sort $(shell for x in $(ALL_MODULES); do basename $x; done))
-uninstall-modules:
-
-BASENAMES=$(sort $(shell for mod in $(ALL_MODULES); do basename $$mod; done))
-
-install-modules: $(INSTALL_MODULES) uninstall-modules
- $(INSTALL) -d $(DESTDIR)$(MOD_DIR)
- $(INSTALL) -m 644 $(INSTALL_MODULES) $(DESTDIR)$(MOD_DIR)
- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
clean:
rm -f makefw tor2fw.h radfw.h
rm -f *.o
- $(MAKE) -C wct4xxp clean
+ $(MAKE_SUBDIR) -C wct4xxp clean
rm -rf .tmp_versions
rm -f core
@@ -156,5 +140,5 @@
dist-clean: clean
-.PHONY: menuselect distclean dist-clean clean all _all install modules config install-modules uninstall-modules
+.PHONY: distclean dist-clean clean all modules
Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/tor2.c
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/tor2.c?view=diff&rev=3944&r1=3943&r2=3944
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/tor2.c (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/tor2.c Wed Mar 5 16:25:03 2008
@@ -269,7 +269,7 @@
for (x = 0; x < SPANS_PER_CARD; x++) {
sprintf(tor->spans[x].name, "Tor2/%d/%d", tor->num, x + 1);
snprintf(tor->spans[x].desc, sizeof(tor->spans[x].desc) - 1,
- "Tormenta 2 (PCI) fQuad %s Card %d Span %d",
+ "Tormenta 2 (PCI) Quad %s Card %d Span %d",
(tor->cardtype == TYPE_T1) ? "T1" : "E1", tor->num, x + 1);
tor->spans[x].manufacturer = "Digium";
zap_copy_string(tor->spans[x].devicetype, tor->type, sizeof(tor->spans[x].devicetype));
Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/torisa.c
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/torisa.c?view=diff&rev=3944&r1=3943&r2=3944
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/torisa.c (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/torisa.c Wed Mar 5 16:25:03 2008
@@ -1095,11 +1095,11 @@
spans[0].irq = irq;
if (card_type == TYPE_E1) {
- spans[0].spantype = "T1";
+ spans[0].spantype = "E1";
spans[0].linecompat = ZT_CONFIG_AMI | ZT_CONFIG_B8ZS | ZT_CONFIG_D4 | ZT_CONFIG_ESF;
spans[0].deflaw = ZT_LAW_ALAW;
} else {
- spans[0].spantype = "E1";
+ spans[0].spantype = "T1";
spans[0].linecompat = ZT_CONFIG_HDB3 | ZT_CONFIG_CCS | ZT_CONFIG_CRC4;
spans[0].deflaw = ZT_LAW_MULAW;
}
Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/zconf/Zaptel/Span.pm
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/zconf/Zaptel/Span.pm?view=diff&rev=3944&r1=3943&r2=3944
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/zconf/Zaptel/Span.pm (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/xpp/utils/zconf/Zaptel/Span.pm Wed Mar 5 16:25:03 2008
@@ -106,6 +106,7 @@
s/^\s*//;
s/\s*$//;
next unless /\S/;
+ next unless /^\s*\d+/; # must be a real channel string.
my $c = Zaptel::Chans->new($self, $index, $_);
push(@channels, $c);
$index++;
Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/zaptel-base.c?view=diff&rev=3944&r1=3943&r2=3944
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/zaptel-base.c (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/zaptel-base.c Wed Mar 5 16:25:03 2008
@@ -2141,7 +2141,9 @@
if (chan->span->flags & ZT_FLAG_RBS) {
if (chan->sig == ZT_SIG_CAS) {
zt_cas_setbits(chan, chan->idlebits);
- } else if ((chan->sig == ZT_SIG_FXOKS) && (chan->txstate != ZT_TXSTATE_ONHOOK)) {
+ } else if ((chan->sig == ZT_SIG_FXOKS) && (chan->txstate != ZT_TXSTATE_ONHOOK)
+ /* if other party is already on-hook we shouldn't do any battery drop */
+ && !((chan->rxhooksig == ZT_RXSIG_ONHOOK) && (chan->itimer <= 0))) {
/* Do RBS signalling on the channel's behalf */
zt_rbs_sethook(chan, ZT_TXSIG_KEWL, ZT_TXSTATE_KEWL, ZT_KEWLTIME);
} else
@@ -2590,6 +2592,23 @@
}
+static int zt_set_default_zone(int defzone)
+{
+ if ((defzone < 0) || (defzone >= ZT_TONE_ZONE_MAX))
+ return -EINVAL;
+ write_lock(&zone_lock);
+ if (!tone_zones[defzone]) {
+ write_unlock(&zone_lock);
+ return -EINVAL;
+ }
+ if ((default_zone != -1) && tone_zones[default_zone])
+ atomic_dec(&tone_zones[default_zone]->refcount);
+ atomic_inc(&tone_zones[defzone]->refcount);
+ default_zone = defzone;
+ write_unlock(&zone_lock);
+ return 0;
+}
+
/* No bigger than 32k for everything per tone zone */
#define MAX_SIZE 32768
/* No more than 128 subtones */
@@ -2737,8 +2756,13 @@
samples[x]->next = samples[next[x]];
}
- if ((res = zt_register_tone_zone(th.zone, z)))
+ if ((res = zt_register_tone_zone(th.zone, z))) {
kfree(slab);
+ } else {
+ if ( -1 == default_zone ) {
+ zt_set_default_zone(th.zone);
+ }
+ }
return res;
}
@@ -3664,19 +3688,7 @@
case ZT_DEFAULTZONE:
if (get_user(j,(int *)data))
return -EFAULT;
- if ((j < 0) || (j >= ZT_TONE_ZONE_MAX))
- return -EINVAL;
- write_lock(&zone_lock);
- if (!tone_zones[j]) {
- write_unlock(&zone_lock);
- return -EINVAL;
- }
- if ((default_zone != -1) && tone_zones[default_zone])
- atomic_dec(&tone_zones[default_zone]->refcount);
- atomic_inc(&tone_zones[j]->refcount);
- default_zone = j;
- write_unlock(&zone_lock);
- break;
+ return zt_set_default_zone(j);
case ZT_LOADZONE:
return ioctl_load_zone(data);
case ZT_FREEZONE:
Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/tonezone.c
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/tonezone.c?view=diff&rev=3944&r1=3943&r2=3944
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/tonezone.c (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/tonezone.c Wed Mar 5 16:25:03 2008
@@ -319,6 +319,8 @@
int iopenedit = 1;
struct zt_tone_def_header *h;
+ memset(buf, 0, sizeof(buf));
+
h = ptr;
ptr += sizeof(*h);
space -= sizeof(*h);
Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/zaptel.conf.sample
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/zaptel.conf.sample?view=diff&rev=3944&r1=3943&r2=3944
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/zaptel.conf.sample (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/zaptel.conf.sample Wed Mar 5 16:25:03 2008
@@ -229,5 +229,18 @@
# # We are all done with our channel parameters, so now we specify what
# # channels they apply to
# channels=1-4
-
-
+#
+# Overiding PCM encoding:
+# Usually the channel driver sets the encoding of the PCM for the
+# channel (mulaw / alaw. That is: g711u or g711a). However there are
+# some cases where you would like to override that. 'mulaw' and 'alaw'
+# set different such encoding. Use them for channels you have already
+# defined with e.g. 'bchan' or 'fxoks'.
+#mulaw=1-4
+#alaw=1-4
+#
+# 'deflaw' is similar, but resets the encoding to the channel driver's
+# default. It must be useful for something, I guess.
+#mulaw=1-10
+#deflaw=5
+#
Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/zonedata.c
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/zonedata.c?view=diff&rev=3944&r1=3943&r2=3944
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/zonedata.c (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/zonedata.c Wed Mar 5 16:25:03 2008
@@ -86,9 +86,9 @@
{ ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
{ ZT_TONE_STUTTER, "!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,440" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -11,
+ .dtmf_low_level = -9,
+ .mf_level = -7,
},
{ .zone = 3,
.country = "nl",
@@ -109,9 +109,9 @@
{ ZT_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
{ ZT_TONE_STUTTER, "425/500,0/50" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -11,
+ .dtmf_low_level = -9,
+ .mf_level = -7,
},
{ .zone = 4,
.country = "uk",
@@ -129,9 +129,9 @@
{ ZT_TONE_INFO, "950/330,0/15,1400/330,0/15,1800/330,0/1000" },
{ ZT_TONE_STUTTER, "350+440/750,440/750" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -11,
+ .dtmf_low_level = -13,
+ .mf_level = -7,
},
{ .zone = 5,
.country = "fi",
@@ -148,9 +148,9 @@
{ ZT_TONE_INFO, "950/650,0/325,950/325,0/30,1400/1300,0/2600" },
{ ZT_TONE_STUTTER, "425/650,0/25" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -11,
+ .dtmf_low_level = -9,
+ .mf_level = -7,
},
{ .zone = 6,
.country = "es",
@@ -167,9 +167,9 @@
{ ZT_TONE_INFO, "950/330,0/1000" },
{ ZT_TONE_STUTTER, "425/500,0/50" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -11,
+ .dtmf_low_level = -13,
+ .mf_level = -7,
},
{ .zone = 7,
.country = "jp",
@@ -186,9 +186,9 @@
{ ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
{ ZT_TONE_STUTTER, "!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,400" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -7,
+ .dtmf_low_level = -7,
+ .mf_level = -7,
},
{ .zone = 8,
.country = "no",
@@ -245,9 +245,9 @@
{ ZT_TONE_INFO, "400/750,0/100,400/750,0/100,400/750,0/100,400/750,0/400" },
{ ZT_TONE_STUTTER, "!400/100!0/100,!400/100,!0/100,!400/100,!0/100,!400/100!0/100,!400/100,!0/100,!400/100,!0/100,400" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -11,
+ .dtmf_low_level = -9,
+ .mf_level = -7,
},
{ .zone = 11,
.country = "it",
@@ -322,9 +322,9 @@
{ ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
{ ZT_TONE_STUTTER, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!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,
- .mf_level = -10,
+ .dtmf_high_level = -11,
+ .dtmf_low_level = -9,
+ .mf_level = -7,
},
{ .zone = 15,
.country = "cl",
@@ -365,9 +365,9 @@
/*{ ZT_TONE_STUTTER, "425/320,0/20" }, Real swedish standard, not used for now */
{ ZT_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" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -9,
+ .dtmf_low_level = -10,
+ .mf_level = -7,
},
{ .zone = 17,
.country = "be",
@@ -409,9 +409,9 @@
{ ZT_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
{ ZT_TONE_STUTTER, "!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,425" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -11,
+ .dtmf_low_level = -9,
+ .mf_level = -7,
},
{ .zone = 19,
.country = "il",
@@ -535,9 +535,9 @@
/* STUTTER not specified */
{ ZT_TONE_STUTTER, "!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,400*33" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -11,
+ .dtmf_low_level = -13,
+ .mf_level = -7,
},
{ .zone = 25,
.country = "pt",
@@ -599,9 +599,9 @@
{ ZT_TONE_INFO, "950/330,0/30,1400/330,0/30,1800/330,0/1000" },
{ ZT_TONE_STUTTER, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!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,
- .mf_level = -10,
+ .dtmf_high_level = -8,
+ .dtmf_low_level = -6,
+ .mf_level = -7,
},
{ .zone = 28,
.country = "in",
@@ -645,9 +645,9 @@
{ ZT_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
{ ZT_TONE_STUTTER, "425+400" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -11,
+ .dtmf_low_level = -9,
+ .mf_level = -7,
},
{ .zone = 30,
.country = "ch",
@@ -734,9 +734,9 @@
/* STUTTER - not specified */
{ ZT_TONE_STUTTER, "450+425" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -11,
+ .dtmf_low_level = -9,
+ .mf_level = -7,
},
{ .zone = 34,
.country = "ar",
@@ -753,9 +753,9 @@
{ ZT_TONE_INFO, "425/100,0/100" },
{ ZT_TONE_STUTTER, "425/450,0/50" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -11,
+ .dtmf_low_level = -9,
+ .mf_level = -7,
},
{ .zone = 35,
.country = "my",
@@ -796,9 +796,9 @@
/* STUTTER - not specified */
{ ZT_TONE_STUTTER, "!400/200,!0/200,!400/600,!0/200,!400/200,!0/200,!400/600,!0/200,!400/200,!0/200,!400/600,!0/200,!400/200,!0/200,!400/600,!0/200,400" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -11,
+ .dtmf_low_level = -9,
+ .mf_level = -7,
},
{ .zone = 37,
.country = "bg",
@@ -837,9 +837,9 @@
/* STUTTER - not specified */
{ ZT_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" },
},
- .dtmf_high_level = -10,
- .dtmf_low_level = -10,
- .mf_level = -10,
+ .dtmf_high_level = -7,
+ .dtmf_low_level = -9,
+ .mf_level = -7,
},
{ .zone = 39,
.country = "ph",
More information about the zaptel-commits
mailing list