A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-23 04:59:05 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Update driver according to latest reg domain info

Browse source 
Update driver for the latest reg domain info according to
Regdomain_23 and Regdomain_24 excel sheets.

Change-Id: I6b259be20de650886a16c32b69f8ed82b96dbcd8
CRs-Fixed: 2112485
This commit is contained in:
Ashish Kumar Dhanotiya 2017-09-19 18:05:21 +05:30 • committed by snandini
commit bfee5898b7
3 changed files with 31 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

48
core/cds/inc/cds_regdomain.h
View file

@ -156,7 +156,6 @@ enum country_code {
CTRY_ICELAND = 352,
CTRY_INDIA = 356,
CTRY_INDONESIA = 360,
CTRY_IRAN = 364,
CTRY_IRAQ = 368,
CTRY_IRELAND = 372,
CTRY_ISRAEL = 376,
@ -165,7 +164,6 @@ enum country_code {
CTRY_JORDAN = 400,
CTRY_KAZAKHSTAN = 398,
CTRY_KENYA = 404,
CTRY_KOREA_NORTH = 408,
CTRY_KOREA_ROC = 410,
CTRY_KOREA_ROC_AP = 412,
CTRY_KUWAIT = 414,
@ -238,7 +236,6 @@ enum country_code {
CTRY_SRI_LANKA = 144,
CTRY_SWEDEN = 752,
CTRY_SWITZERLAND = 756,
CTRY_SYRIA = 760,
CTRY_TAIWAN = 158,
CTRY_TANZANIA = 834,
CTRY_THAILAND = 764,
@ -264,38 +261,11 @@ enum country_code {
CTRY_WALLIS_AND_FUTUNA = 876,
CTRY_YEMEN = 887,
CTRY_ZIMBABWE = 716,
CTRY_JAPAN7 = 4007,
CTRY_JAPAN8 = 4008,
CTRY_JAPAN9 = 4009,
CTRY_JAPAN10 = 4010,
CTRY_JAPAN11 = 4011,
CTRY_JAPAN12 = 4012,
CTRY_JAPAN13 = 4013,
CTRY_JAPAN14 = 4014,
CTRY_JAPAN15 = 4015,
CTRY_JAPAN25 = 4025,
CTRY_JAPAN26 = 4026,
CTRY_JAPAN27 = 4027,
CTRY_JAPAN28 = 4028,
CTRY_JAPAN29 = 4029,
CTRY_JAPAN34 = 4034,
CTRY_JAPAN35 = 4035,
CTRY_JAPAN36 = 4036,
CTRY_JAPAN37 = 4037,
CTRY_JAPAN38 = 4038,
CTRY_JAPAN39 = 4039,
CTRY_JAPAN40 = 4040,
CTRY_JAPAN41 = 4041,
CTRY_JAPAN42 = 4042,
CTRY_JAPAN43 = 4043,
CTRY_JAPAN44 = 4044,
CTRY_JAPAN45 = 4045,
CTRY_JAPAN46 = 4046,
CTRY_JAPAN47 = 4047,
CTRY_JAPAN48 = 4048,
CTRY_JAPAN49 = 4049,
CTRY_JAPAN55 = 4055,
CTRY_JAPAN56 = 4056,
CTRY_JAPAN60 = 4060,
CTRY_XA = 4100,
};
@ -322,6 +292,8 @@ enum reg_domain {
FCC9_FCCA = 0x17,
FCC10_FCCA = 0x18,
FCC11_WORLD = 0x19,
FCC13_WORLD = 0xE4,
FCC14_FCCB = 0xE6,
ETSI1_WORLD = 0x37,
ETSI3_ETSIA = 0x32,
@ -364,6 +336,9 @@ enum reg_domain {
APL14_WORLD = 0x57,
APL15_WORLD = 0x59,
APL16_WORLD = 0x70,
APL17_ETSID = 0xE0,
APL20_WORLD = 0xE5,
APL23_WORLD = 0xE3,
WOR0_WORLD = 0x60,
WOR1_WORLD = 0x61,
@ -411,6 +386,7 @@ enum reg_domain {
MKK11_MKKA1 = 0xD6,
MKK11_MKKC = 0xD7,
MKK11_MKKA2 = 0xD8,
MKK16_MKKC = 0xDF,
FCC1 = 0x0110,
FCC2 = 0x0120,
@ -423,6 +399,8 @@ enum reg_domain {
FCC9 = 0x0910,
FCC10 = 0x0B10,
FCC11 = 0x0B20,
FCC13 = 0x0B60,
FCC14 = 0x0B70,
ETSI1 = 0x0130,
ETSI2 = 0x0230,
@ -451,20 +429,22 @@ enum reg_domain {
APL14 = 0x1180,
APL15 = 0x1190,
APL16 = 0x1200,
APL17 = 0x1210,
APL23 = 0x1280,
APL20 = 0x1250,
NULL1 = 0x0198,
MKK3 = 0x0340,
MKK4 = 0x0440,
MKK5 = 0x0540,
MKK9 = 0x0940,
MKK10 = 0x1040,
MKK11 = 0x1140,
MKK16 = 0x1640,
WORLD = 0x0199,
FCCA = 0x0A10,
MKKA = 0x0A40,
MKKC = 0x0A50,
ETSIC = 0x0C30,
};
/**

39
core/cds/src/cds_regdomain.c
View file

@ -124,7 +124,7 @@ static const struct reg_dmn_pair g_reg_dmn_pairs[] = {
{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},
};
static const struct country_code_to_reg_dmn g_all_countries[] = {
@ -133,7 +133,7 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
{CTRY_ALGERIA, APL13_WORLD, "DZ", "ALGERIA"},
{CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", "AMERICAN SAMOA"},
{CTRY_ANGUILLA, ETSI1_WORLD, "AI", "ANGUILLA"},
{CTRY_ARGENTINA, APL16_WORLD, "AR", "ARGENTINA"},
{CTRY_ARGENTINA, APL17_ETSID, "AR", "ARGENTINA"},
{CTRY_ARMENIA, ETSI4_WORLD, "AM", "ARMENIA"},
{CTRY_ARUBA, ETSI1_WORLD, "AW", "ARUBA"},
{CTRY_AUSTRALIA, FCC6_WORLD, "AU", "AUSTRALIA"},
@ -145,7 +145,7 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
{CTRY_BARBADOS, FCC2_WORLD, "BB", "BARBADOS"},
{CTRY_BELARUS, ETSI1_WORLD, "BY", "BELARUS"},
{CTRY_BELGIUM, ETSI1_WORLD, "BE", "BELGIUM"},
{CTRY_BELIZE, FCC3_ETSIC, "BZ", "BELIZE"},
{CTRY_BELIZE, ETSI8_WORLD, "BZ", "BELIZE"},
{CTRY_BERMUDA, FCC3_FCCA, "BM", "BERMUDA"},
{CTRY_BHUTAN, ETSI1_WORLD, "BT", "BHUTAN"},
{CTRY_BOLIVIA, APL8_WORLD, "BO", "BOLIVIA"},
@ -155,11 +155,11 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
{CTRY_BULGARIA, ETSI1_WORLD, "BG", "BULGARIA"},
{CTRY_BURKINA_FASO, FCC3_WORLD, "BF", "BURKINA-FASO"},
{CTRY_CAMBODIA, ETSI1_WORLD, "KH", "CAMBODIA"},
{CTRY_CANADA, FCC6_FCCA, "CA", "CANADA"},
{CTRY_CANADA, FCC3_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_CHILE, APL23_WORLD, "CL", "CHILE"},
{CTRY_CHINA, APL14_WORLD, "CN", "CHINA"},
{CTRY_CHRISTMAS_ISLAND, FCC3_WORLD, "CX", "CHRISTMAS ISLAND"},
{CTRY_COLOMBIA, FCC3_WORLD, "CO", "COLOMBIA"},
@ -169,11 +169,11 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
{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_DOMINICA, FCC2_FCCA, "DM", "DOMINICA"},
{CTRY_DOMINICAN_REPUBLIC, FCC2_FCCA, "DO", "DOMINICAN REPUBLIC"},
{CTRY_ECUADOR, FCC3_WORLD, "EC", "ECUADOR"},
{CTRY_EGYPT, ETSI3_WORLD, "EG", "EGYPT"},
{CTRY_EL_SALVADOR, FCC1_WORLD, "SV", "EL SALVADOR"},
{CTRY_EL_SALVADOR, FCC2_WORLD, "SV", "EL SALVADOR"},
{CTRY_ESTONIA, ETSI1_WORLD, "EE", "ESTONIA"},
{CTRY_ETHIOPIA, ETSI1_WORLD, "ET", "ETHIOPIA"},
{CTRY_FINLAND, ETSI1_WORLD, "FI", "FINLAND"},
@ -192,22 +192,20 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
{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_HONDURAS, FCC13_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, APL15_WORLD, "IN", "INDIA"},
{CTRY_INDONESIA, APL2_ETSIC, "ID", "INDONESIA"},
{CTRY_IRAN, APL1_WORLD, "IR", "IRAN"},
{CTRY_IRAQ, ETSI1_WORLD, "IQ", "IRAQ"},
{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_JAMAICA, FCC13_WORLD, "JM", "JAMAICA"},
{CTRY_JORDAN, APL4_WORLD, "JO", "JORDAN"},
{CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KAZAKHSTAN"},
{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"},
@ -234,8 +232,8 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
{CTRY_MONGOLIA, FCC3_WORLD, "MN", "MONGOLIA"},
{CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "MONTENEGRO"},
{CTRY_MOROCCO, ETSI3_WORLD, "MA", "MOROCCO"},
{CTRY_NAMIBIA, APL9_WORLD, "NA", "NAMIBIA"},
{CTRY_NEPAL, APL6_WORLD, "NP", "NEPAL"},
{CTRY_NAMIBIA, APL20_WORLD, "NA", "NAMIBIA"},
{CTRY_NEPAL, APL23_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"},
@ -246,7 +244,7 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
{CTRY_OMAN, ETSI1_WORLD, "OM", "OMAN"},
{CTRY_PAKISTAN, APL1_ETSIC, "PK", "PAKISTAN"},
{CTRY_PALAU, FCC3_FCCA, "PW", "PALAU"},
{CTRY_PANAMA, FCC1_FCCA, "PA", "PANAMA"},
{CTRY_PANAMA, FCC14_FCCB, "PA", "PANAMA"},
{CTRY_PAPUA_NEW_GUINEA, FCC3_WORLD, "PG", "PAPUA NEW GUINEA"},
{CTRY_PARAGUAY, FCC3_WORLD, "PY", "PARAGUAY"},
{CTRY_PERU, FCC3_WORLD, "PE", "PERU"},
@ -267,7 +265,7 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
{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_SENEGAL, FCC13_WORLD, "SN", "SENEGAL"},
{CTRY_SERBIA, ETSI1_WORLD, "RS", "REPUBLIC OF SERBIA"},
{CTRY_SINGAPORE, FCC3_WORLD, "SG", "SINGAPORE"},
{CTRY_SLOVAKIA, ETSI1_WORLD, "SK", "SLOVAKIA"},
@ -278,7 +276,6 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
{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, FCC3_FCCA, "TW", "TAIWAN"},
{CTRY_TANZANIA, APL1_WORLD, "TZ", "TANZANIA"},
{CTRY_THAILAND, FCC3_WORLD, "TH", "THAILAND"},
@ -291,8 +288,7 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
{CTRY_UKRAINE, ETSI9_WORLD, "UA", "UKRAINE"},
{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_PS, FCC4_FCCA, "PS", "US PUBLIC SAFETY"},
{CTRY_UNITED_STATES, FCC8_FCCA, "US", "UNITED STATES"},
{CTRY_URUGUAY, FCC2_WORLD, "UY", "URUGUAY"},
{CTRY_UZBEKISTAN, ETSI3_WORLD, "UZ", "UZBEKISTAN"},
{CTRY_VANUATU, FCC3_WORLD, "VU", "VANUATU"},
@ -302,7 +298,7 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
{CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF" "WALLIS"},
{CTRY_YEMEN, NULL1_WORLD, "YE", "YEMEN"},
{CTRY_ZIMBABWE, ETSI1_WORLD, "ZW", "ZIMBABWE"},
{CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN"},
{CTRY_JAPAN15, MKK5_MKKC, "JP", "JAPAN"},
{CTRY_XA, MKK5_MKKA2, "XA", "JAPAN PASSIVE"}
};
@ -346,10 +342,7 @@ static const struct reg_dmn g_reg_dmns[] = {
{APL16, FCC},
{NULL1, NO_CTL},
{MKK3, MKK},
{MKK4, MKK},
{MKK5, MKK},
{MKK9, MKK},
{MKK10, MKK},
{MKK11, MKK},
{WORLD, ETSI},
{FCCA, FCC},

2
core/wma/src/wma_features.c
View file

@ -3899,7 +3899,7 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G,
if (status == QDF_STATUS_E_NOMEM)
return;
if ((((reg_dmn & ~CTRY_FLAG) == CTRY_JAPAN14) ||
if ((((reg_dmn & ~CTRY_FLAG) == CTRY_JAPAN15) ||
((reg_dmn & ~CTRY_FLAG) == CTRY_KOREA_ROC)) &&
(true == wma->tx_chain_mask_cck))
cck_mask_val = 1;