diff --git a/sys/net80211/ieee80211_regdomain.h b/sys/net80211/ieee80211_regdomain.h --- a/sys/net80211/ieee80211_regdomain.h +++ b/sys/net80211/ieee80211_regdomain.h @@ -33,13 +33,14 @@ /* * ISO 3166 Country/Region Codes - * http://ftp.ics.uci.edu/pub/ietf/http/related/iso3166.txt + * https://ftp.ripe.net/iso3166-countrycodes.txt */ enum ISOCountryCode { - CTRY_AFGHANISTAN = 4, + CTRY_AFGHANISTAN = 4, /* Afghanistan */ + CTRY_ALAND_ISLANDS = 248, /* Aland Islands */ CTRY_ALBANIA = 8, /* Albania */ CTRY_ALGERIA = 12, /* Algeria */ - CTRY_AMERICAN_SAMOA = 16, + CTRY_AMERICAN_SAMOA = 16, /* American Samoa */ CTRY_ANDORRA = 20, CTRY_ANGOLA = 24, CTRY_ANGUILLA = 660, @@ -47,7 +48,7 @@ CTRY_ANTIGUA = 28, /* Antigua and Barbuda */ CTRY_ARGENTINA = 32, /* Argentina */ CTRY_ARMENIA = 51, /* Armenia */ - CTRY_ARUBA = 533, /* Aruba */ + CTRY_ARUBA = 553, /* Aruba */ CTRY_AUSTRALIA = 36, /* Australia */ CTRY_AUSTRIA = 40, /* Austria */ CTRY_AZERBAIJAN = 31, /* Azerbaijan */ @@ -61,12 +62,14 @@ CTRY_BENIN = 204, CTRY_BERMUDA = 60, CTRY_BHUTAN = 64, - CTRY_BOLIVIA = 68, /* Bolivia */ + CTRY_BOLIVIA = 68, /* Plurinational State of Bolivia */ + CTRY_BONAIRE = 535, CTRY_BOSNIA_AND_HERZEGOWINA = 70, CTRY_BOTSWANA = 72, CTRY_BOUVET_ISLAND = 74, CTRY_BRAZIL = 76, /* Brazil */ CTRY_BRITISH_INDIAN_OCEAN_TERRITORY = 86, + CTRY_BRITISH_VIRGIN_ISLANDS = 92, CTRY_BRUNEI_DARUSSALAM = 96, /* Brunei Darussalam */ CTRY_BULGARIA = 100, /* Bulgaria */ CTRY_BURKINA_FASO = 854, @@ -89,29 +92,32 @@ CTRY_COSTA_RICA = 188, /* Costa Rica */ CTRY_COTE_DIVOIRE = 384, CTRY_CROATIA = 191, /* Croatia (local name: Hrvatska) */ + CTRY_CUBA = 192, /* Cuba */ + CTRY_CURACAO = 531, /* Curacao */ CTRY_CYPRUS = 196, /* Cyprus */ CTRY_CZECH = 203, /* Czech Republic */ + CTRY_DEMOCRATIC_REPUBLIC_OF_THE_CONGO = 180, CTRY_DENMARK = 208, /* Denmark */ CTRY_DJIBOUTI = 262, CTRY_DOMINICA = 212, CTRY_DOMINICAN_REPUBLIC = 214, /* Dominican Republic */ - CTRY_EAST_TIMOR = 626, + CTRY_EAST_TIMOR = 626, /* Timor-Leste */ CTRY_ECUADOR = 218, /* Ecuador */ CTRY_EGYPT = 818, /* Egypt */ CTRY_EL_SALVADOR = 222, /* El Salvador */ CTRY_EQUATORIAL_GUINEA = 226, CTRY_ERITREA = 232, CTRY_ESTONIA = 233, /* Estonia */ - CTRY_ETHIOPIA = 210, - CTRY_FALKLAND_ISLANDS = 238, /* (Malvinas) */ + CTRY_ESWATINI = 748, + CTRY_ETHIOPIA = 231, /* Formerly 210 */ CTRY_FAEROE_ISLANDS = 234, /* Faeroe Islands */ + CTRY_FALKLAND_ISLANDS = 238, /* (Malvinas) */ CTRY_FIJI = 242, CTRY_FINLAND = 246, /* Finland */ CTRY_FRANCE = 250, /* France */ - CTRY_FRANCE2 = 255, /* France (Metropolitan) */ CTRY_FRENCH_GUIANA = 254, CTRY_FRENCH_POLYNESIA = 258, - CTRY_FRENCH_SOUTHERN_TERRITORIES = 260, + CTRY_FRENCH_SOUTHERN_TERRITORIES = 260, CTRY_GABON = 266, CTRY_GAMBIA = 270, CTRY_GEORGIA = 268, /* Georgia */ @@ -124,11 +130,13 @@ CTRY_GUADELOUPE = 312, CTRY_GUAM = 316, CTRY_GUATEMALA = 320, /* Guatemala */ + CTRY_GUERNSEY = 831, CTRY_GUINEA = 324, CTRY_GUINEA_BISSAU = 624, CTRY_GUYANA = 328, - /* XXX correct remainder */ CTRY_HAITI = 332, + CTRY_HEARD_AND_MCDONALD_ISLANDS = 334, + CTRY_HOLY_SEE = 336, /* Holy See of Rome, Vatican */ CTRY_HONDURAS = 340, /* Honduras */ CTRY_HONG_KONG = 344, /* Hong Kong S.A.R., P.R.C. */ CTRY_HUNGARY = 348, /* Hungary */ @@ -138,78 +146,151 @@ CTRY_IRAN = 364, /* Iran */ CTRY_IRAQ = 368, /* Iraq */ CTRY_IRELAND = 372, /* Ireland */ + CTRY_ISLE_OF_MAN = 833, CTRY_ISRAEL = 376, /* Israel */ CTRY_ITALY = 380, /* Italy */ CTRY_JAMAICA = 388, /* Jamaica */ CTRY_JAPAN = 392, /* Japan */ + CTRY_JERSEY = 832, CTRY_JORDAN = 400, /* Jordan */ CTRY_KAZAKHSTAN = 398, /* Kazakhstan */ CTRY_KENYA = 404, /* Kenya */ + CTRY_KIRIBATI = 296, CTRY_KOREA_NORTH = 408, /* North Korea */ CTRY_KOREA_ROC = 410, /* South Korea */ - CTRY_KOREA_ROC2 = 411, /* South Korea */ CTRY_KUWAIT = 414, /* Kuwait */ + CTRY_KYRGYZSTAN = 417, + CTRY_LAO = 418, /* Lao People's Democratic Republic */ CTRY_LATVIA = 428, /* Latvia */ CTRY_LEBANON = 422, /* Lebanon */ + CTRY_LESOTHO = 426, + CTRY_LIBERIA = 430, CTRY_LIBYA = 434, /* Libya */ CTRY_LIECHTENSTEIN = 438, /* Liechtenstein */ CTRY_LITHUANIA = 440, /* Lithuania */ CTRY_LUXEMBOURG = 442, /* Luxembourg */ CTRY_MACAU = 446, /* Macau */ CTRY_MACEDONIA = 807, /* the Former Yugoslav Republic of Macedonia */ + CTRY_MADAGASCAR = 450, + CTRY_MALAWI = 454, CTRY_MALAYSIA = 458, /* Malaysia */ + CTRY_MALDIVES = 462, + CTRY_MALI = 466, CTRY_MALTA = 470, /* Malta */ + CTRY_MARSHALL_ISLANDS = 485, + CTRY_MARTINIQUE = 474, + CTRY_MAURITANIA = 478, + CTRY_MAURITIUS = 480, + CTRY_MAYOTTE = 175, CTRY_MEXICO = 484, /* Mexico */ + CTRY_MICRONESIA = 583, /* Federated States of Micronesia */ + CTRY_MOLDOVA = 498, /* Republic of Moldova */ CTRY_MONACO = 492, /* Principality of Monaco */ + CTRY_MONGOLIA = 496, + CTRY_MONTENEGRO = 499, + CTRY_MONTSERRAT = 500, CTRY_MOROCCO = 504, /* Morocco */ + CTRY_MOZAMBIQUE = 508, + CTRY_MYANMAR = 104, /* Republic of the Union of Mynamar, formerly Burma */ + CTRY_NAMIBIA = 516, + CTRY_NAURU = 520, CTRY_NEPAL = 524, /* Nepal */ - CTRY_NETHERLANDS = 528, /* Netherlands */ + CTRY_NETHERLANDS = 528, /* Kingdom of the Netherlands */ + CTRY_NEW_CALEDONIA = 540, CTRY_NEW_ZEALAND = 554, /* New Zealand */ CTRY_NICARAGUA = 558, /* Nicaragua */ + CTRY_NIGER = 562, + CTRY_NIGERIA = 566, + CTRY_NIUE = 570, + CTRY_NORFOLK_ISLAND = 574, + CTRY_NORTH_MARIANA_ISLANDS = 580, /* Northern Mariana Islands */ CTRY_NORWAY = 578, /* Norway */ CTRY_OMAN = 512, /* Oman */ CTRY_PAKISTAN = 586, /* Islamic Republic of Pakistan */ + CTRY_PALAU = 585, + CTRY_PALESTINE = 275, /* State of Palestine */ CTRY_PANAMA = 591, /* Panama */ + CTRY_PAPUA_NEW_GUINEA = 598, CTRY_PARAGUAY = 600, /* Paraguay */ CTRY_PERU = 604, /* Peru */ CTRY_PHILIPPINES = 608, /* Republic of the Philippines */ + CTRY_PIERRA_AND_MIQUELON = 666, + CTRY_PITCAIRN = 612, CTRY_POLAND = 616, /* Poland */ CTRY_PORTUGAL = 620, /* Portugal */ CTRY_PUERTO_RICO = 630, /* Puerto Rico */ CTRY_QATAR = 634, /* Qatar */ + CTRY_REUNION = 638, CTRY_ROMANIA = 642, /* Romania */ - CTRY_RUSSIA = 643, /* Russia */ + CTRY_RUSSIA = 643, /* Russia Federation */ + CTRY_RWANDA = 646, + CTRY_SAINT_BARTHELEMY = 652, + CTRY_SAINT_HELENA = 654, + CTRY_SAINT_KITTS_AND_NEVIS = 659, + CTRY_SAINT_LUCIA = 662, + CTRY_SAINT_MARTIN = 663, + CTRY_SAINT_VINCENT_AND_THE_GRENADINES = 670, + CTRY_SAMOA = 882, + CTRY_SAN_MARINO = 674, + CTRY_SAO_TOME_AND_PRINCIPE = 678, CTRY_SAUDI_ARABIA = 682, /* Saudi Arabia */ + CTRY_SENEGAL = 686, + CTRY_SERBIA = 688, + CTRY_SEYCHELLES = 690, + CTRY_SIERRA_LEONE = 694, CTRY_SINGAPORE = 702, /* Singapore */ + CTRY_SINT_MAARTEN = 534, CTRY_SLOVAKIA = 703, /* Slovak Republic */ CTRY_SLOVENIA = 705, /* Slovenia */ + CTRY_SOLOMON_ISLANDS = 90, + CTRY_SOMALIA = 706, CTRY_SOUTH_AFRICA = 710, /* South Africa */ + CTRY_SOUTH_GEORGIA_AND_SOUTH_SANDWICH_ISLANDS = 239, + CTRY_SOUTH_SUDAN = 728, CTRY_SPAIN = 724, /* Spain */ CTRY_SRILANKA = 144, /* Sri Lanka */ + CTRY_SUDAN = 729, + CTRY_SURINAME = 740, + CTRY_SVALBARD_AND_JAN_MAYEN_ISLANDS = 744, CTRY_SWEDEN = 752, /* Sweden */ CTRY_SWITZERLAND = 756, /* Switzerland */ CTRY_SYRIA = 760, /* Syria */ CTRY_TAIWAN = 158, /* Taiwan */ + CTRY_TAJIKISTAN = 762, + CTRY_TANZANIA = 834, /* United Republic of Tanzania */ CTRY_THAILAND = 764, /* Thailand */ + CTRY_TOGO = 768, + CTRY_TOKELAU = 772, + CTRY_TONGA = 776, CTRY_TRINIDAD_Y_TOBAGO = 780, /* Trinidad y Tobago */ CTRY_TUNISIA = 788, /* Tunisia */ CTRY_TURKEY = 792, /* Turkey */ - CTRY_UAE = 784, /* U.A.E. */ + CTRY_TURKMENISTAN = 795, + CTRY_TURKS_AND_CAICOS_ISLANDS = 796, + CTRY_TUVALU = 798, + CTRY_UAE = 784, /* United Arab Emirates */ + CTRY_UGANDA = 800, CTRY_UKRAINE = 804, /* Ukraine */ - CTRY_UNITED_KINGDOM = 826, /* United Kingdom */ - CTRY_UNITED_STATES = 840, /* United States */ + CTRY_UNITED_KINGDOM = 826, /* United Kingdom of Great Britian and Northern Ireland */ + CTRY_UNITED_STATES = 840, /* United States of America */ + CTRY_UNITED_STATES_MINOR_OUTLYING_ISLANDS = 581, CTRY_URUGUAY = 858, /* Uruguay */ + CTRY_US_VIRGIN_ISLANDS = 850, CTRY_UZBEKISTAN = 860, /* Uzbekistan */ + CTRY_VANUATU = 548, CTRY_VENEZUELA = 862, /* Venezuela */ CTRY_VIET_NAM = 704, /* Viet Nam */ + CTRY_WALLIS_AND_FUTUNA_ISLANDS = 876, + CTRY_WESTERN_SAHARA = 732, CTRY_YEMEN = 887, /* Yemen */ + CTRY_ZAMBIA = 894, CTRY_ZIMBABWE = 716, /* Zimbabwe */ /* NB: from here down not listed in 3166; they come from Atheros */ CTRY_DEBUG = 0x1ff, /* debug */ CTRY_DEFAULT = 0, /* default */ - CTRY_UNITED_STATES_FCC49 = 842, /* United States (Public Safety)*/ + CTRY_UNITED_STATES_FCC49 = 842, /* United States (Public Safety) */ CTRY_KOREA_ROC3 = 412, /* South Korea */ CTRY_JAPAN1 = 393, /* Japan (JP1) */