[dahdi-commits] tzafrir: branch tools/2.4 r9735 - in /tools/branches/2.4: ./ zonedata.c

[SVN commits to the DAHDI project]

Author: tzafrir
Date: Tue Feb  8 06:24:57 2011
New Revision: 9735

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9735
Log:
tonezone: Add Macao,China to tone zone data

Adding Macao tone zone data according to
http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf

(closes issue #17744)
	Reported by: alfredtang
	Patches:
	      zonedata.patch uploaded by alfredtang (license 1094)

Merged revisions 9313 via svnmerge from 
http://svn.digium.com/svn/dahdi/tools/trunk

Modified:
    tools/branches/2.4/   (props changed)
    tools/branches/2.4/zonedata.c

Propchange: tools/branches/2.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb  8 06:24:57 2011
@@ -1,1 +1,1 @@
-/tools/trunk:1-9220
+/tools/trunk:1-9220,9313

Modified: tools/branches/2.4/zonedata.c
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.4/zonedata.c?view=diff&rev=9735&r1=9734&r2=9735
==============================================================================
--- tools/branches/2.4/zonedata.c (original)
+++ tools/branches/2.4/zonedata.c Tue Feb  8 06:24:57 2011
@@ -979,5 +979,28 @@
 		.mfr1_level = -7,
 		.mfr2_level = -8,
 	},
+	{
+		.zone = 43,
+		.country = "mo",
+		.description = "Macao,China",
+		.ringcadence = { 1000, 4000 },
+		.tones = {
+			/* References: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
+			{ DAHDI_TONE_DIALTONE, "425" },
+			{ DAHDI_TONE_BUSY, "425/500,0/500" },
+			{ DAHDI_TONE_RINGTONE, "425/1000,0/4000" },
+			{ DAHDI_TONE_CONGESTION, "425/250,0/250" },
+			{ DAHDI_TONE_CALLWAIT, "425/200,0/600" },
+			/* RECORD TONE - not specified */
+			{ DAHDI_TONE_RECORDTONE, "1400/400,0/15000" },
+			{ 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" },
+	},
+		.dtmf_high_level = -10,
+		.dtmf_low_level = -10,
+		.mfr1_level = -10,
+		.mfr2_level = -8,
+	},
 	{ .zone = -1 }
 };