qcacmn: Define DSRC regdomains

ETSI10 and FCC10 regdomains are DSRC regdomains. FCC10 is used by US
and ETSI10 is used by many european countries. Add full country mapping
table for DSRC regdomains. Also separate out channel definitions based on
DSRC.

Change-Id: I0c4c44e7189e88e397c21b2ceada325ce06a88f7
CRs-Fixed: 2271736

umac/regulatory/core/src/reg_db.c

@@ -217,6 +217,8 @@ enum reg_domain {
 	FCC6_WORLD = 0x23,
 	FCC6_FCCA = 0x14,
 	FCC8_FCCA = 0x16,
+	FCC9_FCCA = 0x17,
+	FCC10_FCCA = 0x18,
 	FCC11_WORLD = 0x19,
 	FCC13_WORLD = 0xE4,
 	FCC14_FCCB = 0xE6,
@@ -226,6 +228,7 @@ enum reg_domain {
 	ETSI4_WORLD = 0x30,
 	ETSI8_WORLD = 0x3D,
 	ETSI9_WORLD = 0x3E,
+	ETSI10_WORLD = 0x24,
 	ETSI11_WORLD = 0x26,
 	ETSI12_WORLD = 0x28,
 	ETSI13_WORLD = 0x27,
@@ -448,6 +451,183 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_JAPAN15, MKK5_MKKC, "JP", 40, 160, 0},
 };
 #else
