Skip to content

L
linux
Commit 441dc609 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files
Options

staging: wilc1000: remove typedef from tstrWILC_WFIDrv 

This patch removes typedef from the struct tstrWILC_WFIDrv and
rename it to host_if_drv.
This patch includes the removal of the comment for tstrWILC_WFIDrv as well.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0a589f4f
Hide whitespace changes
Inline Side-by-side
Showing with 249 additions and 257 deletions
drivers/staging/wilc1000/host_interface.c
View file @ 441dc609
...@@ -403,7 +403,7 @@ union message_body { ...@@ -403,7 +403,7 @@ union message_body {
struct host_if_msg { struct host_if_msg {
u16 id; /*!< Message ID */ u16 id; /*!< Message ID */
union message_body body; /*!< Message body */ union message_body body; /*!< Message body */
tstrWILC_WFIDrv *drvHandler; struct host_if_drv *drvHandler;
}; };
typedef struct _tstrWidJoinReqExt { typedef struct _tstrWidJoinReqExt {
...@@ -461,9 +461,9 @@ typedef enum { ...@@ -461,9 +461,9 @@ typedef enum {
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
/* Zero is not used, because a zero ID means termination */ /* Zero is not used, because a zero ID means termination */
static tstrWILC_WFIDrv *wfidrv_list[NUM_CONCURRENT_IFC + 1]; static struct host_if_drv *wfidrv_list[NUM_CONCURRENT_IFC + 1];
tstrWILC_WFIDrv *terminated_handle; struct host_if_drv *terminated_handle;
tstrWILC_WFIDrv *gWFiDrvHandle; struct host_if_drv *gWFiDrvHandle;
bool g_obtainingIP = false; bool g_obtainingIP = false;
u8 P2P_LISTEN_STATE; u8 P2P_LISTEN_STATE;
static struct task_struct *HostIFthreadHandler; static struct task_struct *HostIFthreadHandler;
...@@ -498,7 +498,7 @@ u8 gu8Flushed11iMode; ...@@ -498,7 +498,7 @@ u8 gu8Flushed11iMode;
u8 gu8FlushedAuthType; u8 gu8FlushedAuthType;
u32 gu32FlushedJoinReqSize; u32 gu32FlushedJoinReqSize;
u32 gu32FlushedInfoElemAsocSize; u32 gu32FlushedInfoElemAsocSize;
tstrWILC_WFIDrv *gu8FlushedJoinReqDrvHandler; struct host_if_drv *gu8FlushedJoinReqDrvHandler;
#define REAL_JOIN_REQ 0 #define REAL_JOIN_REQ 0
#define FLUSHED_JOIN_REQ 1 #define FLUSHED_JOIN_REQ 1
#define FLUSHED_BYTE_POS 79 /* Position the byte indicating flushing in the flushed request */ #define FLUSHED_BYTE_POS 79 /* Position the byte indicating flushing in the flushed request */
...@@ -508,7 +508,7 @@ static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo); ...@@ -508,7 +508,7 @@ static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo);
extern void chip_sleep_manually(u32 u32SleepTime); extern void chip_sleep_manually(u32 u32SleepTime);
extern int linux_wlan_get_num_conn_ifcs(void); extern int linux_wlan_get_num_conn_ifcs(void);
static int add_handler_in_list(tstrWILC_WFIDrv *handler) static int add_handler_in_list(struct host_if_drv *handler)
{ {
int i; int i;
...@@ -522,7 +522,7 @@ static int add_handler_in_list(tstrWILC_WFIDrv *handler) ...@@ -522,7 +522,7 @@ static int add_handler_in_list(tstrWILC_WFIDrv *handler)
return -ENOBUFS; return -ENOBUFS;
} }
static int remove_handler_in_list(tstrWILC_WFIDrv *handler) static int remove_handler_in_list(struct host_if_drv *handler)
{ {
int i; int i;
...@@ -536,7 +536,7 @@ static int remove_handler_in_list(tstrWILC_WFIDrv *handler) ...@@ -536,7 +536,7 @@ static int remove_handler_in_list(tstrWILC_WFIDrv *handler)
return -EINVAL; return -EINVAL;
} }
static int get_id_from_handler(tstrWILC_WFIDrv *handler) static int get_id_from_handler(struct host_if_drv *handler)
{ {
int i; int i;
...@@ -551,7 +551,7 @@ static int get_id_from_handler(tstrWILC_WFIDrv *handler) ...@@ -551,7 +551,7 @@ static int get_id_from_handler(tstrWILC_WFIDrv *handler)
return 0; return 0;
} }
static tstrWILC_WFIDrv *get_handler_from_id(int id) static struct host_if_drv *get_handler_from_id(int id)
{ {
if (id <= 0 || id >= ARRAY_SIZE(wfidrv_list)) if (id <= 0 || id >= ARRAY_SIZE(wfidrv_list))
return NULL; return NULL;
...@@ -567,13 +567,13 @@ static tstrWILC_WFIDrv *get_handler_from_id(int id) ...@@ -567,13 +567,13 @@ static tstrWILC_WFIDrv *get_handler_from_id(int id)
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static s32 Handle_SetChannel(tstrWILC_WFIDrv *drvHandler, static s32 Handle_SetChannel(struct host_if_drv *drvHandler,
struct channel_attr *pstrHostIFSetChan) struct channel_attr *pstrHostIFSetChan)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
/*prepare configuration packet*/ /*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_CURRENT_CHANNEL; strWID.u16WIDid = (u16)WID_CURRENT_CHANNEL;
...@@ -602,13 +602,13 @@ static s32 Handle_SetChannel(tstrWILC_WFIDrv *drvHandler, ...@@ -602,13 +602,13 @@ static s32 Handle_SetChannel(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static s32 Handle_SetWfiDrvHandler(tstrWILC_WFIDrv *drvHandler, static s32 Handle_SetWfiDrvHandler(struct host_if_drv *drvHandler,
struct drv_handler *pstrHostIfSetDrvHandler) struct drv_handler *pstrHostIfSetDrvHandler)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
tstrWILC_WFIDrv *pstrWFIDrv = drvHandler; struct host_if_drv *pstrWFIDrv = drvHandler;
/*prepare configuration packet*/ /*prepare configuration packet*/
...@@ -643,13 +643,13 @@ static s32 Handle_SetWfiDrvHandler(tstrWILC_WFIDrv *drvHandler, ...@@ -643,13 +643,13 @@ static s32 Handle_SetWfiDrvHandler(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static s32 Handle_SetOperationMode(tstrWILC_WFIDrv *drvHandler, static s32 Handle_SetOperationMode(struct host_if_drv *drvHandler,
struct op_mode *pstrHostIfSetOperationMode) struct op_mode *pstrHostIfSetOperationMode)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
/*prepare configuration packet*/ /*prepare configuration packet*/
...@@ -686,13 +686,13 @@ static s32 Handle_SetOperationMode(tstrWILC_WFIDrv *drvHandler, ...@@ -686,13 +686,13 @@ static s32 Handle_SetOperationMode(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 Handle_set_IPAddress(tstrWILC_WFIDrv *drvHandler, u8 *pu8IPAddr, u8 idx) s32 Handle_set_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
char firmwareIPAddress[4] = {0}; char firmwareIPAddress[4] = {0};
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
if (pu8IPAddr[0] < 192) if (pu8IPAddr[0] < 192)
pu8IPAddr[0] = 0; pu8IPAddr[0] = 0;
...@@ -733,12 +733,12 @@ s32 Handle_set_IPAddress(tstrWILC_WFIDrv *drvHandler, u8 *pu8IPAddr, u8 idx) ...@@ -733,12 +733,12 @@ s32 Handle_set_IPAddress(tstrWILC_WFIDrv *drvHandler, u8 *pu8IPAddr, u8 idx)
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 Handle_get_IPAddress(tstrWILC_WFIDrv *drvHandler, u8 *pu8IPAddr, u8 idx) s32 Handle_get_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
/*prepare configuration packet*/ /*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_IP_ADDRESS; strWID.u16WIDid = (u16)WID_IP_ADDRESS;
...@@ -781,13 +781,13 @@ s32 Handle_get_IPAddress(tstrWILC_WFIDrv *drvHandler, u8 *pu8IPAddr, u8 idx) ...@@ -781,13 +781,13 @@ s32 Handle_get_IPAddress(tstrWILC_WFIDrv *drvHandler, u8 *pu8IPAddr, u8 idx)
* @date November 2013 * @date November 2013
* @version 7.0 * @version 7.0
*/ */
static s32 Handle_SetMacAddress(tstrWILC_WFIDrv *drvHandler, static s32 Handle_SetMacAddress(struct host_if_drv *drvHandler,
struct set_mac_addr *pstrHostIfSetMacAddress) struct set_mac_addr *pstrHostIfSetMacAddress)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
u8 *mac_buf = kmalloc(ETH_ALEN, GFP_KERNEL); u8 *mac_buf = kmalloc(ETH_ALEN, GFP_KERNEL);
if (mac_buf == NULL) { if (mac_buf == NULL) {
...@@ -824,7 +824,7 @@ static s32 Handle_SetMacAddress(tstrWILC_WFIDrv *drvHandler, ...@@ -824,7 +824,7 @@ static s32 Handle_SetMacAddress(tstrWILC_WFIDrv *drvHandler,
* @date JAN 2013 * @date JAN 2013
* @version 8.0 * @version 8.0
*/ */
static s32 Handle_GetMacAddress(tstrWILC_WFIDrv *drvHandler, static s32 Handle_GetMacAddress(struct host_if_drv *drvHandler,
struct get_mac_addr *pstrHostIfGetMacAddress) struct get_mac_addr *pstrHostIfGetMacAddress)
{ {
...@@ -859,13 +859,13 @@ static s32 Handle_GetMacAddress(tstrWILC_WFIDrv *drvHandler, ...@@ -859,13 +859,13 @@ static s32 Handle_GetMacAddress(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static s32 Handle_CfgParam(tstrWILC_WFIDrv *drvHandler, static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
struct cfg_param_attr *strHostIFCfgParamAttr) struct cfg_param_attr *strHostIFCfgParamAttr)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWIDList[32]; tstrWID strWIDList[32];
u8 u8WidCnt = 0; u8 u8WidCnt = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
down(&(pstrWFIDrv->gtOsCfgValuesSem)); down(&(pstrWFIDrv->gtOsCfgValuesSem));
...@@ -1219,7 +1219,7 @@ static s32 Handle_wait_msg_q_empty(void) ...@@ -1219,7 +1219,7 @@ static s32 Handle_wait_msg_q_empty(void)
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static s32 Handle_Scan(tstrWILC_WFIDrv *drvHandler, static s32 Handle_Scan(struct host_if_drv *drvHandler,
struct scan_attr *pstrHostIFscanAttr) struct scan_attr *pstrHostIFscanAttr)
{ {
s32 s32Error = 0; s32 s32Error = 0;
...@@ -1229,7 +1229,7 @@ static s32 Handle_Scan(tstrWILC_WFIDrv *drvHandler, ...@@ -1229,7 +1229,7 @@ static s32 Handle_Scan(tstrWILC_WFIDrv *drvHandler,
u8 *pu8Buffer; u8 *pu8Buffer;
u8 valuesize = 0; u8 valuesize = 0;
u8 *pu8HdnNtwrksWidVal = NULL; u8 *pu8HdnNtwrksWidVal = NULL;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *) drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *) drvHandler;
PRINT_D(HOSTINF_DBG, "Setting SCAN params\n"); PRINT_D(HOSTINF_DBG, "Setting SCAN params\n");
PRINT_D(HOSTINF_DBG, "Scanning: In [%d] state\n", pstrWFIDrv->enuHostIFstate); PRINT_D(HOSTINF_DBG, "Scanning: In [%d] state\n", pstrWFIDrv->enuHostIFstate);
...@@ -1386,11 +1386,11 @@ static s32 Handle_Scan(tstrWILC_WFIDrv *drvHandler, ...@@ -1386,11 +1386,11 @@ static s32 Handle_Scan(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static s32 Handle_ScanDone(tstrWILC_WFIDrv *drvHandler, tenuScanEvent enuEvent) static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEvent)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
u8 u8abort_running_scan; u8 u8abort_running_scan;
...@@ -1443,10 +1443,10 @@ static s32 Handle_ScanDone(tstrWILC_WFIDrv *drvHandler, tenuScanEvent enuEvent) ...@@ -1443,10 +1443,10 @@ static s32 Handle_ScanDone(tstrWILC_WFIDrv *drvHandler, tenuScanEvent enuEvent)
* @version 1.0 * @version 1.0
*/ */
u8 u8ConnectedSSID[6] = {0}; u8 u8ConnectedSSID[6] = {0};
static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, static s32 Handle_Connect(struct host_if_drv *drvHandler,
struct connect_attr *pstrHostIFconnectAttr) struct connect_attr *pstrHostIFconnectAttr)
{ {
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *) drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *) drvHandler;
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWIDList[8]; tstrWID strWIDList[8];
u32 u32WidsCount = 0, dummyval = 0; u32 u32WidsCount = 0, dummyval = 0;
...@@ -1806,7 +1806,7 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, ...@@ -1806,7 +1806,7 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler,
* @version 8.0 * @version 8.0
*/ */
static s32 Handle_FlushConnect(tstrWILC_WFIDrv *drvHandler) static s32 Handle_FlushConnect(struct host_if_drv *drvHandler)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWIDList[5]; tstrWID strWIDList[5];
...@@ -1865,13 +1865,13 @@ static s32 Handle_FlushConnect(tstrWILC_WFIDrv *drvHandler) ...@@ -1865,13 +1865,13 @@ static s32 Handle_FlushConnect(tstrWILC_WFIDrv *drvHandler)
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static s32 Handle_ConnectTimeout(tstrWILC_WFIDrv *drvHandler) static s32 Handle_ConnectTimeout(struct host_if_drv *drvHandler)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrConnectInfo strConnectInfo; tstrConnectInfo strConnectInfo;
tstrWID strWID; tstrWID strWID;
u16 u16DummyReasonCode = 0; u16 u16DummyReasonCode = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *) drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *) drvHandler;
if (pstrWFIDrv == NULL) { if (pstrWFIDrv == NULL) {
PRINT_ER("Driver handler is NULL\n"); PRINT_ER("Driver handler is NULL\n");
...@@ -1973,7 +1973,7 @@ static s32 Handle_ConnectTimeout(tstrWILC_WFIDrv *drvHandler) ...@@ -1973,7 +1973,7 @@ static s32 Handle_ConnectTimeout(tstrWILC_WFIDrv *drvHandler)
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static s32 Handle_RcvdNtwrkInfo(tstrWILC_WFIDrv *drvHandler, static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *drvHandler,
struct rcvd_net_info *pstrRcvdNetworkInfo) struct rcvd_net_info *pstrRcvdNetworkInfo)
{ {
u32 i; u32 i;
...@@ -1985,7 +1985,7 @@ static s32 Handle_RcvdNtwrkInfo(tstrWILC_WFIDrv *drvHandler, ...@@ -1985,7 +1985,7 @@ static s32 Handle_RcvdNtwrkInfo(tstrWILC_WFIDrv *drvHandler,
tstrNetworkInfo *pstrNetworkInfo = NULL; tstrNetworkInfo *pstrNetworkInfo = NULL;
void *pJoinParams = NULL; void *pJoinParams = NULL;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
...@@ -2089,7 +2089,7 @@ static s32 Handle_RcvdNtwrkInfo(tstrWILC_WFIDrv *drvHandler, ...@@ -2089,7 +2089,7 @@ static s32 Handle_RcvdNtwrkInfo(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler, static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *drvHandler,
struct rcvd_async_info *pstrRcvdGnrlAsyncInfo) struct rcvd_async_info *pstrRcvdGnrlAsyncInfo)
{ {
/* TODO: mostafa: till now, this function just handles only the received mac status msg, */ /* TODO: mostafa: till now, this function just handles only the received mac status msg, */
...@@ -2106,7 +2106,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler, ...@@ -2106,7 +2106,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler,
tstrConnectInfo strConnectInfo; tstrConnectInfo strConnectInfo;
tstrDisconnectNotifInfo strDisconnectNotifInfo; tstrDisconnectNotifInfo strDisconnectNotifInfo;
s32 s32Err = 0; s32 s32Err = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *) drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *) drvHandler;
if (!pstrWFIDrv) { if (!pstrWFIDrv) {
PRINT_ER("Driver handler is NULL\n"); PRINT_ER("Driver handler is NULL\n");
...@@ -2405,7 +2405,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler, ...@@ -2405,7 +2405,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static int Handle_Key(tstrWILC_WFIDrv *drvHandler, static int Handle_Key(struct host_if_drv *drvHandler,
struct key_attr *pstrHostIFkeyAttr) struct key_attr *pstrHostIFkeyAttr)
{ {
s32 s32Error = 0; s32 s32Error = 0;
...@@ -2415,7 +2415,7 @@ static int Handle_Key(tstrWILC_WFIDrv *drvHandler, ...@@ -2415,7 +2415,7 @@ static int Handle_Key(tstrWILC_WFIDrv *drvHandler,
u8 *pu8keybuf; u8 *pu8keybuf;
s8 s8idxarray[1]; s8 s8idxarray[1];
s8 ret = 0; s8 ret = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
switch (pstrHostIFkeyAttr->enuKeyType) { switch (pstrHostIFkeyAttr->enuKeyType) {
...@@ -2769,13 +2769,13 @@ static int Handle_Key(tstrWILC_WFIDrv *drvHandler, ...@@ -2769,13 +2769,13 @@ static int Handle_Key(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static void Handle_Disconnect(tstrWILC_WFIDrv *drvHandler) static void Handle_Disconnect(struct host_if_drv *drvHandler)
{ {
tstrWID strWID; tstrWID strWID;
s32 s32Error = 0; s32 s32Error = 0;
u16 u16DummyReasonCode = 0; u16 u16DummyReasonCode = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_DISCONNECT; strWID.u16WIDid = (u16)WID_DISCONNECT;
...@@ -2872,11 +2872,11 @@ static void Handle_Disconnect(tstrWILC_WFIDrv *drvHandler) ...@@ -2872,11 +2872,11 @@ static void Handle_Disconnect(tstrWILC_WFIDrv *drvHandler)
} }
void resolve_disconnect_aberration(tstrWILC_WFIDrv *drvHandler) void resolve_disconnect_aberration(struct host_if_drv *drvHandler)
{ {
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; pstrWFIDrv = (struct host_if_drv *)drvHandler;
if (pstrWFIDrv == NULL) if (pstrWFIDrv == NULL)
return; return;
if ((pstrWFIDrv->enuHostIFstate == HOST_IF_WAITING_CONN_RESP) || (pstrWFIDrv->enuHostIFstate == HOST_IF_CONNECTING)) { if ((pstrWFIDrv->enuHostIFstate == HOST_IF_WAITING_CONN_RESP) || (pstrWFIDrv->enuHostIFstate == HOST_IF_CONNECTING)) {
...@@ -2895,13 +2895,12 @@ void resolve_disconnect_aberration(tstrWILC_WFIDrv *drvHandler) ...@@ -2895,13 +2895,12 @@ void resolve_disconnect_aberration(tstrWILC_WFIDrv *drvHandler)
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static s32 Handle_GetChnl(tstrWILC_WFIDrv *drvHandler) static s32 Handle_GetChnl(struct host_if_drv *drvHandler)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
/* tstrWILC_WFIDrv * pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; */ struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
strWID.u16WIDid = (u16)WID_CURRENT_CHANNEL; strWID.u16WIDid = (u16)WID_CURRENT_CHANNEL;
strWID.enuWIDtype = WID_CHAR; strWID.enuWIDtype = WID_CHAR;
...@@ -2936,11 +2935,11 @@ static s32 Handle_GetChnl(tstrWILC_WFIDrv *drvHandler) ...@@ -2936,11 +2935,11 @@ static s32 Handle_GetChnl(tstrWILC_WFIDrv *drvHandler)
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static void Handle_GetRssi(tstrWILC_WFIDrv *drvHandler) static void Handle_GetRssi(struct host_if_drv *drvHandler)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_RSSI; strWID.u16WIDid = (u16)WID_RSSI;
strWID.enuWIDtype = WID_CHAR; strWID.enuWIDtype = WID_CHAR;
...@@ -2963,11 +2962,11 @@ static void Handle_GetRssi(tstrWILC_WFIDrv *drvHandler) ...@@ -2963,11 +2962,11 @@ static void Handle_GetRssi(tstrWILC_WFIDrv *drvHandler)
} }
static void Handle_GetLinkspeed(tstrWILC_WFIDrv *drvHandler) static void Handle_GetLinkspeed(struct host_if_drv *drvHandler)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
gs8lnkspd = 0; gs8lnkspd = 0;
...@@ -2990,7 +2989,7 @@ static void Handle_GetLinkspeed(tstrWILC_WFIDrv *drvHandler) ...@@ -2990,7 +2989,7 @@ static void Handle_GetLinkspeed(tstrWILC_WFIDrv *drvHandler)
} }
s32 Handle_GetStatistics(tstrWILC_WFIDrv *drvHandler, tstrStatistics *pstrStatistics) s32 Handle_GetStatistics(struct host_if_drv *drvHandler, tstrStatistics *pstrStatistics)
{ {
tstrWID strWIDList[5]; tstrWID strWIDList[5];
u32 u32WidsCount = 0, s32Error = 0; u32 u32WidsCount = 0, s32Error = 0;
...@@ -3047,14 +3046,14 @@ s32 Handle_GetStatistics(tstrWILC_WFIDrv *drvHandler, tstrStatistics *pstrStatis ...@@ -3047,14 +3046,14 @@ s32 Handle_GetStatistics(tstrWILC_WFIDrv *drvHandler, tstrStatistics *pstrStatis
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static s32 Handle_Get_InActiveTime(tstrWILC_WFIDrv *drvHandler, static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler,
struct sta_inactive_t *strHostIfStaInactiveT) struct sta_inactive_t *strHostIfStaInactiveT)
{ {
s32 s32Error = 0; s32 s32Error = 0;
u8 *stamac; u8 *stamac;
tstrWID strWID; tstrWID strWID;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_SET_STA_MAC_INACTIVE_TIME; strWID.u16WIDid = (u16)WID_SET_STA_MAC_INACTIVE_TIME;
...@@ -3114,13 +3113,13 @@ static s32 Handle_Get_InActiveTime(tstrWILC_WFIDrv *drvHandler, ...@@ -3114,13 +3113,13 @@ static s32 Handle_Get_InActiveTime(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static void Handle_AddBeacon(tstrWILC_WFIDrv *drvHandler, static void Handle_AddBeacon(struct host_if_drv *drvHandler,
struct beacon_attr *pstrSetBeaconParam) struct beacon_attr *pstrSetBeaconParam)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
u8 *pu8CurrByte; u8 *pu8CurrByte;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
PRINT_D(HOSTINF_DBG, "Adding BEACON\n"); PRINT_D(HOSTINF_DBG, "Adding BEACON\n");
...@@ -3177,18 +3176,18 @@ static void Handle_AddBeacon(tstrWILC_WFIDrv *drvHandler, ...@@ -3177,18 +3176,18 @@ static void Handle_AddBeacon(tstrWILC_WFIDrv *drvHandler,
/** /**
* @brief Handle_AddBeacon * @brief Handle_AddBeacon
* @details Sending config packet to delete beacon * @details Sending config packet to delete beacon
* @param[in] tstrWILC_WFIDrv *drvHandler * @param[in] struct host_if_drv *drvHandler
* @return NONE * @return NONE
* @author * @author
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static void Handle_DelBeacon(tstrWILC_WFIDrv *drvHandler) static void Handle_DelBeacon(struct host_if_drv *drvHandler)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
u8 *pu8CurrByte; u8 *pu8CurrByte;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_DEL_BEACON; strWID.u16WIDid = (u16)WID_DEL_BEACON;
strWID.enuWIDtype = WID_CHAR; strWID.enuWIDtype = WID_CHAR;
...@@ -3275,13 +3274,13 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer, ...@@ -3275,13 +3274,13 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static void Handle_AddStation(tstrWILC_WFIDrv *drvHandler, static void Handle_AddStation(struct host_if_drv *drvHandler,
struct add_sta_param *pstrStationParam) struct add_sta_param *pstrStationParam)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
u8 *pu8CurrByte; u8 *pu8CurrByte;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
PRINT_D(HOSTINF_DBG, "Handling add station\n"); PRINT_D(HOSTINF_DBG, "Handling add station\n");
strWID.u16WIDid = (u16)WID_ADD_STA; strWID.u16WIDid = (u16)WID_ADD_STA;
...@@ -3315,14 +3314,14 @@ static void Handle_AddStation(tstrWILC_WFIDrv *drvHandler, ...@@ -3315,14 +3314,14 @@ static void Handle_AddStation(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static void Handle_DelAllSta(tstrWILC_WFIDrv *drvHandler, static void Handle_DelAllSta(struct host_if_drv *drvHandler,
struct del_all_sta *pstrDelAllStaParam) struct del_all_sta *pstrDelAllStaParam)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
u8 *pu8CurrByte; u8 *pu8CurrByte;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
u8 i; u8 i;
u8 au8Zero_Buff[6] = {0}; u8 au8Zero_Buff[6] = {0};
...@@ -3371,13 +3370,13 @@ static void Handle_DelAllSta(tstrWILC_WFIDrv *drvHandler, ...@@ -3371,13 +3370,13 @@ static void Handle_DelAllSta(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static void Handle_DelStation(tstrWILC_WFIDrv *drvHandler, static void Handle_DelStation(struct host_if_drv *drvHandler,
struct del_sta *pstrDelStaParam) struct del_sta *pstrDelStaParam)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
u8 *pu8CurrByte; u8 *pu8CurrByte;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_REMOVE_STA; strWID.u16WIDid = (u16)WID_REMOVE_STA;
strWID.enuWIDtype = WID_BIN; strWID.enuWIDtype = WID_BIN;
...@@ -3413,13 +3412,13 @@ static void Handle_DelStation(tstrWILC_WFIDrv *drvHandler, ...@@ -3413,13 +3412,13 @@ static void Handle_DelStation(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static void Handle_EditStation(tstrWILC_WFIDrv *drvHandler, static void Handle_EditStation(struct host_if_drv *drvHandler,
struct add_sta_param *pstrStationParam) struct add_sta_param *pstrStationParam)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
u8 *pu8CurrByte; u8 *pu8CurrByte;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_EDIT_STA; strWID.u16WIDid = (u16)WID_EDIT_STA;
strWID.enuWIDtype = WID_BIN; strWID.enuWIDtype = WID_BIN;
...@@ -3453,13 +3452,13 @@ static void Handle_EditStation(tstrWILC_WFIDrv *drvHandler, ...@@ -3453,13 +3452,13 @@ static void Handle_EditStation(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static int Handle_RemainOnChan(tstrWILC_WFIDrv *drvHandler, static int Handle_RemainOnChan(struct host_if_drv *drvHandler,
struct remain_ch *pstrHostIfRemainOnChan) struct remain_ch *pstrHostIfRemainOnChan)
{ {
s32 s32Error = 0; s32 s32Error = 0;
u8 u8remain_on_chan_flag; u8 u8remain_on_chan_flag;
tstrWID strWID; tstrWID strWID;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *) drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *) drvHandler;
/*If it's a pendig remain-on-channel, don't overwrite gWFiDrvHandle values (since incoming msg is garbbage)*/ /*If it's a pendig remain-on-channel, don't overwrite gWFiDrvHandle values (since incoming msg is garbbage)*/
if (!pstrWFIDrv->u8RemainOnChan_pendingreq) { if (!pstrWFIDrv->u8RemainOnChan_pendingreq) {
...@@ -3540,13 +3539,13 @@ static int Handle_RemainOnChan(tstrWILC_WFIDrv *drvHandler, ...@@ -3540,13 +3539,13 @@ static int Handle_RemainOnChan(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static int Handle_RegisterFrame(tstrWILC_WFIDrv *drvHandler, static int Handle_RegisterFrame(struct host_if_drv *drvHandler,
struct reg_frame *pstrHostIfRegisterFrame) struct reg_frame *pstrHostIfRegisterFrame)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
u8 *pu8CurrByte; u8 *pu8CurrByte;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
PRINT_D(HOSTINF_DBG, "Handling frame register Flag : %d FrameType: %d\n", pstrHostIfRegisterFrame->bReg, pstrHostIfRegisterFrame->u16FrameType); PRINT_D(HOSTINF_DBG, "Handling frame register Flag : %d FrameType: %d\n", pstrHostIfRegisterFrame->bReg, pstrHostIfRegisterFrame->u16FrameType);
...@@ -3589,13 +3588,13 @@ static int Handle_RegisterFrame(tstrWILC_WFIDrv *drvHandler, ...@@ -3589,13 +3588,13 @@ static int Handle_RegisterFrame(tstrWILC_WFIDrv *drvHandler,
* @version 1.0 * @version 1.0
*/ */
#define FALSE_FRMWR_CHANNEL 100 #define FALSE_FRMWR_CHANNEL 100
static u32 Handle_ListenStateExpired(tstrWILC_WFIDrv *drvHandler, static u32 Handle_ListenStateExpired(struct host_if_drv *drvHandler,
struct remain_ch *pstrHostIfRemainOnChan) struct remain_ch *pstrHostIfRemainOnChan)
{ {
u8 u8remain_on_chan_flag; u8 u8remain_on_chan_flag;
tstrWID strWID; tstrWID strWID;
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *) drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *) drvHandler;
PRINT_D(HOSTINF_DBG, "CANCEL REMAIN ON CHAN\n"); PRINT_D(HOSTINF_DBG, "CANCEL REMAIN ON CHAN\n");
...@@ -3650,7 +3649,7 @@ static void ListenTimerCB(unsigned long arg) ...@@ -3650,7 +3649,7 @@ static void ListenTimerCB(unsigned long arg)
{ {
s32 s32Error = 0; s32 s32Error = 0;
struct host_if_msg msg; struct host_if_msg msg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)arg; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)arg;
/*Stopping remain-on-channel timer*/ /*Stopping remain-on-channel timer*/
del_timer(&pstrWFIDrv->hRemainOnChannel); del_timer(&pstrWFIDrv->hRemainOnChannel);
...@@ -3675,13 +3674,13 @@ static void ListenTimerCB(unsigned long arg) ...@@ -3675,13 +3674,13 @@ static void ListenTimerCB(unsigned long arg)
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static void Handle_PowerManagement(tstrWILC_WFIDrv *drvHandler, static void Handle_PowerManagement(struct host_if_drv *drvHandler,
struct power_mgmt_param *strPowerMgmtParam) struct power_mgmt_param *strPowerMgmtParam)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
s8 s8PowerMode; s8 s8PowerMode;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_POWER_MANAGEMENT; strWID.u16WIDid = (u16)WID_POWER_MANAGEMENT;
...@@ -3711,7 +3710,7 @@ static void Handle_PowerManagement(tstrWILC_WFIDrv *drvHandler, ...@@ -3711,7 +3710,7 @@ static void Handle_PowerManagement(tstrWILC_WFIDrv *drvHandler,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
static void Handle_SetMulticastFilter(tstrWILC_WFIDrv *drvHandler, static void Handle_SetMulticastFilter(struct host_if_drv *drvHandler,
struct set_multicast *strHostIfSetMulti) struct set_multicast *strHostIfSetMulti)
{ {
s32 s32Error = 0; s32 s32Error = 0;
...@@ -3762,14 +3761,14 @@ static void Handle_SetMulticastFilter(tstrWILC_WFIDrv *drvHandler, ...@@ -3762,14 +3761,14 @@ static void Handle_SetMulticastFilter(tstrWILC_WFIDrv *drvHandler,
* @date Feb. 2014 * @date Feb. 2014
* @version 9.0 * @version 9.0
*/ */
static s32 Handle_AddBASession(tstrWILC_WFIDrv *drvHandler, static s32 Handle_AddBASession(struct host_if_drv *drvHandler,
struct ba_session_info *strHostIfBASessionInfo) struct ba_session_info *strHostIfBASessionInfo)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
int AddbaTimeout = 100; int AddbaTimeout = 100;
char *ptr = NULL; char *ptr = NULL;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
PRINT_D(HOSTINF_DBG, "Opening Block Ack session with\nBSSID = %.2x:%.2x:%.2x\nTID=%d\nBufferSize == %d\nSessionTimeOut = %d\n", PRINT_D(HOSTINF_DBG, "Opening Block Ack session with\nBSSID = %.2x:%.2x:%.2x\nTID=%d\nBufferSize == %d\nSessionTimeOut = %d\n",
strHostIfBASessionInfo->au8Bssid[0], strHostIfBASessionInfo->au8Bssid[0],
...@@ -3851,13 +3850,13 @@ static s32 Handle_AddBASession(tstrWILC_WFIDrv *drvHandler, ...@@ -3851,13 +3850,13 @@ static s32 Handle_AddBASession(tstrWILC_WFIDrv *drvHandler,
* @date Feb. 2013 * @date Feb. 2013
* @version 9.0 * @version 9.0
*/ */
static s32 Handle_DelAllRxBASessions(tstrWILC_WFIDrv *drvHandler, static s32 Handle_DelAllRxBASessions(struct host_if_drv *drvHandler,
struct ba_session_info *strHostIfBASessionInfo) struct ba_session_info *strHostIfBASessionInfo)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
char *ptr = NULL; char *ptr = NULL;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
PRINT_D(GENERIC_DBG, "Delete Block Ack session with\nBSSID = %.2x:%.2x:%.2x\nTID=%d\n", PRINT_D(GENERIC_DBG, "Delete Block Ack session with\nBSSID = %.2x:%.2x:%.2x\nTID=%d\n",
strHostIfBASessionInfo->au8Bssid[0], strHostIfBASessionInfo->au8Bssid[0],
...@@ -3909,13 +3908,13 @@ static int hostIFthread(void *pvArg) ...@@ -3909,13 +3908,13 @@ static int hostIFthread(void *pvArg)
{ {
u32 u32Ret; u32 u32Ret;
struct host_if_msg msg; struct host_if_msg msg;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
memset(&msg, 0, sizeof(struct host_if_msg)); memset(&msg, 0, sizeof(struct host_if_msg));
while (1) { while (1) {
wilc_mq_recv(&gMsgQHostIF, &msg, sizeof(struct host_if_msg), &u32Ret); wilc_mq_recv(&gMsgQHostIF, &msg, sizeof(struct host_if_msg), &u32Ret);
pstrWFIDrv = (tstrWILC_WFIDrv *)msg.drvHandler; pstrWFIDrv = (struct host_if_drv *)msg.drvHandler;
if (msg.id == HOST_IF_MSG_EXIT) { if (msg.id == HOST_IF_MSG_EXIT) {
PRINT_D(GENERIC_DBG, "THREAD: Exiting HostIfThread\n"); PRINT_D(GENERIC_DBG, "THREAD: Exiting HostIfThread\n");
break; break;
...@@ -4160,11 +4159,10 @@ static void TimerCB_Connect(unsigned long arg) ...@@ -4160,11 +4159,10 @@ static void TimerCB_Connect(unsigned long arg)
* @version 1.0 * @version 1.0
*/ */
/* Check implementation in core adding 9 bytes to the input! */ /* Check implementation in core adding 9 bytes to the input! */
s32 host_int_remove_key(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8StaAddress) s32 host_int_remove_key(struct host_if_drv *hWFIDrv, const u8 *pu8StaAddress)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
/* tstrWILC_WFIDrv * pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; */
strWID.u16WIDid = (u16)WID_REMOVE_KEY; strWID.u16WIDid = (u16)WID_REMOVE_KEY;
strWID.enuWIDtype = WID_STR; strWID.enuWIDtype = WID_STR;
...@@ -4189,7 +4187,7 @@ s32 host_int_remove_key(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8StaAddress) ...@@ -4189,7 +4187,7 @@ s32 host_int_remove_key(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8StaAddress)
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
int host_int_remove_wep_key(tstrWILC_WFIDrv *wfi_drv, u8 index) int host_int_remove_wep_key(struct host_if_drv *wfi_drv, u8 index)
{ {
int result = 0; int result = 0;
struct host_if_msg msg; struct host_if_msg msg;
...@@ -4232,10 +4230,10 @@ int host_int_remove_wep_key(tstrWILC_WFIDrv *wfi_drv, u8 index) ...@@ -4232,10 +4230,10 @@ int host_int_remove_wep_key(tstrWILC_WFIDrv *wfi_drv, u8 index)
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index) s32 host_int_set_WEPDefaultKeyID(struct host_if_drv *hWFIDrv, u8 u8Index)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
...@@ -4286,11 +4284,11 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index) ...@@ -4286,11 +4284,11 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index)
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx) s32 host_int_add_wep_key_bss_sta(struct host_if_drv *hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
if (pstrWFIDrv == NULL) { if (pstrWFIDrv == NULL) {
...@@ -4348,11 +4346,11 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, ...@@ -4348,11 +4346,11 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey,
* @date 28 FEB 2013 * @date 28 FEB 2013
* @version 1.0 * @version 1.0
*/ */
s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx, u8 u8mode, enum AUTHTYPE tenuAuth_type) s32 host_int_add_wep_key_bss_ap(struct host_if_drv *hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx, u8 u8mode, enum AUTHTYPE tenuAuth_type)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
u8 i; u8 i;
...@@ -4421,11 +4419,11 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u ...@@ -4421,11 +4419,11 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen, s32 host_int_add_ptk(struct host_if_drv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
const u8 *mac_addr, const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode, u8 u8Idx) const u8 *mac_addr, const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode, u8 u8Idx)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
u8 u8KeyLen = u8PtkKeylen; u8 u8KeyLen = u8PtkKeylen;
u32 i; u32 i;
...@@ -4516,12 +4514,12 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen, ...@@ -4516,12 +4514,12 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKeylen, s32 host_int_add_rx_gtk(struct host_if_drv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKeylen,
u8 u8KeyIdx, u32 u32KeyRSClen, const u8 *KeyRSC, u8 u8KeyIdx, u32 u32KeyRSClen, const u8 *KeyRSC,
const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode) const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
u8 u8KeyLen = u8GtkKeylen; u8 u8KeyLen = u8GtkKeylen;
...@@ -4619,10 +4617,10 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe ...@@ -4619,10 +4617,10 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, struct host_if_pmkid_attr *pu8PmkidInfoArray) s32 host_int_set_pmkid_info(struct host_if_drv *hWFIDrv, struct host_if_pmkid_attr *pu8PmkidInfoArray)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
u32 i; u32 i;
...@@ -4679,12 +4677,11 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, struct host_if_pmkid_attr ...@@ -4679,12 +4677,11 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, struct host_if_pmkid_attr
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PmkidInfoArray, s32 host_int_get_pmkid_info(struct host_if_drv *hWFIDrv, u8 *pu8PmkidInfoArray,
u32 u32PmkidInfoLen) u32 u32PmkidInfoLen)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
/* tstrWILC_WFIDrv * pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; */
strWID.u16WIDid = (u16)WID_PMKID_INFO; strWID.u16WIDid = (u16)WID_PMKID_INFO;
strWID.enuWIDtype = WID_STR; strWID.enuWIDtype = WID_STR;
...@@ -4708,7 +4705,7 @@ s32 host_int_get_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PmkidInfoArray, ...@@ -4708,7 +4705,7 @@ s32 host_int_get_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PmkidInfoArray,
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_set_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PassPhrase, s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, u8 *pu8PassPhrase,
u8 u8Psklength) u8 u8Psklength)
{ {
s32 s32Error = 0; s32 s32Error = 0;
...@@ -4735,7 +4732,7 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PassPh ...@@ -4735,7 +4732,7 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PassPh
* @date 19 April 2012 * @date 19 April 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress) s32 host_int_get_MacAddress(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress)
{ {
s32 s32Error = 0; s32 s32Error = 0;
struct host_if_msg msg; struct host_if_msg msg;
...@@ -4769,7 +4766,7 @@ s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress) ...@@ -4769,7 +4766,7 @@ s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
* @date 16 July 2012 * @date 16 July 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress) s32 host_int_set_MacAddress(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress)
{ {
s32 s32Error = 0; s32 s32Error = 0;
struct host_if_msg msg; struct host_if_msg msg;
...@@ -4804,12 +4801,11 @@ s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress) ...@@ -4804,12 +4801,11 @@ s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv,
u8 *pu8PassPhrase, u8 u8Psklength) u8 *pu8PassPhrase, u8 u8Psklength)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
/* tstrWILC_WFIDrv * pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; */
strWID.u16WIDid = (u16)WID_11I_PSK; strWID.u16WIDid = (u16)WID_11I_PSK;
strWID.enuWIDtype = WID_STR; strWID.enuWIDtype = WID_STR;
...@@ -4834,11 +4830,10 @@ s32 host_int_get_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, ...@@ -4834,11 +4830,10 @@ s32 host_int_get_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv,
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_set_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 scanSource) s32 host_int_set_start_scan_req(struct host_if_drv *hWFIDrv, u8 scanSource)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
/* tstrWILC_WFIDrv * pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; */
strWID.u16WIDid = (u16)WID_START_SCAN_REQ; strWID.u16WIDid = (u16)WID_START_SCAN_REQ;
strWID.enuWIDtype = WID_CHAR; strWID.enuWIDtype = WID_CHAR;
...@@ -4864,11 +4859,10 @@ s32 host_int_set_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 scanSource) ...@@ -4864,11 +4859,10 @@ s32 host_int_set_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 scanSource)
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ScanSource) s32 host_int_get_start_scan_req(struct host_if_drv *hWFIDrv, u8 *pu8ScanSource)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
/* tstrWILC_WFIDrv * pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; */
strWID.u16WIDid = (u16)WID_START_SCAN_REQ; strWID.u16WIDid = (u16)WID_START_SCAN_REQ;
strWID.enuWIDtype = WID_CHAR; strWID.enuWIDtype = WID_CHAR;
...@@ -4889,7 +4883,7 @@ s32 host_int_get_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ScanSource) ...@@ -4889,7 +4883,7 @@ s32 host_int_get_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ScanSource)
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid, s32 host_int_set_join_req(struct host_if_drv *hWFIDrv, u8 *pu8bssid,
const u8 *pu8ssid, size_t ssidLen, const u8 *pu8ssid, size_t ssidLen,
const u8 *pu8IEs, size_t IEsLen, const u8 *pu8IEs, size_t IEsLen,
wilc_connect_result pfConnectResult, void *pvUserArg, wilc_connect_result pfConnectResult, void *pvUserArg,
...@@ -4898,7 +4892,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid, ...@@ -4898,7 +4892,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
void *pJoinParams) void *pJoinParams)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
tenuScanConnTimer enuScanConnTimer; tenuScanConnTimer enuScanConnTimer;
...@@ -4983,7 +4977,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid, ...@@ -4983,7 +4977,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
* @version 8.0 * @version 8.0
*/ */
s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv) s32 host_int_flush_join_req(struct host_if_drv *hWFIDrv)
{ {
s32 s32Error = 0; s32 s32Error = 0;
struct host_if_msg msg; struct host_if_msg msg;
...@@ -5024,11 +5018,11 @@ s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv) ...@@ -5024,11 +5018,11 @@ s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv)
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode) s32 host_int_disconnect(struct host_if_drv *hWFIDrv, u16 u16ReasonCode)
{ {
s32 s32Error = 0; s32 s32Error = 0;
struct host_if_msg msg; struct host_if_msg msg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
if (pstrWFIDrv == NULL) { if (pstrWFIDrv == NULL) {
PRINT_ER("Driver is null\n"); PRINT_ER("Driver is null\n");
...@@ -5063,11 +5057,10 @@ s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode) ...@@ -5063,11 +5057,10 @@ s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode)
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_disconnect_station(tstrWILC_WFIDrv *hWFIDrv, u8 assoc_id) s32 host_int_disconnect_station(struct host_if_drv *hWFIDrv, u8 assoc_id)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
/* tstrWILC_WFIDrv * pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; */
strWID.u16WIDid = (u16)WID_DISCONNECT; strWID.u16WIDid = (u16)WID_DISCONNECT;
strWID.enuWIDtype = WID_CHAR; strWID.enuWIDtype = WID_CHAR;
...@@ -5103,12 +5096,11 @@ s32 host_int_disconnect_station(tstrWILC_WFIDrv *hWFIDrv, u8 assoc_id) ...@@ -5103,12 +5096,11 @@ s32 host_int_disconnect_station(tstrWILC_WFIDrv *hWFIDrv, u8 assoc_id)
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_assoc_req_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocReqInfo, s32 host_int_get_assoc_req_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocReqInfo,
u32 u32AssocReqInfoLen) u32 u32AssocReqInfoLen)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
/* tstrWILC_WFIDrv * pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; */
strWID.u16WIDid = (u16)WID_ASSOC_REQ_INFO; strWID.u16WIDid = (u16)WID_ASSOC_REQ_INFO;
strWID.enuWIDtype = WID_STR; strWID.enuWIDtype = WID_STR;
...@@ -5130,12 +5122,12 @@ s32 host_int_get_assoc_req_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocReqInfo, ...@@ -5130,12 +5122,12 @@ s32 host_int_get_assoc_req_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocReqInfo,
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_assoc_res_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocRespInfo, s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocRespInfo,
u32 u32MaxAssocRespInfoLen, u32 *pu32RcvdAssocRespInfoLen) u32 u32MaxAssocRespInfoLen, u32 *pu32RcvdAssocRespInfoLen)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
if (pstrWFIDrv == NULL) { if (pstrWFIDrv == NULL) {
PRINT_ER("Driver is null\n"); PRINT_ER("Driver is null\n");
...@@ -5177,12 +5169,11 @@ s32 host_int_get_assoc_res_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocRespInfo, ...@@ -5177,12 +5169,11 @@ s32 host_int_get_assoc_res_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocRespInfo,
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_rx_power_level(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8RxPowerLevel, s32 host_int_get_rx_power_level(struct host_if_drv *hWFIDrv, u8 *pu8RxPowerLevel,
u32 u32RxPowerLevelLen) u32 u32RxPowerLevelLen)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
/* tstrWILC_WFIDrv * pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; */
strWID.u16WIDid = (u16)WID_RX_POWER_LEVEL; strWID.u16WIDid = (u16)WID_RX_POWER_LEVEL;
strWID.enuWIDtype = WID_STR; strWID.enuWIDtype = WID_STR;
...@@ -5208,7 +5199,7 @@ s32 host_int_get_rx_power_level(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8RxPowerLevel, ...@@ -5208,7 +5199,7 @@ s32 host_int_get_rx_power_level(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8RxPowerLevel,
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
int host_int_set_mac_chnl_num(tstrWILC_WFIDrv *wfi_drv, u8 channel) int host_int_set_mac_chnl_num(struct host_if_drv *wfi_drv, u8 channel)
{ {
int result; int result;
struct host_if_msg msg; struct host_if_msg msg;
...@@ -5255,7 +5246,7 @@ int host_int_wait_msg_queue_idle(void) ...@@ -5255,7 +5246,7 @@ int host_int_wait_msg_queue_idle(void)
return result; return result;
} }
int host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *address) int host_int_set_wfi_drv_handler(struct host_if_drv *address)
{ {
int result = 0; int result = 0;
...@@ -5277,7 +5268,7 @@ int host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *address) ...@@ -5277,7 +5268,7 @@ int host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *address)
return result; return result;
} }
int host_int_set_operation_mode(tstrWILC_WFIDrv *wfi_drv, u32 mode) int host_int_set_operation_mode(struct host_if_drv *wfi_drv, u32 mode)
{ {
int result = 0; int result = 0;
...@@ -5314,10 +5305,10 @@ int host_int_set_operation_mode(tstrWILC_WFIDrv *wfi_drv, u32 mode) ...@@ -5314,10 +5305,10 @@ int host_int_set_operation_mode(tstrWILC_WFIDrv *wfi_drv, u32 mode)
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo) s32 host_int_get_host_chnl_num(struct host_if_drv *hWFIDrv, u8 *pu8ChNo)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
if (pstrWFIDrv == NULL) { if (pstrWFIDrv == NULL) {
...@@ -5356,10 +5347,10 @@ s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo) ...@@ -5356,10 +5347,10 @@ s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo)
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu32InactiveTime) s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac, u32 *pu32InactiveTime)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
if (pstrWFIDrv == NULL) { if (pstrWFIDrv == NULL) {
...@@ -5398,12 +5389,12 @@ s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu3 ...@@ -5398,12 +5389,12 @@ s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu3
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_test_get_int_wid(tstrWILC_WFIDrv *hWFIDrv, u32 *pu32TestMemAddr) s32 host_int_test_get_int_wid(struct host_if_drv *hWFIDrv, u32 *pu32TestMemAddr)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWID strWID; tstrWID strWID;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
if (pstrWFIDrv == NULL) { if (pstrWFIDrv == NULL) {
...@@ -5444,11 +5435,11 @@ s32 host_int_test_get_int_wid(tstrWILC_WFIDrv *hWFIDrv, u32 *pu32TestMemAddr) ...@@ -5444,11 +5435,11 @@ s32 host_int_test_get_int_wid(tstrWILC_WFIDrv *hWFIDrv, u32 *pu32TestMemAddr)
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_rssi(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8Rssi) s32 host_int_get_rssi(struct host_if_drv *hWFIDrv, s8 *ps8Rssi)
{ {
s32 s32Error = 0; s32 s32Error = 0;
struct host_if_msg msg; struct host_if_msg msg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
/* prepare the Get RSSI Message */ /* prepare the Get RSSI Message */
...@@ -5479,12 +5470,12 @@ s32 host_int_get_rssi(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8Rssi) ...@@ -5479,12 +5470,12 @@ s32 host_int_get_rssi(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8Rssi)
return s32Error; return s32Error;
} }
s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd) s32 host_int_get_link_speed(struct host_if_drv *hWFIDrv, s8 *ps8lnkspd)
{ {
struct host_if_msg msg; struct host_if_msg msg;
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
...@@ -5516,7 +5507,7 @@ s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd) ...@@ -5516,7 +5507,7 @@ s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd)
return s32Error; return s32Error;
} }
s32 host_int_get_statistics(tstrWILC_WFIDrv *hWFIDrv, tstrStatistics *pstrStatistics) s32 host_int_get_statistics(struct host_if_drv *hWFIDrv, tstrStatistics *pstrStatistics)
{ {
s32 s32Error = 0; s32 s32Error = 0;
struct host_if_msg msg; struct host_if_msg msg;
...@@ -5556,7 +5547,7 @@ s32 host_int_get_statistics(tstrWILC_WFIDrv *hWFIDrv, tstrStatistics *pstrStatis ...@@ -5556,7 +5547,7 @@ s32 host_int_get_statistics(tstrWILC_WFIDrv *hWFIDrv, tstrStatistics *pstrStatis
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource, s32 host_int_scan(struct host_if_drv *hWFIDrv, u8 u8ScanSource,
u8 u8ScanType, u8 *pu8ChnlFreqList, u8 u8ScanType, u8 *pu8ChnlFreqList,
u8 u8ChnlListLen, const u8 *pu8IEs, u8 u8ChnlListLen, const u8 *pu8IEs,
size_t IEsLen, wilc_scan_result ScanResult, size_t IEsLen, wilc_scan_result ScanResult,
...@@ -5564,7 +5555,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource, ...@@ -5564,7 +5555,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
struct hidden_network *pstrHiddenNetwork) struct hidden_network *pstrHiddenNetwork)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
tenuScanConnTimer enuScanConnTimer; tenuScanConnTimer enuScanConnTimer;
...@@ -5628,11 +5619,11 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource, ...@@ -5628,11 +5619,11 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, struct cfg_param_val *pstrCfgParamVal) s32 hif_set_cfg(struct host_if_drv *hWFIDrv, struct cfg_param_val *pstrCfgParamVal)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
...@@ -5667,10 +5658,10 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, struct cfg_param_val *pstrCfgParamVal) ...@@ -5667,10 +5658,10 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, struct cfg_param_val *pstrCfgParamVal)
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 hif_get_cfg(tstrWILC_WFIDrv *hWFIDrv, u16 u16WID, u16 *pu16WID_Value) s32 hif_get_cfg(struct host_if_drv *hWFIDrv, u16 u16WID, u16 *pu16WID_Value)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
down(&(pstrWFIDrv->gtOsCfgValuesSem)); down(&(pstrWFIDrv->gtOsCfgValuesSem));
...@@ -5801,7 +5792,7 @@ void host_int_send_join_leave_info_to_host ...@@ -5801,7 +5792,7 @@ void host_int_send_join_leave_info_to_host
static void GetPeriodicRSSI(unsigned long arg) static void GetPeriodicRSSI(unsigned long arg)
{ {
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)arg; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)arg;
if (pstrWFIDrv == NULL) { if (pstrWFIDrv == NULL) {
PRINT_ER("Driver handler is NULL\n"); PRINT_ER("Driver handler is NULL\n");
...@@ -5845,10 +5836,10 @@ void host_int_send_network_info_to_host ...@@ -5845,10 +5836,10 @@ void host_int_send_network_info_to_host
*/ */
static u32 clients_count; static u32 clients_count;
s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv) s32 host_int_init(struct host_if_drv **phWFIDrv)
{ {
s32 result = 0; s32 result = 0;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
int err; int err;
PRINT_D(HOSTINF_DBG, "Initializing host interface for client %d\n", clients_count + 1); PRINT_D(HOSTINF_DBG, "Initializing host interface for client %d\n", clients_count + 1);
...@@ -5858,7 +5849,7 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv) ...@@ -5858,7 +5849,7 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
sema_init(&hWaitResponse, 0); sema_init(&hWaitResponse, 0);
/*Allocate host interface private structure*/ /*Allocate host interface private structure*/
pstrWFIDrv = kzalloc(sizeof(tstrWILC_WFIDrv), GFP_KERNEL); pstrWFIDrv = kzalloc(sizeof(struct host_if_drv), GFP_KERNEL);
if (!pstrWFIDrv) { if (!pstrWFIDrv) {
result = -ENOMEM; result = -ENOMEM;
goto _fail_; goto _fail_;
...@@ -5960,14 +5951,14 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv) ...@@ -5960,14 +5951,14 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
* @version 1.0 * @version 1.0
*/ */
s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv) s32 host_int_deinit(struct host_if_drv *hWFIDrv)
{ {
s32 s32Error = 0; s32 s32Error = 0;
struct host_if_msg msg; struct host_if_msg msg;
int ret; int ret;
/*obtain driver handle*/ /*obtain driver handle*/
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
if (pstrWFIDrv == NULL) { if (pstrWFIDrv == NULL) {
PRINT_ER("pstrWFIDrv = NULL\n"); PRINT_ER("pstrWFIDrv = NULL\n");
...@@ -6073,7 +6064,7 @@ void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length) ...@@ -6073,7 +6064,7 @@ void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
s32 s32Error = 0; s32 s32Error = 0;
struct host_if_msg msg; struct host_if_msg msg;
int id; int id;
tstrWILC_WFIDrv *pstrWFIDrv = NULL; struct host_if_drv *pstrWFIDrv = NULL;
id = ((pu8Buffer[u32Length - 4]) | (pu8Buffer[u32Length - 3] << 8) | (pu8Buffer[u32Length - 2] << 16) | (pu8Buffer[u32Length - 1] << 24)); id = ((pu8Buffer[u32Length - 4]) | (pu8Buffer[u32Length - 3] << 8) | (pu8Buffer[u32Length - 2] << 16) | (pu8Buffer[u32Length - 1] << 24));
pstrWFIDrv = get_handler_from_id(id); pstrWFIDrv = get_handler_from_id(id);
...@@ -6119,7 +6110,7 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length) ...@@ -6119,7 +6110,7 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
s32 s32Error = 0; s32 s32Error = 0;
struct host_if_msg msg; struct host_if_msg msg;
int id; int id;
tstrWILC_WFIDrv *pstrWFIDrv = NULL; struct host_if_drv *pstrWFIDrv = NULL;
down(&hSemHostIntDeinit); down(&hSemHostIntDeinit);
...@@ -6176,7 +6167,7 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length) ...@@ -6176,7 +6167,7 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
s32 s32Error = 0; s32 s32Error = 0;
struct host_if_msg msg; struct host_if_msg msg;
int id; int id;
tstrWILC_WFIDrv *pstrWFIDrv = NULL; struct host_if_drv *pstrWFIDrv = NULL;
id = ((pu8Buffer[u32Length - 4]) | (pu8Buffer[u32Length - 3] << 8) | (pu8Buffer[u32Length - 2] << 16) | (pu8Buffer[u32Length - 1] << 24)); id = ((pu8Buffer[u32Length - 4]) | (pu8Buffer[u32Length - 3] << 8) | (pu8Buffer[u32Length - 2] << 16) | (pu8Buffer[u32Length - 1] << 24));
pstrWFIDrv = get_handler_from_id(id); pstrWFIDrv = get_handler_from_id(id);
...@@ -6229,10 +6220,10 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length) ...@@ -6229,10 +6220,10 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u32duration, u16 chan, wilc_remain_on_chan_expired RemainOnChanExpired, wilc_remain_on_chan_ready RemainOnChanReady, void *pvUserArg) s32 host_int_remain_on_channel(struct host_if_drv *hWFIDrv, u32 u32SessionID, u32 u32duration, u16 chan, wilc_remain_on_chan_expired RemainOnChanExpired, wilc_remain_on_chan_ready RemainOnChanReady, void *pvUserArg)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
if (pstrWFIDrv == NULL) { if (pstrWFIDrv == NULL) {
...@@ -6274,10 +6265,10 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u ...@@ -6274,10 +6265,10 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID) s32 host_int_ListenStateExpired(struct host_if_drv *hWFIDrv, u32 u32SessionID)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
if (pstrWFIDrv == NULL) { if (pstrWFIDrv == NULL) {
...@@ -6309,10 +6300,10 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID) ...@@ -6309,10 +6300,10 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID)
* @author * @author
* @date * @date
* @version 1.0*/ * @version 1.0*/
s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bReg) s32 host_int_frame_register(struct host_if_drv *hWFIDrv, u16 u16FrameType, bool bReg)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
if (pstrWFIDrv == NULL) { if (pstrWFIDrv == NULL) {
...@@ -6363,13 +6354,13 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe ...@@ -6363,13 +6354,13 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval, s32 host_int_add_beacon(struct host_if_drv *hWFIDrv, u32 u32Interval,
u32 u32DTIMPeriod, u32 u32DTIMPeriod,
u32 u32HeadLen, u8 *pu8Head, u32 u32HeadLen, u8 *pu8Head,
u32 u32TailLen, u8 *pu8Tail) u32 u32TailLen, u8 *pu8Tail)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
struct beacon_attr *pstrSetBeaconParam = &msg.body.beacon_info; struct beacon_attr *pstrSetBeaconParam = &msg.body.beacon_info;
...@@ -6435,10 +6426,10 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval, ...@@ -6435,10 +6426,10 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv) s32 host_int_del_beacon(struct host_if_drv *hWFIDrv)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
if (pstrWFIDrv == NULL) { if (pstrWFIDrv == NULL) {
...@@ -6468,11 +6459,11 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv) ...@@ -6468,11 +6459,11 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv)
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, s32 host_int_add_station(struct host_if_drv *hWFIDrv,
struct add_sta_param *pstrStaParams) struct add_sta_param *pstrStaParams)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
struct add_sta_param *pstrAddStationMsg = &msg.body.add_sta_info; struct add_sta_param *pstrAddStationMsg = &msg.body.add_sta_info;
...@@ -6518,10 +6509,10 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, ...@@ -6518,10 +6509,10 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr) s32 host_int_del_station(struct host_if_drv *hWFIDrv, const u8 *pu8MacAddr)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
struct del_sta *pstrDelStationMsg = &msg.body.del_sta_info; struct del_sta *pstrDelStationMsg = &msg.body.del_sta_info;
...@@ -6559,10 +6550,11 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr) ...@@ -6559,10 +6550,11 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN]) s32 host_int_del_allstation(struct host_if_drv *hWFIDrv,
u8 pu8MacAddr[][ETH_ALEN])
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
struct del_all_sta *pstrDelAllStationMsg = &msg.body.del_all_sta_info; struct del_all_sta *pstrDelAllStationMsg = &msg.body.del_all_sta_info;
u8 au8Zero_Buff[ETH_ALEN] = {0}; u8 au8Zero_Buff[ETH_ALEN] = {0};
...@@ -6619,11 +6611,11 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN]) ...@@ -6619,11 +6611,11 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, s32 host_int_edit_station(struct host_if_drv *hWFIDrv,
struct add_sta_param *pstrStaParams) struct add_sta_param *pstrStaParams)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
struct add_sta_param *pstrAddStationMsg = &msg.body.add_sta_info; struct add_sta_param *pstrAddStationMsg = &msg.body.add_sta_info;
...@@ -6659,10 +6651,10 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, ...@@ -6659,10 +6651,10 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv,
return s32Error; return s32Error;
} }
s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Timeout) s32 host_int_set_power_mgmt(struct host_if_drv *hWFIDrv, bool bIsEnabled, u32 u32Timeout)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
struct power_mgmt_param *pstrPowerMgmtParam = &msg.body.pwr_mgmt_info; struct power_mgmt_param *pstrPowerMgmtParam = &msg.body.pwr_mgmt_info;
...@@ -6692,11 +6684,11 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti ...@@ -6692,11 +6684,11 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti
return s32Error; return s32Error;
} }
s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32count) s32 host_int_setup_multicast_filter(struct host_if_drv *hWFIDrv, bool bIsEnabled, u32 u32count)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
struct set_multicast *pstrMulticastFilterParam = &msg.body.multicast_info; struct set_multicast *pstrMulticastFilterParam = &msg.body.multicast_info;
...@@ -6942,10 +6934,10 @@ void host_int_freeJoinParams(void *pJoinParams) ...@@ -6942,10 +6934,10 @@ void host_int_freeJoinParams(void *pJoinParams)
PRINT_ER("Unable to FREE null pointer\n"); PRINT_ER("Unable to FREE null pointer\n");
} }
s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID) s32 host_int_delBASession(struct host_if_drv *hWFIDrv, char *pBSSID, char TID)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
struct ba_session_info *pBASessionInfo = &msg.body.session_info; struct ba_session_info *pBASessionInfo = &msg.body.session_info;
...@@ -6972,10 +6964,10 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID) ...@@ -6972,10 +6964,10 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)
return s32Error; return s32Error;
} }
s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID) s32 host_int_del_All_Rx_BASession(struct host_if_drv *hWFIDrv, char *pBSSID, char TID)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
struct ba_session_info *pBASessionInfo = &msg.body.session_info; struct ba_session_info *pBASessionInfo = &msg.body.session_info;
...@@ -7010,10 +7002,10 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T ...@@ -7010,10 +7002,10 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T
* @author Abdelrahman Sobhy * @author Abdelrahman Sobhy
* @date * @date
* @version 1.0*/ * @version 1.0*/
s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx) s32 host_int_setup_ipaddress(struct host_if_drv *hWFIDrv, u8 *u16ipadd, u8 idx)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
/* TODO: Enable This feature on softap firmware */ /* TODO: Enable This feature on softap firmware */
...@@ -7050,10 +7042,10 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx) ...@@ -7050,10 +7042,10 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
* @author Abdelrahman Sobhy * @author Abdelrahman Sobhy
* @date * @date
* @version 1.0*/ * @version 1.0*/
s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx) s32 host_int_get_ipaddress(struct host_if_drv *hWFIDrv, u8 *u16ipadd, u8 idx)
{ {
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
struct host_if_msg msg; struct host_if_msg msg;
if (pstrWFIDrv == NULL) { if (pstrWFIDrv == NULL) {
......
drivers/staging/wilc1000/host_interface.h
View file @ 441dc609
...@@ -303,7 +303,7 @@ enum p2p_listen_state { ...@@ -303,7 +303,7 @@ enum p2p_listen_state {
P2P_GRP_FORMATION P2P_GRP_FORMATION
}; };
typedef struct { struct host_if_drv {
/* Scan user structure */ /* Scan user structure */
tstrWILC_UsrScanReq strWILC_UsrScanReq; tstrWILC_UsrScanReq strWILC_UsrScanReq;
...@@ -335,7 +335,7 @@ typedef struct { ...@@ -335,7 +335,7 @@ typedef struct {
struct timer_list hRemainOnChannel; struct timer_list hRemainOnChannel;
bool IFC_UP; bool IFC_UP;
} tstrWILC_WFIDrv; };
/*! /*!
* @enum tenuWILC_StaFlag * @enum tenuWILC_StaFlag
...@@ -391,7 +391,7 @@ struct add_sta_param { ...@@ -391,7 +391,7 @@ struct add_sta_param {
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_remove_key(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8StaAddress); s32 host_int_remove_key(struct host_if_drv *hWFIDrv, const u8 *pu8StaAddress);
/** /**
* @brief removes WEP key * @brief removes WEP key
* @details valid only in BSS STA mode if External Supplicant support is enabled. * @details valid only in BSS STA mode if External Supplicant support is enabled.
...@@ -406,7 +406,7 @@ s32 host_int_remove_key(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8StaAddress); ...@@ -406,7 +406,7 @@ s32 host_int_remove_key(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8StaAddress);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
int host_int_remove_wep_key(tstrWILC_WFIDrv *wfi_drv, u8 index); int host_int_remove_wep_key(struct host_if_drv *wfi_drv, u8 index);
/** /**
* @brief sets WEP deafault key * @brief sets WEP deafault key
* @details Sets the index of the WEP encryption key in use, * @details Sets the index of the WEP encryption key in use,
...@@ -419,7 +419,7 @@ int host_int_remove_wep_key(tstrWILC_WFIDrv *wfi_drv, u8 index); ...@@ -419,7 +419,7 @@ int host_int_remove_wep_key(tstrWILC_WFIDrv *wfi_drv, u8 index);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index); s32 host_int_set_WEPDefaultKeyID(struct host_if_drv *hWFIDrv, u8 u8Index);
/** /**
* @brief sets WEP deafault key * @brief sets WEP deafault key
...@@ -440,7 +440,7 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index); ...@@ -440,7 +440,7 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx); s32 host_int_add_wep_key_bss_sta(struct host_if_drv *hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx);
/** /**
* @brief host_int_add_wep_key_bss_ap * @brief host_int_add_wep_key_bss_ap
* @details valid only in AP mode if External Supplicant support is enabled. * @details valid only in AP mode if External Supplicant support is enabled.
...@@ -455,7 +455,7 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, ...@@ -455,7 +455,7 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey,
* @date 28 Feb 2013 * @date 28 Feb 2013
* @version 1.0 * @version 1.0
*/ */
s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx, u8 u8mode, enum AUTHTYPE tenuAuth_type); s32 host_int_add_wep_key_bss_ap(struct host_if_drv *hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx, u8 u8mode, enum AUTHTYPE tenuAuth_type);
/** /**
* @brief adds ptk Key * @brief adds ptk Key
...@@ -473,7 +473,7 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u ...@@ -473,7 +473,7 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen, s32 host_int_add_ptk(struct host_if_drv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
const u8 *mac_addr, const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode, u8 u8Idx); const u8 *mac_addr, const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode, u8 u8Idx);
/** /**
...@@ -488,7 +488,7 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen, ...@@ -488,7 +488,7 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
* @date 15 April 2013 * @date 15 April 2013
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu32InactiveTime); s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac, u32 *pu32InactiveTime);
/** /**
* @brief adds Rx GTk Key * @brief adds Rx GTk Key
...@@ -506,7 +506,7 @@ s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu3 ...@@ -506,7 +506,7 @@ s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu3
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKeylen, s32 host_int_add_rx_gtk(struct host_if_drv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKeylen,
u8 u8KeyIdx, u32 u32KeyRSClen, const u8 *KeyRSC, u8 u8KeyIdx, u32 u32KeyRSClen, const u8 *KeyRSC,
const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode); const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode);
...@@ -527,7 +527,7 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe ...@@ -527,7 +527,7 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_add_tx_gtk(tstrWILC_WFIDrv *hWFIDrv, u8 u8KeyLen, u8 *pu8TxGtk, u8 u8KeyIdx); s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen, u8 *pu8TxGtk, u8 u8KeyIdx);
/** /**
* @brief caches the pmkid * @brief caches the pmkid
...@@ -550,7 +550,7 @@ s32 host_int_add_tx_gtk(tstrWILC_WFIDrv *hWFIDrv, u8 u8KeyLen, u8 *pu8TxGtk, u8 ...@@ -550,7 +550,7 @@ s32 host_int_add_tx_gtk(tstrWILC_WFIDrv *hWFIDrv, u8 u8KeyLen, u8 *pu8TxGtk, u8
* @version 1.0 * @version 1.0
*/ */
s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, struct host_if_pmkid_attr *pu8PmkidInfoArray); s32 host_int_set_pmkid_info(struct host_if_drv *hWFIDrv, struct host_if_pmkid_attr *pu8PmkidInfoArray);
/** /**
* @brief gets the cached the pmkid info * @brief gets the cached the pmkid info
* @details valid only in BSS STA mode if External Supplicant * @details valid only in BSS STA mode if External Supplicant
...@@ -574,7 +574,7 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, struct host_if_pmkid_attr ...@@ -574,7 +574,7 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, struct host_if_pmkid_attr
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PmkidInfoArray, s32 host_int_get_pmkid_info(struct host_if_drv *hWFIDrv, u8 *pu8PmkidInfoArray,
u32 u32PmkidInfoLen); u32 u32PmkidInfoLen);
/** /**
...@@ -591,7 +591,7 @@ s32 host_int_get_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PmkidInfoArray, ...@@ -591,7 +591,7 @@ s32 host_int_get_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PmkidInfoArray,
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_set_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PassPhrase, s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, u8 *pu8PassPhrase,
u8 u8Psklength); u8 u8Psklength);
/** /**
* @brief gets the pass phrase * @brief gets the pass phrase
...@@ -607,7 +607,7 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PassPh ...@@ -607,7 +607,7 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PassPh
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv,
u8 *pu8PassPhrase, u8 u8Psklength); u8 *pu8PassPhrase, u8 u8Psklength);
/** /**
...@@ -621,7 +621,7 @@ s32 host_int_get_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, ...@@ -621,7 +621,7 @@ s32 host_int_get_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv,
* @date 19 April 2012 * @date 19 April 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress); s32 host_int_get_MacAddress(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress);
/** /**
* @brief sets mac address * @brief sets mac address
...@@ -634,7 +634,7 @@ s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress); ...@@ -634,7 +634,7 @@ s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress);
* @date 16 July 2012 * @date 16 July 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress); s32 host_int_set_MacAddress(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress);
/** /**
* @brief wait until msg q is empty * @brief wait until msg q is empty
...@@ -665,7 +665,7 @@ int host_int_wait_msg_queue_idle(void); ...@@ -665,7 +665,7 @@ int host_int_wait_msg_queue_idle(void);
* @version 1.0 * @version 1.0
*/ */
s32 host_int_set_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 scanSource); s32 host_int_set_start_scan_req(struct host_if_drv *hWFIDrv, u8 scanSource);
/** /**
* @brief gets scan source of the last scan * @brief gets scan source of the last scan
* @details * @details
...@@ -681,7 +681,7 @@ s32 host_int_set_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 scanSource); ...@@ -681,7 +681,7 @@ s32 host_int_set_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 scanSource);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ScanSource); s32 host_int_get_start_scan_req(struct host_if_drv *hWFIDrv, u8 *pu8ScanSource);
/** /**
* @brief sets a join request * @brief sets a join request
...@@ -695,7 +695,7 @@ s32 host_int_get_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ScanSource); ...@@ -695,7 +695,7 @@ s32 host_int_get_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ScanSource);
* @version 1.0 * @version 1.0
*/ */
s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid, s32 host_int_set_join_req(struct host_if_drv *hWFIDrv, u8 *pu8bssid,
const u8 *pu8ssid, size_t ssidLen, const u8 *pu8ssid, size_t ssidLen,
const u8 *pu8IEs, size_t IEsLen, const u8 *pu8IEs, size_t IEsLen,
wilc_connect_result pfConnectResult, void *pvUserArg, wilc_connect_result pfConnectResult, void *pvUserArg,
...@@ -715,7 +715,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid, ...@@ -715,7 +715,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
* @version 8.0 * @version 8.0
*/ */
s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv); s32 host_int_flush_join_req(struct host_if_drv *hWFIDrv);
/** /**
...@@ -729,7 +729,7 @@ s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv); ...@@ -729,7 +729,7 @@ s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode); s32 host_int_disconnect(struct host_if_drv *hWFIDrv, u16 u16ReasonCode);
/** /**
* @brief disconnects a sta * @brief disconnects a sta
...@@ -742,7 +742,7 @@ s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode); ...@@ -742,7 +742,7 @@ s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_disconnect_station(tstrWILC_WFIDrv *hWFIDrv, u8 assoc_id); s32 host_int_disconnect_station(struct host_if_drv *hWFIDrv, u8 assoc_id);
/** /**
* @brief gets a Association request info * @brief gets a Association request info
* @details * @details
...@@ -769,7 +769,7 @@ s32 host_int_disconnect_station(tstrWILC_WFIDrv *hWFIDrv, u8 assoc_id); ...@@ -769,7 +769,7 @@ s32 host_int_disconnect_station(tstrWILC_WFIDrv *hWFIDrv, u8 assoc_id);
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_assoc_req_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocReqInfo, s32 host_int_get_assoc_req_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocReqInfo,
u32 u32AssocReqInfoLen); u32 u32AssocReqInfoLen);
/** /**
* @brief gets a Association Response info * @brief gets a Association Response info
...@@ -783,7 +783,7 @@ s32 host_int_get_assoc_req_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocReqInfo, ...@@ -783,7 +783,7 @@ s32 host_int_get_assoc_req_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocReqInfo,
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_assoc_res_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocRespInfo, s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocRespInfo,
u32 u32MaxAssocRespInfoLen, u32 *pu32RcvdAssocRespInfoLen); u32 u32MaxAssocRespInfoLen, u32 *pu32RcvdAssocRespInfoLen);
/** /**
* @brief gets a Association Response info * @brief gets a Association Response info
...@@ -800,7 +800,7 @@ s32 host_int_get_assoc_res_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocRespInfo, ...@@ -800,7 +800,7 @@ s32 host_int_get_assoc_res_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocRespInfo,
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_rx_power_level(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8RxPowerLevel, s32 host_int_get_rx_power_level(struct host_if_drv *hWFIDrv, u8 *pu8RxPowerLevel,
u32 u32RxPowerLevelLen); u32 u32RxPowerLevelLen);
/** /**
...@@ -818,7 +818,7 @@ s32 host_int_get_rx_power_level(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8RxPowerLevel, ...@@ -818,7 +818,7 @@ s32 host_int_get_rx_power_level(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8RxPowerLevel,
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
int host_int_set_mac_chnl_num(tstrWILC_WFIDrv *wfi_drv, u8 channel); int host_int_set_mac_chnl_num(struct host_if_drv *wfi_drv, u8 channel);
/** /**
* @brief gets the current channel index * @brief gets the current channel index
...@@ -835,7 +835,7 @@ int host_int_set_mac_chnl_num(tstrWILC_WFIDrv *wfi_drv, u8 channel); ...@@ -835,7 +835,7 @@ int host_int_set_mac_chnl_num(tstrWILC_WFIDrv *wfi_drv, u8 channel);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo); s32 host_int_get_host_chnl_num(struct host_if_drv *hWFIDrv, u8 *pu8ChNo);
/** /**
* @brief gets the sta rssi * @brief gets the sta rssi
* @details gets the currently maintained RSSI value for the station. * @details gets the currently maintained RSSI value for the station.
...@@ -849,8 +849,8 @@ s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo); ...@@ -849,8 +849,8 @@ s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_rssi(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8Rssi); s32 host_int_get_rssi(struct host_if_drv *hWFIDrv, s8 *ps8Rssi);
s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd); s32 host_int_get_link_speed(struct host_if_drv *hWFIDrv, s8 *ps8lnkspd);
/** /**
* @brief scans a set of channels * @brief scans a set of channels
* @details * @details
...@@ -868,7 +868,7 @@ s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd); ...@@ -868,7 +868,7 @@ s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource, s32 host_int_scan(struct host_if_drv *hWFIDrv, u8 u8ScanSource,
u8 u8ScanType, u8 *pu8ChnlFreqList, u8 u8ScanType, u8 *pu8ChnlFreqList,
u8 u8ChnlListLen, const u8 *pu8IEs, u8 u8ChnlListLen, const u8 *pu8IEs,
size_t IEsLen, wilc_scan_result ScanResult, size_t IEsLen, wilc_scan_result ScanResult,
...@@ -885,7 +885,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource, ...@@ -885,7 +885,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, struct cfg_param_val *pstrCfgParamVal); s32 hif_set_cfg(struct host_if_drv *hWFIDrv, struct cfg_param_val *pstrCfgParamVal);
/** /**
* @brief gets configuration wids values * @brief gets configuration wids values
...@@ -899,7 +899,7 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, struct cfg_param_val *pstrCfgParamVal) ...@@ -899,7 +899,7 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, struct cfg_param_val *pstrCfgParamVal)
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 hif_get_cfg(tstrWILC_WFIDrv *hWFIDrv, u16 u16WID, u16 *pu16WID_Value); s32 hif_get_cfg(struct host_if_drv *hWFIDrv, u16 u16WID, u16 *pu16WID_Value);
/*****************************************************************************/ /*****************************************************************************/
/* Notification Functions */ /* Notification Functions */
/*****************************************************************************/ /*****************************************************************************/
...@@ -946,7 +946,7 @@ void host_int_send_network_info_to_host ...@@ -946,7 +946,7 @@ void host_int_send_network_info_to_host
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv); s32 host_int_init(struct host_if_drv **phWFIDrv);
/** /**
* @brief host interface initialization function * @brief host interface initialization function
...@@ -957,7 +957,7 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv); ...@@ -957,7 +957,7 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv); s32 host_int_deinit(struct host_if_drv *hWFIDrv);
/*! /*!
...@@ -982,7 +982,7 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv); ...@@ -982,7 +982,7 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv);
* @version 1.0 Description * @version 1.0 Description
* *
*/ */
s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval, s32 host_int_add_beacon(struct host_if_drv *hWFIDrv, u32 u32Interval,
u32 u32DTIMPeriod, u32 u32DTIMPeriod,
u32 u32HeadLen, u8 *pu8Head, u32 u32HeadLen, u8 *pu8Head,
u32 u32TailLen, u8 *pu8tail); u32 u32TailLen, u8 *pu8tail);
...@@ -1000,7 +1000,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval, ...@@ -1000,7 +1000,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
* @date 10 Julys 2012 * @date 10 Julys 2012
* @version 1.0 Description * @version 1.0 Description
*/ */
s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv); s32 host_int_del_beacon(struct host_if_drv *hWFIDrv);
/*! /*!
* @fn s32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, * @fn s32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv,
...@@ -1016,7 +1016,7 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv); ...@@ -1016,7 +1016,7 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv);
* @date 12 July 2012 * @date 12 July 2012
* @version 1.0 Description * @version 1.0 Description
*/ */
s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, s32 host_int_add_station(struct host_if_drv *hWFIDrv,
struct add_sta_param *pstrStaParams); struct add_sta_param *pstrStaParams);
/*! /*!
...@@ -1032,7 +1032,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, ...@@ -1032,7 +1032,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv,
* @date 09 April 2014 * @date 09 April 2014
* @version 1.0 Description * @version 1.0 Description
*/ */
s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN]); s32 host_int_del_allstation(struct host_if_drv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN]);
/*! /*!
* @fn s32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, u8* pu8MacAddr) * @fn s32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, u8* pu8MacAddr)
...@@ -1047,7 +1047,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN]) ...@@ -1047,7 +1047,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
* @date 15 July 2012 * @date 15 July 2012
* @version 1.0 Description * @version 1.0 Description
*/ */
s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr); s32 host_int_del_station(struct host_if_drv *hWFIDrv, const u8 *pu8MacAddr);
/*! /*!
* @fn s32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, * @fn s32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv,
...@@ -1063,7 +1063,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr); ...@@ -1063,7 +1063,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr);
* @date 15 July 2012 * @date 15 July 2012
* @version 1.0 Description * @version 1.0 Description
*/ */
s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, s32 host_int_edit_station(struct host_if_drv *hWFIDrv,
struct add_sta_param *pstrStaParams); struct add_sta_param *pstrStaParams);
/*! /*!
...@@ -1081,7 +1081,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, ...@@ -1081,7 +1081,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv,
* @date 24 November 2012 * @date 24 November 2012
* @version 1.0 Description * @version 1.0 Description
*/ */
s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Timeout); s32 host_int_set_power_mgmt(struct host_if_drv *hWFIDrv, bool bIsEnabled, u32 u32Timeout);
/* @param[in,out] hWFIDrv handle to the wifi driver /* @param[in,out] hWFIDrv handle to the wifi driver
* @param[in] bIsEnabled TRUE if enabled, FALSE otherwise * @param[in] bIsEnabled TRUE if enabled, FALSE otherwise
* @param[in] u8count count of mac address entries in the filter table * @param[in] u8count count of mac address entries in the filter table
...@@ -1093,7 +1093,7 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti ...@@ -1093,7 +1093,7 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti
* @date 24 November 2012 * @date 24 November 2012
* @version 1.0 Description * @version 1.0 Description
*/ */
s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32count); s32 host_int_setup_multicast_filter(struct host_if_drv *hWFIDrv, bool bIsEnabled, u32 u32count);
/** /**
* @brief host_int_setup_ipaddress * @brief host_int_setup_ipaddress
* @details set IP address on firmware * @details set IP address on firmware
...@@ -1103,7 +1103,7 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u ...@@ -1103,7 +1103,7 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8IPAddr, u8 idx); s32 host_int_setup_ipaddress(struct host_if_drv *hWFIDrv, u8 *pu8IPAddr, u8 idx);
/** /**
...@@ -1115,7 +1115,7 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8IPAddr, u8 idx); ...@@ -1115,7 +1115,7 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8IPAddr, u8 idx);
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID); s32 host_int_delBASession(struct host_if_drv *hWFIDrv, char *pBSSID, char TID);
/** /**
* @brief host_int_delBASession * @brief host_int_delBASession
...@@ -1126,7 +1126,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID); ...@@ -1126,7 +1126,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID);
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID); s32 host_int_del_All_Rx_BASession(struct host_if_drv *hWFIDrv, char *pBSSID, char TID);
/** /**
...@@ -1138,7 +1138,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T ...@@ -1138,7 +1138,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8IPAddr, u8 idx); s32 host_int_get_ipaddress(struct host_if_drv *hWFIDrv, u8 *pu8IPAddr, u8 idx);
/** /**
* @brief host_int_remain_on_channel * @brief host_int_remain_on_channel
...@@ -1149,7 +1149,7 @@ s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8IPAddr, u8 idx); ...@@ -1149,7 +1149,7 @@ s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8IPAddr, u8 idx);
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u32duration, u16 chan, wilc_remain_on_chan_expired RemainOnChanExpired, wilc_remain_on_chan_ready RemainOnChanReady, void *pvUserArg); s32 host_int_remain_on_channel(struct host_if_drv *hWFIDrv, u32 u32SessionID, u32 u32duration, u16 chan, wilc_remain_on_chan_expired RemainOnChanExpired, wilc_remain_on_chan_ready RemainOnChanReady, void *pvUserArg);
/** /**
* @brief host_int_ListenStateExpired * @brief host_int_ListenStateExpired
...@@ -1165,7 +1165,7 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u ...@@ -1165,7 +1165,7 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID); s32 host_int_ListenStateExpired(struct host_if_drv *hWFIDrv, u32 u32SessionID);
/** /**
* @brief host_int_frame_register * @brief host_int_frame_register
...@@ -1176,7 +1176,7 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID); ...@@ -1176,7 +1176,7 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID);
* @date * @date
* @version 1.0 * @version 1.0
*/ */
s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bReg); s32 host_int_frame_register(struct host_if_drv *hWFIDrv, u16 u16FrameType, bool bReg);
/** /**
* @brief host_int_set_wfi_drv_handler * @brief host_int_set_wfi_drv_handler
* @details * @details
...@@ -1186,13 +1186,13 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe ...@@ -1186,13 +1186,13 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe
* @date * @date
* @version 1.0 * @version 1.0
*/ */
int host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *address); int host_int_set_wfi_drv_handler(struct host_if_drv *address);
int host_int_set_operation_mode(tstrWILC_WFIDrv *wfi_drv, u32 mode); int host_int_set_operation_mode(struct host_if_drv *wfi_drv, u32 mode);
static s32 Handle_ScanDone(tstrWILC_WFIDrv *drvHandler, tenuScanEvent enuEvent); static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEvent);
void host_int_freeJoinParams(void *pJoinParams); void host_int_freeJoinParams(void *pJoinParams);
s32 host_int_get_statistics(tstrWILC_WFIDrv *hWFIDrv, tstrStatistics *pstrStatistics); s32 host_int_get_statistics(struct host_if_drv *hWFIDrv, tstrStatistics *pstrStatistics);
#endif #endif
drivers/staging/wilc1000/linux_wlan.c
View file @ 441dc609
...@@ -132,7 +132,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event ...@@ -132,7 +132,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
{ {
struct in_ifaddr *dev_iface = (struct in_ifaddr *)ptr; struct in_ifaddr *dev_iface = (struct in_ifaddr *)ptr;
struct wilc_priv *priv; struct wilc_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
struct net_device *dev; struct net_device *dev;
u8 *pIP_Add_buff; u8 *pIP_Add_buff;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
...@@ -159,7 +159,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event ...@@ -159,7 +159,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
PRINT_D(GENERIC_DBG, "No Wireless Priv\n"); PRINT_D(GENERIC_DBG, "No Wireless Priv\n");
return NOTIFY_DONE; return NOTIFY_DONE;
} }
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
nic = netdev_priv(dev); nic = netdev_priv(dev);
if (nic == NULL || pstrWFIDrv == NULL) { if (nic == NULL || pstrWFIDrv == NULL) {
PRINT_D(GENERIC_DBG, "No Wireless Priv\n"); PRINT_D(GENERIC_DBG, "No Wireless Priv\n");
...@@ -633,13 +633,13 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n ...@@ -633,13 +633,13 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n
unsigned char mac_add[] = {0x00, 0x80, 0xC2, 0x5E, 0xa2, 0xff}; unsigned char mac_add[] = {0x00, 0x80, 0xC2, 0x5E, 0xa2, 0xff};
struct wilc_priv *priv; struct wilc_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
PRINT_D(TX_DBG, "Start configuring Firmware\n"); PRINT_D(TX_DBG, "Start configuring Firmware\n");
get_random_bytes(&mac_add[5], 1); get_random_bytes(&mac_add[5], 1);
get_random_bytes(&mac_add[4], 1); get_random_bytes(&mac_add[4], 1);
priv = wiphy_priv(dev->ieee80211_ptr->wiphy); priv = wiphy_priv(dev->ieee80211_ptr->wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
PRINT_D(INIT_DBG, "Host = %p\n", pstrWFIDrv); PRINT_D(INIT_DBG, "Host = %p\n", pstrWFIDrv);
PRINT_D(INIT_DBG, "MAC address is : %02x-%02x-%02x-%02x-%02x-%02x\n", mac_add[0], mac_add[1], mac_add[2], mac_add[3], mac_add[4], mac_add[5]); PRINT_D(INIT_DBG, "MAC address is : %02x-%02x-%02x-%02x-%02x-%02x\n", mac_add[0], mac_add[1], mac_add[2], mac_add[3], mac_add[4], mac_add[5]);
...@@ -1364,11 +1364,11 @@ static void wilc_set_multicast_list(struct net_device *dev) ...@@ -1364,11 +1364,11 @@ static void wilc_set_multicast_list(struct net_device *dev)
struct netdev_hw_addr *ha; struct netdev_hw_addr *ha;
struct wilc_priv *priv; struct wilc_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
int i = 0; int i = 0;
priv = wiphy_priv(dev->ieee80211_ptr->wiphy); priv = wiphy_priv(dev->ieee80211_ptr->wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
if (!dev) if (!dev)
return; return;
...@@ -1497,7 +1497,7 @@ int mac_close(struct net_device *ndev) ...@@ -1497,7 +1497,7 @@ int mac_close(struct net_device *ndev)
{ {
struct wilc_priv *priv; struct wilc_priv *priv;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
nic = netdev_priv(ndev); nic = netdev_priv(ndev);
...@@ -1513,7 +1513,7 @@ int mac_close(struct net_device *ndev) ...@@ -1513,7 +1513,7 @@ int mac_close(struct net_device *ndev)
return 0; return 0;
} }
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
PRINT_D(GENERIC_DBG, "Mac close\n"); PRINT_D(GENERIC_DBG, "Mac close\n");
......
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View file @ 441dc609
...@@ -539,14 +539,14 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, ...@@ -539,14 +539,14 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent,
{ {
struct wilc_priv *priv; struct wilc_priv *priv;
struct net_device *dev; struct net_device *dev;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
u8 NullBssid[ETH_ALEN] = {0}; u8 NullBssid[ETH_ALEN] = {0};
connecting = 0; connecting = 0;
priv = (struct wilc_priv *)pUserVoid; priv = (struct wilc_priv *)pUserVoid;
dev = priv->dev; dev = priv->dev;
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
if (enuConnDisconnEvent == CONN_DISCONN_EVENT_CONN_RESP) { if (enuConnDisconnEvent == CONN_DISCONN_EVENT_CONN_RESP) {
/*Initialization*/ /*Initialization*/
...@@ -792,13 +792,13 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, ...@@ -792,13 +792,13 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
char *pcwpa_version = NULL; char *pcwpa_version = NULL;
struct wilc_priv *priv; struct wilc_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
tstrNetworkInfo *pstrNetworkInfo = NULL; tstrNetworkInfo *pstrNetworkInfo = NULL;
connecting = 1; connecting = 1;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)(priv->hWILCWFIDrv); pstrWFIDrv = (struct host_if_drv *)(priv->hWILCWFIDrv);
host_int_set_wfi_drv_handler(priv->hWILCWFIDrv); host_int_set_wfi_drv_handler(priv->hWILCWFIDrv);
...@@ -1034,14 +1034,14 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_co ...@@ -1034,14 +1034,14 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_co
{ {
s32 s32Error = 0; s32 s32Error = 0;
struct wilc_priv *priv; struct wilc_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
u8 NullBssid[ETH_ALEN] = {0}; u8 NullBssid[ETH_ALEN] = {0};
connecting = 0; connecting = 0;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
/*Invalidate u8WLANChannel value on wlan0 disconnect*/ /*Invalidate u8WLANChannel value on wlan0 disconnect*/
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
if (!pstrWFIDrv->u8P2PConnect) if (!pstrWFIDrv->u8P2PConnect)
u8WLANChannel = INVALID_CHANNEL; u8WLANChannel = INVALID_CHANNEL;
linux_wlan_set_bssid(priv->dev, NullBssid); linux_wlan_set_bssid(priv->dev, NullBssid);
...@@ -1948,12 +1948,12 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, u32 size) ...@@ -1948,12 +1948,12 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, u32 size)
struct wilc_priv *priv; struct wilc_priv *priv;
u32 header, pkt_offset; u32 header, pkt_offset;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
u32 i = 0; u32 i = 0;
s32 s32Freq; s32 s32Freq;
priv = wiphy_priv(dev->ieee80211_ptr->wiphy); priv = wiphy_priv(dev->ieee80211_ptr->wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
/* Get WILC header */ /* Get WILC header */
memcpy(&header, (buff - HOST_HDR_OFFSET), HOST_HDR_OFFSET); memcpy(&header, (buff - HOST_HDR_OFFSET), HOST_HDR_OFFSET);
...@@ -2249,14 +2249,14 @@ static int mgmt_tx(struct wiphy *wiphy, ...@@ -2249,14 +2249,14 @@ static int mgmt_tx(struct wiphy *wiphy,
struct p2p_mgmt_data *mgmt_tx; struct p2p_mgmt_data *mgmt_tx;
struct wilc_priv *priv; struct wilc_priv *priv;
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
u32 i; u32 i;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
u32 buf_len = len + sizeof(u8P2P_vendorspec) + sizeof(u8P2Plocalrandom); u32 buf_len = len + sizeof(u8P2P_vendorspec) + sizeof(u8P2Plocalrandom);
nic = netdev_priv(wdev->netdev); nic = netdev_priv(wdev->netdev);
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
*cookie = (unsigned long)buf; *cookie = (unsigned long)buf;
priv->u64tx_cookie = *cookie; priv->u64tx_cookie = *cookie;
...@@ -2394,10 +2394,10 @@ static int mgmt_tx_cancel_wait(struct wiphy *wiphy, ...@@ -2394,10 +2394,10 @@ static int mgmt_tx_cancel_wait(struct wiphy *wiphy,
u64 cookie) u64 cookie)
{ {
struct wilc_priv *priv; struct wilc_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
PRINT_D(GENERIC_DBG, "Tx Cancel wait :%lu\n", jiffies); PRINT_D(GENERIC_DBG, "Tx Cancel wait :%lu\n", jiffies);
......
drivers/staging/wilc1000/wilc_wfi_netdevice.h
View file @ 441dc609
...@@ -121,7 +121,7 @@ struct wilc_priv { ...@@ -121,7 +121,7 @@ struct wilc_priv {
spinlock_t lock; spinlock_t lock;
struct net_device *dev; struct net_device *dev;
struct napi_struct napi; struct napi_struct napi;
tstrWILC_WFIDrv *hWILCWFIDrv; struct host_if_drv *hWILCWFIDrv;
struct host_if_pmkid_attr pmkid_list; struct host_if_pmkid_attr pmkid_list;
struct WILC_WFI_stats netstats; struct WILC_WFI_stats netstats;
u8 WILC_WFI_wep_default; u8 WILC_WFI_wep_default;
...@@ -151,7 +151,7 @@ typedef struct { ...@@ -151,7 +151,7 @@ typedef struct {
typedef struct { typedef struct {
u8 aSrcAddress[ETH_ALEN]; u8 aSrcAddress[ETH_ALEN];
u8 aBSSID[ETH_ALEN]; u8 aBSSID[ETH_ALEN];
tstrWILC_WFIDrv *drvHandler; struct host_if_drv *drvHandler;
struct net_device *wilc_netdev; struct net_device *wilc_netdev;
} tstrInterfaceInfo; } tstrInterfaceInfo;
typedef struct { typedef struct {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7