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
This commit is contained in:
Hariharan Basuthkar
zatwierdzone przez
nshrivas
nshrivas
rodzic
cd9abacf18
commit
2082a4c585
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user