summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWu Gao <wugao@qti.qualcomm.com>2015-04-22 15:59:10 +0800
committerAnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com>2015-04-24 19:52:35 +0530
commit3c7365651b1cc2df334d2adbf167f3dcf69bd867 (patch)
tree37a89e794ddb8b1f3233f0d5d9c0e4d4ce6b31c9
parentbdf0f67439baf5dec556eca56607f01cb420dbe0 (diff)
qcacld: Add parameter for iwpriv command
In order to set GPIO number when set LED GPIO parameters, add parameter "gpio_num" for iwpriv command "gpio_control". CRs-Fixed: 826952 Change-Id: I2a30f4c22d5f463a4efa7dec225675e3d92b5b0d
-rw-r--r--CORE/HDD/src/wlan_hdd_wext.c8
-rw-r--r--CORE/MAC/inc/sirApi.h1
-rw-r--r--CORE/SERVICES/WMA/wma.c1
-rw-r--r--CORE/SME/inc/sme_Api.h3
-rw-r--r--CORE/SME/src/sme_common/sme_Api.c4
5 files changed, 11 insertions, 6 deletions
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 54009f03545c..741e70a2c529 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -7679,9 +7679,9 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
case WE_LED_FLASHING_PARAM:
{
int i;
- if (num_args != 4) {
+ if (num_args != 5) {
hddLog(LOGE,
- FL("gpio_control: 4 parameters are required"));
+ FL("gpio_control: 5 parameters are required"));
return -EINVAL;
}
@@ -7693,9 +7693,9 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
}
}
sme_SetLedFlashing(WLAN_HDD_GET_HAL_CTX(pAdapter),
- 0, apps_args[0], apps_args[1]);
+ 0, apps_args[0], apps_args[1], apps_args[4]);
sme_SetLedFlashing(WLAN_HDD_GET_HAL_CTX(pAdapter),
- 1, apps_args[2], apps_args[3]);
+ 1, apps_args[2], apps_args[3], apps_args[4]);
}
break;
#endif
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index bd16fe8bbdad..11daad2e2bdd 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -5740,6 +5740,7 @@ typedef struct
tANI_U32 pattern_id; /* pattern identifier. 0: disconnected 1: connected*/
tANI_U32 led_x0; /* led flashing parameter0 */
tANI_U32 led_x1; /* led flashing parameter1 */
+ tANI_U32 gpio_num; /* GPIO number */
} tSirLedFlashingReq, *tpSirLedFlashingReq;
#endif
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index 22c3b5165dca..6be4593bc86c 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -24106,6 +24106,7 @@ VOS_STATUS wma_set_led_flashing(tp_wma_handle wma_handle,
cmd->pattern_id = flashing->pattern_id;
cmd->led_x0 = flashing->led_x0;
cmd->led_x1 = flashing->led_x1;
+ cmd->gpio_num = flashing->gpio_num;
status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len,
WMI_PDEV_SET_LED_FLASHING_CMDID);
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index ae37014faaa0..5370b1a979c6 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -4145,10 +4145,11 @@ eHalStatus sme_setDhcpSrvOffload(tHalHandle hHal,
\brief API to set the LED flashing feature.
\param hHal - The handle returned by macOpen.
\param x0, x1 - led flashing parameters
+ \param gpio_num - GPIO number
\return eHalStatus
---------------------------------------------------------------------------*/
eHalStatus sme_SetLedFlashing (tHalHandle hHal, tANI_U8 type,
- tANI_U32 x0, tANI_U32 x1);
+ tANI_U32 x0, tANI_U32 x1, tANI_U32 gpio_num);
#endif
/* ---------------------------------------------------------------------------
\fn sme_handle_dfS_chan_scan
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 199640b03e8b..61c511f88510 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -15634,10 +15634,11 @@ eHalStatus sme_setDhcpSrvOffload(tHalHandle hHal,
\brief API to set the Led flashing parameters.
\param hHal - The handle returned by macOpen.
\param x0, x1 - led flashing parameters
+ \param gpio_num - GPIO number
\return eHalStatus
---------------------------------------------------------------------------*/
eHalStatus sme_SetLedFlashing (tHalHandle hHal, tANI_U8 type,
- tANI_U32 x0, tANI_U32 x1)
+ tANI_U32 x0, tANI_U32 x1, tANI_U32 gpio_num)
{
eHalStatus status = eHAL_STATUS_SUCCESS;
VOS_STATUS vosStatus = VOS_STATUS_SUCCESS;
@@ -15655,6 +15656,7 @@ eHalStatus sme_SetLedFlashing (tHalHandle hHal, tANI_U8 type,
ledflashing->pattern_id = type;
ledflashing->led_x0 = x0;
ledflashing->led_x1 = x1;
+ ledflashing->gpio_num = gpio_num;
if (eHAL_STATUS_SUCCESS == (status = sme_AcquireGlobalLock(&pMac->sme))) {
/* Serialize the req through MC thread */