commit 4f3d02e4c43a03e7b3c35dbfc5873675013b1445 Author: Jiri Slaby Date: Mon Jun 18 17:11:57 2007 +0200 remove unused functions from ieee80211_regdomain diff --git a/openhal/ieee80211_regdomain.c b/openhal/ieee80211_regdomain.c index 4c0fd06..a2fd25a 100644 --- a/openhal/ieee80211_regdomain.c +++ b/openhal/ieee80211_regdomain.c @@ -15,98 +15,61 @@ #include "ieee80211_regdomain.h" -static const struct ieee80211_regdomainname -ieee80211_r_names[] = IEEE80211_REGDOMAIN_NAMES; - -static const struct ieee80211_regdomainmap -ieee80211_r_map[] = IEEE80211_REGDOMAIN_MAP; - -static const struct ieee80211_countryname -ieee80211_r_ctry[] = IEEE80211_REGDOMAIN_COUNTRY_NAMES; - -#ifndef bsearch -static const void *bsearch(const void *key, const void *base0, size_t nmemb, - size_t size, int (*compar)(const void *, const void *)) -{ - const char *base = base0; - int lim, cmp; - const void *p; - - for (lim = nmemb; lim != 0; lim /= 2) { - p = base + (lim / 2) * size; - cmp = (*compar)(key, p); - if (cmp == 0) - return p; - if (cmp > 0) { /* key > p: move right */ - base = p + size; - lim--; - } /* else move left */ - } - return NULL; -} -#endif - -static int ieee80211_regdomain_compare_cn(const void *a, const void *b) -{ - const struct ieee80211_countryname *ca = a, *cb = b; - return strcmp(ca->cn_name, cb->cn_name); -} - -static int ieee80211_regdomain_compare_rn(const void *a, const void *b) -{ - const struct ieee80211_regdomainname *ra = a, *rb = b; - return strcmp(ra->rn_name, rb->rn_name); -} - -u16 ieee80211_name2countrycode(const char *name) -{ - const struct ieee80211_countryname key = { CTRY_DEFAULT, name }, *value; - - value = bsearch(&key, &ieee80211_r_ctry, ARRAY_SIZE(ieee80211_r_ctry), - sizeof(struct ieee80211_countryname), - ieee80211_regdomain_compare_cn); - if (value != 0) - return value->cn_code; - - return CTRY_DEFAULT; -} - -u32 ieee80211_name2regdomain(const char *name) -{ - const struct ieee80211_regdomainname key = { DMN_DEFAULT, name },*value; - - value = bsearch(&key, &ieee80211_r_names, ARRAY_SIZE(ieee80211_r_names), - sizeof(struct ieee80211_regdomainname), - ieee80211_regdomain_compare_rn); - if (value != 0) - return (u32)value->rn_domain; - - return (u32)DMN_DEFAULT; -} - -const char *ieee80211_countrycode2name(u16 code) -{ - unsigned int i; - - /* Linear search over the table */ - for (i = 0; i < ARRAY_SIZE(ieee80211_r_ctry); i++) - if (ieee80211_r_ctry[i].cn_code == code) - return ieee80211_r_ctry[i].cn_name; - - return NULL; -} - -const char *ieee80211_regdomain2name(u_int32_t regdomain) -{ - unsigned int i; - - /* Linear search over the table */ - for (i = 0; i < ARRAY_SIZE(ieee80211_r_names); i++) - if (ieee80211_r_names[i].rn_domain == regdomain) - return ieee80211_r_names[i].rn_name; - - return ieee80211_r_names[0].rn_name; -} +static const struct ieee80211_regdomainmap { + u16 rm_domain; + u32 rm_domain_5ghz; + u32 rm_domain_2ghz; +} ieee80211_r_map[] = { + { DMN_DEFAULT, DMN_DEBUG, DMN_DEBUG }, + { DMN_NULL_WORLD, DMN_NULL, DMN_WORLD }, + { DMN_NULL_ETSIB, DMN_NULL, DMN_ETSIB }, + { DMN_NULL_ETSIC, DMN_NULL, DMN_ETSIC }, + { DMN_FCC1_FCCA, DMN_FCC1, DMN_FCCA }, + { DMN_FCC1_WORLD, DMN_FCC1, DMN_WORLD }, + { DMN_FCC2_FCCA, DMN_FCC2, DMN_FCCA }, + { DMN_FCC2_WORLD, DMN_FCC2, DMN_WORLD }, + { DMN_FCC2_ETSIC, DMN_FCC2, DMN_ETSIC }, + { DMN_FRANCE_NULL, DMN_ETSI3, DMN_ETSI3 }, + { DMN_FCC3_FCCA, DMN_FCC3, DMN_WORLD }, + { DMN_ETSI1_WORLD, DMN_ETSI1, DMN_WORLD }, + { DMN_ETSI3_ETSIA, DMN_ETSI3, DMN_WORLD }, + { DMN_ETSI2_WORLD, DMN_ETSI2, DMN_WORLD }, + { DMN_ETSI3_WORLD, DMN_ETSI3, DMN_WORLD }, + { DMN_ETSI4_WORLD, DMN_ETSI4, DMN_WORLD }, + { DMN_ETSI4_ETSIC, DMN_ETSI4, DMN_ETSIC }, + { DMN_ETSI5_WORLD, DMN_ETSI5, DMN_WORLD }, + { DMN_ETSI6_WORLD, DMN_ETSI6, DMN_WORLD }, + { DMN_ETSI_NULL, DMN_ETSI1, DMN_ETSI1 }, + { DMN_MKK1_MKKA, DMN_MKK1, DMN_MKKA }, + { DMN_MKK1_MKKB, DMN_MKK1, DMN_MKKA }, + { DMN_APL4_WORLD, DMN_APL4, DMN_WORLD }, + { DMN_MKK2_MKKA, DMN_MKK2, DMN_MKKA }, + { DMN_APL_NULL, DMN_APL1, DMN_NULL }, + { DMN_APL2_WORLD, DMN_APL2, DMN_WORLD }, + { DMN_APL2_APLC, DMN_APL2, DMN_WORLD }, + { DMN_APL3_WORLD, DMN_APL3, DMN_WORLD }, + { DMN_MKK1_FCCA, DMN_MKK1, DMN_FCCA }, + { DMN_APL2_APLD, DMN_APL2, DMN_APLD }, + { DMN_MKK1_MKKA1, DMN_MKK1, DMN_MKKA }, + { DMN_MKK1_MKKA2, DMN_MKK1, DMN_MKKA }, + { DMN_APL1_WORLD, DMN_APL1, DMN_WORLD }, + { DMN_APL1_FCCA, DMN_APL1, DMN_FCCA }, + { DMN_APL1_APLA, DMN_APL1, DMN_WORLD }, + { DMN_APL1_ETSIC, DMN_APL1, DMN_ETSIC }, + { DMN_APL2_ETSIC, DMN_APL2, DMN_ETSIC }, + { DMN_APL5_WORLD, DMN_APL5, DMN_WORLD }, + { DMN_WOR0_WORLD, DMN_WORLD, DMN_WORLD }, + { DMN_WOR1_WORLD, DMN_WORLD, DMN_WORLD }, + { DMN_WOR2_WORLD, DMN_WORLD, DMN_WORLD }, + { DMN_WOR3_WORLD, DMN_WORLD, DMN_WORLD }, + { DMN_WOR4_WORLD, DMN_WORLD, DMN_WORLD }, + { DMN_WOR5_ETSIC, DMN_WORLD, DMN_WORLD }, + { DMN_WOR01_WORLD, DMN_WORLD, DMN_WORLD }, + { DMN_WOR02_WORLD, DMN_WORLD, DMN_WORLD }, + { DMN_EU1_WORLD, DMN_ETSI1, DMN_WORLD }, + { DMN_WOR9_WORLD, DMN_WORLD, DMN_WORLD }, + { DMN_WORA_WORLD, DMN_WORLD, DMN_WORLD }, +}; u32 ieee80211_regdomain2flag(u16 regdomain, u16 mhz) { @@ -124,14 +87,3 @@ u32 ieee80211_regdomain2flag(u16 regdomain, u16 mhz) return (u32)DMN_DEBUG; } - -u32 ieee80211_countrycode2regdomain(u16 code) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(ieee80211_r_ctry); i++) - if (ieee80211_r_ctry[i].cn_code == code) - return ieee80211_r_ctry[i].cn_domain; - - return (u32)DMN_DEFAULT; -} diff --git a/openhal/ieee80211_regdomain.h b/openhal/ieee80211_regdomain.h index 7df7990..8d9ad74 100644 --- a/openhal/ieee80211_regdomain.h +++ b/openhal/ieee80211_regdomain.h @@ -1,19 +1,9 @@ -/* $OpenBSD: ieee80211_regdomain.h,v 1.8 2005/12/18 17:59:59 reyk Exp $ */ - /* * Copyright (c) 2004, 2005 Reyk Floeter * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #ifndef _NET80211_IEEE80211_REGDOMAIN_H_ @@ -101,146 +91,6 @@ enum ieee80211_regdomain { #define IEEE80211_DMN(_d) ((_d) & ~0xf0000000) -struct ieee80211_regdomainname { - u32 rn_domain; - const char *rn_name; -}; - -#define IEEE80211_REGDOMAIN_NAMES { \ - { DMN_APL1, "APL1" }, \ - { DMN_APL1_APLA, "APL1A" }, \ - { DMN_APL1_ETSIC, "APL1_ETSIC" }, \ - { DMN_APL1_FCCA, "APL1_FCCA" }, \ - { DMN_APL1_WORLD, "APL1W" }, \ - { DMN_APL2, "APL2" }, \ - { DMN_APL2_APLC, "APL2C" }, \ - { DMN_APL2_APLD, "APL2D" }, \ - { DMN_APL2_ETSIC, "APL2_ETSIC" }, \ - { DMN_APL2_WORLD, "APL2W" }, \ - { DMN_APL3, "APL3" }, \ - { DMN_APL3_WORLD, "APL3W" }, \ - { DMN_APL4, "APL4" }, \ - { DMN_APL4_WORLD, "APL4W" }, \ - { DMN_APL5, "APL5" }, \ - { DMN_APL5_WORLD, "APL5W" }, \ - { DMN_APLD, "APLD" }, \ - { DMN_APL_NULL, "APL" }, \ - { DMN_DEBUG, "DEBUG" }, \ - { DMN_ETSI1, "ETSI1" }, \ - { DMN_ETSI1_WORLD, "ETSI1W" }, \ - { DMN_ETSI2, "ETSI2" }, \ - { DMN_ETSI2_WORLD, "ETSI2W" }, \ - { DMN_ETSI3, "ETSI3" }, \ - { DMN_ETSI3_ETSIA, "ETSI3A" }, \ - { DMN_ETSI3_WORLD, "ETSI3W," }, \ - { DMN_ETSI4, "ETSI4" }, \ - { DMN_ETSI4_ETSIC, "ETSI4C" }, \ - { DMN_ETSI4_WORLD, "ETSI4W" }, \ - { DMN_ETSI5, "ETSI5" }, \ - { DMN_ETSI5_WORLD, "ETSI5W" }, \ - { DMN_ETSI6, "ETSI6" }, \ - { DMN_ETSI6_WORLD, "ETSI6W" }, \ - { DMN_ETSIA, "ETSIA" }, \ - { DMN_ETSIB, "ETSIB" }, \ - { DMN_ETSIC, "ETSIC" }, \ - { DMN_ETSI_NULL, "ETSI" }, \ - { DMN_EU1_WORLD, "EU1W" }, \ - { DMN_FCC1, "FCC1" }, \ - { DMN_FCC1_FCCA, "FCC1A" }, \ - { DMN_FCC1_WORLD, "FCC1W" }, \ - { DMN_FCC2, "FCC2" }, \ - { DMN_FCC2_ETSIC, "FCC2C" }, \ - { DMN_FCC2_FCCA, "FCC2A" }, \ - { DMN_FCC2_WORLD, "FCC2W" }, \ - { DMN_FCC3, "FCC3" }, \ - { DMN_FCC3_FCCA, "FCC3A" }, \ - { DMN_FCCA, "FCCA" }, \ - { DMN_FRANCE_NULL, "FRANCE" }, \ - { DMN_MKK1, "MKK1" }, \ - { DMN_MKK1_FCCA, "MKK1_FCCA" }, \ - { DMN_MKK1_MKKA, "MKK1A" }, \ - { DMN_MKK1_MKKA1, "MKK1A1" }, \ - { DMN_MKK1_MKKA2, "MKK1A2" }, \ - { DMN_MKK1_MKKB, "MKK1B" }, \ - { DMN_MKK2, "MKK2" }, \ - { DMN_MKK2_MKKA, "MKK2A" }, \ - { DMN_MKKA, "MKKA" }, \ - { DMN_DEFAULT, "NONE" }, \ - { DMN_NULL, "NONE" }, \ - { DMN_NULL_ETSIB, "ETSIB" }, \ - { DMN_NULL_ETSIC, "ETSIC" }, \ - { DMN_WOR01_WORLD, "WOR01W" }, \ - { DMN_WOR02_WORLD, "WOR02W" }, \ - { DMN_WOR0_WORLD, "WOR0W" }, \ - { DMN_WOR1_WORLD, "WOR1W" }, \ - { DMN_WOR2_WORLD, "WOR2W" }, \ - { DMN_WOR3_WORLD, "WOR3W" }, \ - { DMN_WOR4_WORLD, "WOR4W" }, \ - { DMN_WOR5_ETSIC, "WOR5_ETSIC" }, \ - { DMN_WOR9_WORLD, "WOR9W" }, \ - { DMN_WORA_WORLD, "WORAW" }, \ - { DMN_NULL_WORLD, "WORLD" }, \ - { DMN_WORLD, "WORLD" } \ -} - -struct ieee80211_regdomainmap { - u16 rm_domain; - u32 rm_domain_5ghz; - u32 rm_domain_2ghz; -}; - -#define IEEE80211_REGDOMAIN_MAP { \ - { DMN_DEFAULT, DMN_DEBUG, DMN_DEBUG }, \ - { DMN_NULL_WORLD, DMN_NULL, DMN_WORLD }, \ - { DMN_NULL_ETSIB, DMN_NULL, DMN_ETSIB }, \ - { DMN_NULL_ETSIC, DMN_NULL, DMN_ETSIC }, \ - { DMN_FCC1_FCCA, DMN_FCC1, DMN_FCCA }, \ - { DMN_FCC1_WORLD, DMN_FCC1, DMN_WORLD }, \ - { DMN_FCC2_FCCA, DMN_FCC2, DMN_FCCA }, \ - { DMN_FCC2_WORLD, DMN_FCC2, DMN_WORLD }, \ - { DMN_FCC2_ETSIC, DMN_FCC2, DMN_ETSIC }, \ - { DMN_FRANCE_NULL, DMN_ETSI3, DMN_ETSI3 }, \ - { DMN_FCC3_FCCA, DMN_FCC3, DMN_WORLD }, \ - { DMN_ETSI1_WORLD, DMN_ETSI1, DMN_WORLD }, \ - { DMN_ETSI3_ETSIA, DMN_ETSI3, DMN_WORLD }, \ - { DMN_ETSI2_WORLD, DMN_ETSI2, DMN_WORLD }, \ - { DMN_ETSI3_WORLD, DMN_ETSI3, DMN_WORLD }, \ - { DMN_ETSI4_WORLD, DMN_ETSI4, DMN_WORLD }, \ - { DMN_ETSI4_ETSIC, DMN_ETSI4, DMN_ETSIC }, \ - { DMN_ETSI5_WORLD, DMN_ETSI5, DMN_WORLD }, \ - { DMN_ETSI6_WORLD, DMN_ETSI6, DMN_WORLD }, \ - { DMN_ETSI_NULL, DMN_ETSI1, DMN_ETSI1 }, \ - { DMN_MKK1_MKKA, DMN_MKK1, DMN_MKKA }, \ - { DMN_MKK1_MKKB, DMN_MKK1, DMN_MKKA }, \ - { DMN_APL4_WORLD, DMN_APL4, DMN_WORLD }, \ - { DMN_MKK2_MKKA, DMN_MKK2, DMN_MKKA }, \ - { DMN_APL_NULL, DMN_APL1, DMN_NULL }, \ - { DMN_APL2_WORLD, DMN_APL2, DMN_WORLD }, \ - { DMN_APL2_APLC, DMN_APL2, DMN_WORLD }, \ - { DMN_APL3_WORLD, DMN_APL3, DMN_WORLD }, \ - { DMN_MKK1_FCCA, DMN_MKK1, DMN_FCCA }, \ - { DMN_APL2_APLD, DMN_APL2, DMN_APLD }, \ - { DMN_MKK1_MKKA1, DMN_MKK1, DMN_MKKA }, \ - { DMN_MKK1_MKKA2, DMN_MKK1, DMN_MKKA }, \ - { DMN_APL1_WORLD, DMN_APL1, DMN_WORLD }, \ - { DMN_APL1_FCCA, DMN_APL1, DMN_FCCA }, \ - { DMN_APL1_APLA, DMN_APL1, DMN_WORLD }, \ - { DMN_APL1_ETSIC, DMN_APL1, DMN_ETSIC }, \ - { DMN_APL2_ETSIC, DMN_APL2, DMN_ETSIC }, \ - { DMN_APL5_WORLD, DMN_APL5, DMN_WORLD }, \ - { DMN_WOR0_WORLD, DMN_WORLD, DMN_WORLD }, \ - { DMN_WOR1_WORLD, DMN_WORLD, DMN_WORLD }, \ - { DMN_WOR2_WORLD, DMN_WORLD, DMN_WORLD }, \ - { DMN_WOR3_WORLD, DMN_WORLD, DMN_WORLD }, \ - { DMN_WOR4_WORLD, DMN_WORLD, DMN_WORLD }, \ - { DMN_WOR5_ETSIC, DMN_WORLD, DMN_WORLD }, \ - { DMN_WOR01_WORLD, DMN_WORLD, DMN_WORLD }, \ - { DMN_WOR02_WORLD, DMN_WORLD, DMN_WORLD }, \ - { DMN_EU1_WORLD, DMN_ETSI1, DMN_WORLD }, \ - { DMN_WOR9_WORLD, DMN_WORLD, DMN_WORLD }, \ - { DMN_WORA_WORLD, DMN_WORLD, DMN_WORLD }, \ -} - enum ieee80211_countrycode { CTRY_DEFAULT = 0, /* Default domain (NA) */ CTRY_ALBANIA = 8, /* Albania */ @@ -360,143 +210,6 @@ enum ieee80211_countrycode { CTRY_ZIMBABWE = 716, /* Zimbabwe */ }; -struct ieee80211_countryname { - u16 cn_code; - const char *cn_name; - u32 cn_domain; -}; - -#define IEEE80211_REGDOMAIN_COUNTRY_NAMES { \ - { CTRY_DEFAULT, "00", DMN_DEFAULT }, \ - { CTRY_UAE, "ae", DMN_NULL_WORLD }, \ - { CTRY_ALBANIA, "al", DMN_NULL_WORLD }, \ - { CTRY_ARMENIA, "am", DMN_ETSI4_WORLD }, \ - { CTRY_ARGENTINA, "ar", DMN_APL3_WORLD }, \ - { CTRY_AUSTRIA, "at", DMN_ETSI5_WORLD }, \ - { CTRY_AUSTRALIA, "au", DMN_FCC2_WORLD }, \ - { CTRY_AZERBAIJAN, "az", DMN_ETSI4_WORLD }, \ - { CTRY_BELGIUM, "be", DMN_ETSI4_WORLD }, \ - { CTRY_BULGARIA, "bg", DMN_ETSI6_WORLD }, \ - { CTRY_BAHRAIN, "bh", DMN_NULL_WORLD }, \ - { CTRY_BRUNEI_DARUSSALAM, "bn", DMN_APL1_WORLD }, \ - { CTRY_BOLIVIA, "bo", DMN_APL1_ETSIC }, \ - { CTRY_BRAZIL, "br", DMN_NULL_ETSIC }, \ - { CTRY_BELARUS, "by", DMN_NULL_WORLD }, \ - { CTRY_BELIZE, "bz", DMN_NULL_ETSIC }, \ - { CTRY_CANADA, "ca", DMN_FCC2_FCCA }, \ - { CTRY_SWITZERLAND, "ch", DMN_ETSI2_WORLD }, \ - { CTRY_CHILE, "cl", DMN_APL5_WORLD }, \ - { CTRY_CHINA, "cn", DMN_APL1_WORLD }, \ - { CTRY_COLOMBIA, "co", DMN_FCC1_FCCA }, \ - { CTRY_COSTA_RICA, "cr", DMN_NULL_WORLD }, \ - { CTRY_CYPRUS, "cy", DMN_ETSI1_WORLD }, \ - { CTRY_CZECH, "cz", DMN_ETSI3_WORLD }, \ - { CTRY_GERMANY, "de", DMN_ETSI1_WORLD }, \ - { CTRY_DENMARK, "dk", DMN_ETSI1_WORLD }, \ - { CTRY_DOMINICAN_REPUBLIC, "do", DMN_FCC1_FCCA }, \ - { CTRY_ALGERIA, "dz", DMN_NULL_WORLD }, \ - { CTRY_ECUADOR, "ec", DMN_NULL_WORLD }, \ - { CTRY_ESTONIA, "ee", DMN_ETSI1_WORLD }, \ - { CTRY_EGYPT, "eg", DMN_NULL_WORLD }, \ - { CTRY_SPAIN, "es", DMN_ETSI1_WORLD }, \ - { CTRY_FRANCE2, "f2", DMN_ETSI3_WORLD }, \ - { CTRY_FINLAND, "fi", DMN_ETSI1_WORLD }, \ - { CTRY_FAEROE_ISLANDS, "fo", DMN_NULL_WORLD }, \ - { CTRY_FRANCE, "fr", DMN_ETSI3_WORLD }, \ - { CTRY_GEORGIA, "ge", DMN_ETSI4_WORLD }, \ - { CTRY_GREECE, "gr", DMN_NULL_WORLD }, \ - { CTRY_GUATEMALA, "gt", DMN_FCC1_FCCA }, \ - { CTRY_HONG_KONG, "hk", DMN_FCC2_WORLD }, \ - { CTRY_HONDURAS, "hn", DMN_NULL_WORLD }, \ - { CTRY_CROATIA, "hr", DMN_ETSI3_WORLD }, \ - { CTRY_HUNGARY, "hu", DMN_ETSI2_WORLD }, \ - { CTRY_INDONESIA, "id", DMN_NULL_WORLD }, \ - { CTRY_IRELAND, "ie", DMN_ETSI1_WORLD }, \ - { CTRY_ISRAEL, "il", DMN_NULL_WORLD }, \ - { CTRY_INDIA, "in", DMN_NULL_WORLD }, \ - { CTRY_IRAQ, "iq", DMN_NULL_WORLD }, \ - { CTRY_IRAN, "ir", DMN_APL1_WORLD }, \ - { CTRY_ICELAND, "is", DMN_ETSI1_WORLD }, \ - { CTRY_ITALY, "it", DMN_ETSI1_WORLD }, \ - { CTRY_JAPAN1, "j1", DMN_MKK1_MKKB }, \ - { CTRY_JAPAN2, "j2", DMN_MKK1_FCCA }, \ - { CTRY_JAPAN3, "j3", DMN_MKK2_MKKA }, \ - { CTRY_JAPAN4, "j4", DMN_MKK1_MKKA1 }, \ - { CTRY_JAPAN5, "j5", DMN_MKK1_MKKA2 }, \ - { CTRY_JAMAICA, "jm", DMN_NULL_WORLD }, \ - { CTRY_JORDAN, "jo", DMN_NULL_WORLD }, \ - { CTRY_JAPAN, "jp", DMN_MKK1_MKKA }, \ - { CTRY_KOREA_ROC2, "k2", DMN_APL2_APLD }, \ - { CTRY_KENYA, "ke", DMN_NULL_WORLD }, \ - { CTRY_KOREA_NORTH, "kp", DMN_APL2_WORLD }, \ - { CTRY_KOREA_ROC, "kr", DMN_APL2_WORLD }, \ - { CTRY_KUWAIT, "kw", DMN_NULL_WORLD }, \ - { CTRY_KAZAKHSTAN, "kz", DMN_NULL_WORLD }, \ - { CTRY_LEBANON, "lb", DMN_NULL_WORLD }, \ - { CTRY_LIECHTENSTEIN, "li", DMN_ETSI2_WORLD }, \ - { CTRY_SRI_LANKA, "lk", DMN_NULL_WORLD }, \ - { CTRY_LITHUANIA, "lt", DMN_ETSI1_WORLD }, \ - { CTRY_LUXEMBOURG, "lu", DMN_ETSI1_WORLD }, \ - { CTRY_LATVIA, "lv", DMN_NULL_WORLD }, \ - { CTRY_LIBYA, "ly", DMN_NULL_WORLD }, \ - { CTRY_MOROCCO, "ma", DMN_NULL_WORLD }, \ - { CTRY_MONACO, "mc", DMN_ETSI4_WORLD }, \ - { CTRY_MACEDONIA, "mk", DMN_NULL_WORLD }, \ - { CTRY_MACAU, "mo", DMN_FCC2_WORLD }, \ - { CTRY_MEXICO, "mx", DMN_FCC1_FCCA }, \ - { CTRY_MALAYSIA, "my", DMN_NULL_WORLD }, \ - { CTRY_NICARAGUA, "ni", DMN_NULL_WORLD }, \ - { CTRY_NETHERLANDS, "nl", DMN_ETSI1_WORLD }, \ - { CTRY_NORWAY, "no", DMN_ETSI1_WORLD }, \ - { CTRY_NEW_ZEALAND, "nz", DMN_FCC2_ETSIC }, \ - { CTRY_OMAN, "om", DMN_NULL_WORLD }, \ - { CTRY_PANAMA, "pa", DMN_FCC1_FCCA }, \ - { CTRY_PERU, "pe", DMN_NULL_WORLD }, \ - { CTRY_PHILIPPINES, "ph", DMN_FCC1_WORLD }, \ - { CTRY_PAKISTAN, "pk", DMN_NULL_WORLD }, \ - { CTRY_POLAND, "pl", DMN_ETSI1_WORLD }, \ - { CTRY_PUERTO_RICO, "pr", DMN_FCC1_FCCA }, \ - { CTRY_PORTUGAL, "pt", DMN_ETSI1_WORLD }, \ - { CTRY_PARAGUAY, "py", DMN_NULL_WORLD }, \ - { CTRY_QATAR, "qa", DMN_NULL_WORLD }, \ - { CTRY_ROMANIA, "ro", DMN_NULL_WORLD }, \ - { CTRY_RUSSIA, "ru", DMN_NULL_WORLD }, \ - { CTRY_SAUDI_ARABIA, "sa", DMN_NULL_WORLD }, \ - { CTRY_SWEDEN, "se", DMN_ETSI1_WORLD }, \ - { CTRY_SINGAPORE, "sg", DMN_APL4_WORLD }, \ - { CTRY_SLOVENIA, "si", DMN_ETSI1_WORLD }, \ - { CTRY_SLOVAKIA, "sk", DMN_ETSI3_WORLD }, \ - { CTRY_EL_SALVADOR, "sv", DMN_NULL_WORLD }, \ - { CTRY_SYRIA, "sy", DMN_NULL_WORLD }, \ - { CTRY_THAILAND, "th", DMN_APL2_WORLD }, \ - { CTRY_TUNISIA, "tn", DMN_ETSI3_WORLD }, \ - { CTRY_TURKEY, "tr", DMN_ETSI3_WORLD }, \ - { CTRY_TRINIDAD_Y_TOBAGO, "tt", DMN_ETSI4_WORLD }, \ - { CTRY_TAIWAN, "tw", DMN_APL3_WORLD }, \ - { CTRY_UKRAINE, "ua", DMN_NULL_WORLD }, \ - { CTRY_UNITED_KINGDOM, "uk", DMN_ETSI1_WORLD }, \ - { CTRY_UNITED_STATES, "us", DMN_FCC1_FCCA }, \ - { CTRY_URUGUAY, "uy", DMN_APL2_WORLD }, \ - { CTRY_UZBEKISTAN, "uz", DMN_FCC3_FCCA }, \ - { CTRY_VENEZUELA, "ve", DMN_APL2_ETSIC }, \ - { CTRY_VIET_NAM, "vn", DMN_NULL_WORLD }, \ - { CTRY_YEMEN, "ye", DMN_NULL_WORLD }, \ - { CTRY_SOUTH_AFRICA, "za", DMN_ETSI1_WORLD }, \ - { CTRY_ZIMBABWE, "zw", DMN_NULL_WORLD }, \ -} - -enum ieee80211_ctl { - CTL_11A = 0x00, - CTL_11B = 0x01, - CTL_11G = 0x02, - CTL_TURBO = 0x03, - CTL_TURBO_G = 0x04, - CTL_FCC = 0x10, - CTL_ETSI = 0x30, - CTL_MKK = 0x40, - CTL_NONEA = 0xff -}; - #define IEEE80211_CHANNELS_2GHZ_MIN 2412 /* 2GHz channel 1 */ #define IEEE80211_CHANNELS_2GHZ_MAX 2732 /* 2GHz channel 26 */ @@ -768,11 +481,6 @@ struct ieee80211_regchannel { { 5240, DMN_WORLD, CHANNEL_OFDM }, \ } -extern u16 ieee80211_name2countrycode(const char *); -extern u32 ieee80211_name2regdomain(const char *); -extern const char *ieee80211_countrycode2name(u16); -extern const char *ieee80211_regdomain2name(u32); -extern u32 ieee80211_regdomain2flag(u16, u16); -extern u32 ieee80211_countrycode2regdomain(u16); +u32 ieee80211_regdomain2flag(u16, u16); #endif /* _NET80211_IEEE80211_REGDOMAIN_H_ */