qcacmn: Make 6G edge channel APIs common
Currently the 6G edge channel feature is MCC specific. Make the 6G edge channel feature common for WIN and MCC. Change-Id: I723b6db1d74dca5a911eede4ec6e6167f6b3e6bc CRs-Fixed: 2976871
This commit is contained in:

committed by
Madan Koyyalamudi

parent
b128bc2e3e
commit
2234d80a72
@@ -101,7 +101,7 @@ QDF_STATUS target_if_regulatory_set_ext_tpc(struct wlan_objmgr_psoc *psoc);
|
|||||||
struct wlan_lmac_if_reg_tx_ops *
|
struct wlan_lmac_if_reg_tx_ops *
|
||||||
target_if_regulatory_get_tx_ops(struct wlan_objmgr_psoc *psoc);
|
target_if_regulatory_get_tx_ops(struct wlan_objmgr_psoc *psoc);
|
||||||
|
|
||||||
#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
|
#if defined(CONFIG_BAND_6GHZ)
|
||||||
/**
|
/**
|
||||||
* target_if_reg_set_lower_6g_edge_ch_info() - populate lower 6ghz edge channel
|
* target_if_reg_set_lower_6g_edge_ch_info() - populate lower 6ghz edge channel
|
||||||
* enablement info
|
* enablement info
|
||||||
|
@@ -745,7 +745,7 @@ QDF_STATUS target_if_regulatory_set_ext_tpc(struct wlan_objmgr_psoc *psoc)
|
|||||||
return QDF_STATUS_SUCCESS;
|
return QDF_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
|
#if defined(CONFIG_BAND_6GHZ)
|
||||||
/**
|
/**
|
||||||
* tgt_if_regulatory_is_lower_6g_edge_ch_supp() - Check if lower 6ghz
|
* tgt_if_regulatory_is_lower_6g_edge_ch_supp() - Check if lower 6ghz
|
||||||
* edge channel (5935MHz) is supported
|
* edge channel (5935MHz) is supported
|
||||||
|
@@ -1252,7 +1252,7 @@ struct wlan_lmac_if_reg_rx_ops {
|
|||||||
uint8_t *bitmap);
|
uint8_t *bitmap);
|
||||||
QDF_STATUS (*reg_set_ext_tpc_supported)(struct wlan_objmgr_psoc *psoc,
|
QDF_STATUS (*reg_set_ext_tpc_supported)(struct wlan_objmgr_psoc *psoc,
|
||||||
bool val);
|
bool val);
|
||||||
#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
|
#if defined(CONFIG_BAND_6GHZ)
|
||||||
QDF_STATUS
|
QDF_STATUS
|
||||||
(*reg_set_lower_6g_edge_ch_supp)(struct wlan_objmgr_psoc *psoc,
|
(*reg_set_lower_6g_edge_ch_supp)(struct wlan_objmgr_psoc *psoc,
|
||||||
bool val);
|
bool val);
|
||||||
|
@@ -303,7 +303,7 @@ static inline void wlan_lmac_if_register_master_list_ext_handler(
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
|
#if defined(CONFIG_BAND_6GHZ)
|
||||||
static void wlan_lmac_if_register_6g_edge_chan_supp(
|
static void wlan_lmac_if_register_6g_edge_chan_supp(
|
||||||
struct wlan_lmac_if_rx_ops *rx_ops)
|
struct wlan_lmac_if_rx_ops *rx_ops)
|
||||||
{
|
{
|
||||||
|
@@ -846,7 +846,7 @@ reg_modify_chan_list_for_5dot9_ghz_channels(struct wlan_objmgr_pdev *pdev,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
|
#if defined(CONFIG_BAND_6GHZ)
|
||||||
/**
|
/**
|
||||||
* reg_modify_chan_list_for_6g_edge_channels() - Modify 6 GHz edge channels
|
* reg_modify_chan_list_for_6g_edge_channels() - Modify 6 GHz edge channels
|
||||||
*
|
*
|
||||||
|
@@ -166,7 +166,7 @@ struct wlan_regulatory_psoc_priv_obj {
|
|||||||
uint8_t domain_code_6g_client[REG_CURRENT_MAX_AP_TYPE][REG_MAX_CLIENT_TYPE];
|
uint8_t domain_code_6g_client[REG_CURRENT_MAX_AP_TYPE][REG_MAX_CLIENT_TYPE];
|
||||||
#endif
|
#endif
|
||||||
bool is_ext_tpc_supported;
|
bool is_ext_tpc_supported;
|
||||||
#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
|
#if defined(CONFIG_BAND_6GHZ)
|
||||||
bool is_lower_6g_edge_ch_supported;
|
bool is_lower_6g_edge_ch_supported;
|
||||||
bool is_upper_6g_edge_ch_disabled;
|
bool is_upper_6g_edge_ch_disabled;
|
||||||
#endif
|
#endif
|
||||||
|
@@ -5032,7 +5032,7 @@ bool reg_is_ext_tpc_supported(struct wlan_objmgr_psoc *psoc)
|
|||||||
return psoc_priv_obj->is_ext_tpc_supported;
|
return psoc_priv_obj->is_ext_tpc_supported;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
|
#if defined(CONFIG_BAND_6GHZ)
|
||||||
QDF_STATUS
|
QDF_STATUS
|
||||||
reg_set_lower_6g_edge_ch_supp(struct wlan_objmgr_psoc *psoc, bool val)
|
reg_set_lower_6g_edge_ch_supp(struct wlan_objmgr_psoc *psoc, bool val)
|
||||||
{
|
{
|
||||||
|
@@ -1531,7 +1531,7 @@ void reg_set_2g_channel_params_for_freq(struct wlan_objmgr_pdev *pdev,
|
|||||||
enum channel_state reg_combine_channel_states(enum channel_state chan_state1,
|
enum channel_state reg_combine_channel_states(enum channel_state chan_state1,
|
||||||
enum channel_state chan_state2);
|
enum channel_state chan_state2);
|
||||||
|
|
||||||
#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
|
#if defined(CONFIG_BAND_6GHZ)
|
||||||
/**
|
/**
|
||||||
* reg_set_lower_6g_edge_ch_supp() - Set if lower 6ghz edge channel is
|
* reg_set_lower_6g_edge_ch_supp() - Set if lower 6ghz edge channel is
|
||||||
* supported by FW
|
* supported by FW
|
||||||
|
@@ -116,7 +116,7 @@ QDF_STATUS tgt_reg_set_5dot9_ghz_supported(struct wlan_objmgr_psoc *psoc,
|
|||||||
QDF_STATUS tgt_reg_set_ext_tpc_supported(struct wlan_objmgr_psoc *psoc,
|
QDF_STATUS tgt_reg_set_ext_tpc_supported(struct wlan_objmgr_psoc *psoc,
|
||||||
bool val);
|
bool val);
|
||||||
|
|
||||||
#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
|
#if defined(CONFIG_BAND_6GHZ)
|
||||||
/**
|
/**
|
||||||
* tgt_reg_set_lower_6g_edge_ch_supp() - Assign the value set by FW for lower
|
* tgt_reg_set_lower_6g_edge_ch_supp() - Assign the value set by FW for lower
|
||||||
* 6ghz edge channel (5935 MHz) support
|
* 6ghz edge channel (5935 MHz) support
|
||||||
|
@@ -124,7 +124,7 @@ QDF_STATUS tgt_reg_set_ext_tpc_supported(struct wlan_objmgr_psoc *psoc,
|
|||||||
return reg_set_ext_tpc_supported(psoc, val);
|
return reg_set_ext_tpc_supported(psoc, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
|
#if defined(CONFIG_BAND_6GHZ)
|
||||||
QDF_STATUS tgt_reg_set_lower_6g_edge_ch_supp(struct wlan_objmgr_psoc *psoc,
|
QDF_STATUS tgt_reg_set_lower_6g_edge_ch_supp(struct wlan_objmgr_psoc *psoc,
|
||||||
bool val)
|
bool val)
|
||||||
{
|
{
|
||||||
|
@@ -5238,7 +5238,7 @@ typedef enum {
|
|||||||
wmi_service_ext_tpc_reg_support,
|
wmi_service_ext_tpc_reg_support,
|
||||||
wmi_service_ndi_txbf_support,
|
wmi_service_ndi_txbf_support,
|
||||||
wmi_service_reg_cc_ext_event_support,
|
wmi_service_reg_cc_ext_event_support,
|
||||||
#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
|
#if defined(CONFIG_BAND_6GHZ)
|
||||||
wmi_service_lower_6g_edge_ch_supp,
|
wmi_service_lower_6g_edge_ch_supp,
|
||||||
wmi_service_disable_upper_6g_edge_ch_supp,
|
wmi_service_disable_upper_6g_edge_ch_supp,
|
||||||
#endif
|
#endif
|
||||||
|
@@ -16270,7 +16270,7 @@ static void populate_tlv_service(uint32_t *wmi_service)
|
|||||||
WMI_SERVICE_NDI_TXBF_SUPPORT;
|
WMI_SERVICE_NDI_TXBF_SUPPORT;
|
||||||
wmi_service[wmi_service_reg_cc_ext_event_support] =
|
wmi_service[wmi_service_reg_cc_ext_event_support] =
|
||||||
WMI_SERVICE_REG_CC_EXT_EVENT_SUPPORT;
|
WMI_SERVICE_REG_CC_EXT_EVENT_SUPPORT;
|
||||||
#if defined(CONFIG_BAND_6GHZ) && defined(CONFIG_REG_CLIENT)
|
#if defined(CONFIG_BAND_6GHZ)
|
||||||
wmi_service[wmi_service_lower_6g_edge_ch_supp] =
|
wmi_service[wmi_service_lower_6g_edge_ch_supp] =
|
||||||
WMI_SERVICE_ENABLE_LOWER_6G_EDGE_CH_SUPP;
|
WMI_SERVICE_ENABLE_LOWER_6G_EDGE_CH_SUPP;
|
||||||
wmi_service[wmi_service_disable_upper_6g_edge_ch_supp] =
|
wmi_service[wmi_service_disable_upper_6g_edge_ch_supp] =
|
||||||
|
Reference in New Issue
Block a user