+#ifdef WLAN_FEATURE_DSRC
+const struct country_code_to_reg_domain g_all_countries[] = {
+	{CTRY_AFGHANISTAN, ETSI1_WORLD, "AF", 40, 160, 0},
+	{CTRY_ALBANIA, ETSI13_WORLD, "AL", 40, 160, 0},
+	{CTRY_ALGERIA, APL13_WORLD, "DZ", 40, 160, 0},
+	{CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", 40, 160, 0},
+	{CTRY_ANGUILLA, ETSI1_WORLD, "AI", 40, 160, 0},
+	{CTRY_ARGENTINA, APL17_ETSID, "AR1", 40, 160, 0},
+	{CTRY_ARMENIA, ETSI4_WORLD, "AM", 40, 20, 0},
+	{CTRY_ARUBA, ETSI1_WORLD, "AW", 40, 160, 0},
+	{CTRY_AUSTRALIA, FCC6_WORLD, "AU", 40, 160, 0},
+	{CTRY_AUSTRIA, ETSI10_WORLD, "AT", 40, 160, 0},
+	{CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", 40, 160, 0},
+	{CTRY_BAHAMAS, FCC3_WORLD, "BS", 40, 160, 0},
+	{CTRY_BAHRAIN, APL15_WORLD, "BH", 40, 20, 0},
+	{CTRY_BANGLADESH, APL1_WORLD, "BD", 40, 160, 0},
+	{CTRY_BARBADOS, FCC2_WORLD, "BB", 40, 160, 0},
+	{CTRY_BELARUS, ETSI1_WORLD, "BY", 40, 160, 0},
+	{CTRY_BELGIUM, ETSI10_WORLD, "BE", 40, 160, 0},
+	{CTRY_BELIZE, ETSI8_WORLD, "BZ", 40, 160, 0},
+	{CTRY_BERMUDA, FCC3_FCCA, "BM", 40, 160, 0},
+	{CTRY_BHUTAN, ETSI1_WORLD, "BT", 40, 160, 0},
+	{CTRY_BOLIVIA, APL8_WORLD, "BO", 40, 160, 0},
+	{CTRY_BOSNIA_HERZ, ETSI13_WORLD, "BA", 40, 160, 0},
+	{CTRY_BRAZIL, FCC3_ETSIC, "BR", 40, 160, 0},
+	{CTRY_BRUNEI_DARUSSALAM, APL6_WORLD, "BN", 40, 160, 0},
+	{CTRY_BULGARIA, ETSI10_WORLD, "BG", 40, 160, 0},
+	{CTRY_BURKINA_FASO, FCC3_WORLD, "BF", 40, 160, 0},
+	{CTRY_CAMBODIA, ETSI1_WORLD, "KH", 40, 160, 0},
+	{CTRY_CANADA, FCC3_FCCA, "CA", 40, 160, 0},
+	{CTRY_CAYMAN_ISLANDS, FCC3_WORLD, "KY", 40, 160, 0},
+	{CTRY_CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, "CF", 40, 40, 0},
+	{CTRY_CHAD, ETSI1_WORLD, "TD", 40, 160, 0},
+	{CTRY_CHILE, APL23_WORLD, "CL", 40, 160, 0},
+	{CTRY_CHINA, APL14_WORLD, "CN", 40, 160, 0},
+	{CTRY_CHRISTMAS_ISLAND, FCC3_WORLD, "CX", 40, 160, 0},
+	{CTRY_COLOMBIA, FCC3_WORLD, "CO", 40, 160, 0},
+	{CTRY_COSTA_RICA, FCC3_WORLD, "CR", 40, 20, 0},
+	{CTRY_COTE_DIVOIRE, FCC3_WORLD, "CI", 40, 160, 0},
+	{CTRY_CROATIA, ETSI10_WORLD, "HR", 40, 160, 0},
+	{CTRY_CYPRUS, ETSI10_WORLD, "CY", 40, 160, 0},
+	{CTRY_CZECH, ETSI10_WORLD, "CZ", 40, 160, 0},
+	{CTRY_DENMARK, ETSI10_WORLD, "DK", 40, 160,  0},
+	{CTRY_DOMINICA, FCC2_FCCA, "DM", 40, 160, 0},
+	{CTRY_DOMINICAN_REPUBLIC, FCC2_FCCA, "DO", 40, 160, 0},
+	{CTRY_ECUADOR, FCC3_WORLD, "EC", 40, 20, 0},
+	{CTRY_EGYPT, ETSI3_WORLD, "EG", 40, 160, 0},
+	{CTRY_EL_SALVADOR, FCC2_WORLD, "SV", 40, 20, 0},
+	{CTRY_ESTONIA, ETSI10_WORLD, "EE", 40, 160, 0},
+	{CTRY_ETHIOPIA, ETSI1_WORLD, "ET", 40, 160, 0},
+	{CTRY_FINLAND, ETSI10_WORLD, "FI", 40, 160, 0},
+	{CTRY_FRANCE, ETSI10_WORLD, "FR", 40, 160, 0},
+	{CTRY_FRENCH_GUIANA, ETSI13_WORLD, "GF", 40, 160, 0},
+	{CTRY_FRENCH_POLYNESIA, ETSI13_WORLD, "PF", 40, 160, 0},
+	{CTRY_GEORGIA, ETSI4_WORLD, "GE", 40, 160, 0},
+	{CTRY_GERMANY, ETSI10_WORLD, "DE", 40, 160, 0},
+	{CTRY_GHANA, FCC3_WORLD, "GH", 40, 160, 0},
+	{CTRY_GIBRALTAR, ETSI1_WORLD, "GI", 40, 160, 0},
+	{CTRY_GREECE, ETSI10_WORLD, "GR", 40, 160, 0},
+	{CTRY_GREENLAND, ETSI1_WORLD, "GL", 40, 160, 0},
+	{CTRY_GRENADA, FCC3_FCCA, "GD", 40, 160, 0},
+	{CTRY_GUADELOUPE, ETSI1_WORLD, "GP", 40, 160, 0},
+	{CTRY_GUAM, FCC3_FCCA, "GU", 40, 160, 0},
+	{CTRY_GUATEMALA, ETSI1_WORLD, "GT", 40, 160, 0},
+	{CTRY_GUYANA, APL1_ETSIC, "GY", 40, 160, 0},
+	{CTRY_HAITI, FCC3_FCCA, "HT", 40, 160, 0},
+	{CTRY_HONDURAS, FCC13_WORLD, "HN", 40, 160, 0},
+	{CTRY_HONG_KONG, FCC3_WORLD, "HK", 40, 160, 0},
+	{CTRY_HUNGARY, ETSI10_WORLD, "HU", 40, 160, 0},
+	{CTRY_ICELAND, ETSI10_WORLD, "IS", 40, 160, 0},
+	{CTRY_INDIA, APL15_WORLD, "IN", 40, 160, 0},
+	{CTRY_INDONESIA, APL2_ETSIC, "ID", 40, 20, 0},
+	{CTRY_IRAQ, ETSI1_WORLD, "IQ", 40, 160, 0},
+	{CTRY_IRELAND, ETSI10_WORLD, "IE", 40, 160, 0},
+	{CTRY_ISRAEL, ETSI3_WORLD, "IL", 40, 160, 0},
+	{CTRY_ITALY, ETSI10_WORLD, "IT", 40, 160,  0},
+	{CTRY_JAMAICA, FCC13_WORLD, "JM", 40, 160, 0},
+	{CTRY_JORDAN, APL4_WORLD, "JO", 40, 160, 0},
+	{CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", 40, 0, 0},
+	{CTRY_KENYA, APL12_WORLD, "KE", 40, 160, 0},
+	{CTRY_KOREA_ROC, APL9_WORLD, "KR", 40, 160, 0},
+	{CTRY_KUWAIT, ETSI3_WORLD, "KW", 40, 160, 0},
+	{CTRY_LATVIA, ETSI10_WORLD, "LV", 40, 160, 0},
+	{CTRY_LEBANON, FCC3_WORLD, "LB", 40, 160, 0},
+	{CTRY_LESOTHO, ETSI1_WORLD, "LS", 40, 160, 0},
+	{CTRY_LIECHTENSTEIN, ETSI10_WORLD, "LI", 40, 160, 0},
+	{CTRY_LITHUANIA, ETSI10_WORLD, "LT", 40, 160, 0},
+	{CTRY_LUXEMBOURG, ETSI10_WORLD, "LU", 40, 160, 0},
+	{CTRY_MACAU, FCC3_WORLD, "MO", 40, 160, 0},
+	{CTRY_MACEDONIA, ETSI13_WORLD, "MK", 40, 160, 0},
+	{CTRY_MALAWI, ETSI1_WORLD, "MW", 40, 160, 0},
+	{CTRY_MALAYSIA, FCC11_WORLD, "MY", 40, 160, 0},
+	{CTRY_MALDIVES, APL6_WORLD, "MV", 40, 160, 0},
+	{CTRY_MALTA, ETSI10_WORLD, "MT", 40, 160, 0},
+	{CTRY_MARSHALL_ISLANDS, FCC3_FCCA, "MH", 40, 160, 0},
+	{CTRY_MARTINIQUE, ETSI13_WORLD, "MQ", 40, 160, 0},
+	{CTRY_MAURITANIA, ETSI1_WORLD, "MR", 40, 160, 0},
+	{CTRY_MAURITIUS, ETSI13_WORLD, "MU", 40, 160, 0},
+	{CTRY_MAYOTTE, ETSI1_WORLD, "YT", 40, 160, 0},
+	{CTRY_MEXICO, FCC3_ETSIC, "MX", 40, 160, 0},
+	{CTRY_MICRONESIA, FCC3_FCCA, "FM", 40, 160, 0},
+	{CTRY_MOLDOVA, ETSI13_WORLD, "MD", 40, 160, 0},
+	{CTRY_MONACO, ETSI13_WORLD, "MC", 40, 160, 0},
+	{CTRY_MONGOLIA, FCC3_WORLD, "MN", 40, 160, 0},
+	{CTRY_MONTENEGRO, ETSI13_WORLD, "ME", 40, 160, 0},
+	{CTRY_MOROCCO, ETSI3_WORLD, "MA", 40, 160, 0},
+	{CTRY_NAMIBIA, APL20_WORLD, "NA", 40, 160, 0},
+	{CTRY_NEPAL, APL23_WORLD, "NP", 40, 160, 0},
+	{CTRY_NETHERLANDS, ETSI10_WORLD, "NL", 40, 160, 0},
+	{CTRY_NETHERLANDS_ANTILLES, ETSI13_WORLD, "AN", 40, 160, 0},
+	{CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", 40, 160, 0},
+	{CTRY_NIGERIA, APL8_WORLD, "NG", 40, 160, 0},
+	{CTRY_NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, "MP", 40, 160, 0},
+	{CTRY_NICARAGUA, FCC3_FCCA, "NI", 40, 160, 0},
+	{CTRY_NORWAY, ETSI10_WORLD, "NO", 40, 160, 0},
+	{CTRY_OMAN, ETSI1_WORLD, "OM", 40, 160, 0},
+	{CTRY_PAKISTAN, APL1_ETSIC, "PK", 40, 160, 0},
+	{CTRY_PALAU, FCC3_FCCA, "PW", 40, 160, 0},
+	{CTRY_PANAMA, FCC14_FCCB, "PA", 40, 160, 0},
+	{CTRY_PAPUA_NEW_GUINEA, FCC3_WORLD, "PG", 40, 160, 0},
+	{CTRY_PARAGUAY, FCC3_WORLD, "PY", 40, 160, 0},
+	{CTRY_PERU, FCC3_WORLD, "PE", 40, 160, 0},
+	{CTRY_PHILIPPINES, FCC3_WORLD, "PH", 40, 160, 0},
+	{CTRY_POLAND, ETSI10_WORLD, "PL", 40, 160, 0},
+	{CTRY_PORTUGAL, ETSI10_WORLD, "PT", 40, 160, 0},
+	{CTRY_PUERTO_RICO, FCC3_FCCA, "PR", 40, 160, 0},
+	{CTRY_QATAR, ETSI14_WORLD, "QA", 40, 160, 0},
+	{CTRY_REUNION, ETSI1_WORLD, "RE", 40, 160, 0},
+	{CTRY_ROMANIA, ETSI10_WORLD, "RO", 40, 160, 0},
+	{CTRY_RUSSIA, ETSI8_WORLD, "RU", 40, 160, 0},
+	{CTRY_RWANDA, FCC3_WORLD, "RW", 40, 160, 0},
+	{CTRY_SAINT_BARTHELEMY, ETSI1_WORLD, "BL", 40, 160, 0},
+	{CTRY_SAINT_KITTS_AND_NEVIS, APL10_WORLD, "KN", 40, 160, 0},
+	{CTRY_SAINT_LUCIA, APL10_WORLD, "LC", 40, 160, 0},
+	{CTRY_SAINT_MARTIN, ETSI1_WORLD, "MF", 40, 160, 0},
+	{CTRY_SAINT_PIERRE_AND_MIQUELON, ETSI13_WORLD, "PM", 40, 160, 0},
+	{CTRY_SAINT_VINCENT_AND_THE_GRENADIENS, ETSI13_WORLD, "VC",
+	 40, 160, 0},
+	{CTRY_SAMOA, ETSI1_WORLD, "WS", 40, 40, 0},
+	{CTRY_SAUDI_ARABIA, ETSI1_WORLD, "SA", 40, 160, 0},
+	{CTRY_SENEGAL, FCC13_WORLD, "SN", 40, 160, 0},
+	{CTRY_SERBIA, ETSI13_WORLD, "RS", 40, 160, 0},
+	{CTRY_SINGAPORE, FCC3_WORLD, "SG", 40, 160, 0},
+	{CTRY_SLOVAKIA, ETSI10_WORLD, "SK", 40, 160, 0},
+	{CTRY_SLOVENIA, ETSI10_WORLD, "SI", 40, 160, 0},
+	{CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", 40, 160, 0},
+	{CTRY_SPAIN, ETSI10_WORLD, "ES", 40, 160, 0},
+	{CTRY_SURINAME, ETSI1_WORLD, "SR", 40, 160, 0},
+	{CTRY_SRI_LANKA, FCC3_WORLD, "LK", 40, 20, 0},
+	{CTRY_SWEDEN, ETSI10_WORLD, "SE", 40, 160, 0},
+	{CTRY_SWITZERLAND, ETSI10_WORLD, "CH", 40, 160, 0},
+	{CTRY_TAIWAN, FCC3_FCCA, "TW", 40, 160, 0},
+	{CTRY_TANZANIA, APL1_WORLD, "TZ", 40, 160, 0},
+	{CTRY_THAILAND, FCC3_WORLD, "TH", 40, 160, 0},
+	{CTRY_TOGO, ETSI1_WORLD, "TG", 40, 40, 0},
+	{CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", 40, 160, 0},
+	{CTRY_TUNISIA, ETSI3_WORLD, "TN", 40, 160, 0},
+	{CTRY_TURKEY, ETSI13_WORLD, "TR", 40, 160, 0},
+	{CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC", 40, 160, 0},
+	{CTRY_UGANDA, FCC3_WORLD, "UG", 40, 160, 0},
+	{CTRY_UKRAINE, ETSI9_WORLD, "UA", 40, 160, 0},
+	{CTRY_UAE, FCC3_WORLD, "AE", 40, 160, 0},
+	{CTRY_UNITED_KINGDOM, ETSI10_WORLD, "GB", 40, 160, 0},
+	{CTRY_UNITED_STATES, FCC10_FCCA, "US", 40, 160, 0},
+	{CTRY_URUGUAY, FCC2_WORLD, "UY", 40, 160, 0},
+	{CTRY_UZBEKISTAN, ETSI3_WORLD, "UZ", 40, 160, 0},
+	{CTRY_VANUATU, FCC3_WORLD, "VU", 40, 160, 0},
+	{CTRY_VENEZUELA, FCC2_ETSIC, "VE", 40, 160, 0},
+	{CTRY_VIET_NAM, FCC3_WORLD, "VN", 40, 80, 0},
+	{CTRY_VIRGIN_ISLANDS, FCC3_FCCA, "VI", 40, 160, 0},
+	{CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF", 40, 160, 0},
+	{CTRY_YEMEN, NULL1_WORLD, "YE", 40, 0, 0},
+	{CTRY_ZIMBABWE, ETSI1_WORLD, "ZW", 40, 160, 0},
+	{CTRY_JAPAN, MKK5_MKKC, "JP", 40, 160, 0},
+	{CTRY_XA, MKK5_MKKA, "XA", 40, 160, 0},
+};
+#else
 const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_AFGHANISTAN, ETSI1_WORLD, "AF", 40, 160, 0},
 	{CTRY_ALBANIA, ETSI13_WORLD, "AL", 40, 160, 0},
@@ -624,6 +804,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_XA, MKK5_MKKA, "XA", 40, 160, 0},
 };
 #endif
+#endif
 
 enum reg_domains_2g {
 	FCCA,
@@ -647,6 +828,7 @@ enum reg_domains_5g {
 	FCC5,
 	FCC6,
 	FCC8,
+	FCC10,
 	FCC11,
 	FCC13,
 	FCC14,
@@ -655,6 +837,7 @@ enum reg_domains_5g {
 	ETSI4,
 	ETSI8,
 	ETSI9,
+	ETSI10,
 	ETSI11,
 	ETSI12,
 	ETSI13,
@@ -874,6 +1057,8 @@ enum reg_rules_5g {
 	CHAN_5735_5775_1,
 	CHAN_5835_5855_1,
 	CHAN_5855_5875_1,
+	CHAN_5850_5925_1,
+	CHAN_5850_5925_2,
 };
 
 const struct regulatory_rule reg_rules_5g[] = {
@@ -947,6 +1132,8 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5735_5775_1] = {5735, 5775, 40, 23, 0},
 	[CHAN_5835_5855_1] = {5835, 5855, 20, 30, 0},
 	[CHAN_5855_5875_1] = {5855, 5875, 20, 30, 0},
+	[CHAN_5850_5925_1] = {5850, 5925, 20, 24, 0},
+	[CHAN_5850_5925_2] = {5850, 5925, 20, 30, 0},
 };
 
 
@@ -981,6 +1168,12 @@ const struct regdomain regdomains_5g[] = {
 					      CHAN_5490_5730_1,
 					      CHAN_5735_5835_2} },
 
+	[FCC10] = {CTL_FCC, DFS_FCC_REG, 2, 0, 5, {CHAN_5170_5250_4,
+						   CHAN_5250_5330_7,
+						   CHAN_5490_5730_1,
+						   CHAN_5735_5835_2,
+						   CHAN_5850_5925_1} },
+
 	[FCC11] = {CTL_FCC, DFS_FCC_REG, 2, 6, 4, {CHAN_5170_5250_5,
 					      CHAN_5250_5330_7,
 					      CHAN_5490_5650_2,
@@ -1016,10 +1209,15 @@ const struct regdomain regdomains_5g[] = {
 						  CHAN_5490_5710_5,
 						  CHAN_5735_5835_6} },
 
+	[ETSI10] = {CTL_ETSI, DFS_ETSI_REG, 10, 0, 4, {CHAN_5170_5250_3,
+						       CHAN_5250_5330_2,
+						       CHAN_5490_5710_3,
+						       CHAN_5850_5925_2} },
+
 	[ETSI11] = {CTL_ETSI, DFS_ETSI_REG, 10, 0, 4, {CHAN_5170_5250_3,
-						  CHAN_5250_5330_2,
-						  CHAN_5490_5710_3,
-						  CHAN_5735_5875_1} },
+						       CHAN_5250_5330_2,
+						       CHAN_5490_5710_3,
+						       CHAN_5735_5875_1} },
 
 	[ETSI12] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 4, {CHAN_5170_5250_3,
 						  CHAN_5250_5330_2,

umac/regulatory/dispatcher/inc/reg_services_public_struct.h

@@ -103,6 +103,8 @@
  * @CHAN_ENUM_183:  channel number 183
  * @CHAN_ENUM_184:  channel number 184
  */
+
+#ifdef WLAN_FEATURE_DSRC
 enum channel_enum {
 	CHAN_ENUM_1,
 	CHAN_ENUM_2,
@@ -146,10 +148,7 @@ enum channel_enum {
 	CHAN_ENUM_157,
 	CHAN_ENUM_161,
 	CHAN_ENUM_165,
-#ifndef WLAN_FEATURE_DSRC
-	CHAN_ENUM_169,
-	CHAN_ENUM_173,
-#else
+
 	CHAN_ENUM_170,
 	CHAN_ENUM_171,
 	CHAN_ENUM_172,
@@ -165,7 +164,6 @@ enum channel_enum {
 	CHAN_ENUM_182,
 	CHAN_ENUM_183,
 	CHAN_ENUM_184,
-#endif
 
 	NUM_CHANNELS,
 
@@ -178,23 +176,83 @@ enum channel_enum {
 	NUM_49GHZ_CHANNELS = MAX_49GHZ_CHANNEL - MIN_49GHZ_CHANNEL + 1,
 
 	MIN_5GHZ_CHANNEL = CHAN_ENUM_36,
-#ifndef WLAN_FEATURE_DSRC
-	MAX_5GHZ_CHANNEL = CHAN_ENUM_173,
-#else
 	MAX_5GHZ_CHANNEL = CHAN_ENUM_184,
-#endif
 	NUM_5GHZ_CHANNELS = (MAX_5GHZ_CHANNEL - MIN_5GHZ_CHANNEL + 1),
 
-#ifdef WLAN_FEATURE_DSRC
 	MIN_DSRC_CHANNEL = CHAN_ENUM_170,
 	MAX_DSRC_CHANNEL = CHAN_ENUM_184,
 	NUM_DSRC_CHANNELS = (MAX_DSRC_CHANNEL - MIN_DSRC_CHANNEL + 1),
-#endif
 
 	INVALID_CHANNEL = 0xBAD,
 };
 
 #else
+enum channel_enum {
+	CHAN_ENUM_1,
+	CHAN_ENUM_2,
+	CHAN_ENUM_3,
+	CHAN_ENUM_4,
+	CHAN_ENUM_5,
+	CHAN_ENUM_6,
+	CHAN_ENUM_7,
+	CHAN_ENUM_8,
+	CHAN_ENUM_9,
+	CHAN_ENUM_10,
+	CHAN_ENUM_11,
+	CHAN_ENUM_12,
+	CHAN_ENUM_13,
+	CHAN_ENUM_14,
+
+	CHAN_ENUM_36,
+	CHAN_ENUM_40,
+	CHAN_ENUM_44,
+	CHAN_ENUM_48,
+	CHAN_ENUM_52,
+	CHAN_ENUM_56,
+	CHAN_ENUM_60,
+	CHAN_ENUM_64,
+
+	CHAN_ENUM_100,
+	CHAN_ENUM_104,
+	CHAN_ENUM_108,
+	CHAN_ENUM_112,
+	CHAN_ENUM_116,
+	CHAN_ENUM_120,
+	CHAN_ENUM_124,
+	CHAN_ENUM_128,
+	CHAN_ENUM_132,
+	CHAN_ENUM_136,
+	CHAN_ENUM_140,
+	CHAN_ENUM_144,
+
+	CHAN_ENUM_149,
+	CHAN_ENUM_153,
+	CHAN_ENUM_157,
+	CHAN_ENUM_161,
+	CHAN_ENUM_165,
+	CHAN_ENUM_169,
+	CHAN_ENUM_173,
+
+	NUM_CHANNELS,
+
+	MIN_24GHZ_CHANNEL = CHAN_ENUM_1,
+	MAX_24GHZ_CHANNEL = CHAN_ENUM_14,
+	NUM_24GHZ_CHANNELS = (MAX_24GHZ_CHANNEL - MIN_24GHZ_CHANNEL + 1),
+
+	MIN_49GHZ_CHANNEL = INVALID_CHANNEL_NUM,
+	MAX_49GHZ_CHANNEL = INVALID_CHANNEL_NUM - 1,
+	NUM_49GHZ_CHANNELS = MAX_49GHZ_CHANNEL - MIN_49GHZ_CHANNEL + 1,
+
+	MIN_5GHZ_CHANNEL = CHAN_ENUM_36,
+
+	MAX_5GHZ_CHANNEL = CHAN_ENUM_173,
+
+	NUM_5GHZ_CHANNELS = (MAX_5GHZ_CHANNEL - MIN_5GHZ_CHANNEL + 1),
+	INVALID_CHANNEL = 0xBAD,
+};
+#endif /* WLAN_FEATURE_DSRC */
+
+#else /* CONFIG_LEGACY_CHAN_ENUM */
 /**
  * enum channel_enum - channel enumeration
  * @CHAN_ENUM_2412: channel with freq 2412