mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 07:31:29 +00:00
staging: wilc1000: remove unneeded tstrWILC_MsgQueueAttrs typedef
No one uses it, so remove it and all of the NULL parameters being used to pass it into the msg code. Cc: Johnny Kim <johnny.kim@atmel.com> Cc: Rachel Kim <rachel.kim@atmel.com> Cc: Dean Lee <dean.lee@atmel.com> Cc: Chris Park <chris.park@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
parent
2b5f12eac0
commit
c4f83a5571
@ -3997,7 +3997,7 @@ static void ListenTimerCB(unsigned long arg)
|
||||
strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -4332,7 +4332,7 @@ static int hostIFthread(void *pvArg)
|
||||
memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
|
||||
|
||||
while (1) {
|
||||
WILC_MsgQueueRecv(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), &u32Ret, NULL);
|
||||
WILC_MsgQueueRecv(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), &u32Ret);
|
||||
pstrWFIDrv = (tstrWILC_WFIDrv *)strHostIFmsg.drvHandler;
|
||||
if (strHostIFmsg.u16MsgId == HOST_IF_MSG_EXIT) {
|
||||
PRINT_D(GENERIC_DBG, "THREAD: Exiting HostIfThread\n");
|
||||
@ -4344,13 +4344,13 @@ static int hostIFthread(void *pvArg)
|
||||
if ((!g_wilc_initialized)) {
|
||||
PRINT_D(GENERIC_DBG, "--WAIT--");
|
||||
usleep_range(200 * 1000, 200 * 1000);
|
||||
WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
continue;
|
||||
}
|
||||
|
||||
if (strHostIFmsg.u16MsgId == HOST_IF_MSG_CONNECT && pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {
|
||||
PRINT_D(HOSTINF_DBG, "Requeue connect request till scan done received\n");
|
||||
WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
usleep_range(2 * 1000, 2 * 1000);
|
||||
continue;
|
||||
}
|
||||
@ -4557,7 +4557,7 @@ static void TimerCB_Scan(unsigned long arg)
|
||||
strHostIFmsg.u16MsgId = HOST_IF_MSG_SCAN_TIMER_FIRED;
|
||||
|
||||
/* send the message */
|
||||
WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
}
|
||||
|
||||
static void TimerCB_Connect(unsigned long arg)
|
||||
@ -4571,7 +4571,7 @@ static void TimerCB_Connect(unsigned long arg)
|
||||
strHostIFmsg.u16MsgId = HOST_IF_MSG_CONNECT_TIMER_FIRED;
|
||||
|
||||
/* send the message */
|
||||
WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
}
|
||||
|
||||
|
||||
@ -4642,7 +4642,7 @@ s32 host_int_remove_wep_key(tstrWILC_WFIDrv *hWFIDrv, u8 u8keyIdx)
|
||||
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8keyIdx;
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
PRINT_ER("Error in sending message queue : Request to remove WEP key\n");
|
||||
down(&(pstrWFIDrv->hSemTestKeyBlock));
|
||||
@ -4690,7 +4690,7 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index)
|
||||
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8Index;
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
PRINT_ER("Error in sending message queue : Default key index\n");
|
||||
down(&(pstrWFIDrv->hSemTestKeyBlock));
|
||||
@ -4757,7 +4757,7 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey,
|
||||
uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8Keyidx;
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
PRINT_ER("Error in sending message queue :WEP Key\n");
|
||||
down(&(pstrWFIDrv->hSemTestKeyBlock));
|
||||
@ -4832,7 +4832,7 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u
|
||||
strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
|
||||
uniHostIFkeyAttr.strHostIFwepAttr.tenuAuth_type = tenuAuth_type;
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
|
||||
if (s32Error)
|
||||
PRINT_ER("Error in sending message queue :WEP Key\n");
|
||||
@ -4931,7 +4931,7 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
|
||||
if (s32Error)
|
||||
PRINT_ER("Error in sending message queue: PTK Key\n");
|
||||
@ -5033,7 +5033,7 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
|
||||
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
PRINT_ER("Error in sending message queue: RX GTK\n");
|
||||
/* ////////////// */
|
||||
@ -5096,7 +5096,7 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, tstrHostIFpmkidAttr *pu8Pm
|
||||
}
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
PRINT_ER(" Error in sending messagequeue: PMKID Info\n");
|
||||
|
||||
@ -5198,7 +5198,7 @@ s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
|
||||
strHostIFmsg.uniHostIFmsgBody.strHostIfGetMacAddress.u8MacAddress = pu8MacAddress;
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error) {
|
||||
PRINT_ER("Failed to send get mac address\n");
|
||||
return WILC_FAIL;
|
||||
@ -5232,7 +5232,7 @@ s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)
|
||||
memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIfSetMacAddress.u8MacAddress, pu8MacAddress, ETH_ALEN);
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error) {
|
||||
PRINT_ER("Failed to send message queue: Set mac address\n");
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
@ -5484,7 +5484,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
|
||||
PRINT_D(GENERIC_DBG, "Don't set state to 'connecting' as state is %d\n", pstrWFIDrv->enuHostIFstate);
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error) {
|
||||
PRINT_ER("Failed to send message queue: Set join request\n");
|
||||
WILC_ERRORREPORT(s32Error, WILC_FAIL);
|
||||
@ -5534,7 +5534,7 @@ s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv)
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error) {
|
||||
PRINT_ER("Failed to send message queue: Flush join request\n");
|
||||
WILC_ERRORREPORT(s32Error, WILC_FAIL);
|
||||
@ -5581,7 +5581,7 @@ s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode)
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
PRINT_ER("Failed to send message queue: disconnect\n");
|
||||
/* ////////////// */
|
||||
@ -5770,7 +5770,7 @@ s32 host_int_set_mac_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 u8ChNum)
|
||||
strHostIFmsg.uniHostIFmsgBody.strHostIFSetChan.u8SetChan = u8ChNum;
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -5792,7 +5792,7 @@ s32 host_int_wait_msg_queue_idle(void)
|
||||
|
||||
memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
|
||||
strHostIFmsg.u16MsgId = HOST_IF_MSG_Q_IDLE;
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -5821,7 +5821,7 @@ s32 host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *u32address)
|
||||
strHostIFmsg.uniHostIFmsgBody.strHostIfSetDrvHandler.u32Address = u32address;
|
||||
/* strHostIFmsg.drvHandler=hWFIDrv; */
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -5848,7 +5848,7 @@ s32 host_int_set_operation_mode(tstrWILC_WFIDrv *hWFIDrv, u32 u32mode)
|
||||
strHostIFmsg.uniHostIFmsgBody.strHostIfSetOperationMode.u32Mode = u32mode;
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -5892,7 +5892,7 @@ s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo)
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
PRINT_ER("Failed to send get host channel param's message queue ");
|
||||
down(&(pstrWFIDrv->hSemGetCHNL));
|
||||
@ -5988,7 +5988,7 @@ s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu3
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
PRINT_ER("Failed to send get host channel param's message queue ");
|
||||
|
||||
@ -6076,7 +6076,7 @@ s32 host_int_get_rssi(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8Rssi)
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error) {
|
||||
PRINT_ER("Failed to send get host channel param's message queue ");
|
||||
return WILC_FAIL;
|
||||
@ -6113,7 +6113,7 @@ s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd)
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error) {
|
||||
PRINT_ER("Failed to send GET_LINKSPEED to message queue ");
|
||||
return WILC_FAIL;
|
||||
@ -6147,7 +6147,7 @@ s32 host_int_get_statistics(tstrWILC_WFIDrv *hWFIDrv, tstrStatistics *pstrStatis
|
||||
strHostIFmsg.uniHostIFmsgBody.pUserData = (char *)pstrStatistics;
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error) {
|
||||
PRINT_ER("Failed to send get host channel param's message queue ");
|
||||
return WILC_FAIL;
|
||||
@ -6218,7 +6218,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
|
||||
pu8IEs, IEsLen);
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error) {
|
||||
PRINT_ER("Error in sending message queue scanning parameters: Error(%d)\n", s32Error);
|
||||
WILC_ERRORREPORT(s32Error, WILC_FAIL);
|
||||
@ -6265,7 +6265,7 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, tstrCfgParamVal *pstrCfgParamVal)
|
||||
strHostIFmsg.uniHostIFmsgBody.strHostIFCfgParamAttr.pstrCfgParamVal = *pstrCfgParamVal;
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
|
||||
WILC_CATCH(s32Error)
|
||||
{
|
||||
@ -6444,7 +6444,7 @@ static void GetPeriodicRSSI(unsigned long arg)
|
||||
strHostIFmsg.drvHandler = pstrWFIDrv;
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error) {
|
||||
PRINT_ER("Failed to send get host channel param's message queue ");
|
||||
return;
|
||||
@ -6532,9 +6532,7 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
|
||||
PRINT_D(HOSTINF_DBG, "INIT: CLIENT COUNT %d\n", clients_count);
|
||||
|
||||
if (clients_count == 0) {
|
||||
|
||||
s32Error = WILC_MsgQueueCreate(&gMsgQHostIF, NULL);
|
||||
|
||||
s32Error = WILC_MsgQueueCreate(&gMsgQHostIF);
|
||||
|
||||
if (s32Error < 0) {
|
||||
PRINT_ER("Failed to creat MQ\n");
|
||||
@ -6617,7 +6615,7 @@ _fail_timer_2:
|
||||
del_timer_sync(&pstrWFIDrv->hScanTimer);
|
||||
kthread_stop(HostIFthreadHandler);
|
||||
_fail_mq_:
|
||||
WILC_MsgQueueDestroy(&gMsgQHostIF, NULL);
|
||||
WILC_MsgQueueDestroy(&gMsgQHostIF);
|
||||
_fail_:
|
||||
return s32Error;
|
||||
|
||||
@ -6712,15 +6710,13 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error != WILC_SUCCESS)
|
||||
PRINT_ER("Error in sending deinit's message queue message function: Error(%d)\n", s32Error);
|
||||
|
||||
down(&hSemHostIFthrdEnd);
|
||||
|
||||
|
||||
|
||||
WILC_MsgQueueDestroy(&gMsgQHostIF, NULL);
|
||||
WILC_MsgQueueDestroy(&gMsgQHostIF);
|
||||
msgQ_created = 0;
|
||||
}
|
||||
|
||||
@ -6783,7 +6779,7 @@ void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
|
||||
pu8Buffer, u32Length);
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
PRINT_ER("Error in sending network info message queue message parameters: Error(%d)\n", s32Error);
|
||||
|
||||
@ -6846,7 +6842,7 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
|
||||
pu8Buffer, u32Length);
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
PRINT_ER("Error in sending message queue asynchronous message info: Error(%d)\n", s32Error);
|
||||
|
||||
@ -6898,7 +6894,7 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
|
||||
* pu8Buffer, u32Length); */
|
||||
|
||||
/* send the message */
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
PRINT_ER("Error in sending message queue scan complete parameters: Error(%d)\n", s32Error);
|
||||
}
|
||||
@ -6945,7 +6941,7 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u
|
||||
strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -6988,7 +6984,7 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID)
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -7038,7 +7034,7 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe
|
||||
strHostIFmsg.uniHostIFmsgBody.strHostIfRegisterFrame.bReg = bReg;
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -7104,7 +7100,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
|
||||
pstrSetBeaconParam->pu8Tail = NULL;
|
||||
}
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
|
||||
@ -7145,7 +7141,7 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv)
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
PRINT_D(HOSTINF_DBG, "Setting deleting beacon message queue params\n");
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
WILC_ERRORCHECK(s32Error);
|
||||
|
||||
WILC_CATCH(s32Error)
|
||||
@ -7195,7 +7191,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta
|
||||
}
|
||||
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
|
||||
@ -7240,7 +7236,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)
|
||||
else
|
||||
memcpy(pstrDelStationMsg->au8MacAddr, pu8MacAddr, ETH_ALEN);
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
|
||||
@ -7295,7 +7291,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
|
||||
}
|
||||
|
||||
pstrDelAllStationMsg->u8Num_AssocSta = u8AssocNumb;
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
|
||||
|
||||
if (s32Error)
|
||||
@ -7348,7 +7344,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
|
||||
pstrAddStationMsg->pu8Rates = rates;
|
||||
}
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -7384,7 +7380,7 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti
|
||||
pstrPowerMgmtParam->u32Timeout = u32Timeout;
|
||||
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -7417,7 +7413,7 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u
|
||||
pstrMulticastFilterParam->bIsEnabled = bIsEnabled;
|
||||
pstrMulticastFilterParam->u32count = u32count;
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -7685,7 +7681,7 @@ static int host_int_addBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TI
|
||||
pBASessionInfo->u16SessionTimeout = SessionTimeout;
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -7716,7 +7712,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)
|
||||
pBASessionInfo->u8Ted = TID;
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -7749,7 +7745,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T
|
||||
pBASessionInfo->u8Ted = TID;
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -7792,7 +7788,7 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.idx = idx;
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
@ -7831,7 +7827,7 @@ s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)
|
||||
strHostIFmsg.drvHandler = hWFIDrv;
|
||||
strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.idx = idx;
|
||||
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
|
||||
s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
|
||||
if (s32Error)
|
||||
WILC_ERRORREPORT(s32Error, s32Error);
|
||||
WILC_CATCH(s32Error)
|
||||
|
||||
@ -8,8 +8,7 @@
|
||||
* @note copied from FLO glue implementatuion
|
||||
* @version 1.0
|
||||
*/
|
||||
WILC_ErrNo WILC_MsgQueueCreate(WILC_MsgQueueHandle *pHandle,
|
||||
tstrWILC_MsgQueueAttrs *pstrAttrs)
|
||||
WILC_ErrNo WILC_MsgQueueCreate(WILC_MsgQueueHandle *pHandle)
|
||||
{
|
||||
spin_lock_init(&pHandle->strCriticalSection);
|
||||
sema_init(&pHandle->hSem, 0);
|
||||
@ -25,8 +24,7 @@ WILC_ErrNo WILC_MsgQueueCreate(WILC_MsgQueueHandle *pHandle,
|
||||
* @note copied from FLO glue implementatuion
|
||||
* @version 1.0
|
||||
*/
|
||||
WILC_ErrNo WILC_MsgQueueDestroy(WILC_MsgQueueHandle *pHandle,
|
||||
tstrWILC_MsgQueueAttrs *pstrAttrs)
|
||||
WILC_ErrNo WILC_MsgQueueDestroy(WILC_MsgQueueHandle *pHandle)
|
||||
{
|
||||
|
||||
pHandle->bExiting = true;
|
||||
@ -53,8 +51,7 @@ WILC_ErrNo WILC_MsgQueueDestroy(WILC_MsgQueueHandle *pHandle,
|
||||
* @version 1.0
|
||||
*/
|
||||
WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle,
|
||||
const void *pvSendBuffer, u32 u32SendBufferSize,
|
||||
tstrWILC_MsgQueueAttrs *pstrAttrs)
|
||||
const void *pvSendBuffer, u32 u32SendBufferSize)
|
||||
{
|
||||
WILC_ErrNo s32RetStatus = WILC_SUCCESS;
|
||||
unsigned long flags;
|
||||
@ -119,8 +116,7 @@ WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle,
|
||||
*/
|
||||
WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle,
|
||||
void *pvRecvBuffer, u32 u32RecvBufferSize,
|
||||
u32 *pu32ReceivedLength,
|
||||
tstrWILC_MsgQueueAttrs *pstrAttrs)
|
||||
u32 *pu32ReceivedLength)
|
||||
{
|
||||
|
||||
Message *pstrMessage;
|
||||
|
||||
@ -14,19 +14,6 @@
|
||||
#include "wilc_errorsupport.h"
|
||||
#include "wilc_memory.h"
|
||||
|
||||
/*!
|
||||
* @struct tstrWILC_MsgQueueAttrs
|
||||
* @brief Message Queue API options
|
||||
* @author syounan
|
||||
* @date 30 Aug 2010
|
||||
* @version 1.0
|
||||
*/
|
||||
typedef struct {
|
||||
/* a dummy member to avoid compiler errors*/
|
||||
u8 dummy;
|
||||
|
||||
} tstrWILC_MsgQueueAttrs;
|
||||
|
||||
/*!
|
||||
* @brief Creates a new Message queue
|
||||
* @details Creates a new Message queue, if the feature
|
||||
@ -36,14 +23,11 @@ typedef struct {
|
||||
* @param[in,out] pHandle handle to the message queue object
|
||||
* @param[in] pstrAttrs Optional attributes, NULL for default
|
||||
* @return Error code indicating sucess/failure
|
||||
* @sa tstrWILC_MsgQueueAttrs
|
||||
* @author syounan
|
||||
* @date 30 Aug 2010
|
||||
* @version 1.0
|
||||
*/
|
||||
WILC_ErrNo WILC_MsgQueueCreate(WILC_MsgQueueHandle *pHandle,
|
||||
tstrWILC_MsgQueueAttrs *pstrAttrs);
|
||||
|
||||
WILC_ErrNo WILC_MsgQueueCreate(WILC_MsgQueueHandle *pHandle);
|
||||
|
||||
/*!
|
||||
* @brief Sends a message
|
||||
@ -56,15 +40,12 @@ WILC_ErrNo WILC_MsgQueueCreate(WILC_MsgQueueHandle *pHandle,
|
||||
* @param[in] u32SendBufferSize the size of the data to send
|
||||
* @param[in] pstrAttrs Optional attributes, NULL for default
|
||||
* @return Error code indicating sucess/failure
|
||||
* @sa tstrWILC_MsgQueueAttrs
|
||||
* @author syounan
|
||||
* @date 30 Aug 2010
|
||||
* @version 1.0
|
||||
*/
|
||||
WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle,
|
||||
const void *pvSendBuffer, u32 u32SendBufferSize,
|
||||
tstrWILC_MsgQueueAttrs *pstrAttrs);
|
||||
|
||||
const void *pvSendBuffer, u32 u32SendBufferSize);
|
||||
|
||||
/*!
|
||||
* @brief Receives a message
|
||||
@ -78,30 +59,23 @@ WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle,
|
||||
* @param[out] pu32ReceivedLength the length of received data
|
||||
* @param[in] pstrAttrs Optional attributes, NULL for default
|
||||
* @return Error code indicating sucess/failure
|
||||
* @sa tstrWILC_MsgQueueAttrs
|
||||
* @author syounan
|
||||
* @date 30 Aug 2010
|
||||
* @version 1.0
|
||||
*/
|
||||
WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle,
|
||||
void *pvRecvBuffer, u32 u32RecvBufferSize,
|
||||
u32 *pu32ReceivedLength,
|
||||
tstrWILC_MsgQueueAttrs *pstrAttrs);
|
||||
|
||||
u32 *pu32ReceivedLength);
|
||||
|
||||
/*!
|
||||
* @brief Destroys an existing Message queue
|
||||
* @param[in] pHandle handle to the message queue object
|
||||
* @param[in] pstrAttrs Optional attributes, NULL for default
|
||||
* @return Error code indicating sucess/failure
|
||||
* @sa tstrWILC_MsgQueueAttrs
|
||||
* @author syounan
|
||||
* @date 30 Aug 2010
|
||||
* @version 1.0
|
||||
*/
|
||||
WILC_ErrNo WILC_MsgQueueDestroy(WILC_MsgQueueHandle *pHandle,
|
||||
tstrWILC_MsgQueueAttrs *pstrAttrs);
|
||||
|
||||
|
||||
WILC_ErrNo WILC_MsgQueueDestroy(WILC_MsgQueueHandle *pHandle);
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user