瀏覽代碼

qcacld-3.0: Regulatory updates

Change 2G regulatory domain for Pakistan. Add country Namibia.
Add regdomain APL14_WORLD and APL14.

Change-Id: I5ebb27b2ded4548c107331d22e962c4c2d2c3bd5
CRs-Fixed: 1023830
Amar Singhal 9 年之前
父節點
當前提交
8b2e3f8026
共有 2 個文件被更改,包括 6 次插入1 次删除
  1. 3 0
      core/cds/inc/cds_regdomain.h
  2. 3 1
      core/cds/src/cds_regdomain.c

+ 3 - 0
core/cds/inc/cds_regdomain.h

@@ -189,6 +189,7 @@ enum country_code {
 	CTRY_MONGOLIA = 496,
 	CTRY_MONTENEGRO = 499,
 	CTRY_MOROCCO = 504,
+	CTRY_NAMIBIA = 516,
 	CTRY_NEPAL = 524,
 	CTRY_NETHERLANDS = 528,
 	CTRY_NETHERLANDS_ANTILLES = 530,
@@ -355,6 +356,7 @@ enum reg_domain {
 	APL11_FCCA = 0x4F,
 	APL12_WORLD = 0x51,
 	APL13_WORLD = 0x5A,
+	APL14_WORLD = 0x57,
 
 	WOR0_WORLD = 0x60,
 	WOR1_WORLD = 0x61,
@@ -439,6 +441,7 @@ enum reg_domain {
 	APL11 = 0x1150,
 	APL12 = 0x1160,
 	APL13 = 0x1170,
+	APL14 = 0x1180,
 
 	NULL1 = 0x0198,
 	MKK3 = 0x0340,

+ 3 - 1
core/cds/src/cds_regdomain.c

@@ -312,6 +312,7 @@ 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, APL10_WORLD, "NA", "NAMIBIA"},
 	{CTRY_NEPAL, APL6_WORLD, "NP", "NEPAL"},
 	{CTRY_NETHERLANDS, ETSI1_WORLD, "NL", "NETHERLANDS"},
 	{CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", "NETHERLANDS ANTILLES"},
@@ -321,7 +322,7 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
 	{CTRY_NICARAGUA, FCC3_FCCA, "NI", "NICARAGUA"},
 	{CTRY_NORWAY, ETSI1_WORLD, "NO", "NORWAY"},
 	{CTRY_OMAN, ETSI1_WORLD, "OM", "OMAN"},
-	{CTRY_PAKISTAN, APL1_WORLD, "PK", "PAKISTAN"},
+	{CTRY_PAKISTAN, APL1_ETSIC, "PK", "PAKISTAN"},
 	{CTRY_PALAU, FCC3_FCCA, "PW", "PALAU"},
 	{CTRY_PANAMA, FCC1_FCCA, "PA", "PANAMA"},
 	{CTRY_PAPUA_NEW_GUINEA, FCC3_WORLD, "PG", "PAPUA NEW GUINEA"},
@@ -418,6 +419,7 @@ static const struct reg_dmn g_reg_dmns[] = {
 	{APL11, ETSI},
 	{APL12, ETSI},
 	{APL13, ETSI},
+	{APL14, FCC},
 	{NULL1, NO_CTL},
 	{MKK3, MKK},
 	{MKK4, MKK},