Merge "qca-wifi: Replace void * wmi_hdl with abstract type"
diff --git a/wmi/inc/wmi_unified_atf_api.h b/wmi/inc/wmi_unified_atf_api.h
index c7f3438..d39c719 100644
--- a/wmi/inc/wmi_unified_atf_api.h
+++ b/wmi/inc/wmi_unified_atf_api.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@@ -25,32 +25,87 @@
#include "wmi_unified_atf_param.h"
-QDF_STATUS wmi_unified_set_bwf_cmd_send(void *wmi_hdl,
- struct set_bwf_params *param);
+/**
+ * wmi_unified_set_bwf_cmd_send() - WMI set bwf function
+ * @wmi_handle: handle to WMI.
+ * @param: pointer to set bwf param
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
+QDF_STATUS wmi_unified_set_bwf_cmd_send(wmi_unified_t wmi_handle,
+ struct set_bwf_params *param);
#ifdef WLAN_ATF_ENABLE
+/**
+ * wmi_unified_set_atf_cmd_send() - WMI set atf function
+ * @wmi_handle: handle to WMI.
+ * @param: pointer to set atf param
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
QDF_STATUS
-wmi_unified_set_atf_cmd_send(void *wmi_hdl,
+wmi_unified_set_atf_cmd_send(wmi_unified_t wmi_handle,
struct set_atf_params *param);
+/**
+ * wmi_send_atf_peer_request_cmd() - send atf peer request command to fw
+ * @wmi_handle: wmi handle
+ * @param: pointer to atf peer request param
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
QDF_STATUS
-wmi_send_atf_peer_request_cmd(void *wmi_hdl,
+wmi_send_atf_peer_request_cmd(wmi_unified_t wmi_handle,
struct atf_peer_request_params *param);
+/**
+ * wmi_send_set_atf_grouping_cmd() - send set atf grouping command to fw
+ * @wmi_handle: wmi handle
+ * @param: pointer to set atf grouping param
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
QDF_STATUS
-wmi_send_set_atf_grouping_cmd(void *wmi_hdl,
+wmi_send_set_atf_grouping_cmd(wmi_unified_t wmi_handle,
struct atf_grouping_params *param);
+/**
+ * wmi_send_set_atf_group_ac_cmd() - send set atf AC command to fw
+ * @wmi_handle: wmi handle
+ * @param: pointer to set atf AC group param
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
QDF_STATUS
-wmi_send_set_atf_group_ac_cmd(void *wmi_hdl,
+wmi_send_set_atf_group_ac_cmd(wmi_unified_t wmi_handle,
struct atf_group_ac_params *param);
+/**
+ * wmi_extract_atf_peer_stats_ev() - extract atf peer stats
+ * from event
+ * @wmi_handle: wmi handle
+ * @evt_buf: pointer to event buffer
+ * @ev: Pointer to hold atf peer stats
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
QDF_STATUS
-wmi_extract_atf_peer_stats_ev(void *wmi_hdl, void *evt_buf,
+wmi_extract_atf_peer_stats_ev(wmi_unified_t wmi_handle, void *evt_buf,
wmi_host_atf_peer_stats_event *ev);
+/**
+ * wmi_extract_atf_token_info_ev() - extract atf token info
+ * from event
+ * @wmi_handle: wmi handle
+ * @evt_buf: pointer to event buffer
+ * @idx: Index indicating the peer number
+ * @atf_token_info: Pointer to hold atf token info
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
QDF_STATUS
-wmi_extract_atf_token_info_ev(void *wmi_hdl, void *evt_buf, uint8_t idx,
+wmi_extract_atf_token_info_ev(wmi_unified_t wmi_handle,
+ void *evt_buf, uint8_t idx,
wmi_host_atf_peer_stats_info *atf_token_info);
#endif
diff --git a/wmi/inc/wmi_unified_smart_ant_api.h b/wmi/inc/wmi_unified_smart_ant_api.h
index 37636ba..8f7b442 100644
--- a/wmi/inc/wmi_unified_smart_ant_api.h
+++ b/wmi/inc/wmi_unified_smart_ant_api.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@@ -24,25 +24,74 @@
#include "wmi_unified_smart_ant_param.h"
-QDF_STATUS wmi_unified_smart_ant_enable_cmd_send(void *wmi_hdl,
- struct smart_ant_enable_params *param);
+/**
+ * wmi_unified_smart_ant_enable_cmd_send() - WMI smart ant enable function
+ * @wmi_handle: handle to WMI.
+ * @param: pointer to hold antenna param
+ *
+ * @return QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
+QDF_STATUS wmi_unified_smart_ant_enable_cmd_send(
+ wmi_unified_t wmi_handle,
+ struct smart_ant_enable_params *param);
-QDF_STATUS wmi_unified_smart_ant_set_rx_ant_cmd_send(void *wmi_hdl,
- struct smart_ant_rx_ant_params *param);
+/**
+ * wmi_unified_smart_ant_set_rx_ant_cmd_send() - WMI set rx antenna function
+ * @wmi_handle: handle to WMI.
+ * @param: pointer to hold antenna param
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
+QDF_STATUS wmi_unified_smart_ant_set_rx_ant_cmd_send(
+ wmi_unified_t wmi_handle,
+ struct smart_ant_rx_ant_params *param);
-QDF_STATUS wmi_unified_smart_ant_set_tx_ant_cmd_send(void *wmi_hdl,
- uint8_t macaddr[QDF_MAC_ADDR_SIZE],
- struct smart_ant_tx_ant_params *param);
+/**
+ * wmi_unified_smart_ant_set_tx_ant_cmd_send() - WMI set tx antenna function
+ * @wmi_handle: handle to WMI.
+ * @param: pointer to hold antenna param
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
+QDF_STATUS wmi_unified_smart_ant_set_tx_ant_cmd_send(
+ wmi_unified_t wmi_handle,
+ uint8_t macaddr[QDF_MAC_ADDR_SIZE],
+ struct smart_ant_tx_ant_params *param);
-QDF_STATUS wmi_unified_smart_ant_set_training_info_cmd_send(void *wmi_hdl,
- uint8_t macaddr[QDF_MAC_ADDR_SIZE],
- struct smart_ant_training_info_params *param);
+/**
+ * wmi_unified_smart_ant_set_training_info_cmd_send() - WMI set tx antenna function
+ * @wmi_handle: handle to WMI.
+ * @param: pointer to hold antenna param
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
+QDF_STATUS wmi_unified_smart_ant_set_training_info_cmd_send(
+ wmi_unified_t wmi_handle,
+ uint8_t macaddr[QDF_MAC_ADDR_SIZE],
+ struct smart_ant_training_info_params *param);
-QDF_STATUS wmi_unified_smart_ant_node_config_cmd_send(void *wmi_hdl,
- uint8_t macaddr[QDF_MAC_ADDR_SIZE],
- struct smart_ant_node_config_params *param);
+/**
+ * wmi_unified_smart_ant_node_config_cmd_send() - WMI set node config function
+ * @wmi_handle: handle to WMI.
+ * @macaddr: MAC address
+ * @param: pointer to hold node parameter
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
+QDF_STATUS wmi_unified_smart_ant_node_config_cmd_send(
+ wmi_unified_t wmi_handle,
+ uint8_t macaddr[QDF_MAC_ADDR_SIZE],
+ struct smart_ant_node_config_params *param);
-QDF_STATUS wmi_unified_set_ant_switch_tbl_cmd_send(void *wmi_hdl,
- struct ant_switch_tbl_params *param);
+/**
+ * wmi_unified_set_ant_switch_tbl_cmd_send() - WMI ant switch tbl cmd function
+ * @wmi_handle: handle to WMI.
+ * @param: pointer to hold ant switch tbl param
+ *
+ * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
+ */
+QDF_STATUS wmi_unified_set_ant_switch_tbl_cmd_send(
+ wmi_unified_t wmi_handle,
+ struct ant_switch_tbl_params *param);
#endif /* _WMI_UNIFIED_SMART_ANT_API_H_ */
diff --git a/wmi/src/wmi_unified_atf_api.c b/wmi/src/wmi_unified_atf_api.c
index 4f27c6e..fbac829 100644
--- a/wmi/src/wmi_unified_atf_api.c
+++ b/wmi/src/wmi_unified_atf_api.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@@ -20,18 +20,9 @@
#include "wmi_unified_atf_param.h"
#include "qdf_module.h"
-/**
- * wmi_unified_set_bwf_cmd_send() - WMI set bwf function
- * @param wmi_handle : handle to WMI.
- * @param param : pointer to set bwf param
- *
- * @return QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
-QDF_STATUS wmi_unified_set_bwf_cmd_send(void *wmi_hdl,
- struct set_bwf_params *param)
+QDF_STATUS wmi_unified_set_bwf_cmd_send(wmi_unified_t wmi_handle,
+ struct set_bwf_params *param)
{
- wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
-
if (wmi_handle->ops->send_set_bwf_cmd)
return wmi_handle->ops->send_set_bwf_cmd(wmi_handle, param);
@@ -39,38 +30,20 @@
}
#ifdef WLAN_ATF_ENABLE
-/**
- * wmi_unified_set_atf_cmd_send() - WMI set atf function
- * @param wmi_handle : handle to WMI.
- * @param param : pointer to set atf param
- *
- * @return QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
QDF_STATUS
-wmi_unified_set_atf_cmd_send(void *wmi_hdl,
+wmi_unified_set_atf_cmd_send(wmi_unified_t wmi_handle,
struct set_atf_params *param)
{
- wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
if (wmi_handle->ops->send_set_atf_cmd)
return wmi_handle->ops->send_set_atf_cmd(wmi_handle, param);
return QDF_STATUS_E_FAILURE;
}
-/**
- * wmi_send_atf_peer_request_cmd() - send atf peer request command to fw
- * @wmi_handle: wmi handle
- * @param: pointer to atf peer request param
- *
- * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
QDF_STATUS
-wmi_send_atf_peer_request_cmd(void *wmi_hdl,
+wmi_send_atf_peer_request_cmd(wmi_unified_t wmi_handle,
struct atf_peer_request_params *param)
{
- wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
if (wmi_handle->ops->send_atf_peer_request_cmd)
return wmi_handle->ops->send_atf_peer_request_cmd(wmi_handle,
param);
@@ -78,19 +51,10 @@
return QDF_STATUS_E_FAILURE;
}
-/**
- * wmi_send_set_atf_grouping_cmd() - send set atf grouping command to fw
- * @wmi_handle: wmi handle
- * @param: pointer to set atf grouping param
- *
- * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
QDF_STATUS
-wmi_send_set_atf_grouping_cmd(void *wmi_hdl,
+wmi_send_set_atf_grouping_cmd(wmi_unified_t wmi_handle,
struct atf_grouping_params *param)
{
- wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
if (wmi_handle->ops->send_set_atf_grouping_cmd)
return wmi_handle->ops->send_set_atf_grouping_cmd(wmi_handle,
param);
@@ -98,19 +62,10 @@
return QDF_STATUS_E_FAILURE;
}
-/**
- * wmi_send_set_atf_group_ac_cmd() - send set atf AC command to fw
- * @wmi_handle: wmi handle
- * @param: pointer to set atf AC group param
- *
- * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
QDF_STATUS
-wmi_send_set_atf_group_ac_cmd(void *wmi_hdl,
+wmi_send_set_atf_group_ac_cmd(wmi_unified_t wmi_handle,
struct atf_group_ac_params *param)
{
- wmi_unified_t wmi_handle = (wmi_unified_t)wmi_hdl;
-
if (wmi_handle->ops->send_set_atf_group_ac_cmd)
return wmi_handle->ops->send_set_atf_group_ac_cmd(wmi_handle,
param);
@@ -118,46 +73,25 @@
return QDF_STATUS_E_FAILURE;
}
-/**
- * wmi_extract_atf_peer_stats_ev() - extract atf peer stats
- * from event
- * @wmi_handle: wmi handle
- * @param evt_buf: pointer to event buffer
- * @param ev: Pointer to hold atf peer stats
- *
- * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
QDF_STATUS
-wmi_extract_atf_peer_stats_ev(void *wmi_hdl, void *evt_buf,
+wmi_extract_atf_peer_stats_ev(wmi_unified_t wmi_handle, void *evt_buf,
wmi_host_atf_peer_stats_event *ev)
{
- wmi_unified_t wmi = (wmi_unified_t)wmi_hdl;
-
- if (wmi->ops->extract_atf_peer_stats_ev)
- return wmi->ops->extract_atf_peer_stats_ev(wmi, evt_buf, ev);
+ if (wmi_handle->ops->extract_atf_peer_stats_ev)
+ return wmi_handle->ops->extract_atf_peer_stats_ev(
+ wmi_handle, evt_buf, ev);
return QDF_STATUS_E_FAILURE;
}
-/**
- * wmi_extract_atf_token_info_ev() - extract atf token info
- * from event
- * @wmi_handle: wmi handle
- * @param evt_buf: pointer to event buffer
- * @param idx: Index indicating the peer number
- * @param ev: Pointer to hold atf token info
- *
- * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
QDF_STATUS
-wmi_extract_atf_token_info_ev(void *wmi_hdl, void *evt_buf, uint8_t idx,
+wmi_extract_atf_token_info_ev(wmi_unified_t wmi_handle,
+ void *evt_buf, uint8_t idx,
wmi_host_atf_peer_stats_info *ev)
{
- wmi_unified_t wmi = (wmi_unified_t)wmi_hdl;
-
- if (wmi->ops->extract_atf_token_info_ev)
- return wmi->ops->extract_atf_token_info_ev(wmi, evt_buf,
- idx, ev);
+ if (wmi_handle->ops->extract_atf_token_info_ev)
+ return wmi_handle->ops->extract_atf_token_info_ev(
+ wmi_handle, evt_buf, idx, ev);
return QDF_STATUS_E_FAILURE;
}
diff --git a/wmi/src/wmi_unified_smart_ant_api.c b/wmi/src/wmi_unified_smart_ant_api.c
index 99e13de..4402224 100644
--- a/wmi/src/wmi_unified_smart_ant_api.c
+++ b/wmi/src/wmi_unified_smart_ant_api.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@@ -20,18 +20,10 @@
#include "wmi_unified_param.h"
#include "qdf_module.h"
-/**
- * wmi_unified_set_ant_switch_tbl_cmd_send() - WMI ant switch tbl cmd function
- * @param wmi_handle : handle to WMI.
- * @param param : pointer to hold ant switch tbl param
- *
- * @return QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
-QDF_STATUS wmi_unified_set_ant_switch_tbl_cmd_send(void *wmi_hdl,
- struct ant_switch_tbl_params *param)
+QDF_STATUS wmi_unified_set_ant_switch_tbl_cmd_send(
+ wmi_unified_t wmi_handle,
+ struct ant_switch_tbl_params *param)
{
- wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
-
if (wmi_handle->ops->send_set_ant_switch_tbl_cmd)
return wmi_handle->ops->send_set_ant_switch_tbl_cmd(wmi_handle,
param);
@@ -39,18 +31,10 @@
return QDF_STATUS_E_FAILURE;
}
-/**
- * wmi_unified_smart_ant_enable_cmd_send() - WMI smart ant enable function
- * @param wmi_handle : handle to WMI.
- * @param param : pointer to hold antenna param
- *
- * @return QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
-QDF_STATUS wmi_unified_smart_ant_enable_cmd_send(void *wmi_hdl,
- struct smart_ant_enable_params *param)
+QDF_STATUS wmi_unified_smart_ant_enable_cmd_send(
+ wmi_unified_t wmi_handle,
+ struct smart_ant_enable_params *param)
{
- wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
-
if (wmi_handle->ops->send_smart_ant_enable_cmd)
return wmi_handle->ops->send_smart_ant_enable_cmd(wmi_handle,
param);
@@ -58,81 +42,49 @@
return QDF_STATUS_E_FAILURE;
}
-/**
- * wmi_unified_smart_ant_set_rx_ant_cmd_send() - WMI set rx antenna function
- * @param wmi_handle : handle to WMI.
- * @param param : pointer to hold antenna param
- *
- * @return QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
-QDF_STATUS wmi_unified_smart_ant_set_rx_ant_cmd_send(void *wmi_hdl,
- struct smart_ant_rx_ant_params *param)
+QDF_STATUS wmi_unified_smart_ant_set_rx_ant_cmd_send(
+ wmi_unified_t wmi_handle,
+ struct smart_ant_rx_ant_params *param)
{
- wmi_unified_t wmi = (wmi_unified_t) wmi_hdl;
-
- if (wmi->ops->send_smart_ant_set_rx_ant_cmd)
- return wmi->ops->send_smart_ant_set_rx_ant_cmd(wmi, param);
+ if (wmi_handle->ops->send_smart_ant_set_rx_ant_cmd)
+ return wmi_handle->ops->send_smart_ant_set_rx_ant_cmd(
+ wmi_handle, param);
return QDF_STATUS_E_FAILURE;
}
-/**
- * wmi_unified_smart_ant_set_tx_ant_cmd_send() - WMI set tx antenna function
- * @param wmi_handle : handle to WMI.
- * @param param : pointer to hold antenna param
- *
- * @return QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
-QDF_STATUS wmi_unified_smart_ant_set_tx_ant_cmd_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_smart_ant_set_tx_ant_cmd_send(
+ wmi_unified_t wmi_handle,
uint8_t macaddr[QDF_MAC_ADDR_SIZE],
- struct smart_ant_tx_ant_params *param)
+ struct smart_ant_tx_ant_params *param)
{
- wmi_unified_t wmi = (wmi_unified_t) wmi_hdl;
-
- if (wmi->ops->send_smart_ant_set_tx_ant_cmd)
- return wmi->ops->send_smart_ant_set_tx_ant_cmd(wmi, macaddr,
- param);
+ if (wmi_handle->ops->send_smart_ant_set_tx_ant_cmd)
+ return wmi_handle->ops->send_smart_ant_set_tx_ant_cmd(
+ wmi_handle, macaddr, param);
return QDF_STATUS_E_FAILURE;
}
-/**
- * wmi_unified_smart_ant_set_training_info_cmd_send() - WMI set tx antenna function
- * @param wmi_handle : handle to WMI.
- * @param param : pointer to hold antenna param
- *
- * @return QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
-QDF_STATUS wmi_unified_smart_ant_set_training_info_cmd_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_smart_ant_set_training_info_cmd_send(
+ wmi_unified_t wmi_handle,
uint8_t macaddr[QDF_MAC_ADDR_SIZE],
- struct smart_ant_training_info_params *param)
+ struct smart_ant_training_info_params *param)
{
- wmi_unified_t wmi = (wmi_unified_t) wmi_hdl;
-
- if (wmi->ops->send_smart_ant_set_training_info_cmd)
- return wmi->ops->send_smart_ant_set_training_info_cmd(wmi,
- macaddr, param);
+ if (wmi_handle->ops->send_smart_ant_set_training_info_cmd)
+ return wmi_handle->ops->send_smart_ant_set_training_info_cmd(
+ wmi_handle, macaddr, param);
return QDF_STATUS_E_FAILURE;
}
-/**
- * wmi_unified_smart_ant_node_config_cmd_send() - WMI set node config function
- * @param wmi_handle : handle to WMI.
- * @param macaddr : MAC address
- * @param param : pointer to hold node parameter
- *
- * @return QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
- */
-QDF_STATUS wmi_unified_smart_ant_node_config_cmd_send(void *wmi_hdl,
- uint8_t macaddr[QDF_MAC_ADDR_SIZE],
- struct smart_ant_node_config_params *param)
+QDF_STATUS wmi_unified_smart_ant_node_config_cmd_send(
+ wmi_unified_t wmi_handle,
+ uint8_t macaddr[QDF_MAC_ADDR_SIZE],
+ struct smart_ant_node_config_params *param)
{
- wmi_unified_t wmi = (wmi_unified_t) wmi_hdl;
-
- if (wmi->ops->send_smart_ant_set_node_config_cmd)
- return wmi->ops->send_smart_ant_set_node_config_cmd(wmi,
- macaddr, param);
+ if (wmi_handle->ops->send_smart_ant_set_node_config_cmd)
+ return wmi_handle->ops->send_smart_ant_set_node_config_cmd(
+ wmi_handle, macaddr, param);
return QDF_STATUS_E_FAILURE;
}