diff options
| author | Rajeev Kumar Sirasanagandla <rsirasan@qti.qualcomm.com> | 2016-06-21 17:43:09 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-06-28 19:55:19 +0530 |
| commit | b2a670924c1f8cb5a08bfcb7aba2fcd9e4bc7660 (patch) | |
| tree | e5ed3691b99885c60f8eaad0a173c4bf74e8abfa | |
| parent | ffd39e4e75835af3088477c3eb876606de57d53f (diff) | |
qcacld-2.0: Add new country XA
qcacld-3.0 to qcacld-2.0 propagation
Add new user country XA to regulatory tables. This is an 'engineered'
country for Japan that has channels 5150-5230 marked as passive.
Change-Id: I6c582bc0635ecae2c37b98d761f72f222c408d2f
CRS-Fixed: 1007217
| -rw-r--r-- | CORE/SERVICES/WMA/regdomain.h | 6 | ||||
| -rw-r--r-- | CORE/SERVICES/WMA/regdomain_common.h | 4 | ||||
| -rw-r--r-- | CORE/VOSS/src/vos_nvitem.c | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/CORE/SERVICES/WMA/regdomain.h b/CORE/SERVICES/WMA/regdomain.h index 516a3afe2b46..6eff5a08715c 100644 --- a/CORE/SERVICES/WMA/regdomain.h +++ b/CORE/SERVICES/WMA/regdomain.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -884,6 +884,9 @@ typedef struct ath_hal_reg_dmn_tables { * - country definition: CTRY_ZIMBABWE * - country string: ZW * - country ID: 716 + * - country definition: CTRY_XA + * - country string: XA + * - country ID: 4100 */ enum CountryCode { CTRY_ALBANIA = 8, /* Albania */ @@ -1083,6 +1086,7 @@ enum CountryCode { CTRY_JAPAN57 = 4057, /* Japan (J57) */ CTRY_JAPAN58 = 4058, /* Japan (J58) */ CTRY_JAPAN59 = 4059, /* Japan (J59) */ + CTRY_XA = 4100, /* Japan KDDI */ /* ** "Special" codes for multiply defined countries, with the exception diff --git a/CORE/SERVICES/WMA/regdomain_common.h b/CORE/SERVICES/WMA/regdomain_common.h index baeb8f2de0f1..f660315d22dc 100644 --- a/CORE/SERVICES/WMA/regdomain_common.h +++ b/CORE/SERVICES/WMA/regdomain_common.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -463,6 +463,7 @@ static const REG_DMN_PAIR_MAPPING ahCmnRegDomainPairs[] = { {MKK14_MKKA1, MKK14, MKKA, DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK1 | PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN58 }, {MKK15_MKKA1, MKK15, MKKA, DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK1 | PSCAN_MKK3 | PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN59 }, + {MKK5_MKKA2, MKK5, MKKA, DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK3 | PSCAN_MKKA2 | PSCAN_MKKA2_G, CTRY_XA }, /* These are super domains */ {WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0 }, @@ -602,6 +603,7 @@ static const COUNTRY_CODE_TO_ENUM_RD ahCmnAllCountries[] = { {CTRY_JAPAN57, MKK13_MKKB, "JP", "JAPAN57", YES, NO, NO, YES, YES, YES, YES, NO, 7000 }, {CTRY_JAPAN58, MKK14_MKKA1, "JP", "JAPAN58", YES, NO, NO, YES, YES, YES, YES, NO, 7000 }, {CTRY_JAPAN59, MKK15_MKKA1, "JP", "JAPAN59", YES, NO, NO, YES, YES, YES, YES, NO, 7000 }, + {CTRY_XA, MKK5_MKKA2, "XA", "JAPAN PASSIVE", YES, NO, NO, YES, YES, YES, NO, NO, 7000 }, {CTRY_JORDAN, ETSI2_WORLD, "JO", "JORDAN", YES, NO, YES, YES, YES, YES, YES, YES, 7000 }, {CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KAZAKHSTAN", YES, NO, YES, YES, YES, NO, NO, NO, 7000 }, {CTRY_KENYA, APL1_WORLD, "KE", "KENYA", YES, NO, YES, YES, YES, YES, YES, YES, 7000 }, diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c index 82afaeb14140..5e2524b639ab 100644 --- a/CORE/VOSS/src/vos_nvitem.c +++ b/CORE/VOSS/src/vos_nvitem.c @@ -428,6 +428,7 @@ static CountryInfoTable_t countryInfoTable = {REGDOMAIN_ETSI, {'Y', 'T'}}, //MAYOTTE {REGDOMAIN_ETSI, {'Z', 'A'}}, //SOUTH AFRICA {REGDOMAIN_ETSI, {'Z', 'W'}}, //ZIMBABWE + {REGDOMAIN_JAPAN, {'X', 'A'}}, //JAPAN PASSIVE } }; |