qcacmn: Remove channel_map_old and CONFIG_LEGACY_CHAN_ENUM

Remove channel_map_old and and remove the instances of
CONFIG_LEGACY_CHAN_ENUM in the dfs and regulatory component.

Change-Id: I3e30dba72c28c9c356648595ad96720ab0cd789a
CRs-Fixed: 2463009

umac/dfs/core/src/dfs_random_chan_sel.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -164,7 +164,8 @@ struct dfs_tx_leak_info {
  */
 struct dfs_matrix_tx_leak_info {
 	uint8_t channel;
-	struct dfs_tx_leak_info chan_matrix[CHAN_ENUM_144 - CHAN_ENUM_36 + 1];
+	struct dfs_tx_leak_info chan_matrix[CHAN_ENUM_5720 -
+					    CHAN_ENUM_5180 + 1];
 };
 #endif
 

umac/dfs/core/src/misc/dfs_random_chan_sel.c

@@ -779,7 +779,7 @@ dfs_mark_leaking_ch(struct wlan_dfs *dfs,
 		uint8_t *temp_ch_lst)
 {
 	struct dfs_tx_leak_info *target_chan_matrix = NULL;
-	uint32_t         num_channel = (CHAN_ENUM_144 - CHAN_ENUM_36) + 1;
+	uint32_t         num_channel = (CHAN_ENUM_5720 - CHAN_ENUM_5180) + 1;
 	uint32_t         j = 0;
 	uint32_t         k = 0;
 	uint8_t          dfs_nol_channel;

umac/regulatory/core/src/reg_services_common.c

@@ -77,73 +77,6 @@ static const enum phy_ch_width get_next_lower_bw[] = {
 	[CH_WIDTH_5MHZ] = CH_WIDTH_INVALID
 };
 
-#ifdef CONFIG_LEGACY_CHAN_ENUM
-static const struct chan_map channel_map_old[NUM_CHANNELS] = {
-	[CHAN_ENUM_1] = {2412, 1, 2, 40},
-	[CHAN_ENUM_2] = {2417, 2, 2, 40},
-	[CHAN_ENUM_3] = {2422, 3, 2, 40},
-	[CHAN_ENUM_4] = {2427, 4, 2, 40},
-	[CHAN_ENUM_5] = {2432, 5, 2, 40},
-	[CHAN_ENUM_6] = {2437, 6, 2, 40},
-	[CHAN_ENUM_7] = {2442, 7, 2, 40},
-	[CHAN_ENUM_8] = {2447, 8, 2, 40},
-	[CHAN_ENUM_9] = {2452, 9, 2, 40},
-	[CHAN_ENUM_10] = {2457, 10, 2, 40},
-	[CHAN_ENUM_11] = {2462, 11, 2, 40},
-	[CHAN_ENUM_12] = {2467, 12, 2, 40},
-	[CHAN_ENUM_13] = {2472, 13, 2, 40},
-	[CHAN_ENUM_14] = {2484, 14, 2, 40},
-
-	[CHAN_ENUM_36] = {5180, 36, 2, 160},
-	[CHAN_ENUM_40] = {5200, 40, 2, 160},
-	[CHAN_ENUM_44] = {5220, 44, 2, 160},
-	[CHAN_ENUM_48] = {5240, 48, 2, 160},
-	[CHAN_ENUM_52] = {5260, 52, 2, 160},
-	[CHAN_ENUM_56] = {5280, 56, 2, 160},
-	[CHAN_ENUM_60] = {5300, 60, 2, 160},
-	[CHAN_ENUM_64] = {5320, 64, 2, 160},
-
-	[CHAN_ENUM_100] = {5500, 100, 2, 160},
-	[CHAN_ENUM_104] = {5520, 104, 2, 160},
-	[CHAN_ENUM_108] = {5540, 108, 2, 160},
-	[CHAN_ENUM_112] = {5560, 112, 2, 160},
-	[CHAN_ENUM_116] = {5580, 116, 2, 160},
-	[CHAN_ENUM_120] = {5600, 120, 2, 160},
-	[CHAN_ENUM_124] = {5620, 124, 2, 160},
-	[CHAN_ENUM_128] = {5640, 128, 2, 160},
-	[CHAN_ENUM_132] = {5660, 132, 2, 160},
-	[CHAN_ENUM_136] = {5680, 136, 2, 160},
-	[CHAN_ENUM_140] = {5700, 140, 2, 160},
-	[CHAN_ENUM_144] = {5720, 144, 2, 160},
-
-	[CHAN_ENUM_149] = {5745, 149, 2, 160},
-	[CHAN_ENUM_153] = {5765, 153, 2, 160},
-	[CHAN_ENUM_157] = {5785, 157, 2, 160},
-	[CHAN_ENUM_161] = {5805, 161, 2, 160},
-	[CHAN_ENUM_165] = {5825, 165, 2, 160},
-#ifndef WLAN_FEATURE_DSRC
-	[CHAN_ENUM_169] = {5845, 169, 2, 40},
-	[CHAN_ENUM_173] = {5865, 173, 2, 20},
-#else
-	[CHAN_ENUM_170] = {5852, 170, 2, 20},
-	[CHAN_ENUM_171] = {5855, 171, 2, 20},
-	[CHAN_ENUM_172] = {5860, 172, 2, 20},
-	[CHAN_ENUM_173] = {5865, 173, 2, 20},
-	[CHAN_ENUM_174] = {5870, 174, 2, 20},
-	[CHAN_ENUM_175] = {5875, 175, 2, 20},
-	[CHAN_ENUM_176] = {5880, 176, 2, 20},
-	[CHAN_ENUM_177] = {5885, 177, 2, 20},
-	[CHAN_ENUM_178] = {5890, 178, 2, 20},
-	[CHAN_ENUM_179] = {5895, 179, 2, 20},
-	[CHAN_ENUM_180] = {5900, 180, 2, 20},
-	[CHAN_ENUM_181] = {5905, 181, 2, 20},
-	[CHAN_ENUM_182] = {5910, 182, 2, 20},
-	[CHAN_ENUM_183] = {5915, 183, 2, 20},
-	[CHAN_ENUM_184] = {5920, 184, 2, 20},
-#endif
-};
-
-#else
 static const struct chan_map channel_map_us[NUM_CHANNELS] = {
 	[CHAN_ENUM_2412] = {2412, 1, 20, 40},
 	[CHAN_ENUM_2417] = {2417, 2, 20, 40},
@@ -958,14 +891,7 @@ static const struct chan_map channel_map_china[NUM_CHANNELS] = {
 	[CHAN_ENUM_7105] = {7105, 233, 2, 160}
 #endif /* CONFIG_BAND_6GHZ */
 };
-#endif
 
-#ifdef CONFIG_LEGACY_CHAN_ENUM
-void reg_init_channel_map(enum dfs_reg dfs_region)
-{
-	channel_map = channel_map_old;
-}
-#else
 void reg_init_channel_map(enum dfs_reg dfs_region)
 {
 	switch (dfs_region) {
@@ -990,7 +916,6 @@ void reg_init_channel_map(enum dfs_reg dfs_region)
 		break;
 	}
 }
-#endif
 
 uint16_t reg_get_bw_value(enum phy_ch_width bw)
 {
@@ -1670,7 +1595,6 @@ uint32_t reg_chan_to_freq(struct wlan_objmgr_pdev *pdev,
 	return 0;
 }
 
-#ifndef CONFIG_LEGACY_CHAN_ENUM
 bool reg_chan_is_49ghz(struct wlan_objmgr_pdev *pdev, uint8_t chan_num)
 {
 	uint32_t freq = 0;
@@ -1679,12 +1603,6 @@ bool reg_chan_is_49ghz(struct wlan_objmgr_pdev *pdev, uint8_t chan_num)
 
 	return REG_IS_49GHZ_FREQ(freq) ? true : false;
 }
-#else
-bool reg_chan_is_49ghz(struct wlan_objmgr_pdev *pdev, uint8_t chan_num)
-{
-	return false;
-}
-#endif
 
 enum band_info reg_chan_to_band(uint32_t chan_num)
 {
@@ -2222,12 +2140,10 @@ bool reg_is_6ghz_chan_freq(uint16_t freq)
 }
 #endif
 
-#ifndef CONFIG_LEGACY_CHAN_ENUM
 bool reg_is_49ghz_freq(uint32_t freq)
 {
 	return REG_IS_49GHZ_FREQ(freq);
 }
-#endif
 
 uint32_t reg_ch_num(uint32_t ch_enum)
 {

umac/regulatory/core/src/reg_services_common.h

@@ -45,14 +45,12 @@
 	(((freq) >= REG_MIN_24GHZ_CH_FREQ) &&   \
 	((freq) <= REG_MAX_24GHZ_CH_FREQ))
 
-#ifndef CONFIG_LEGACY_CHAN_ENUM
 #define REG_MIN_49GHZ_CH_FREQ channel_map[MIN_49GHZ_CHANNEL].center_freq
 #define REG_MAX_49GHZ_CH_FREQ channel_map[MAX_49GHZ_CHANNEL].center_freq
 
 #define REG_IS_49GHZ_FREQ(freq) \
 	(((freq) >= REG_MIN_49GHZ_CH_FREQ) &&   \
 	((freq) <= REG_MAX_49GHZ_CH_FREQ))
-#endif
 
 #define REG_IS_5GHZ_CH(chan_num) \
 	(((chan_num) >= REG_MIN_5GHZ_CH_NUM) &&	\
@@ -458,7 +456,6 @@ static inline bool reg_is_6ghz_chan_freq(uint16_t freq)
 }
 #endif /* CONFIG_BAND_6GHZ */
 
-#ifndef CONFIG_LEGACY_CHAN_ENUM
 /**
  * reg_is_49ghz_freq() - Check if the given channel frequency is 4.9GHz
  * @freq: Channel frequency
@@ -466,7 +463,6 @@ static inline bool reg_is_6ghz_chan_freq(uint16_t freq)
  * Return: true if channel frequency is 4.9GHz, else false
  */
 bool reg_is_49ghz_freq(uint32_t freq);
-#endif
 
 /**
  * reg_ch_num() - Get channel number from channel enum

umac/regulatory/dispatcher/inc/reg_services_public_struct.h

@@ -86,224 +86,7 @@ enum op_class_table_num {
 	OP_CLASS_JAPAN,
 	OP_CLASS_GLOBAL
 };
-#ifdef CONFIG_LEGACY_CHAN_ENUM
 
-/**
- * enum channel_enum - channel enumeration
- * @CHAN_ENUM_1:  channel number 1
- * @CHAN_ENUM_2:  channel number 2
- * @CHAN_ENUM_3:  channel number 3
- * @CHAN_ENUM_4:  channel number 4
- * @CHAN_ENUM_5:  channel number 5
- * @CHAN_ENUM_6:  channel number 6
- * @CHAN_ENUM_7:  channel number 7
- * @CHAN_ENUM_8:  channel number 8
- * @CHAN_ENUM_9:  channel number 9
- * @CHAN_ENUM_10:  channel number 10
- * @CHAN_ENUM_11:  channel number 11
- * @CHAN_ENUM_12:  channel number 12
- * @CHAN_ENUM_13:  channel number 13
- * @CHAN_ENUM_14:  channel number 14
- * @CHAN_ENUM_183:  channel number 183
- * @CHAN_ENUM_184:  channel number 184
- * @CHAN_ENUM_185:  channel number 185
- * @CHAN_ENUM_187:  channel number 187
- * @CHAN_ENUM_188:  channel number 188
- * @CHAN_ENUM_189:  channel number 189
- * @CHAN_ENUM_192:  channel number 192
- * @CHAN_ENUM_196:  channel number 196
- * @CHAN_ENUM_36:  channel number 36
- * @CHAN_ENUM_40:  channel number 40
- * @CHAN_ENUM_44:  channel number 44
- * @CHAN_ENUM_48:  channel number 48
- * @CHAN_ENUM_52:  channel number 52
- * @CHAN_ENUM_56:  channel number 56
- * @CHAN_ENUM_60:  channel number 60
- * @CHAN_ENUM_64:  channel number 64
- * @CHAN_ENUM_100:  channel number 100
- * @CHAN_ENUM_104:  channel number 104
- * @CHAN_ENUM_108:  channel number 108
- * @CHAN_ENUM_112:  channel number 112
- * @CHAN_ENUM_116:  channel number 116
- * @CHAN_ENUM_120:  channel number 120
- * @CHAN_ENUM_124:  channel number 124
- * @CHAN_ENUM_128:  channel number 128
- * @CHAN_ENUM_132:  channel number 132
- * @CHAN_ENUM_136:  channel number 136
- * @CHAN_ENUM_140:  channel number 140
- * @CHAN_ENUM_144:  channel number 144
- * @CHAN_ENUM_149:  channel number 149
- * @CHAN_ENUM_153:  channel number 153
- * @CHAN_ENUM_157:  channel number 157
- * @CHAN_ENUM_161:  channel number 161
- * @CHAN_ENUM_165:  channel number 165
- * @CHAN_ENUM_169:  channel number 169
- * @CHAN_ENUM_170:  channel number 170
- * @CHAN_ENUM_171:  channel number 171
- * @CHAN_ENUM_172:  channel number 172
- * @CHAN_ENUM_173:  channel number 173
- * @CHAN_ENUM_174:  channel number 174
- * @CHAN_ENUM_175:  channel number 175
- * @CHAN_ENUM_176:  channel number 176
- * @CHAN_ENUM_177:  channel number 177
- * @CHAN_ENUM_178:  channel number 178
- * @CHAN_ENUM_179:  channel number 179
- * @CHAN_ENUM_180:  channel number 180
- * @CHAN_ENUM_181:  channel number 181
- * @CHAN_ENUM_182:  channel number 182
- * @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,
-	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_170,
-	CHAN_ENUM_171,
-	CHAN_ENUM_172,
-	CHAN_ENUM_173,
-	CHAN_ENUM_174,
-	CHAN_ENUM_175,
-	CHAN_ENUM_176,
-	CHAN_ENUM_177,
-	CHAN_ENUM_178,
-	CHAN_ENUM_179,
-	CHAN_ENUM_180,
-	CHAN_ENUM_181,
-	CHAN_ENUM_182,
-	CHAN_ENUM_183,
-	CHAN_ENUM_184,
-
-	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_184,
-	NUM_5GHZ_CHANNELS = (MAX_5GHZ_CHANNEL - MIN_5GHZ_CHANNEL + 1),
-
-	MIN_DSRC_CHANNEL = CHAN_ENUM_170,
-	MAX_DSRC_CHANNEL = CHAN_ENUM_184,
-	NUM_DSRC_CHANNELS = (MAX_DSRC_CHANNEL - MIN_DSRC_CHANNEL + 1),
-
-	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
@@ -652,7 +435,6 @@ enum channel_enum {
 
 	INVALID_CHANNEL = 0xBAD,
 };
-#endif
 
 /**
  * enum channel_state - channel state

umac/regulatory/dispatcher/inc/wlan_reg_services_api.h

@@ -112,7 +112,6 @@ static inline bool wlan_reg_is_6ghz_chan_freq(uint16_t freq)
 }
 #endif
 
-#ifndef CONFIG_LEGACY_CHAN_ENUM
 /**
  * wlan_reg_is_49ghz_freq() - Check if the given channel frequency is 4.9GHz
  * @freq: Channel frequency
@@ -121,7 +120,6 @@ static inline bool wlan_reg_is_6ghz_chan_freq(uint16_t freq)
  */
 #define WLAN_REG_IS_49GHZ_FREQ(freq) wlan_reg_is_49ghz_freq(freq)
 bool wlan_reg_is_49ghz_freq(uint32_t freq);
-#endif
 
 /**
  * wlan_reg_ch_num() - Get channel number from channel enum

umac/regulatory/dispatcher/src/wlan_reg_services_api.c

@@ -672,12 +672,10 @@ bool wlan_reg_is_6ghz_chan_freq(uint16_t freq)
 	return reg_is_6ghz_chan_freq(freq);
 }
 #endif
-#ifndef CONFIG_LEGACY_CHAN_ENUM
 bool wlan_reg_is_49ghz_freq(uint32_t freq)
 {
 	return reg_is_49ghz_freq(freq);
 }
-#endif
 
 uint32_t wlan_reg_ch_num(uint32_t ch_enum)
 {