samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Remove duplicate (ext)service ready structures from WMI

Browse Source 
Object manager psoc service ready api provides host (ext)service ready
data structures hence remove duplicate copy from wmi_unified_param.h
and change WMI to use psoc service ready data structures.

Change-Id: Iaec20e9b818077ed1ca58754c4b1bc6deaedd761
CRs-Fixed: 2002016
This commit is contained in:
Rajeev Kumar
2017-02-03 00:39:49 -08:00
committed by qcabuildsw
parent 316357d791
commit 037799b816
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wmi_unified_api.c
View File

@@ -4393,7 +4393,7 @@ bool wmi_service_enabled(void *wmi_hdl, uint32_t service_id)
* Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
*/ */
QDF_STATUS wmi_get_target_cap_from_service_ready(void *wmi_hdl, QDF_STATUS wmi_get_target_cap_from_service_ready(void *wmi_hdl,
void *evt_buf, target_capability_info *ev) void *evt_buf, struct wlan_psoc_target_capability_info *ev)
{ {
wmi_unified_t wmi = (wmi_unified_t) wmi_hdl; wmi_unified_t wmi = (wmi_unified_t) wmi_hdl;
@@ -4453,7 +4453,7 @@ QDF_STATUS wmi_extract_fw_abi_version(void *wmi_hdl,
* Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
*/ */
QDF_STATUS wmi_extract_hal_reg_cap(void *wmi_hdl, void *evt_buf, QDF_STATUS wmi_extract_hal_reg_cap(void *wmi_hdl, void *evt_buf,
TARGET_HAL_REG_CAPABILITIES *hal_reg_cap) struct wlan_psoc_hal_reg_capability *hal_reg_cap)
{ {
wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
@@ -6197,7 +6197,7 @@ QDF_STATUS wmi_unified_send_btcoex_duty_cycle_cmd(void *wmi_hdl,
* Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error
*/ */
QDF_STATUS wmi_extract_service_ready_ext(void *wmi_hdl, uint8_t *evt_buf, QDF_STATUS wmi_extract_service_ready_ext(void *wmi_hdl, uint8_t *evt_buf,
struct wmi_host_service_ext_param *param) struct wlan_psoc_host_service_ext_param *param)
{ {
wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
@@ -6221,7 +6221,7 @@ QDF_STATUS wmi_extract_service_ready_ext(void *wmi_hdl, uint8_t *evt_buf,
QDF_STATUS wmi_extract_hw_mode_cap_service_ready_ext( QDF_STATUS wmi_extract_hw_mode_cap_service_ready_ext(
void *wmi_hdl, void *wmi_hdl,
uint8_t *evt_buf, uint8_t hw_mode_idx, uint8_t *evt_buf, uint8_t hw_mode_idx,
struct wmi_host_hw_mode_caps *param) struct wlan_psoc_host_hw_mode_caps *param)
{ {
wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
@@ -6248,7 +6248,7 @@ QDF_STATUS wmi_extract_mac_phy_cap_service_ready_ext(
uint8_t *evt_buf, uint8_t *evt_buf,
uint8_t hw_mode_id, uint8_t hw_mode_id,
uint8_t phy_id, uint8_t phy_id,
struct wmi_host_mac_phy_caps *param) struct wlan_psoc_host_mac_phy_caps *param)
{ {
wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
@@ -6273,7 +6273,7 @@ QDF_STATUS wmi_extract_mac_phy_cap_service_ready_ext(
QDF_STATUS wmi_extract_reg_cap_service_ready_ext( QDF_STATUS wmi_extract_reg_cap_service_ready_ext(
void *wmi_hdl, void *wmi_hdl,
uint8_t *evt_buf, uint8_t phy_idx, uint8_t *evt_buf, uint8_t phy_idx,
struct WMI_HOST_HAL_REG_CAPABILITIES_EXT *param) struct wlan_psoc_host_hal_reg_capabilities_ext *param)
{ {
wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;

6
wmi_unified_non_tlv.c
View File

@@ -5454,7 +5454,7 @@ static bool is_service_enabled_non_tlv(wmi_unified_t wmi_handle,
*/ */
static QDF_STATUS extract_service_ready_non_tlv(wmi_unified_t wmi_handle, static QDF_STATUS extract_service_ready_non_tlv(wmi_unified_t wmi_handle,
void *evt_buf, void *evt_buf,
target_capability_info *cap) struct wlan_psoc_target_capability_info *cap)
{ {
wmi_service_ready_event *ev; wmi_service_ready_event *ev;
@@ -5535,7 +5535,7 @@ static QDF_STATUS extract_fw_abi_version_non_tlv(wmi_unified_t wmi_handle,
*/ */
static QDF_STATUS extract_hal_reg_cap_non_tlv(wmi_unified_t wmi_handle, static QDF_STATUS extract_hal_reg_cap_non_tlv(wmi_unified_t wmi_handle,
void *evt_buf, void *evt_buf,
TARGET_HAL_REG_CAPABILITIES *cap) struct wlan_psoc_hal_reg_capability *cap)
{ {
wmi_service_ready_event *ev; wmi_service_ready_event *ev;
u_int32_t wireless_modes_orig = 0; u_int32_t wireless_modes_orig = 0;
@@ -5543,7 +5543,7 @@ static QDF_STATUS extract_hal_reg_cap_non_tlv(wmi_unified_t wmi_handle,
ev = (wmi_service_ready_event *) evt_buf; ev = (wmi_service_ready_event *) evt_buf;
qdf_mem_copy(cap, &ev->hal_reg_capabilities, qdf_mem_copy(cap, &ev->hal_reg_capabilities,
sizeof(TARGET_HAL_REG_CAPABILITIES)); sizeof(struct wlan_psoc_hal_reg_capability));
/* Convert REGDMN_MODE values sent by target to host internal /* Convert REGDMN_MODE values sent by target to host internal
* WMI_HOST_REGDMN_MODE values. * WMI_HOST_REGDMN_MODE values.

14
wmi_unified_tlv.c
View File

@@ -12427,7 +12427,7 @@ static bool is_service_enabled_tlv(wmi_unified_t wmi_handle,
* Return: QDF_STATUS_SUCCESS for success or error code * Return: QDF_STATUS_SUCCESS for success or error code
*/ */
static QDF_STATUS extract_service_ready_tlv(wmi_unified_t wmi_handle, static QDF_STATUS extract_service_ready_tlv(wmi_unified_t wmi_handle,
void *evt_buf, target_capability_info *cap) void *evt_buf, struct wlan_psoc_target_capability_info *cap)
{ {
WMI_SERVICE_READY_EVENTID_param_tlvs *param_buf; WMI_SERVICE_READY_EVENTID_param_tlvs *param_buf;
wmi_service_ready_event_fixed_param *ev; wmi_service_ready_event_fixed_param *ev;
@@ -12471,7 +12471,7 @@ static QDF_STATUS extract_service_ready_tlv(wmi_unified_t wmi_handle,
* Return: QDF_STATUS_SUCCESS for success or error code * Return: QDF_STATUS_SUCCESS for success or error code
*/ */
static QDF_STATUS extract_hal_reg_cap_tlv(wmi_unified_t wmi_handle, static QDF_STATUS extract_hal_reg_cap_tlv(wmi_unified_t wmi_handle,
void *evt_buf, TARGET_HAL_REG_CAPABILITIES *cap) void *evt_buf, struct wlan_psoc_hal_reg_capability *cap)
{ {
WMI_SERVICE_READY_EVENTID_param_tlvs *param_buf; WMI_SERVICE_READY_EVENTID_param_tlvs *param_buf;
u_int32_t wireless_modes_orig = 0; u_int32_t wireless_modes_orig = 0;
@@ -12480,7 +12480,7 @@ static QDF_STATUS extract_hal_reg_cap_tlv(wmi_unified_t wmi_handle,
qdf_mem_copy(cap, (((uint8_t *)param_buf->hal_reg_capabilities) + qdf_mem_copy(cap, (((uint8_t *)param_buf->hal_reg_capabilities) +
sizeof(uint32_t)), sizeof(uint32_t)),
sizeof(TARGET_HAL_REG_CAPABILITIES)); sizeof(struct wlan_psoc_hal_reg_capability));
/* Convert REGDMN_MODE values sent by target to host internal /* Convert REGDMN_MODE values sent by target to host internal
* WMI_HOST_REGDMN_MODE values. * WMI_HOST_REGDMN_MODE values.
@@ -13507,7 +13507,7 @@ static QDF_STATUS extract_channel_hopping_event_tlv(wmi_unified_t wmi_handle,
* Return: QDF_STATUS_SUCCESS for success or error code * Return: QDF_STATUS_SUCCESS for success or error code
*/ */
static QDF_STATUS extract_service_ready_ext_tlv(wmi_unified_t wmi_handle, static QDF_STATUS extract_service_ready_ext_tlv(wmi_unified_t wmi_handle,
uint8_t *event, struct wmi_host_service_ext_param *param) uint8_t *event, struct wlan_psoc_host_service_ext_param *param)
{ {
WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf; WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf;
wmi_service_ready_ext_event_fixed_param *ev; wmi_service_ready_ext_event_fixed_param *ev;
@@ -13559,7 +13559,7 @@ static QDF_STATUS extract_service_ready_ext_tlv(wmi_unified_t wmi_handle,
static QDF_STATUS extract_hw_mode_cap_service_ready_ext_tlv( static QDF_STATUS extract_hw_mode_cap_service_ready_ext_tlv(
wmi_unified_t wmi_handle, wmi_unified_t wmi_handle,
uint8_t *event, uint8_t hw_mode_idx, uint8_t *event, uint8_t hw_mode_idx,
struct wmi_host_hw_mode_caps *param) struct wlan_psoc_host_hw_mode_caps *param)
{ {
WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf; WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf;
WMI_SOC_MAC_PHY_HW_MODE_CAPS *hw_caps; WMI_SOC_MAC_PHY_HW_MODE_CAPS *hw_caps;
@@ -13598,7 +13598,7 @@ static QDF_STATUS extract_hw_mode_cap_service_ready_ext_tlv(
static QDF_STATUS extract_mac_phy_cap_service_ready_ext_tlv( static QDF_STATUS extract_mac_phy_cap_service_ready_ext_tlv(
wmi_unified_t wmi_handle, wmi_unified_t wmi_handle,
uint8_t *event, uint8_t hw_mode_id, uint8_t phy_id, uint8_t *event, uint8_t hw_mode_id, uint8_t phy_id,
struct wmi_host_mac_phy_caps *param) struct wlan_psoc_host_mac_phy_caps *param)
{ {
WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf; WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf;
WMI_MAC_PHY_CAPABILITIES *mac_phy_caps; WMI_MAC_PHY_CAPABILITIES *mac_phy_caps;
@@ -13695,7 +13695,7 @@ static QDF_STATUS extract_mac_phy_cap_service_ready_ext_tlv(
static QDF_STATUS extract_reg_cap_service_ready_ext_tlv( static QDF_STATUS extract_reg_cap_service_ready_ext_tlv(
wmi_unified_t wmi_handle, wmi_unified_t wmi_handle,
uint8_t *event, uint8_t phy_idx, uint8_t *event, uint8_t phy_idx,
struct WMI_HOST_HAL_REG_CAPABILITIES_EXT *param) struct wlan_psoc_host_hal_reg_capabilities_ext *param)
{ {
WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf; WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf;
WMI_SOC_HAL_REG_CAPABILITIES *reg_caps; WMI_SOC_HAL_REG_CAPABILITIES *reg_caps;