Index: zonedata.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zonedata.c,v
retrieving revision 1.35
diff -u -r1.35 zonedata.c
--- zonedata.c	19 May 2005 16:06:40 -0000	1.35
+++ zonedata.c	7 Jun 2005 13:02:54 -0000
@@ -17,10 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
- * Primary Author: Mark Spencer <markster@linux-support.net>
- *
+ * Primary Author: Mark Spencer <markster@digium.com>
+ * 
  * This information from ITU E.180 Supplement 2.
  * UK information from BT SIN 350 Issue 1.1
+ * Helpful reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
  */
 #include "tonezone.h"
 
@@ -53,35 +54,35 @@
 	},
 	{ 2, "fr", "France", { 1500, 3500 },
 	{
+		/* Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
 		/* Dialtone can also be 440+330 */
 		{ ZT_TONE_DIALTONE, "440" },
 		{ ZT_TONE_BUSY, "440/500,0/500" },
 		{ ZT_TONE_RINGTONE, "440/1500,0/3500" },
-		/* XXX I'm making up the congestion tone XXX */
+		/* CONGESTION - not specified */
 		{ ZT_TONE_CONGESTION, "440/250,0/250" },
-		/* XXX I'm making up the call wait tone too XXX */
 		{ ZT_TONE_CALLWAIT, "440/300,0/10000" },
-		/* XXX I'm making up dial recall XXX */
+		/* DIALRECALL - not specified */
 		{ ZT_TONE_DIALRECALL, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
-		/* XXX I'm making up the record tone XXX */
+		/* RECORDTONE - not specified */
 		{ ZT_TONE_RECORDTONE, "1400/500,0/15000" },
 		{ 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" } },
 	},
 	{ 3, "nl", "Netherlands", { 1000, 4000 },
 	{
+		/* Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
 		/* Most of these 425's can also be 450's */
 		{ ZT_TONE_DIALTONE, "425" },
 		{ ZT_TONE_BUSY, "425/500,0/500" },
 		{ ZT_TONE_RINGTONE, "425/1000,0/4000" },
 		{ ZT_TONE_CONGESTION, "425/250,0/250" },
-		/* XXX I'm making up the call wait tone XXX */
-		{ ZT_TONE_CALLWAIT, "440/300,0/10000" },
-		/* XXX Assuming this is "Special Dial Tone" XXX */
-		{ ZT_TONE_DIALRECALL, "425/500,0/50" },
-		/* XXX I'm making up the record tone XXX */
+		{ ZT_TONE_CALLWAIT, "425/500,0/9500" },
+		/* DIALRECALL - not specified */
+		{ ZT_TONE_DIALRECALL, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
+		/* RECORDTONE - not specified */
 		{ ZT_TONE_RECORDTONE, "1400/500,0/15000" },
-		{ ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
+		{ ZT_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
 		{ ZT_TONE_STUTTER, "425/500,0/50" } },
 	},
 	{ 4, "uk", "United Kingdom", { 400, 200, 400, 2000 },
@@ -98,16 +99,17 @@
 		{ ZT_TONE_STUTTER, "350+440/750,440/750" } },
 	},
 	{ 5, "fi", "Finland", { 1000, 4000 },
-        {
-                { ZT_TONE_DIALTONE, "425" },
-                { ZT_TONE_BUSY, "425/300,0/300" },
-                { ZT_TONE_RINGTONE, "425/1000,0/4000" },
-                { ZT_TONE_CONGESTION, "425/200,0/200" },
-                { ZT_TONE_CALLWAIT, "425/150,0/150,425/150,0/8000" },
-                { ZT_TONE_DIALRECALL, "425/650,0/25" },
-                { ZT_TONE_RECORDTONE, "1400/500,0/15000" },
-                { ZT_TONE_INFO, "950/650,0/325,950/325,0/30,1400/1300,0/2600" } },
-        },
+	{
+		{ ZT_TONE_DIALTONE, "425" },
+		{ ZT_TONE_BUSY, "425/300,0/300" },
+		{ ZT_TONE_RINGTONE, "425/1000,0/4000" },
+		{ ZT_TONE_CONGESTION, "425/200,0/200" },
+		{ ZT_TONE_CALLWAIT, "425/150,0/150,425/150,0/8000" },
+		{ ZT_TONE_DIALRECALL, "425/650,0/25" },
+		{ ZT_TONE_RECORDTONE, "1400/500,0/15000" },
+		{ ZT_TONE_INFO, "950/650,0/325,950/325,0/30,1400/1300,0/2600" },
+		{ ZT_TONE_STUTTER, "425/650,0/25" } },
+	},
 	{ 6,"es","Spain", { 1500, 3000},
 	{
 		{ ZT_TONE_DIALTONE, "425" },
@@ -146,17 +148,17 @@
 	},
 	{ 9, "at", "Austria", { 1000, 5000 },
 	{
-		{ ZT_TONE_DIALTONE, "440" },
-		{ ZT_TONE_BUSY, "440/400,0/400" },
-		{ ZT_TONE_RINGTONE, "440/1000,0/5000" },
-		{ ZT_TONE_CONGESTION, "440/200,440/200" },
-		{ ZT_TONE_CALLWAIT, "440/40,0/1950" },
-		/*XXX what is this? XXX*/
-		{ ZT_TONE_DIALRECALL, "425/500,0/50" },
-		/*XXX hmm? XXX*/
-		{ ZT_TONE_RECORDTONE, "1400/500,0/15000" },
-		{ ZT_TONE_INFO, "!950/330,!1450/330,!1850/330,0/1000" },
-		{ ZT_TONE_STUTTER, "350+430" } },
+		/* Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
+		{ ZT_TONE_DIALTONE, "420" },
+		{ ZT_TONE_BUSY, "420/400,0/400" },
+		{ ZT_TONE_RINGTONE, "420/1000,0/5000" },
+		{ ZT_TONE_CONGESTION, "420/200,0/200" },
+		{ ZT_TONE_CALLWAIT, "420/40,0/1960" },
+		{ ZT_TONE_DIALRECALL, "420" },
+		/* RECORDTONE - not specified */
+		{ ZT_TONE_RECORDTONE, "1400/80,0/14920" },
+		{ ZT_TONE_INFO, "950/330,1450/330,1850/330,0/1000" },
+		{ ZT_TONE_STUTTER, "380+420" } },
 	},
 	{ 10, "nz", "New Zealand", { 400, 200, 400, 2000 },
 	{
@@ -166,17 +168,18 @@
 		{ ZT_TONE_CONGESTION, "400/250,0/250" },
 		{ ZT_TONE_CALLWAIT, "400/250,0/250,400/250,0/3250" },
 		{ ZT_TONE_DIALRECALL, "!400/100!0/100,!400/100,!0/100,!400/100,!0/100,400" },
-	        { ZT_TONE_RECORDTONE, "1400/425,0/15000" },
+		{ ZT_TONE_RECORDTONE, "1400/425,0/15000" },
 		{ 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" } },
 	},
 	{ 11,"it","Italy", { 1000, 4000 },
 	{
-		{ ZT_TONE_DIALTONE, "425/600,0/1000,425/200,0/200" },
+		/* Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
+		{ ZT_TONE_DIALTONE, "425/200,0/200,425/600,0/1000" },
 		{ ZT_TONE_BUSY, "425/500,0/500" },
 		{ ZT_TONE_RINGTONE, "425/1000,0/4000" },
 		{ ZT_TONE_CONGESTION, "425/200,0/200" },
-		{ ZT_TONE_CALLWAIT, "425/200,0/600,425/200,0/10000" },
+		{ ZT_TONE_CALLWAIT, "425/400,0/100,425/250,0/100,425/150,0/14000" },
 		{ ZT_TONE_DIALRECALL, "470/400,425/400" },
 		{ ZT_TONE_RECORDTONE, "1400/400,0/15000" },
 		{ ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0" },
@@ -249,6 +252,7 @@
 	},
 	{ 17, "be", "Belgium", { 1000, 3000 },
 	{
+		/* Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
 		{ ZT_TONE_DIALTONE, "425" },
 		{ ZT_TONE_BUSY, "425/500,0/500" },
 		{ ZT_TONE_RINGTONE, "425/1000,0/3000" },
@@ -258,9 +262,8 @@
 		{ ZT_TONE_DIALRECALL, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
 		/* RECORDTONE - not specified */
 		{ ZT_TONE_RECORDTONE, "1400/500,0/15000" },
-		{ ZT_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
-		/* 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" } },
+		{ ZT_TONE_INFO, "900/330,1400/330,1800/330,0/1000" },
+		{ ZT_TONE_STUTTER, "425/1000,0/250" } },
 	},
 	{ 18, "sg", "Singapore", { 400, 200, 400, 2000 },
 	{
@@ -377,17 +380,17 @@
 		/* 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" } },
 	},
-    { 26, "ee", "Estonia", { 1000, 4000 },
-    {
-        { ZT_TONE_DIALTONE, "425" }, 
-        { ZT_TONE_BUSY, "425/300,0/300" }, 
-        { ZT_TONE_RINGTONE, "425/1000,0/4000" }, 
-        { ZT_TONE_CONGESTION, "425/200,0/200" },
-        { ZT_TONE_CALLWAIT, "950/650,0/325,950/325,0/30,1400/1300,0/2600" }, 
-        { ZT_TONE_DIALRECALL, "425/650,0/25" },
-        { ZT_TONE_STUTTER, "425/150,0/150,425/150,0/8000" },
-        { ZT_TONE_INFO, "950/650,0/325,950/325,0/30,1400/1300,0/2600" } },
-    },
+	{ 26, "ee", "Estonia", { 1000, 4000 },
+	{
+		{ ZT_TONE_DIALTONE, "425" }, 
+		{ ZT_TONE_BUSY, "425/300,0/300" }, 
+		{ ZT_TONE_RINGTONE, "425/1000,0/4000" }, 
+		{ ZT_TONE_CONGESTION, "425/200,0/200" },
+		{ ZT_TONE_CALLWAIT, "950/650,0/325,950/325,0/30,1400/1300,0/2600" }, 
+		{ ZT_TONE_DIALRECALL, "425/650,0/25" },
+		{ ZT_TONE_STUTTER, "425/150,0/150,425/150,0/8000" },
+		{ ZT_TONE_INFO, "950/650,0/325,950/325,0/30,1400/1300,0/2600" } },
+	},
 	{ 27, "mx", "Mexico", { 2000, 4000 }, 
 	{
 		{ ZT_TONE_DIALTONE, "425" },
@@ -416,6 +419,83 @@
 		{ ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0/1000" },
 		/* STUTTER - not specified */
 		{ 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" } },
+	},
+	{ 29, "de", "Germany", { 1000, 4000 },
+	{
+		/* Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
+		{ ZT_TONE_DIALTONE, "425" },
+		{ ZT_TONE_BUSY, "425/480,0/480" },
+		{ ZT_TONE_RINGTONE, "425/1000,0/4000" },
+		{ ZT_TONE_CONGESTION, "425/240,0/240" },
+		{ ZT_TONE_CALLWAIT, "!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200" },
+		/* DIALRECALL - not specified */
+		{ ZT_TONE_DIALRECALL, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
+		/* RECORDTONE - not specified */
+		{ ZT_TONE_RECORDTONE, "1400/80,0/15000" },
+		{ ZT_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
+		{ ZT_TONE_STUTTER, "425+400" } },
+	},
+	{ 30, "ch", "Switzerland", { 1000, 4000 },
+	{
+		/* Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
+		{ ZT_TONE_DIALTONE, "425" },
+		{ ZT_TONE_BUSY, "425/500,0/500" },
+		{ ZT_TONE_RINGTONE, "425/1000,0/4000" },
+		{ ZT_TONE_CONGESTION, "425/200,0/200" },
+		{ ZT_TONE_CALLWAIT, "425/200,0/200,425/200,0/4000" },
+		/* DIALRECALL - not specified */
+		{ ZT_TONE_DIALRECALL, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
+		/* RECORDTONE - not specified */
+		{ ZT_TONE_RECORDTONE, "1400/80,0/15000" },
+		{ ZT_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
+		{ ZT_TONE_STUTTER, "425+340/1100,0/1100" } },
+	},
+	{ 31, "dk", "Denmark", { 1000, 4000 },
+	{
+		/* Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
+		{ ZT_TONE_DIALTONE, "425" },
+		{ ZT_TONE_BUSY, "425/500,0/500" },
+		{ ZT_TONE_RINGTONE, "425/1000,0/4000" },
+		{ ZT_TONE_CONGESTION, "425/200,0/200" },
+		{ ZT_TONE_CALLWAIT, "!425/200,!0/600,!425/200,!0/3000,!425/200,!0/200,!425/200" },
+		/* DIALRECALL - not specified */
+		{ ZT_TONE_DIALRECALL, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
+		/* RECORDTONE - not specified */
+		{ ZT_TONE_RECORDTONE, "1400/80,0/15000" },
+		{ ZT_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
+		/* STUTTER - not specified */
+		{ ZT_TONE_STUTTER, "425/450,0/50" } },
+	},
+	{ 32, "cz", "Czech Republic", { 1000, 4000 },
+	{
+		/* Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
+		{ ZT_TONE_DIALTONE, "425/330,0/330,425/660,0/660" },
+		{ ZT_TONE_BUSY, "425/330,0/330" },
+		{ ZT_TONE_RINGTONE, "425/1000,0/4000" },
+		{ ZT_TONE_CONGESTION, "425/165,0/165" },
+		{ ZT_TONE_CALLWAIT, "425/330,0/9000" },
+		/* DIALRECALL - not specified */
+		{ ZT_TONE_DIALRECALL, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425/330,0/330,425/660,0/660" },
+		/* RECORDTONE - not specified */
+		{ ZT_TONE_RECORDTONE, "1400/500,0/14000" },
+		{ ZT_TONE_INFO, "950/330,0/30,1400/330,0/30,1800/330,0/1000" },
+		/* STUTTER - not specified */
+		{ ZT_TONE_STUTTER, "425/450,0/50" } },
+	},
+	{ 33, "cn", "China", { 1000, 4000 },
+	{
+		/* Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
+		{ ZT_TONE_DIALTONE, "450" },
+		{ ZT_TONE_BUSY, "450/350,0/350" },
+		{ ZT_TONE_RINGTONE, "450/1000,0/4000" },
+		{ ZT_TONE_CONGESTION, "450/700,0/700" },
+		{ ZT_TONE_CALLWAIT, "450/400,0/4000" },
+		/* DIALRECALL - not specified */
+		{ ZT_TONE_DIALRECALL, "!450/100,!0/100,!450/100,!0/100,!450/100,!0/100,450" },
+		{ ZT_TONE_RECORDTONE, "950/400,0/10000" },
+		{ ZT_TONE_INFO, "450/100,0/100,450/100,0/100,450/100,0/100,450/400,0/400" },
+		/* STUTTER - not specified */
+		{ ZT_TONE_STUTTER, "450+425" } },
 	},
 	{ -1 }		
 };