svn commit: r187351 - in user/sam/wifi/sys/dev/ath: . ath_hal
Sam Leffler
sam at FreeBSD.org
Fri Jan 16 15:25:50 PST 2009
Author: sam
Date: Fri Jan 16 23:25:49 2009
New Revision: 187351
URL: http://svn.freebsd.org/changeset/base/187351
Log:
Eliminate the outdoor control in setting up the channel list; the hal
never returns a frequency above 5825 so it had no effect.
Modified:
user/sam/wifi/sys/dev/ath/ath_hal/ah.h
user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c
user/sam/wifi/sys/dev/ath/if_ath.c
Modified: user/sam/wifi/sys/dev/ath/ath_hal/ah.h
==============================================================================
--- user/sam/wifi/sys/dev/ath/ath_hal/ah.h Fri Jan 16 22:41:12 2009 (r187350)
+++ user/sam/wifi/sys/dev/ath/ath_hal/ah.h Fri Jan 16 23:25:49 2009 (r187351)
@@ -861,7 +861,7 @@ extern struct ath_hal * __ahdecl ath_hal
extern HAL_BOOL __ahdecl ath_hal_init_channels(struct ath_hal *,
HAL_CHANNEL *chans, u_int maxchans, u_int *nchans,
HAL_CTRY_CODE cc, u_int modeSelect,
- HAL_BOOL enableOutdoor, HAL_BOOL enableExtendedChannels);
+ HAL_BOOL enableExtendedChannels);
/*
* Calibrate noise floor data following a channel scan or similar.
Modified: user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c
==============================================================================
--- user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c Fri Jan 16 22:41:12 2009 (r187350)
+++ user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c Fri Jan 16 23:25:49 2009 (r187351)
@@ -34,10 +34,6 @@
#define HAL_MODE_11A_TURBO HAL_MODE_108A
#define HAL_MODE_11G_TURBO HAL_MODE_108G
-/* 10MHz is half the 11A bandwidth used to determine upper edge freq
- of the outdoor channel */
-#define HALF_MAXCHANBW 10
-
/*
* BMLEN defines the size of the bitmask used to hold frequency
* band specifications. Note this must agree with the BM macro
@@ -617,151 +613,150 @@ typedef struct {
HAL_BOOL allow11ng40;
HAL_BOOL allow11na20;
HAL_BOOL allow11na40;
- uint16_t outdoorChanStart;
} COUNTRY_CODE_TO_ENUM_RD;
static COUNTRY_CODE_TO_ENUM_RD allCountries[] = {
- {CTRY_DEBUG, NO_ENUMRD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_DEFAULT, DEF_REGDMN, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_ALBANIA, NULL1_WORLD, YES, NO, YES, YES, NO, NO, NO, 7000 },
- {CTRY_ALGERIA, NULL1_WORLD, YES, NO, YES, YES, NO, NO, NO, 7000 },
- {CTRY_ARGENTINA, APL3_WORLD, NO, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_ARMENIA, ETSI4_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 },
- {CTRY_AUSTRALIA, FCC2_WORLD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_AUSTRIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_AZERBAIJAN, ETSI4_WORLD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_BAHRAIN, APL6_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_BELARUS, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_BELGIUM, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_BELIZE, APL1_ETSIC, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_BOLIVIA, APL1_ETSIC, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_BRAZIL, FCC3_WORLD, YES, NO, NO, YES, NO, YES, NO, 7000 },
- {CTRY_BRUNEI_DARUSSALAM,APL1_WORLD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_BULGARIA, ETSI6_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_CANADA, FCC2_FCCA, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_CHILE, APL6_WORLD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_CHINA, APL1_WORLD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_COLOMBIA, FCC1_FCCA, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_COSTA_RICA, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_CROATIA, ETSI3_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_CYPRUS, ETSI1_WORLD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_CZECH, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_DENMARK, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_DOMINICAN_REPUBLIC,FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_ECUADOR, NULL1_WORLD, NO, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_EGYPT, ETSI3_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_EL_SALVADOR, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 },
- {CTRY_ESTONIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_FINLAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_FRANCE, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_FRANCE2, ETSI3_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_GEORGIA, ETSI4_WORLD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_GERMANY, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_GREECE, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_GUATEMALA, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_GZ901, GZ901_WORLD, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_HONDURAS, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_HONG_KONG, FCC2_WORLD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_HUNGARY, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_ICELAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_INDIA, APL6_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_INDONESIA, APL1_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_IRAN, APL1_WORLD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_IRELAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_ISRAEL, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_ITALY, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_JAPAN, MKK1_MKKA, YES, NO, NO, YES, NO, YES, NO, 7000 },
- {CTRY_JAPAN1, MKK1_MKKB, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN2, MKK1_FCCA, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN3, MKK2_MKKA, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN4, MKK1_MKKA1, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN5, MKK1_MKKA2, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN6, MKK1_MKKC, YES, NO, NO, NO, NO, NO, NO, 7000 },
-
- {CTRY_JAPAN7, MKK3_MKKB, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN8, MKK3_MKKA2, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN9, MKK3_MKKC, YES, NO, NO, NO, NO, NO, NO, 7000 },
-
- {CTRY_JAPAN10, MKK4_MKKB, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN11, MKK4_MKKA2, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN12, MKK4_MKKC, YES, NO, NO, NO, NO, NO, NO, 7000 },
-
- {CTRY_JAPAN13, MKK5_MKKB, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN14, MKK5_MKKA2, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN15, MKK5_MKKC, YES, NO, NO, NO, NO, NO, NO, 7000 },
-
- {CTRY_JAPAN16, MKK6_MKKB, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN17, MKK6_MKKA2, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN18, MKK6_MKKC, YES, NO, NO, NO, NO, NO, NO, 7000 },
-
- {CTRY_JAPAN19, MKK7_MKKB, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN20, MKK7_MKKA2, YES, NO, NO, YES, NO, YES, NO, 7000 },
- {CTRY_JAPAN21, MKK7_MKKC, YES, NO, NO, NO, NO, NO, NO, 7000 },
-
- {CTRY_JAPAN22, MKK8_MKKB, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN23, MKK8_MKKA2, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_JAPAN24, MKK8_MKKC, YES, NO, NO, NO, NO, NO, NO, 7000 },
-
- {CTRY_JORDAN, APL4_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_KAZAKHSTAN, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 },
- {CTRY_KOREA_NORTH, APL2_WORLD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_KOREA_ROC, APL2_WORLD, YES, NO, NO, YES, NO, YES, NO, 7000 },
- {CTRY_KOREA_ROC2, APL2_WORLD, YES, NO, NO, YES, NO, YES, NO, 7000 },
- {CTRY_KOREA_ROC3, APL9_WORLD, YES, NO, NO, YES, NO, YES, NO, 7000 },
- {CTRY_KUWAIT, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_LATVIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_LEBANON, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_LIECHTENSTEIN,ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_LITHUANIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_LUXEMBOURG, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_MACAU, FCC2_WORLD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_MACEDONIA, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 },
- {CTRY_MALAYSIA, APL8_WORLD, YES, NO, NO, YES, NO, YES, NO, 7000 },
- {CTRY_MALTA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_MEXICO, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_MONACO, ETSI4_WORLD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_MOROCCO, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 },
- {CTRY_NETHERLANDS, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_NEW_ZEALAND, FCC2_ETSIC, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_NORWAY, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_OMAN, APL6_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_PAKISTAN, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 },
- {CTRY_PANAMA, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_PERU, APL1_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_PHILIPPINES, FCC3_WORLD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_POLAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_PORTUGAL, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_PUERTO_RICO, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_QATAR, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 },
- {CTRY_ROMANIA, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 },
- {CTRY_RUSSIA, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 },
- {CTRY_SAUDI_ARABIA,FCC2_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_SINGAPORE, APL6_WORLD, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_SLOVAKIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_SLOVENIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_SOUTH_AFRICA,FCC3_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_SPAIN, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_SR9, SR9_WORLD, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_SWEDEN, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_SWITZERLAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES, 7000 },
- {CTRY_SYRIA, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_TAIWAN, APL3_FCCA, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_THAILAND, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 },
- {CTRY_TRINIDAD_Y_TOBAGO,ETSI4_WORLD,YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_TUNISIA, ETSI3_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_TURKEY, ETSI3_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_UKRAINE, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 },
- {CTRY_UAE, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 },
- {CTRY_UNITED_KINGDOM, ETSI1_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_UNITED_STATES, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES, 5825 },
- {CTRY_UNITED_STATES_FCC49,FCC4_FCCA,YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_URUGUAY, FCC1_WORLD, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_UZBEKISTAN, FCC3_FCCA, YES, YES, YES, YES,YES, YES,YES, 7000 },
- {CTRY_VENEZUELA, APL2_ETSIC, YES, NO, YES, YES,YES, YES, NO, 7000 },
- {CTRY_VIET_NAM, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 },
- {CTRY_XR9, XR9_WORLD, YES, NO, NO, NO, NO, NO, NO, 7000 },
- {CTRY_YEMEN, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 },
- {CTRY_ZIMBABWE, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO, 7000 }
+ {CTRY_DEBUG, NO_ENUMRD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_DEFAULT, DEF_REGDMN, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_ALBANIA, NULL1_WORLD, YES, NO, YES, YES, NO, NO, NO },
+ {CTRY_ALGERIA, NULL1_WORLD, YES, NO, YES, YES, NO, NO, NO },
+ {CTRY_ARGENTINA, APL3_WORLD, NO, NO, NO, NO, NO, NO, NO },
+ {CTRY_ARMENIA, ETSI4_WORLD, YES, NO, YES, YES,YES, NO, NO },
+ {CTRY_AUSTRALIA, FCC2_WORLD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_AUSTRIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_AZERBAIJAN, ETSI4_WORLD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_BAHRAIN, APL6_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_BELARUS, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_BELGIUM, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_BELIZE, APL1_ETSIC, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_BOLIVIA, APL1_ETSIC, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_BRAZIL, FCC3_WORLD, YES, NO, NO, YES, NO, YES, NO },
+ {CTRY_BRUNEI_DARUSSALAM,APL1_WORLD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_BULGARIA, ETSI6_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_CANADA, FCC2_FCCA, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_CHILE, APL6_WORLD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_CHINA, APL1_WORLD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_COLOMBIA, FCC1_FCCA, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_COSTA_RICA, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_CROATIA, ETSI3_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_CYPRUS, ETSI1_WORLD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_CZECH, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_DENMARK, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_DOMINICAN_REPUBLIC,FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_ECUADOR, NULL1_WORLD, NO, NO, NO, NO, NO, NO, NO },
+ {CTRY_EGYPT, ETSI3_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_EL_SALVADOR, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO },
+ {CTRY_ESTONIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_FINLAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_FRANCE, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_FRANCE2, ETSI3_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_GEORGIA, ETSI4_WORLD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_GERMANY, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_GREECE, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_GUATEMALA, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_GZ901, GZ901_WORLD, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_HONDURAS, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_HONG_KONG, FCC2_WORLD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_HUNGARY, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_ICELAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_INDIA, APL6_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_INDONESIA, APL1_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_IRAN, APL1_WORLD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_IRELAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_ISRAEL, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_ITALY, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_JAPAN, MKK1_MKKA, YES, NO, NO, YES, NO, YES, NO },
+ {CTRY_JAPAN1, MKK1_MKKB, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN2, MKK1_FCCA, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN3, MKK2_MKKA, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN4, MKK1_MKKA1, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN5, MKK1_MKKA2, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN6, MKK1_MKKC, YES, NO, NO, NO, NO, NO, NO },
+
+ {CTRY_JAPAN7, MKK3_MKKB, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN8, MKK3_MKKA2, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN9, MKK3_MKKC, YES, NO, NO, NO, NO, NO, NO },
+
+ {CTRY_JAPAN10, MKK4_MKKB, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN11, MKK4_MKKA2, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN12, MKK4_MKKC, YES, NO, NO, NO, NO, NO, NO },
+
+ {CTRY_JAPAN13, MKK5_MKKB, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN14, MKK5_MKKA2, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN15, MKK5_MKKC, YES, NO, NO, NO, NO, NO, NO },
+
+ {CTRY_JAPAN16, MKK6_MKKB, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN17, MKK6_MKKA2, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN18, MKK6_MKKC, YES, NO, NO, NO, NO, NO, NO },
+
+ {CTRY_JAPAN19, MKK7_MKKB, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN20, MKK7_MKKA2, YES, NO, NO, YES, NO, YES, NO },
+ {CTRY_JAPAN21, MKK7_MKKC, YES, NO, NO, NO, NO, NO, NO },
+
+ {CTRY_JAPAN22, MKK8_MKKB, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN23, MKK8_MKKA2, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_JAPAN24, MKK8_MKKC, YES, NO, NO, NO, NO, NO, NO },
+
+ {CTRY_JORDAN, APL4_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_KAZAKHSTAN, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO },
+ {CTRY_KOREA_NORTH, APL2_WORLD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_KOREA_ROC, APL2_WORLD, YES, NO, NO, YES, NO, YES, NO },
+ {CTRY_KOREA_ROC2, APL2_WORLD, YES, NO, NO, YES, NO, YES, NO },
+ {CTRY_KOREA_ROC3, APL9_WORLD, YES, NO, NO, YES, NO, YES, NO },
+ {CTRY_KUWAIT, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_LATVIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_LEBANON, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_LIECHTENSTEIN,ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_LITHUANIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_LUXEMBOURG, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_MACAU, FCC2_WORLD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_MACEDONIA, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO },
+ {CTRY_MALAYSIA, APL8_WORLD, YES, NO, NO, YES, NO, YES, NO },
+ {CTRY_MALTA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_MEXICO, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_MONACO, ETSI4_WORLD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_MOROCCO, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO },
+ {CTRY_NETHERLANDS, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_NEW_ZEALAND, FCC2_ETSIC, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_NORWAY, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_OMAN, APL6_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_PAKISTAN, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO },
+ {CTRY_PANAMA, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_PERU, APL1_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_PHILIPPINES, FCC3_WORLD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_POLAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_PORTUGAL, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_PUERTO_RICO, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_QATAR, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO },
+ {CTRY_ROMANIA, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO },
+ {CTRY_RUSSIA, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO },
+ {CTRY_SAUDI_ARABIA,FCC2_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_SINGAPORE, APL6_WORLD, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_SLOVAKIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_SLOVENIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_SOUTH_AFRICA,FCC3_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_SPAIN, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_SR9, SR9_WORLD, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_SWEDEN, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_SWITZERLAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES },
+ {CTRY_SYRIA, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_TAIWAN, APL3_FCCA, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_THAILAND, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO },
+ {CTRY_TRINIDAD_Y_TOBAGO,ETSI4_WORLD,YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_TUNISIA, ETSI3_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_TURKEY, ETSI3_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_UKRAINE, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO },
+ {CTRY_UAE, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO },
+ {CTRY_UNITED_KINGDOM, ETSI1_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_UNITED_STATES, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_UNITED_STATES_FCC49,FCC4_FCCA,YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_URUGUAY, FCC1_WORLD, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_UZBEKISTAN, FCC3_FCCA, YES, YES, YES, YES,YES, YES,YES },
+ {CTRY_VENEZUELA, APL2_ETSIC, YES, NO, YES, YES,YES, YES, NO },
+ {CTRY_VIET_NAM, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO },
+ {CTRY_XR9, XR9_WORLD, YES, NO, NO, NO, NO, NO, NO },
+ {CTRY_YEMEN, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO },
+ {CTRY_ZIMBABWE, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO }
};
/* Bit masks for DFS per regdomain */
@@ -2236,12 +2231,11 @@ HAL_BOOL
ath_hal_init_channels(struct ath_hal *ah,
HAL_CHANNEL *chans, u_int maxchans, u_int *nchans,
HAL_CTRY_CODE cc, u_int modeSelect,
- HAL_BOOL enableOutdoor, HAL_BOOL enableExtendedChannels)
+ HAL_BOOL enableExtendedChannels)
{
#define CHANNEL_HALF_BW 10
#define CHANNEL_QUARTER_BW 5
u_int modesAvail;
- uint16_t maxChan;
COUNTRY_CODE_TO_ENUM_RD *country = AH_NULL;
REG_DMN_PAIR_MAPPING *regpair;
REG_DOMAIN *rd5GHz, *rd2GHz;
@@ -2249,8 +2243,8 @@ ath_hal_init_channels(struct ath_hal *ah
HAL_CHANNEL_INTERNAL *ichans = &AH_PRIVATE(ah)->ah_channels[0];
int next, b, regDmn;
- HALDEBUG(ah, HAL_DEBUG_REGDOMAIN, "%s: cc %u mode 0x%x%s%s\n",
- __func__, cc, modeSelect, enableOutdoor? " Enable outdoor" : " ",
+ HALDEBUG(ah, HAL_DEBUG_REGDOMAIN, "%s: cc %u mode 0x%x%s\n",
+ __func__, cc, modeSelect,
enableExtendedChannels ? " Enable ecm" : "");
/*
@@ -2335,7 +2329,6 @@ ath_hal_init_channels(struct ath_hal *ah
AH_PRIVATE(ah)->ah_reg5G = rd5GHz;
modesAvail = ath_hal_getwmodesnreg(ah, country, rd5GHz);
- maxChan = !enableOutdoor ? country->outdoorChanStart : 7000;
if (maxchans > N(AH_PRIVATE(ah)->ah_channels))
maxchans = N(AH_PRIVATE(ah)->ah_channels);
@@ -2462,12 +2455,6 @@ ath_hal_init_channels(struct ath_hal *ah
__func__, c, c_lo, c_hi);
continue;
}
- if (((c+fband->channelSep)/2) > (maxChan+HALF_MAXCHANBW)) {
- HALDEBUG(ah, HAL_DEBUG_REGDOMAIN,
- "%s: c %u > maxChan %u\n",
- __func__, c, maxChan);
- continue;
- }
if (next >= maxchans){
HALDEBUG(ah, HAL_DEBUG_REGDOMAIN,
"%s: too many channels for channel table\n",
Modified: user/sam/wifi/sys/dev/ath/if_ath.c
==============================================================================
--- user/sam/wifi/sys/dev/ath/if_ath.c Fri Jan 16 22:41:12 2009 (r187350)
+++ user/sam/wifi/sys/dev/ath/if_ath.c Fri Jan 16 23:25:49 2009 (r187351)
@@ -6186,14 +6186,14 @@ ath_newassoc(struct ieee80211_node *ni,
static int
getchannels(struct ath_softc *sc, int *nchans, struct ieee80211_channel chans[],
- int cc, int ecm, int outdoor)
+ int cc, int ecm)
{
struct ath_hal *ah = sc->sc_ah;
HAL_CHANNEL *halchans;
int i, nhalchans, error;
- DPRINTF(sc, ATH_DEBUG_REGDOMAIN, "%s: cc %u outdoor %u ecm %u\n",
- __func__, cc, outdoor, ecm);
+ DPRINTF(sc, ATH_DEBUG_REGDOMAIN, "%s: cc %u ecm %u\n",
+ __func__, cc, ecm);
halchans = malloc(IEEE80211_CHAN_MAX * sizeof(HAL_CHANNEL),
M_TEMP, M_NOWAIT | M_ZERO);
@@ -6204,11 +6204,11 @@ getchannels(struct ath_softc *sc, int *n
}
error = 0;
if (!ath_hal_init_channels(ah, halchans, IEEE80211_CHAN_MAX, &nhalchans,
- cc, HAL_MODE_ALL, outdoor, ecm)) {
+ cc, HAL_MODE_ALL, ecm)) {
u_int32_t rd;
(void) ath_hal_getregdomain(ah, &rd);
device_printf(sc->sc_dev, "ath_hal_init_channels failed, "
- "rd %d cc %u outdoor %u ecm %u\n", rd, cc, outdoor, ecm);
+ "rd %d cc %u ecm %u\n", rd, cc, ecm);
error = EINVAL;
goto done;
}
@@ -6308,16 +6308,14 @@ ath_setregdomain(struct ieee80211com *ic
ath_hal_setregdomain(ah, regdomain);
error = getchannels(sc, &nchans, chans, cc,
- rd->ecm ? AH_TRUE : AH_FALSE,
- rd->location != 'I' ? AH_TRUE : AH_FALSE);
+ rd->ecm ? AH_TRUE : AH_FALSE);
if (error != 0) {
/*
* Restore previous state.
*/
ath_hal_setregdomain(ah, ord);
(void) getchannels(sc, NULL, NULL, ic->ic_regdomain.country,
- ic->ic_regdomain.ecm ? AH_TRUE : AH_FALSE,
- ic->ic_regdomain.location != 'I' ? AH_TRUE : AH_FALSE);
+ ic->ic_regdomain.ecm ? AH_TRUE : AH_FALSE);
return error;
}
return 0;
@@ -6338,13 +6336,12 @@ ath_getradiocaps(struct ieee80211com *ic
ath_hal_setregdomain(ah, 0);
/* XXX not quite right but close enough for now */
- getchannels(sc, nchans, chans, CTRY_DEBUG, AH_TRUE, AH_FALSE);
+ getchannels(sc, nchans, chans, CTRY_DEBUG, AH_TRUE);
/* NB: restore previous state */
ath_hal_setregdomain(ah, ord);
(void) getchannels(sc, NULL, NULL, ic->ic_regdomain.country,
- ic->ic_regdomain.ecm ? AH_TRUE : AH_FALSE,
- ic->ic_regdomain.location != 'I' ? AH_TRUE : AH_FALSE);
+ ic->ic_regdomain.ecm ? AH_TRUE : AH_FALSE);
}
static void
@@ -6380,7 +6377,7 @@ ath_getchannels(struct ath_softc *sc)
* Convert HAL channels to ieee80211 ones.
*/
error = getchannels(sc, &ic->ic_nchans, ic->ic_channels,
- CTRY_DEFAULT, AH_TRUE, AH_FALSE);
+ CTRY_DEFAULT, AH_TRUE);
(void) ath_hal_getregdomain(ah, &sc->sc_eerd);
ath_hal_getcountrycode(ah, &sc->sc_eecc); /* NB: cannot fail */
if (error) {
More information about the svn-src-user
mailing list