From fee9e5424474b470f42a82ac0d88a76b8c035e3a Mon Sep 17 00:00:00 2001 From: Kiran Venkatappa Date: Wed, 8 Feb 2017 14:57:16 +0530 Subject: [PATCH] qcacmn: Add pdev_id in Pdev AST reserve event pdev_id is required to identify the pdev object on which this event is recieved. Add pdev_id in the event extract API. Change-Id: Ia910d42af6a9d6099da1b7781601b0320dff80ba CRs-Fixed: 2003898 --- wmi/inc/wmi_unified_api.h | 2 +- wmi/inc/wmi_unified_param.h | 10 ++++++++++ wmi/inc/wmi_unified_priv.h | 2 +- wmi/src/wmi_unified_api.c | 6 +++--- wmi/src/wmi_unified_non_tlv.c | 5 +++-- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h index eacaee6097..76b1941c92 100644 --- a/wmi/inc/wmi_unified_api.h +++ b/wmi/inc/wmi_unified_api.h @@ -1232,7 +1232,7 @@ QDF_STATUS wmi_extract_gpio_input_ev_param(void *wmi_hdl, void *evt_buf, uint32_t *gpio_num); QDF_STATUS wmi_extract_pdev_reserve_ast_ev_param(void *wmi_hdl, - void *evt_buf, uint32_t *result); + void *evt_buf, struct wmi_host_proxy_ast_reserve_param *param); QDF_STATUS wmi_extract_nfcal_power_ev_param(void *wmi_hdl, void *evt_buf, wmi_host_pdev_nfcal_power_all_channels_event *param); diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 9421002226..8a6f1ca509 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -7383,4 +7383,14 @@ struct wmi_host_fips_event_param { uint32_t data_len; uint32_t *data; }; + +/** + * struct wmi_host_proxy_ast_reserve_param + * @pdev_id: pdev id + * @result: result + */ +struct wmi_host_proxy_ast_reserve_param { + uint32_t pdev_id; + uint32_t result; +}; #endif /* _WMI_UNIFIED_PARAM_H_ */ diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index fa6e59676f..43b26ec5ea 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -1055,7 +1055,7 @@ QDF_STATUS (*extract_gpio_input_ev_param)(wmi_unified_t wmi_handle, void *evt_buf, uint32_t *gpio_num); QDF_STATUS (*extract_pdev_reserve_ast_ev_param)(wmi_unified_t wmi_handle, - void *evt_buf, uint32_t *result); + void *evt_buf, struct wmi_host_proxy_ast_reserve_param *param); QDF_STATUS (*extract_nfcal_power_ev_param)(wmi_unified_t wmi_handle, void *evt_buf, diff --git a/wmi/src/wmi_unified_api.c b/wmi/src/wmi_unified_api.c index b07e15deef..6207e77dda 100644 --- a/wmi/src/wmi_unified_api.c +++ b/wmi/src/wmi_unified_api.c @@ -5538,18 +5538,18 @@ QDF_STATUS wmi_extract_gpio_input_ev_param(void *wmi_hdl, * param from event * @wmi_handle: wmi handle * @param evt_buf: pointer to event buffer - * @param result: Pointer to hold reserve ast entry param + * @param param: Pointer to hold reserve ast entry param * * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure */ QDF_STATUS wmi_extract_pdev_reserve_ast_ev_param(void *wmi_hdl, - void *evt_buf, uint32_t *result) + void *evt_buf, struct wmi_host_proxy_ast_reserve_param *param) { wmi_unified_t wmi = (wmi_unified_t) wmi_hdl; if (wmi->ops->extract_pdev_reserve_ast_ev_param) return wmi->ops->extract_pdev_reserve_ast_ev_param(wmi, - evt_buf, result); + evt_buf, param); return QDF_STATUS_E_FAILURE; } diff --git a/wmi/src/wmi_unified_non_tlv.c b/wmi/src/wmi_unified_non_tlv.c index 42cad5952d..e242b25c27 100644 --- a/wmi/src/wmi_unified_non_tlv.c +++ b/wmi/src/wmi_unified_non_tlv.c @@ -6360,12 +6360,13 @@ static QDF_STATUS extract_gpio_input_ev_param_non_tlv(wmi_unified_t wmi_handle, */ static QDF_STATUS extract_pdev_reserve_ast_ev_param_non_tlv( wmi_unified_t wmi_handle, - void *evt_buf, uint32_t *result) + void *evt_buf, struct wmi_host_proxy_ast_reserve_param *param) { wmi_pdev_reserve_ast_entry_event *ev = (wmi_pdev_reserve_ast_entry_event *) evt_buf; - *result = ev->result; + param->result = ev->result; + param->pdev_id = WMI_NON_TLV_DEFAULT_PDEV_ID; return QDF_STATUS_SUCCESS; }