qcacmn: Update API to use super channel list
The current channel list alone is not enough to represent the capability of the chip or device. Given a channel, in many cases it may be required to know all the power modes that are supported by this channel. Remove reg_get_5g_bonded_channel_state_for_freq, wlan_reg_get_5g_bonded_channel_state_for_freq and reg_update_5g_bonded_channel_state_punc_for_freq APIs to use the super channel APIs reg_get_5g_bonded_channel_state_for_pwrmode, wlan_reg_get_5g_bonded_channel_state_for_pwrmode and reg_update_5g_bonded_channel_state_punc_for_pwrmode. Change-Id: I895d70d3a07e239500f97b9ab7884d7723de5080 CRs-Fixed: 3144661
此提交包含在:
@@ -1473,18 +1473,6 @@ QDF_STATUS
|
||||
wlan_reg_get_channel_list_with_power_for_freq(struct wlan_objmgr_pdev *pdev,
|
||||
struct channel_power *ch_list,
|
||||
uint8_t *num_chan);
|
||||
/**
|
||||
* wlan_reg_get_5g_bonded_channel_state_for_freq() - Get 5G bonded channel state
|
||||
* @pdev: The physical dev to program country code or regdomain
|
||||
* @freq: channel frequency.
|
||||
* @bw: channel band width
|
||||
*
|
||||
* Return: channel state
|
||||
*/
|
||||
enum channel_state
|
||||
wlan_reg_get_5g_bonded_channel_state_for_freq(struct wlan_objmgr_pdev *pdev,
|
||||
qdf_freq_t freq,
|
||||
enum phy_ch_width bw);
|
||||
|
||||
#ifdef CONFIG_REG_6G_PWRMODE
|
||||
/**
|
||||
|
@@ -1205,29 +1205,6 @@ wlan_reg_chan_has_dfs_attribute_for_freq(struct wlan_objmgr_pdev *pdev,
|
||||
return reg_chan_has_dfs_attribute_for_freq(pdev, freq);
|
||||
}
|
||||
|
||||
enum channel_state
|
||||
wlan_reg_get_5g_bonded_channel_state_for_freq(struct wlan_objmgr_pdev *pdev,
|
||||
qdf_freq_t freq,
|
||||
enum phy_ch_width bw)
|
||||
{
|
||||
struct ch_params params = {0};
|
||||
|
||||
if (reg_is_ch_width_320(bw)) {
|
||||
const struct bonded_channel_freq *bonded_chan_ptr_ptr = NULL;
|
||||
|
||||
return reg_get_5g_bonded_channel_for_freq(pdev, freq, bw,
|
||||
&bonded_chan_ptr_ptr);
|
||||
}
|
||||
|
||||
params.ch_width = bw;
|
||||
|
||||
return reg_get_5g_bonded_channel_state_for_freq(pdev, freq, ¶ms);
|
||||
}
|
||||
|
||||
qdf_export_symbol(wlan_reg_get_5g_bonded_channel_state_for_freq);
|
||||
|
||||
|
||||
#ifdef CONFIG_REG_6G_PWRMODE
|
||||
enum channel_state
|
||||
wlan_reg_get_5g_bonded_channel_state_for_pwrmode(struct wlan_objmgr_pdev *pdev,
|
||||
qdf_freq_t freq,
|
||||
@@ -1257,32 +1234,6 @@ wlan_reg_get_5g_bonded_channel_state_for_pwrmode(struct wlan_objmgr_pdev *pdev,
|
||||
ch_params,
|
||||
in_6g_pwr_type);
|
||||
}
|
||||
#else
|
||||
enum channel_state
|
||||
wlan_reg_get_5g_bonded_channel_state_for_pwrmode(struct wlan_objmgr_pdev *pdev,
|
||||
qdf_freq_t freq,
|
||||
struct ch_params *ch_params,
|
||||
enum supported_6g_pwr_types
|
||||
in_6g_pwr_type)
|
||||
{
|
||||
enum phy_ch_width bw;
|
||||
|
||||
if (!ch_params) {
|
||||
reg_err_rl("Invalid ch_params");
|
||||
return CHANNEL_STATE_INVALID;
|
||||
}
|
||||
bw = ch_params->ch_width;
|
||||
|
||||
if (reg_is_ch_width_320(bw)) {
|
||||
const struct bonded_channel_freq *bonded_ch_ptr_ptr = NULL;
|
||||
|
||||
return reg_get_5g_bonded_channel_for_freq(pdev, freq, bw,
|
||||
&bonded_ch_ptr_ptr);
|
||||
}
|
||||
|
||||
return reg_get_5g_bonded_channel_state_for_freq(pdev, freq, ch_params);
|
||||
}
|
||||
#endif
|
||||
|
||||
qdf_export_symbol(wlan_reg_get_5g_bonded_channel_state_for_pwrmode);
|
||||
|
||||
|
新增問題並參考
封鎖使用者