[zaptel-commits] sruffell: branch kpfleming/battery_alarms r3927 - in /team/kpfleming/battery_...

SVN commits to the Zaptel project zaptel-commits at lists.digium.com
Tue Mar 4 12:39:19 CST 2008


Author: sruffell
Date: Tue Mar  4 12:39:18 2008
New Revision: 3927

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3927
Log:
Fixing error in fxo_modes array that was preventing battthresh from being set
correctly.  This was responsible for the reports where the drivers were not
detecting remote disconnects.

Issue #12099

Modified:
    team/kpfleming/battery_alarms/kernel/wctdm.c
    team/kpfleming/battery_alarms/kernel/wctdm24xxp/base.c

Modified: team/kpfleming/battery_alarms/kernel/wctdm.c
URL: http://svn.digium.com/view/zaptel/team/kpfleming/battery_alarms/kernel/wctdm.c?view=diff&rev=3927&r1=3926&r2=3927
==============================================================================
--- team/kpfleming/battery_alarms/kernel/wctdm.c (original)
+++ team/kpfleming/battery_alarms/kernel/wctdm.c Tue Mar  4 12:39:18 2008
@@ -125,82 +125,82 @@
 	unsigned int battthresh; /* unknown units */
 } fxo_modes[] =
 {
-	{ "FCC", 0, 0, 0, 1, 0, 0x3, 0, 0, 64, 1000, 3, }, 	/* US, Canada */
-	{ "TBR21", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0x7e6c, 0x023a, 64, 1000, 3, },
+	{ "FCC", 0, 0, 0, 1, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, }, 	/* US, Canada */
+	{ "TBR21", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0x7e6c, 0x023a, 0, 0, 64, 1000, 3, },
 										/* Austria, Belgium, Denmark, Finland, France, Germany, 
 										   Greece, Iceland, Ireland, Italy, Luxembourg, Netherlands,
 										   Norway, Portugal, Spain, Sweden, Switzerland, and UK */
-	{ "ARGENTINA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "AUSTRALIA", 1, 0, 0, 0, 0, 0, 0x3, 0x3, 64, 1000, 3, },
-	{ "AUSTRIA", 0, 1, 0, 0, 1, 0x3, 0, 0x3, 64, 1000, 3, },
-	{ "BAHRAIN", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "BELGIUM", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "BRAZIL", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "BULGARIA", 0, 0, 0, 0, 1, 0x3, 0x0, 0x3, 64, 1000, 3, },
-	{ "CANADA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "CHILE", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "CHINA", 0, 0, 0, 0, 0, 0, 0x3, 0xf, 64, 1000, 3, },
-	{ "COLUMBIA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "CROATIA", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "CYRPUS", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "CZECH", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "DENMARK", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "ECUADOR", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "EGYPT", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "ELSALVADOR", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "FINLAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "FRANCE", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "GERMANY", 0, 1, 0, 0, 1, 0x3, 0, 0x3, 64, 1000, 3, },
-	{ "GREECE", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "GUAM", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "HONGKONG", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "HUNGARY", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "ICELAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "INDIA", 0, 0, 0, 0, 0, 0x3, 0, 0x4, 64, 1000, 3, },
-	{ "INDONESIA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "IRELAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "ISRAEL", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "ITALY", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "JAPAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "JORDAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "KAZAKHSTAN", 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "KUWAIT", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "LATVIA", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "LEBANON", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "LUXEMBOURG", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "MACAO", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "MALAYSIA", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },	/* Current loop >= 20ma */
-	{ "MALTA", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "MEXICO", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "MOROCCO", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "NETHERLANDS", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "NEWZEALAND", 0, 0, 0, 0, 0, 0x3, 0, 0x4, 64, 1000, 3, },
-	{ "NIGERIA", 0, 0, 0, 0, 0x1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "NORWAY", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "OMAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "PAKISTAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "PERU", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "PHILIPPINES", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "POLAND", 0, 0, 1, 1, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "PORTUGAL", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "ROMANIA", 0, 0, 0, 0, 0, 3, 0, 0, 64, 1000, 3, },
-	{ "RUSSIA", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "SAUDIARABIA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "SINGAPORE", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "SLOVAKIA", 0, 0, 0, 0, 0, 0x3, 0, 0x3, 64, 1000, 3, },
-	{ "SLOVENIA", 0, 0, 0, 0, 0, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "SOUTHAFRICA", 1, 0, 1, 0, 0, 0x3, 0, 0x3, 64, 1000, 3, },
-	{ "SOUTHKOREA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "SPAIN", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "SWEDEN", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "SWITZERLAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "SYRIA", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "TAIWAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "THAILAND", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "UAE", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "UK", 0, 1, 0, 0, 1, 0x3, 0, 0x5, 64, 1000, 3, },
-	{ "USA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "YEMEN", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
+	{ "ARGENTINA", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "AUSTRALIA", 1, 0, 0, 0, 0, 0, 0x3, 0x3, 0, 0, 64, 1000, 3, },
+	{ "AUSTRIA", 0, 1, 0, 0, 1, 0x3, 0, 0x3, 0, 0, 64, 1000, 3, },
+	{ "BAHRAIN", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "BELGIUM", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "BRAZIL", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "BULGARIA", 0, 0, 0, 0, 1, 0x3, 0x0, 0x3, 0, 0, 64, 1000, 3, },
+	{ "CANADA", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "CHILE", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "CHINA", 0, 0, 0, 0, 0, 0, 0x3, 0xf, 0, 0, 64, 1000, 3, },
+	{ "COLUMBIA", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "CROATIA", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "CYRPUS", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "CZECH", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "DENMARK", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "ECUADOR", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "EGYPT", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "ELSALVADOR", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "FINLAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "FRANCE", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "GERMANY", 0, 1, 0, 0, 1, 0x3, 0, 0x3, 0, 0, 64, 1000, 3, },
+	{ "GREECE", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "GUAM", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "HONGKONG", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "HUNGARY", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "ICELAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "INDIA", 0, 0, 0, 0, 0, 0x3, 0, 0x4, 0, 0, 64, 1000, 3, },
+	{ "INDONESIA", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "IRELAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "ISRAEL", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "ITALY", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "JAPAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "JORDAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "KAZAKHSTAN", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "KUWAIT", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "LATVIA", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "LEBANON", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "LUXEMBOURG", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "MACAO", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "MALAYSIA", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },	/* Current loop >= 20ma */
+	{ "MALTA", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "MEXICO", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "MOROCCO", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "NETHERLANDS", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "NEWZEALAND", 0, 0, 0, 0, 0, 0x3, 0, 0x4, 0, 0, 64, 1000, 3, },
+	{ "NIGERIA", 0, 0, 0, 0, 0x1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "NORWAY", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "OMAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "PAKISTAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "PERU", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "PHILIPPINES", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "POLAND", 0, 0, 1, 1, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "PORTUGAL", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "ROMANIA", 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "RUSSIA", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "SAUDIARABIA", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "SINGAPORE", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "SLOVAKIA", 0, 0, 0, 0, 0, 0x3, 0, 0x3, 0, 0, 64, 1000, 3, },
+	{ "SLOVENIA", 0, 0, 0, 0, 0, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "SOUTHAFRICA", 1, 0, 1, 0, 0, 0x3, 0, 0x3, 0, 0, 64, 1000, 3, },
+	{ "SOUTHKOREA", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "SPAIN", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "SWEDEN", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "SWITZERLAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "SYRIA", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "TAIWAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "THAILAND", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "UAE", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "UK", 0, 1, 0, 0, 1, 0x3, 0, 0x5, 0, 0, 64, 1000, 3, },
+	{ "USA", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "YEMEN", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
 };
 
 #include "zaptel.h"

Modified: team/kpfleming/battery_alarms/kernel/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/kpfleming/battery_alarms/kernel/wctdm24xxp/base.c?view=diff&rev=3927&r1=3926&r2=3927
==============================================================================
--- team/kpfleming/battery_alarms/kernel/wctdm24xxp/base.c (original)
+++ team/kpfleming/battery_alarms/kernel/wctdm24xxp/base.c Tue Mar  4 12:39:18 2008
@@ -163,82 +163,82 @@
 	unsigned int battthresh; /* unknown units */
 } fxo_modes[] =
 {
-	{ "FCC", 0, 0, 0, 1, 0, 0x3, 0, 0, 64, 1000, 3, }, 	/* US, Canada */
-	{ "TBR21", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0x7e6c, 0x023a, 64, 1000, 3, },
+	{ "FCC", 0, 0, 0, 1, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, }, 	/* US, Canada */
+	{ "TBR21", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0x7e6c, 0x023a, 0, 0, 64, 1000, 3, },
 										/* Austria, Belgium, Denmark, Finland, France, Germany, 
 										   Greece, Iceland, Ireland, Italy, Luxembourg, Netherlands,
 										   Norway, Portugal, Spain, Sweden, Switzerland, and UK */
-	{ "ARGENTINA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "AUSTRALIA", 1, 0, 0, 0, 0, 0, 0x3, 0x3, 64, 1000, 3, },
-	{ "AUSTRIA", 0, 1, 0, 0, 1, 0x3, 0, 0x3, 64, 1000, 3, },
-	{ "BAHRAIN", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "BELGIUM", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "BRAZIL", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "BULGARIA", 0, 0, 0, 0, 1, 0x3, 0x0, 0x3, 64, 1000, 3, },
-	{ "CANADA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "CHILE", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "CHINA", 0, 0, 0, 0, 0, 0, 0x3, 0xf, 64, 1000, 3, },
-	{ "COLUMBIA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "CROATIA", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "CYRPUS", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "CZECH", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "DENMARK", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "ECUADOR", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "EGYPT", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "ELSALVADOR", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "FINLAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "FRANCE", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "GERMANY", 0, 1, 0, 0, 1, 0x3, 0, 0x3, 64, 1000, 3, },
-	{ "GREECE", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "GUAM", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "HONGKONG", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "HUNGARY", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "ICELAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "INDIA", 0, 0, 0, 0, 0, 0x3, 0, 0x4, 64, 1000, 3, },
-	{ "INDONESIA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "IRELAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "ISRAEL", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "ITALY", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "JAPAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "JORDAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "KAZAKHSTAN", 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "KUWAIT", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "LATVIA", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "LEBANON", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "LUXEMBOURG", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "MACAO", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "MALAYSIA", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },	/* Current loop >= 20ma */
-	{ "MALTA", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "MEXICO", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "MOROCCO", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "NETHERLANDS", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "NEWZEALAND", 0, 0, 0, 0, 0, 0x3, 0, 0x4, 64, 1000, 3, },
-	{ "NIGERIA", 0, 0, 0, 0, 0x1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "NORWAY", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "OMAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "PAKISTAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "PERU", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "PHILIPPINES", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "POLAND", 0, 0, 1, 1, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "PORTUGAL", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "ROMANIA", 0, 0, 0, 0, 0, 3, 0, 0, 64, 1000, 3, },
-	{ "RUSSIA", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "SAUDIARABIA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "SINGAPORE", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "SLOVAKIA", 0, 0, 0, 0, 0, 0x3, 0, 0x3, 64, 1000, 3, },
-	{ "SLOVENIA", 0, 0, 0, 0, 0, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "SOUTHAFRICA", 1, 0, 1, 0, 0, 0x3, 0, 0x3, 64, 1000, 3, },
-	{ "SOUTHKOREA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "SPAIN", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "SWEDEN", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "SWITZERLAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 64, 1000, 3, },
-	{ "SYRIA", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "TAIWAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "THAILAND", 0, 0, 0, 0, 0, 0, 0x3, 0, 64, 1000, 3, },
-	{ "UAE", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "UK", 0, 1, 0, 0, 1, 0x3, 0, 0x5, 64, 1000, 3, },
-	{ "USA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
-	{ "YEMEN", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 1000, 3, },
+	{ "ARGENTINA", 0, 0, 0, 0, 0, 0x3, 0, 0, 64, 0, 0, 1000, 3, },
+	{ "AUSTRALIA", 1, 0, 0, 0, 0, 0, 0x3, 0x3, 0, 0, 64, 1000, 3, },
+	{ "AUSTRIA", 0, 1, 0, 0, 1, 0x3, 0, 0x3, 0, 0, 64, 1000, 3, },
+	{ "BAHRAIN", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "BELGIUM", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "BRAZIL", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "BULGARIA", 0, 0, 0, 0, 1, 0x3, 0x0, 0x3, 0, 0, 64, 1000, 3, },
+	{ "CANADA", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "CHILE", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "CHINA", 0, 0, 0, 0, 0, 0, 0x3, 0xf, 0, 0, 64, 1000, 3, },
+	{ "COLUMBIA", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "CROATIA", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "CYRPUS", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "CZECH", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "DENMARK", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "ECUADOR", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "EGYPT", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "ELSALVADOR", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "FINLAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "FRANCE", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "GERMANY", 0, 1, 0, 0, 1, 0x3, 0, 0x3, 0, 0, 64, 1000, 3, },
+	{ "GREECE", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "GUAM", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "HONGKONG", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "HUNGARY", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "ICELAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "INDIA", 0, 0, 0, 0, 0, 0x3, 0, 0x4, 0, 0, 64, 1000, 3, },
+	{ "INDONESIA", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "IRELAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "ISRAEL", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "ITALY", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "JAPAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "JORDAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "KAZAKHSTAN", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "KUWAIT", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "LATVIA", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "LEBANON", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "LUXEMBOURG", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "MACAO", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "MALAYSIA", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },	/* Current loop >= 20ma */
+	{ "MALTA", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "MEXICO", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "MOROCCO", 0, 0, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "NETHERLANDS", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "NEWZEALAND", 0, 0, 0, 0, 0, 0x3, 0, 0x4, 0, 0, 64, 1000, 3, },
+	{ "NIGERIA", 0, 0, 0, 0, 0x1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "NORWAY", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "OMAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "PAKISTAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "PERU", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "PHILIPPINES", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "POLAND", 0, 0, 1, 1, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "PORTUGAL", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "ROMANIA", 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "RUSSIA", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "SAUDIARABIA", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "SINGAPORE", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "SLOVAKIA", 0, 0, 0, 0, 0, 0x3, 0, 0x3, 0, 0, 64, 1000, 3, },
+	{ "SLOVENIA", 0, 0, 0, 0, 0, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "SOUTHAFRICA", 1, 0, 1, 0, 0, 0x3, 0, 0x3, 0, 0, 64, 1000, 3, },
+	{ "SOUTHKOREA", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "SPAIN", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "SWEDEN", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "SWITZERLAND", 0, 1, 0, 0, 1, 0x3, 0, 0x2, 0, 0, 64, 1000, 3, },
+	{ "SYRIA", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "TAIWAN", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "THAILAND", 0, 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 64, 1000, 3, },
+	{ "UAE", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "UK", 0, 1, 0, 0, 1, 0x3, 0, 0x5, 0, 0, 64, 1000, 3, },
+	{ "USA", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
+	{ "YEMEN", 0, 0, 0, 0, 0, 0x3, 0, 0, 0, 0, 64, 1000, 3, },
 };
 
 #define DEBUG_CARD (1 << 0)




More information about the zaptel-commits mailing list