qcacld-3.0: Correct the country code definitions
Correct the definitions from country code to regulatory domains
mappings. Add the missing countries to regulatory domain mappings.
Also streamline the definitions of regulatory domain pairs and
regulatory domains.
Change-Id: I0ff5a13425c6b5d4671864745f6b44a0d16b78aa
CRs-Fixed: 961806
diff --git a/core/cds/inc/cds_regdomain.h b/core/cds/inc/cds_regdomain.h
index 0c4f157..c5db379 100644
--- a/core/cds/inc/cds_regdomain.h
+++ b/core/cds/inc/cds_regdomain.h
@@ -72,31 +72,34 @@
#define __CDS_REGDOMAIN_H
#define MAX_CHANNELS_PER_OPERATING_CLASS 25
-#define CTRY_DEBUG 0x1ff
+#define CDS_MAX_SUPP_OPER_CLASSES 32
#define CTRY_DEFAULT 0
#define COUNTRY_ERD_FLAG 0x8000
#define WORLDWIDE_ROAMING_FLAG 0x4000
-#define DEF_REGDMN FCC3_FCCA
-#define CDS_MAX_SUPP_OPER_CLASSES 32
enum reg_domain {
NO_ENUMRD = 0x00,
NULL1_WORLD = 0x03,
NULL1_ETSIB = 0x07,
NULL1_ETSIC = 0x08,
+
FCC1_FCCA = 0x10,
FCC1_WORLD = 0x11,
- FCC4_FCCA = 0x12,
- FCC5_FCCA = 0x13,
- FCC6_FCCA = 0x14,
FCC2_FCCA = 0x20,
FCC2_WORLD = 0x21,
FCC2_ETSIC = 0x22,
- FCC6_WORLD = 0x23,
- FRANCE_RES = 0x31,
FCC3_FCCA = 0x3A,
FCC3_WORLD = 0x3B,
FCC3_ETSIC = 0x3F,
+ FCC4_FCCA = 0x12,
+ FCC5_FCCA = 0x13,
+ FCC6_FCCA = 0x14,
+ FCC7_FCCA = 0x15,
+ FCC8_FCCA = 0x16,
+ FCC6_WORLD = 0x23,
+ FCC9_FCCA = 0x17,
+ FCC10_FCCA = 0x18,
+ FCC11_WORLD = 0x19,
ETSI1_WORLD = 0x37,
ETSI3_ETSIA = 0x32,
@@ -106,46 +109,42 @@
ETSI4_ETSIC = 0x38,
ETSI5_WORLD = 0x39,
ETSI6_WORLD = 0x34,
+ ETSI_RESERVED = 0x33,
+ FRANCE_RES = 0x31,
+ ETSI7_WORLD = 0x3C,
ETSI8_WORLD = 0x3D,
ETSI9_WORLD = 0x3E,
- ETSI_RESERVED = 0x33,
+ ETSI10_WORLD = 0x24,
+ ETSI11_WORLD = 0x26,
- MKK1_MKKA = 0x40,
- MKK1_MKKB = 0x41,
APL4_WORLD = 0x42,
- MKK2_MKKA = 0x43,
+ APL3_FCCA = 0x50,
APL_RESERVED = 0x44,
APL2_WORLD = 0x45,
+ APL2_FCCA = 0x4D,
APL2_APLC = 0x46,
APL3_WORLD = 0x47,
- MKK1_FCCA = 0x48,
APL2_APLD = 0x49,
- MKK1_MKKA1 = 0x4A,
- MKK1_MKKA2 = 0x4B,
- MKK1_MKKC = 0x4C,
- APL2_FCCA = 0x4D,
- APL11_FCCA = 0x4F,
-
- APL3_FCCA = 0x50,
- APL12_WORLD = 0x51,
APL1_WORLD = 0x52,
APL1_FCCA = 0x53,
APL1_APLA = 0x54,
APL1_ETSIC = 0x55,
APL2_ETSIC = 0x56,
APL5_WORLD = 0x58,
- APL13_WORLD = 0x5A,
APL6_WORLD = 0x5B,
APL7_FCCA = 0x5C,
APL8_WORLD = 0x5D,
- APL9_MKKC = 0x5E,
- APL10_MKKC = 0x5F,
+ APL9_WORLD = 0x5E,
+ APL10_WORLD = 0x5F,
+ APL11_FCCA = 0x4F,
+ APL12_WORLD = 0x51,
+ APL13_WORLD = 0x5A,
WOR0_WORLD = 0x60,
WOR1_WORLD = 0x61,
WOR2_WORLD = 0x62,
WOR3_WORLD = 0x63,
- WOR4_WORLD = 0x64,
+ WOR4_FCCA = 0x64,
WOR5_ETSIC = 0x65,
WOR01_WORLD = 0x66,
WOR02_WORLD = 0x67,
@@ -161,22 +160,23 @@
MKK4_MKKB = 0x83,
MKK4_MKKA2 = 0x84,
MKK4_MKKC = 0x85,
+ MKK5_MKKA = 0x99,
+ MKK5_FCCA = 0x9A,
MKK5_MKKB = 0x86,
MKK5_MKKA2 = 0x87,
MKK5_MKKC = 0x88,
- MKK5_MKKA = 0x99,
- MKK5_FCCA = 0x9A,
- MKK6_MKKB = 0x89,
- MKK6_MKKA2 = 0x8A,
- MKK6_MKKC = 0x8B,
- MKK7_MKKB = 0x8C,
- MKK7_MKKA2 = 0x8D,
- MKK7_MKKC = 0x8E,
- MKK8_MKKB = 0x8F,
- MKK8_MKKA2 = 0x90,
- MKK8_MKKC = 0x91,
- MKK14_MKKA1 = 0x92,
- MKK15_MKKA1 = 0x93,
+ MKK3_MKKA = 0xF0,
+ MKK3_MKKA1 = 0xF1,
+ MKK3_FCCA = 0xF2,
+ MKK4_MKKA = 0xF3,
+ MKK4_MKKA1 = 0xF4,
+ MKK4_FCCA = 0xF5,
+ MKK9_MKKA = 0xF6,
+ MKK9_FCCA = 0xFC,
+ MKK9_MKKA1 = 0xFD,
+ MKK9_MKKC = 0xFE,
+ MKK9_MKKA2 = 0xFF,
+ MKK10_MKKA = 0xF7,
MKK10_FCCA = 0xD0,
MKK10_MKKA1 = 0xD1,
MKK10_MKKC = 0xD2,
@@ -186,28 +186,29 @@
MKK11_MKKA1 = 0xD6,
MKK11_MKKC = 0xD7,
MKK11_MKKA2 = 0xD8,
- MKK12_MKKA = 0xD9,
- MKK12_FCCA = 0xDA,
- MKK12_MKKA1 = 0xDB,
- MKK12_MKKC = 0xDC,
- MKK12_MKKA2 = 0xDD,
- MKK13_MKKB = 0xDE,
- MKK3_MKKA = 0xF0,
- MKK3_MKKA1 = 0xF1,
- MKK3_FCCA = 0xF2,
- MKK4_MKKA = 0xF3,
- MKK4_MKKA1 = 0xF4,
- MKK4_FCCA = 0xF5,
- MKK9_MKKA = 0xF6,
- MKK10_MKKA = 0xF7,
- MKK6_MKKA1 = 0xF8,
- MKK6_FCCA = 0xF9,
- MKK7_MKKA1 = 0xFA,
- MKK7_FCCA = 0xFB,
- MKK9_FCCA = 0xFC,
- MKK9_MKKA1 = 0xFD,
- MKK9_MKKC = 0xFE,
- MKK9_MKKA2 = 0xFF,
+
+ FCC1 = 0x0110,
+ FCC2 = 0x0120,
+ FCC3 = 0x0160,
+ FCC4 = 0x0165,
+ FCC5 = 0x0510,
+ FCC6 = 0x0610,
+ FCC7 = 0x0710,
+ FCC8 = 0x0810,
+ FCC9 = 0x0910,
+ FCC10 = 0x0B10,
+ FCC11 = 0x0B20,
+
+ ETSI1 = 0x0130,
+ ETSI2 = 0x0230,
+ ETSI3 = 0x0330,
+ ETSI4 = 0x0430,
+ ETSI5 = 0x0530,
+ ETSI6 = 0x0630,
+ ETSI8 = 0x0830,
+ ETSI9 = 0x0930,
+ ETSI10 = 0x0D30,
+ ETSI11 = 0x0E30,
APL1 = 0x0150,
APL2 = 0x0250,
@@ -221,49 +222,22 @@
APL10 = 0x1050,
APL11 = 0x1150,
APL12 = 0x1160,
+ APL13 = 0x1170,
- ETSI1 = 0x0130,
- ETSI2 = 0x0230,
- ETSI3 = 0x0330,
- ETSI4 = 0x0430,
- ETSI5 = 0x0530,
- ETSI6 = 0x0630,
- ETSI8 = 0x0830,
- ETSI9 = 0x0930,
- ETSIA = 0x0A30,
- ETSIB = 0x0B30,
- ETSIC = 0x0C30,
-
- FCC1 = 0x0110,
- FCC2 = 0x0120,
- FCC3 = 0x0160,
- FCC4 = 0x0165,
- FCC5 = 0x0510,
- FCC6 = 0x0610,
- FCCA = 0x0A10,
-
- APLD = 0x0D50,
-
- MKK1 = 0x0140,
- MKK2 = 0x0240,
+ NULL1 = 0x0198,
MKK3 = 0x0340,
MKK4 = 0x0440,
MKK5 = 0x0540,
- MKK6 = 0x0640,
- MKK7 = 0x0740,
- MKK8 = 0x0840,
MKK9 = 0x0940,
- MKK10 = 0x0B40,
+ MKK10 = 0x1040,
MKK11 = 0x1140,
- MKK12 = 0x1240,
- MKK13 = 0x0C40,
- MKK14 = 0x1440,
- MKK15 = 0x1540,
+
+ WORLD = 0x0199,
+ FCCA = 0x0A10,
MKKA = 0x0A40,
MKKC = 0x0A50,
+ ETSIC = 0x0C30,
- NULL1 = 0x0198,
- WORLD = 0x0199,
DEBUG_REG_DMN = 0x01ff,
};
diff --git a/core/cds/src/cds_regdomain.c b/core/cds/src/cds_regdomain.c
index fd15d36..89bba13 100644
--- a/core/cds/src/cds_regdomain.c
+++ b/core/cds/src/cds_regdomain.c
@@ -156,273 +156,244 @@
};
static const struct reg_dmn_pair g_reg_dmn_pairs[] = {
- {NO_ENUMRD, DEBUG_REG_DMN, DEBUG_REG_DMN, 0},
- {NULL1_WORLD, NULL1, WORLD, 0},
- {NULL1_ETSIB, NULL1, ETSIB, 0},
- {NULL1_ETSIC, NULL1, ETSIC, 0},
- {FCC2_FCCA, FCC2, FCCA, 0},
- {FCC2_WORLD, FCC2, WORLD, 0},
- {FCC2_ETSIC, FCC2, ETSIC, 0},
- {FCC3_FCCA, FCC3, FCCA, 0},
- {FCC3_WORLD, FCC3, WORLD, 0},
- {FCC3_ETSIC, FCC3, ETSIC, 0},
- {FCC4_FCCA, FCC4, FCCA, 0},
- {FCC5_FCCA, FCC5, FCCA, 0},
- {FCC6_FCCA, FCC6, FCCA, 0},
- {FCC6_WORLD, FCC6, WORLD, 0},
- {ETSI1_WORLD, ETSI1, WORLD, 0},
- {ETSI2_WORLD, ETSI2, WORLD, 0},
- {ETSI3_WORLD, ETSI3, WORLD, 0},
- {ETSI4_WORLD, ETSI4, WORLD, 0},
- {ETSI5_WORLD, ETSI5, WORLD, 0},
- {ETSI6_WORLD, ETSI6, WORLD, 0},
- {ETSI8_WORLD, ETSI8, WORLD, 0},
- {ETSI9_WORLD, ETSI9, WORLD, 0},
- {ETSI3_ETSIA, ETSI3, WORLD, 0},
- {FRANCE_RES, ETSI3, WORLD, 0},
- {FCC1_WORLD, FCC1, WORLD, 0},
- {FCC1_FCCA, FCC1, FCCA, 0},
- {APL1_WORLD, APL1, WORLD, 0},
- {APL2_WORLD, APL2, WORLD, 0},
- {APL2_FCCA, APL2, FCCA, 0},
- {APL3_WORLD, APL3, WORLD, 0},
- {APL4_WORLD, APL4, WORLD, 0},
- {APL5_WORLD, APL5, WORLD, 0},
- {APL6_WORLD, APL6, WORLD, 0},
- {APL7_FCCA, APL7, FCCA, 0},
- {APL8_WORLD, APL8, WORLD, 0},
- {APL9_MKKC, APL9, MKKC, 0},
- {APL10_MKKC, APL10, MKKC, 0},
- {APL3_FCCA, APL3, FCCA, 0},
- {APL1_ETSIC, APL1, ETSIC, 0},
- {APL2_ETSIC, APL2, ETSIC, 0},
- {MKK3_MKKA, MKK3, MKKA, CTRY_JAPAN25},
- {MKK3_MKKB, MKK3, MKKA, CTRY_JAPAN7},
- {MKK3_MKKA1, MKK3, MKKA, CTRY_JAPAN26},
- {MKK3_MKKA2, MKK3, MKKA, CTRY_JAPAN8},
- {MKK3_MKKC, MKK3, MKKC, CTRY_JAPAN9},
- {MKK3_FCCA, MKK3, FCCA, CTRY_JAPAN27},
- {MKK4_MKKA, MKK4, MKKA, CTRY_JAPAN36},
- {MKK4_MKKB, MKK4, MKKA, CTRY_JAPAN10},
- {MKK4_MKKA1, MKK4, MKKA, CTRY_JAPAN28},
- {MKK4_MKKA2, MKK4, MKKA, CTRY_JAPAN11},
- {MKK4_MKKC, MKK4, MKKC, CTRY_JAPAN12},
- {MKK4_FCCA, MKK4, FCCA, CTRY_JAPAN29},
- {MKK5_MKKB, MKK5, MKKA, CTRY_JAPAN13},
+ {NO_ENUMRD, FCC8, FCCA, CTRY_DEFAULT},
+ {NULL1_WORLD, NULL1, WORLD, CTRY_DEFAULT},
+ {FCC1_FCCA, FCC1, FCCA, CTRY_DEFAULT},
+ {FCC1_WORLD, FCC1, WORLD, CTRY_DEFAULT},
+ {FCC2_WORLD, FCC2, WORLD, CTRY_DEFAULT},
+ {FCC2_ETSIC, FCC2, ETSIC, CTRY_DEFAULT},
+ {FCC3_FCCA, FCC3, FCCA, CTRY_DEFAULT},
+ {FCC3_WORLD, FCC3, WORLD, CTRY_DEFAULT},
+ {FCC3_ETSIC, FCC3, ETSIC, CTRY_DEFAULT},
+ {FCC4_FCCA, FCC4, FCCA, CTRY_DEFAULT},
+ {FCC5_FCCA, FCC5, FCCA, CTRY_DEFAULT},
+ {FCC6_FCCA, FCC6, FCCA, CTRY_DEFAULT},
+ {FCC7_FCCA, FCC7, FCCA, CTRY_DEFAULT},
+ {FCC8_FCCA, FCC8, FCCA, CTRY_DEFAULT},
+ {FCC6_WORLD, FCC6, WORLD, CTRY_DEFAULT},
+ {FCC9_FCCA, FCC9, FCCA, CTRY_DEFAULT},
+ {FCC10_FCCA, FCC10, FCCA, CTRY_DEFAULT},
+ {FCC11_WORLD, FCC11, WORLD, CTRY_DEFAULT},
+ {ETSI1_WORLD, ETSI1, WORLD, CTRY_DEFAULT},
+ {ETSI3_WORLD, ETSI3, WORLD, CTRY_DEFAULT},
+ {ETSI4_WORLD, ETSI4, WORLD, CTRY_DEFAULT},
+ {ETSI7_WORLD, ETSI4, WORLD, CTRY_DEFAULT},
+ {ETSI8_WORLD, ETSI8, WORLD, CTRY_DEFAULT},
+ {ETSI9_WORLD, ETSI9, WORLD, CTRY_DEFAULT},
+ {APL4_WORLD, APL4, WORLD, CTRY_DEFAULT},
+ {APL2_WORLD, APL2, WORLD, CTRY_DEFAULT},
+ {APL2_FCCA, APL2, FCCA, CTRY_DEFAULT},
+ {APL1_WORLD, APL1, WORLD, CTRY_DEFAULT},
+ {APL1_ETSIC, APL1, ETSIC, CTRY_DEFAULT},
+ {APL6_WORLD, APL6, WORLD, CTRY_DEFAULT},
+ {APL7_FCCA, APL7, FCCA, CTRY_DEFAULT},
+ {APL9_WORLD, APL9, WORLD, CTRY_DEFAULT},
+ {APL10_WORLD, APL10, WORLD, CTRY_DEFAULT},
+ {APL12_WORLD, APL12, WORLD, CTRY_DEFAULT},
+ {APL13_WORLD, APL13, WORLD, CTRY_DEFAULT},
+ {WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, CTRY_DEFAULT},
+ {WOR1_WORLD, WOR1_WORLD, WOR1_WORLD, CTRY_DEFAULT},
+ {WOR2_WORLD, WOR2_WORLD, WOR2_WORLD, CTRY_DEFAULT},
+ {WOR3_WORLD, WOR3_WORLD, WOR3_WORLD, CTRY_DEFAULT},
+ {WOR4_FCCA, WOR4_FCCA, WOR4_FCCA, CTRY_DEFAULT},
+ {WOR5_ETSIC, WOR5_ETSIC, WOR5_ETSIC, CTRY_DEFAULT},
+ {WOR01_WORLD, WOR01_WORLD, WOR01_WORLD, CTRY_DEFAULT},
+ {WOR02_WORLD, WOR02_WORLD, WOR02_WORLD, CTRY_DEFAULT},
+ {EU1_WORLD, EU1_WORLD, EU1_WORLD, CTRY_DEFAULT},
+ {WOR9_WORLD, WOR9_WORLD, WOR9_WORLD, CTRY_DEFAULT},
+ {WORA_WORLD, WORA_WORLD, WORA_WORLD, CTRY_DEFAULT},
+ {WORB_WORLD, WORB_WORLD, WORB_WORLD, CTRY_DEFAULT},
+ {WORC_WORLD, WORC_WORLD, WORC_WORLD, CTRY_DEFAULT},
{MKK5_MKKA2, MKK5, MKKA, CTRY_JAPAN14},
- {MKK5_MKKC, MKK5, MKKC, CTRY_JAPAN15},
- {MKK5_FCCA, MKK5, FCCA, CTRY_JAPAN56},
- {MKK9_MKKA, MKK9, MKKA, CTRY_JAPAN34},
- {MKK9_FCCA, MKK9, FCCA, CTRY_JAPAN37},
- {MKK9_MKKA1, MKK9, MKKA, CTRY_JAPAN38},
- {MKK9_MKKA2, MKK9, MKKA, CTRY_JAPAN40},
- {MKK9_MKKC, MKK9, MKKC, CTRY_JAPAN39},
- {MKK10_MKKA, MKK10, MKKA, CTRY_JAPAN35},
- {MKK10_FCCA, MKK10, FCCA, CTRY_JAPAN41},
- {MKK10_MKKA1, MKK10, MKKA, CTRY_JAPAN42},
- {MKK10_MKKA2, MKK10, MKKA, CTRY_JAPAN44},
- {MKK10_MKKC, MKK10, MKKC, CTRY_JAPAN43},
- {MKK11_MKKA, MKK11, MKKA, CTRY_JAPAN45},
- {MKK11_FCCA, MKK11, FCCA, CTRY_JAPAN46},
- {MKK11_MKKA1, MKK11, MKKA, CTRY_JAPAN47},
- {MKK11_MKKA2, MKK11, MKKA, CTRY_JAPAN49},
- {MKK11_MKKC, MKK11, MKKC, CTRY_JAPAN48},
-
- {WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, 0},
- {WOR1_WORLD, WOR1_WORLD, WOR1_WORLD, 0},
- {WOR2_WORLD, WOR2_WORLD, WOR2_WORLD, 0},
- {WOR3_WORLD, WOR3_WORLD, WOR3_WORLD, 0},
- {WOR4_WORLD, WOR4_WORLD, WOR4_WORLD, 0},
- {WOR5_ETSIC, WOR5_ETSIC, WOR5_ETSIC, 0},
- {WOR01_WORLD, WOR01_WORLD, WOR01_WORLD, 0},
- {WOR02_WORLD, WOR02_WORLD, WOR02_WORLD, 0},
- {EU1_WORLD, EU1_WORLD, EU1_WORLD, 0},
- {WOR9_WORLD, WOR9_WORLD, WOR9_WORLD, 0},
- {WORA_WORLD, WORA_WORLD, WORA_WORLD, 0},
- {WORB_WORLD, WORB_WORLD, WORB_WORLD, 0},
- {WORC_WORLD, WORC_WORLD, WORC_WORLD, 0},
};
static const struct country_code_to_reg_dmn g_all_countries[] = {
- {CTRY_DEBUG, NO_ENUMRD, "DB", "DEBUG"},
- {CTRY_DEFAULT, DEF_REGDMN, "NA", "NO_COUNTRY_SET"},
- {CTRY_ALBANIA, NULL1_WORLD, "AL", "ALBANIA"},
- {CTRY_ALGERIA, NULL1_WORLD, "DZ", "ALGERIA"},
- {CTRY_ARGENTINA, FCC3_WORLD, "AR", "ARGENTINA"},
+ {CTRY_AFGHANISTAN, ETSI1_WORLD, "AF", "AFGHANISTAN"},
+ {CTRY_ALBANIA, ETSI1_WORLD, "AL", "ALBANIA"},
+ {CTRY_ALGERIA, APL13_WORLD, "DZ", "ALGERIA"},
+ {CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", "AMERICAN SAMOA"},
+ {CTRY_ANGUILLA, ETSI1_WORLD, "AI", "ANGUILLA"},
+ {CTRY_ARGENTINA, FCC6_WORLD, "AR", "ARGENTINA"},
{CTRY_ARMENIA, ETSI4_WORLD, "AM", "ARMENIA"},
{CTRY_ARUBA, ETSI1_WORLD, "AW", "ARUBA"},
- {CTRY_AUSTRALIA, FCC3_WORLD, "AU", "AUSTRALIA"},
+ {CTRY_AUSTRALIA, FCC6_WORLD, "AU", "AUSTRALIA"},
{CTRY_AUSTRIA, ETSI1_WORLD, "AT", "AUSTRIA"},
{CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", "AZERBAIJAN"},
{CTRY_BAHAMAS, FCC3_WORLD, "BS", "BAHAMAS"},
{CTRY_BAHRAIN, APL6_WORLD, "BH", "BAHRAIN"},
- {CTRY_BANGLADESH, NULL1_WORLD, "BD", "BANGLADESH"},
+ {CTRY_BANGLADESH, APL1_WORLD, "BD", "BANGLADESH"},
{CTRY_BARBADOS, FCC2_WORLD, "BB", "BARBADOS"},
{CTRY_BELARUS, ETSI1_WORLD, "BY", "BELARUS"},
{CTRY_BELGIUM, ETSI1_WORLD, "BE", "BELGIUM"},
{CTRY_BELIZE, APL1_ETSIC, "BZ", "BELIZE"},
{CTRY_BERMUDA, FCC3_FCCA, "BM", "BERMUDA"},
- {CTRY_BOLIVIA, APL1_ETSIC, "BO", "BOLIVIA"},
+ {CTRY_BHUTAN, ETSI1_WORLD, "BT", "BHUTAN"},
+ {CTRY_BOLIVIA, APL8_WORLD, "BO", "BOLIVIA"},
{CTRY_BOSNIA_HERZ, ETSI1_WORLD, "BA", "BOSNIA AND HERZEGOVINA"},
- {CTRY_BRAZIL, FCC3_WORLD, "BR", "BRAZIL"},
+ {CTRY_BRAZIL, FCC3_ETSIC, "BR", "BRAZIL"},
{CTRY_BRUNEI_DARUSSALAM, APL6_WORLD, "BN", "BRUNEI DARUSSALAM"},
{CTRY_BULGARIA, ETSI1_WORLD, "BG", "BULGARIA"},
+ {CTRY_BURKINA_FASO, FCC3_WORLD, "BF", "BURKINA-FASO"},
{CTRY_CAMBODIA, ETSI1_WORLD, "KH", "CAMBODIA"},
- {CTRY_CANADA, FCC3_FCCA, "CA", "CANADA"},
+ {CTRY_CANADA, FCC6_FCCA, "CA", "CANADA"},
+ {CTRY_CAYMAN_ISLANDS, FCC3_WORLD, "KY", "CAYMAN ISLANDS"},
+ {CTRY_CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, "CF", "AFRICA REPUBLIC"},
+ {CTRY_CHAD, ETSI1_WORLD, "TD", "CHAD"},
{CTRY_CHILE, APL6_WORLD, "CL", "CHILE"},
- {CTRY_CHINA, APL1_WORLD, "CN", "CHINA"},
- {CTRY_COLOMBIA, FCC1_FCCA, "CO", "COLOMBIA"},
- {CTRY_COSTA_RICA, FCC1_WORLD, "CR", "COSTA RICA"},
+ {CTRY_CHINA, FCC2_WORLD, "CN", "CHINA"},
+ {CTRY_CHRISTMAS_ISLAND, FCC3_WORLD, "CX", "CHRISTMAS ISLAND"},
+ {CTRY_COLOMBIA, FCC3_WORLD, "CO", "COLOMBIA"},
+ {CTRY_COSTA_RICA, FCC3_WORLD, "CR", "COSTA RICA"},
+ {CTRY_COTE_DIVOIRE, FCC3_WORLD, "CI", "COTE DIVOIRE"},
{CTRY_CROATIA, ETSI1_WORLD, "HR", "CROATIA"},
{CTRY_CYPRUS, ETSI1_WORLD, "CY", "CYPRUS"},
{CTRY_CZECH, ETSI1_WORLD, "CZ", "CZECH REPUBLIC"},
{CTRY_DENMARK, ETSI1_WORLD, "DK", "DENMARK"},
+ {CTRY_DOMINICA, FCC1_FCCA, "DM", "DOMINICA"},
{CTRY_DOMINICAN_REPUBLIC, FCC1_FCCA, "DO", "DOMINICAN REPUBLIC"},
- {CTRY_ECUADOR, FCC1_WORLD, "EC", "ECUADOR"},
+ {CTRY_ECUADOR, FCC3_WORLD, "EC", "ECUADOR"},
{CTRY_EGYPT, ETSI3_WORLD, "EG", "EGYPT"},
{CTRY_EL_SALVADOR, FCC1_WORLD, "SV", "EL SALVADOR"},
{CTRY_ESTONIA, ETSI1_WORLD, "EE", "ESTONIA"},
+ {CTRY_ETHIOPIA, ETSI1_WORLD, "ET", "ETHIOPIA"},
{CTRY_FINLAND, ETSI1_WORLD, "FI", "FINLAND"},
{CTRY_FRANCE, ETSI1_WORLD, "FR", "FRANCE"},
+ {CTRY_FRENCH_GUIANA, ETSI1_WORLD, "GF", "FRENCH GUIANA"},
+ {CTRY_FRENCH_POLYNESIA, ETSI1_WORLD, "PF", "FRENCH POLYNESIA"},
{CTRY_GEORGIA, ETSI4_WORLD, "GE", "GEORGIA"},
{CTRY_GERMANY, ETSI1_WORLD, "DE", "GERMANY"},
+ {CTRY_GHANA, FCC3_WORLD, "GH", "GHANA"},
{CTRY_GREECE, ETSI1_WORLD, "GR", "GREECE"},
{CTRY_GREENLAND, ETSI1_WORLD, "GL", "GREENLAND"},
{CTRY_GRENADA, FCC3_FCCA, "GD", "GRENADA"},
- {CTRY_GUAM, FCC1_FCCA, "GU", "GUAM"},
- {CTRY_GUATEMALA, FCC1_FCCA, "GT", "GUATEMALA"},
- {CTRY_HAITI, ETSI1_WORLD, "HT", "HAITI"},
+ {CTRY_GUADELOUPE, ETSI1_WORLD, "GP", "GUADELOUPE"},
+ {CTRY_GUAM, FCC3_FCCA, "GU", "GUAM"},
+ {CTRY_GUATEMALA, ETSI1_WORLD, "GT", "GUATEMALA"},
+ {CTRY_GUYANA, APL1_ETSIC, "GY", "GUYANA"},
+ {CTRY_HAITI, FCC3_FCCA, "HT", "HAITI"},
{CTRY_HONDURAS, FCC3_WORLD, "HN", "HONDURAS"},
{CTRY_HONG_KONG, FCC3_WORLD, "HK", "HONG KONG"},
{CTRY_HUNGARY, ETSI1_WORLD, "HU", "HUNGARY"},
{CTRY_ICELAND, ETSI1_WORLD, "IS", "ICELAND"},
{CTRY_INDIA, APL6_WORLD, "IN", "INDIA"},
- {CTRY_INDONESIA, APL2_WORLD, "ID", "INDONESIA"},
+ {CTRY_INDONESIA, APL2_ETSIC, "ID", "INDONESIA"},
{CTRY_IRAN, APL1_WORLD, "IR", "IRAN"},
{CTRY_IRELAND, ETSI1_WORLD, "IE", "IRELAND"},
{CTRY_ISRAEL, ETSI3_WORLD, "IL", "ISRAEL"},
{CTRY_ITALY, ETSI1_WORLD, "IT", "ITALY"},
{CTRY_JAMAICA, FCC3_WORLD, "JM", "JAMAICA"},
- {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN"},
- {CTRY_JAPAN7, MKK3_MKKB, "JP", "JAPAN7"},
- {CTRY_JAPAN8, MKK3_MKKA2, "JP", "JAPAN8"},
- {CTRY_JAPAN9, MKK3_MKKC, "JP", "JAPAN9"},
- {CTRY_JAPAN10, MKK4_MKKB, "JP", "JAPAN10"},
- {CTRY_JAPAN11, MKK4_MKKA2, "JP", "JAPAN11"},
- {CTRY_JAPAN12, MKK4_MKKC, "JP", "JAPAN12"},
- {CTRY_JAPAN13, MKK5_MKKB, "JP", "JAPAN13"},
- {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN14"},
- {CTRY_JAPAN15, MKK5_MKKC, "JP", "JAPAN15"},
- {CTRY_JAPAN25, MKK3_MKKA, "JP", "JAPAN25"},
- {CTRY_JAPAN26, MKK3_MKKA1, "JP", "JAPAN26"},
- {CTRY_JAPAN27, MKK3_FCCA, "JP", "JAPAN27"},
- {CTRY_JAPAN28, MKK4_MKKA1, "JP", "JAPAN28"},
- {CTRY_JAPAN29, MKK4_FCCA, "JP", "JAPAN29"},
- {CTRY_JAPAN34, MKK9_MKKA, "JP", "JAPAN34"},
- {CTRY_JAPAN35, MKK10_MKKA, "JP", "JAPAN35"},
- {CTRY_JAPAN36, MKK4_MKKA, "JP", "JAPAN36"},
- {CTRY_JAPAN37, MKK9_FCCA, "JP", "JAPAN37"},
- {CTRY_JAPAN38, MKK9_MKKA1, "JP", "JAPAN38"},
- {CTRY_JAPAN39, MKK9_MKKC, "JP", "JAPAN39"},
- {CTRY_JAPAN40, MKK9_MKKA2, "JP", "JAPAN40"},
- {CTRY_JAPAN41, MKK10_FCCA, "JP", "JAPAN41"},
- {CTRY_JAPAN42, MKK10_MKKA1, "JP", "JAPAN42"},
- {CTRY_JAPAN43, MKK10_MKKC, "JP", "JAPAN43"},
- {CTRY_JAPAN44, MKK10_MKKA2, "JP", "JAPAN44"},
- {CTRY_JAPAN45, MKK11_MKKA, "JP", "JAPAN45"},
- {CTRY_JAPAN46, MKK11_FCCA, "JP", "JAPAN46"},
- {CTRY_JAPAN47, MKK11_MKKA1, "JP", "JAPAN47"},
- {CTRY_JAPAN48, MKK11_MKKC, "JP", "JAPAN48"},
- {CTRY_JAPAN49, MKK11_MKKA2, "JP", "JAPAN49"},
- {CTRY_JAPAN55, MKK5_MKKA, "JP", "JAPAN55"},
- {CTRY_JAPAN56, MKK5_FCCA, "JP", "JAPAN56"},
- {CTRY_JORDAN, ETSI2_WORLD, "JO", "JORDAN"},
+ {CTRY_JORDAN, APL4_WORLD, "JO", "JORDAN"},
{CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KAZAKHSTAN"},
- {CTRY_KENYA, APL1_WORLD, "KE", "KENYA"},
- {CTRY_KOREA_NORTH, APL9_MKKC, "KP", "NORTH KOREA"},
- {CTRY_KOREA_ROC, APL10_MKKC, "KR", "KOREA REPUBLIC"},
- {CTRY_KOREA_ROC_AP, APL9_MKKC, "KR", "KOREA REPUBLIC3"},
+ {CTRY_KENYA, APL12_WORLD, "KE", "KENYA"},
+ {CTRY_KOREA_NORTH, APL9_WORLD, "KP", "NORTH KOREA"},
+ {CTRY_KOREA_ROC, APL9_WORLD, "KR", "KOREA REPUBLIC"},
{CTRY_KUWAIT, ETSI3_WORLD, "KW", "KUWAIT"},
{CTRY_LATVIA, ETSI1_WORLD, "LV", "LATVIA"},
- {CTRY_LEBANON, APL1_WORLD, "LB", "LEBANON"},
+ {CTRY_LEBANON, FCC3_WORLD, "LB", "LEBANON"},
+ {CTRY_LESOTHO, ETSI1_WORLD, "LS", "LESOTHO"},
{CTRY_LIECHTENSTEIN, ETSI1_WORLD, "LI", "LIECHTENSTEIN"},
{CTRY_LITHUANIA, ETSI1_WORLD, "LT", "LITHUANIA"},
{CTRY_LUXEMBOURG, ETSI1_WORLD, "LU", "LUXEMBOURG"},
- {CTRY_MACAU, FCC2_WORLD, "MO", "MACAU SAR"},
+ {CTRY_MACAU, FCC3_WORLD, "MO", "MACAU SAR"},
{CTRY_MACEDONIA, ETSI1_WORLD, "MK", "MACEDONIA, FYRO"},
- {CTRY_MALAYSIA, FCC1_WORLD, "MY", "MALAYSIA"},
+ {CTRY_MALAWI, ETSI1_WORLD, "MW", "MALAWI"},
+ {CTRY_MALAYSIA, FCC11_WORLD, "MY", "MALAYSIA"},
+ {CTRY_MALDIVES, APL6_WORLD, "MV", "MALDIVES"},
{CTRY_MALTA, ETSI1_WORLD, "MT", "MALTA"},
- {CTRY_MAURITIUS, ETSI1_WORLD, "MU", "MAURITIUS"},
- {CTRY_MEXICO, FCC1_WORLD, "MX", "MEXICO"},
- {CTRY_MONACO, ETSI4_WORLD, "MC", "MONACO"},
- {CTRY_MOROCCO, APL4_WORLD, "MA", "MOROCCO"},
- {CTRY_NEPAL, APL1_WORLD, "NP", "NEPAL"},
+ {CTRY_MARSHALL_ISLANDS, FCC3_FCCA, "MH", "MARSHALL ISLANDS"},
+ {CTRY_MARTINIQUE, ETSI1_WORLD, "MQ", "MARTINIQUE"},
+ {CTRY_MAURITANIA, ETSI1_WORLD, "MR", "MAURITANA"},
+ {CTRY_MAURITIUS, FCC3_WORLD, "MU", "MAURITIUS"},
+ {CTRY_MAYOTTE, ETSI1_WORLD, "YT", "MAYOTTE"},
+ {CTRY_MEXICO, FCC3_ETSIC, "MX", "MEXICO"},
+ {CTRY_MICRONESIA, FCC3_FCCA, "FM", "MICRONESIA"},
+ {CTRY_MOLDOVA, ETSI1_WORLD, "MD", "MOLDOVA"},
+ {CTRY_MONACO, ETSI1_WORLD, "MC", "MONACO"},
+ {CTRY_MONGOLIA, FCC3_WORLD, "MN", "MONGOLIA"},
+ {CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "MONTENEGRO"},
+ {CTRY_MOROCCO, ETSI3_WORLD, "MA", "MOROCCO"},
+ {CTRY_NEPAL, APL6_WORLD, "NP", "NEPAL"},
{CTRY_NETHERLANDS, ETSI1_WORLD, "NL", "NETHERLANDS"},
{CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", "NETHERLANDS ANTILLES"},
{CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", "NEW ZEALAND"},
+ {CTRY_NIGERIA, APL8_WORLD, "NG", "NIGERIA"},
+ {CTRY_NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, "MP", "MARIANA ISLANDS"},
{CTRY_NICARAGUA, FCC3_FCCA, "NI", "NICARAGUA"},
{CTRY_NORWAY, ETSI1_WORLD, "NO", "NORWAY"},
- {CTRY_OMAN, FCC3_WORLD, "OM", "OMAN"},
+ {CTRY_OMAN, ETSI1_WORLD, "OM", "OMAN"},
{CTRY_PAKISTAN, APL1_WORLD, "PK", "PAKISTAN"},
+ {CTRY_PALAU, FCC3_FCCA, "PW", "PALAU"},
{CTRY_PANAMA, FCC1_FCCA, "PA", "PANAMA"},
- {CTRY_PAPUA_NEW_GUINEA, FCC1_WORLD, "PG", "PAPUA NEW GUINEA"},
+ {CTRY_PAPUA_NEW_GUINEA, FCC3_WORLD, "PG", "PAPUA NEW GUINEA"},
{CTRY_PARAGUAY, FCC3_WORLD, "PY", "PARAGUAY"},
{CTRY_PERU, FCC3_WORLD, "PE", "PERU"},
{CTRY_PHILIPPINES, FCC3_WORLD, "PH", "PHILIPPINES"},
{CTRY_POLAND, ETSI1_WORLD, "PL", "POLAND"},
{CTRY_PORTUGAL, ETSI1_WORLD, "PT", "PORTUGAL"},
- {CTRY_PUERTO_RICO, FCC1_FCCA, "PR", "PUERTO RICO"},
+ {CTRY_PUERTO_RICO, FCC3_FCCA, "PR", "PUERTO RICO"},
{CTRY_QATAR, APL1_WORLD, "QA", "QATAR"},
+ {CTRY_REUNION, ETSI1_WORLD, "RE", "REUNION"},
{CTRY_ROMANIA, ETSI1_WORLD, "RO", "ROMANIA"},
{CTRY_RUSSIA, ETSI8_WORLD, "RU", "RUSSIA"},
- {CTRY_RWANDA, APL1_WORLD, "RW", "RWANDA"},
- {CTRY_SAUDI_ARABIA, FCC2_WORLD, "SA", "SAUDI ARABIA"},
+ {CTRY_RWANDA, FCC3_WORLD, "RW", "RWANDA"},
+ {CTRY_SAINT_BARTHELEMY, ETSI1_WORLD, "BL", "SAINT BARTHELEMY"},
+ {CTRY_SAINT_KITTS_AND_NEVIS, APL10_WORLD, "KN", "SAINT KITTS"},
+ {CTRY_SAINT_LUCIA, APL10_WORLD, "LC", "SAINT LUCIA"},
+ {CTRY_SAINT_MARTIN, ETSI1_WORLD, "MF", "SAINT MARTIN"},
+ {CTRY_SAINT_PIERRE_AND_MIQUELON, ETSI1_WORLD, "PM", "SAINT PIERRE"},
+ {CTRY_SAINT_VINCENT_AND_THE_GRENADIENS, ETSI1_WORLD, "VC", "VINCENT"},
+ {CTRY_SAMOA, ETSI1_WORLD, "WS", "SAMOA"},
+ {CTRY_SAUDI_ARABIA, ETSI1_WORLD, "SA", "SAUDI ARABIA"},
+ {CTRY_SENEGAL, FCC3_WORLD, "SN", "SENEGAL"},
{CTRY_SERBIA, ETSI1_WORLD, "RS", "REPUBLIC OF SERBIA"},
- {CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "MONTENEGRO"},
{CTRY_SINGAPORE, FCC3_WORLD, "SG", "SINGAPORE"},
{CTRY_SLOVAKIA, ETSI1_WORLD, "SK", "SLOVAKIA"},
{CTRY_SLOVENIA, ETSI1_WORLD, "SI", "SLOVENIA"},
{CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", "SOUTH AFRICA"},
{CTRY_SPAIN, ETSI1_WORLD, "ES", "SPAIN"},
+ {CTRY_SURINAME, ETSI1_WORLD, "SR", "SURINAME"},
{CTRY_SRI_LANKA, FCC3_WORLD, "LK", "SRI LANKA"},
{CTRY_SWEDEN, ETSI1_WORLD, "SE", "SWEDEN"},
{CTRY_SWITZERLAND, ETSI1_WORLD, "CH", "SWITZERLAND"},
{CTRY_SYRIA, NULL1_WORLD, "SY", "SYRIAN ARAB REPUBLIC"},
- {CTRY_TAIWAN, APL7_FCCA, "TW", "TAIWAN"},
+ {CTRY_TAIWAN, FCC3_FCCA, "TW", "TAIWAN"},
{CTRY_TANZANIA, APL1_WORLD, "TZ", "TANZANIA"},
{CTRY_THAILAND, FCC3_WORLD, "TH", "THAILAND"},
+ {CTRY_TOGO, ETSI1_WORLD, "TG", "TOGO"},
{CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", "TRINIDAD AND TOBAGO"},
{CTRY_TUNISIA, ETSI3_WORLD, "TN", "TUNISIA"},
- {CTRY_TURKEY, ETSI3_WORLD, "TR", "TURKEY"},
+ {CTRY_TURKEY, ETSI1_WORLD, "TR", "TURKEY"},
+ {CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC" "TURKS AND CAICOS"},
{CTRY_UGANDA, FCC3_WORLD, "UG", "UGANDA"},
{CTRY_UKRAINE, ETSI9_WORLD, "UA", "UKRAINE"},
- {CTRY_UAE, ETSI1_WORLD, "AE", "UNITED ARAB EMIRATES"},
+ {CTRY_UAE, FCC3_WORLD, "AE", "UNITED ARAB EMIRATES"},
{CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB", "UNITED KINGDOM"},
- {CTRY_UNITED_STATES, FCC3_FCCA, "US", "UNITED STATES"},
- {CTRY_UNITED_STATES_AP, FCC6_FCCA, "US", "UNITED STATES2"},
+ {CTRY_UNITED_STATES, FCC8_FCCA, "US", "UNITED STATES"},
{CTRY_UNITED_STATES_PS, FCC4_FCCA, "PS", "US PUBLIC SAFETY"},
- {CTRY_URUGUAY, FCC3_WORLD, "UY", "URUGUAY"},
- {CTRY_UZBEKISTAN, FCC3_FCCA, "UZ", "UZBEKISTAN"},
- {CTRY_VENEZUELA, FCC1_WORLD, "VE", "VENEZUELA"},
- {CTRY_VIET_NAM, ETSI3_WORLD, "VN", "VIETNAM"},
+ {CTRY_URUGUAY, FCC2_WORLD, "UY", "URUGUAY"},
+ {CTRY_UZBEKISTAN, ETSI3_WORLD, "UZ", "UZBEKISTAN"},
+ {CTRY_VANUATU, FCC3_WORLD, "VU", "VANUATU"},
+ {CTRY_VENEZUELA, FCC2_ETSIC, "VE", "VENEZUELA"},
+ {CTRY_VIET_NAM, FCC3_WORLD, "VN", "VIETNAM"},
+ {CTRY_VIRGIN_ISLANDS, FCC3_FCCA, "VI", "VIRGIN ISLANDS"},
+ {CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF" "WALLIS"},
{CTRY_YEMEN, NULL1_WORLD, "YE", "YEMEN"},
- {CTRY_ZIMBABWE, NULL1_WORLD, "ZW", "ZIMBABWE"}
+ {CTRY_ZIMBABWE, ETSI1_WORLD, "ZW", "ZIMBABWE"},
+ {CTRY_JAPAN14, MKK5_MKKA, "JP", "JAPAN"}
};
static const struct reg_dmn g_reg_dmns[] = {
- {DEBUG_REG_DMN, FCC},
- {APL1, FCC},
- {APL2, FCC},
- {APL3, FCC},
- {APL4, FCC},
- {APL5, FCC},
- {APL6, ETSI},
- {APL7, FCC},
- {APL8, ETSI},
- {APL9, ETSI},
- {APL10, ETSI},
- {APL11, ETSI},
- {APL12, ETSI},
+ {FCC1, FCC},
+ {FCC2, FCC},
+ {FCC3, FCC},
+ {FCC4, FCC},
+ {FCC5, FCC},
+ {FCC6, FCC},
+ {FCC7, FCC},
+ {FCC8, FCC},
+ {FCC9, FCC},
+ {FCC10, FCC},
+ {FCC11, FCC},
{ETSI1, ETSI},
{ETSI2, ETSI},
{ETSI3, ETSI},
@@ -431,49 +402,46 @@
{ETSI6, ETSI},
{ETSI8, ETSI},
{ETSI9, ETSI},
- {FCC1, FCC},
- {FCC2, FCC},
- {FCC3, FCC},
- {FCC4, FCC},
- {FCC5, FCC},
- {FCC6, FCC},
- {MKK1, MKK},
- {MKK2, MKK},
+ {ETSI10, ETSI},
+ {ETSI11, ETSI},
+ {APL1, ETSI},
+ {APL2, ETSI},
+ {APL3, ETSI},
+ {APL4, ETSI},
+ {APL5, ETSI},
+ {APL6, ETSI},
+ {APL7, ETSI},
+ {APL8, ETSI},
+ {APL9, ETSI},
+ {APL10, ETSI},
+ {APL11, ETSI},
+ {APL12, ETSI},
+ {APL13, ETSI},
+ {NULL1, NO_CTL},
{MKK3, MKK},
{MKK4, MKK},
{MKK5, MKK},
- {MKK6, MKK},
- {MKK7, MKK},
- {MKK8, MKK},
{MKK9, MKK},
{MKK10, MKK},
{MKK11, MKK},
- {MKK12, MKK},
- {MKK13, MKK},
- {MKK14, MKK},
- {MKK15, MKK},
- {APLD, NO_CTL},
- {ETSIA, NO_CTL},
- {ETSIB, ETSI},
- {ETSIC, ETSI},
+ {WORLD, ETSI},
{FCCA, FCC},
{MKKA, MKK},
{MKKC, MKK},
- {WORLD, ETSI},
+ {ETSIC, ETSI},
{WOR0_WORLD, NO_CTL},
- {WOR01_WORLD, NO_CTL},
- {WOR02_WORLD, NO_CTL},
- {EU1_WORLD, NO_CTL},
{WOR1_WORLD, NO_CTL},
{WOR2_WORLD, NO_CTL},
{WOR3_WORLD, NO_CTL},
- {WOR4_WORLD, NO_CTL},
+ {WOR4_FCCA, NO_CTL},
{WOR5_ETSIC, NO_CTL},
+ {WOR01_WORLD, NO_CTL},
+ {WOR02_WORLD, NO_CTL},
+ {EU1_WORLD, NO_CTL},
{WOR9_WORLD, NO_CTL},
{WORA_WORLD, NO_CTL},
{WORB_WORLD, NO_CTL},
{WORC_WORLD, NO_CTL},
- {NULL1, NO_CTL},
};