[Asterisk-cvs] zaptel zonedata.c,1.21,1.22

[markster at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv742

Modified Files:
	zonedata.c 
Log Message:
Add singapore definitions (bug #2688)


Index: zonedata.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zonedata.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- zonedata.c	25 Jul 2004 21:07:29 -0000	1.21
+++ zonedata.c	23 Oct 2004 13:07:49 -0000	1.22
@@ -194,7 +194,7 @@
 		{ ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
 		{ ZT_TONE_STUTTER, "!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,600*120" } },
 	},
-{ 13, "gr", "Greece", { 1000, 4000 },
+	{ 13, "gr", "Greece", { 1000, 4000 },
 	{
 		{ ZT_TONE_DIALTONE, "425/200,0/300,425/700,0/800" },
 		{ ZT_TONE_BUSY, "425/300,0/300" },
@@ -206,19 +206,19 @@
 		{ 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" },
 		{ ZT_TONE_STUTTER, "425/650,0/25" } },
 	},
-        { 14, "tw", "Taiwan", { 1000, 4000 },
-        {
-                { ZT_TONE_DIALTONE, "350+440" },
-                { ZT_TONE_BUSY, "480+620/500,0/500" },
-                { ZT_TONE_RINGTONE, "440+480/1000,0/2000" },
-                { ZT_TONE_CONGESTION, "480+620/250,0/250" },
-                { ZT_TONE_CALLWAIT, "350+440/250,0/250,350+440/250,0/3250" },
-                { ZT_TONE_DIALRECALL, "300/1500,0/500" },
-                { ZT_TONE_RECORDTONE, "1400/500,0/15000" },
-                { 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" } },
-        },
-        { 15, "cl", "Chile", { 1000, 3000 }, 
+	{ 14, "tw", "Taiwan", { 1000, 4000 },
+	{
+		{ ZT_TONE_DIALTONE, "350+440" },
+		{ ZT_TONE_BUSY, "480+620/500,0/500" },
+		{ ZT_TONE_RINGTONE, "440+480/1000,0/2000" },
+		{ ZT_TONE_CONGESTION, "480+620/250,0/250" },
+		{ ZT_TONE_CALLWAIT, "350+440/250,0/250,350+440/250,0/3250" },
+		{ ZT_TONE_DIALRECALL, "300/1500,0/500" },
+		{ ZT_TONE_RECORDTONE, "1400/500,0/15000" },
+		{ 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" } },
+	},
+	{ 15, "cl", "Chile", { 1000, 3000 }, 
 	{
 		{ ZT_TONE_DIALTONE, "400" },
 		{ ZT_TONE_BUSY, "400/500,0/500" },
@@ -230,7 +230,7 @@
 		{ ZT_TONE_INFO, "!950/333,!1400/333,!1800/333,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" } },
 	},
-        { 16, "se", "Sweden", { 1000, 5000 }, 
+	{ 16, "se", "Sweden", { 1000, 5000 }, 
 	{
 		{ ZT_TONE_DIALTONE, "425" },
 		{ ZT_TONE_BUSY, "425/250,0/250" },
@@ -262,5 +262,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" } },
 	},
+	{ 18, "sg", "Singapore", { 400, 200, 400, 2000 },
+	{
+		{ ZT_TONE_DIALTONE, "425" },
+		{ ZT_TONE_BUSY, "425/750,0/750" },
+		{ ZT_TONE_RINGTONE, "400+450/400,0/200,400+450/400,0/2000" },
+		{ ZT_TONE_CONGESTION, "425/250,0/250" },
+		{ ZT_TONE_CALLWAIT, "!425/200,!0/600,!425/200,!0/3000,!425/200,!0/600,!425/200" },
+		{ ZT_TONE_DIALRECALL, "400+450/100,0/500,425/500,0/2500" },
+		{ ZT_TONE_RECORDTONE, "1400/425,0/15000" },
+		{ 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," } },
+	}, 	
 	{ -1 }		
 };