--- zaptel-orig/zonedata.c 2005-05-16 23:24:51.000000000 +0200 +++ zaptel/zonedata.c 2005-05-17 10:14:16.066331376 +0200 @@ -38,7 +38,7 @@ { 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" } }, }, - { 1, "au", "Australia", { 400, 200, 400, 2000 }, + { 1, "au", "Australia", { 400, 2000, 400, 200 }, { { ZT_TONE_DIALTONE, "413+438" }, { ZT_TONE_BUSY, "425/375,0/375" }, @@ -84,7 +84,7 @@ { ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0" }, { ZT_TONE_STUTTER, "425/500,0/50" } }, }, - { 4, "uk", "United Kingdom", { 400, 200, 400, 2000 }, + { 4, "uk", "United Kingdom", { 400, 2000, 400, 200 }, { /* From British Telecom SIN350 v1.2 */ { ZT_TONE_DIALTONE, "350+440" }, @@ -158,7 +158,7 @@ { ZT_TONE_INFO, "!950/330,!1450/330,!1850/330,0/1000" }, { ZT_TONE_STUTTER, "350+430" } }, }, - { 10, "nz", "New Zealand", { 400, 200, 400, 2000 }, + { 10, "nz", "New Zealand", { 400, 2000, 400, 200 }, { { ZT_TONE_DIALTONE, "400" }, { ZT_TONE_BUSY, "400/500,0/500" }, @@ -262,7 +262,7 @@ /* 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 }, + { 18, "sg", "Singapore", { 400, 2000, 400, 200 }, { /* Reference: http://www.ida.gov.sg/idaweb/doc/download/I397/ida_ts_pstn1_i4r2.pdf */ { ZT_TONE_DIALTONE, "425" }, @@ -347,7 +347,7 @@ /* 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" } }, }, - { 24, "za", "South Africa", { 400, 200, 400, 2000 }, + { 24, "za", "South Africa", { 400, 2000, 400, 200 }, { { ZT_TONE_DIALTONE, "400*33" }, { ZT_TONE_BUSY, "400/500,0/500" }, @@ -400,7 +400,7 @@ { 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" } }, }, - { 28, "in", "India", { 400, 200, 400, 2000 }, + { 28, "in", "India", { 400, 2000, 400, 200 }, { /* Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */ { ZT_TONE_DIALTONE, "400*25" },