system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-28 06:09:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: wilc1000: remove WILC_Sint32

Browse source 
Use s32 instead of WILC_Sint32.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chaehyun Lim 2015-06-11 14:35:59 +09:00 committed by Greg Kroah-Hartman
parent 4320f6febc
commit fb4ec9caa4
11 changed files with 359 additions and 360 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/wilc1000/coreconfigsimulator.h
View file

@ -13,8 +13,8 @@
#define CORECONFIGSIMULATOR_H #define CORECONFIGSIMULATOR_H
extern WILC_Sint32 CoreConfigSimulatorInit (void); extern s32 CoreConfigSimulatorInit (void);
extern WILC_Sint32 CoreConfigSimulatorDeInit (void); extern s32 CoreConfigSimulatorDeInit (void);
#endif #endif

114
drivers/staging/wilc1000/coreconfigurator.c
View file

@ -143,8 +143,8 @@ typedef enum {
typedef struct { typedef struct {
WILC_Char *pcRespBuffer; WILC_Char *pcRespBuffer;
WILC_Sint32 s32MaxRespBuffLen; s32 s32MaxRespBuffLen;
WILC_Sint32 s32BytesRead; s32 s32BytesRead;
WILC_Bool bRespRequired; WILC_Bool bRespRequired;
} tstrConfigPktInfo; } tstrConfigPktInfo;
@ -158,7 +158,7 @@ typedef struct {
/*****************************************************************************/ /*****************************************************************************/
/* Extern Function Declarations */ /* Extern Function Declarations */
/*****************************************************************************/ /*****************************************************************************/
extern WILC_Sint32 SendRawPacket(s8 *ps8Packet, WILC_Sint32 s32PacketLen); extern s32 SendRawPacket(s8 *ps8Packet, s32 s32PacketLen);
extern void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length); extern void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length);
extern void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length); extern void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length);
extern void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length); extern void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length);
@ -670,9 +670,9 @@ INLINE u16 get_asoc_id(u8 *data)
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 CoreConfiguratorInit(void) s32 CoreConfiguratorInit(void)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
PRINT_D(CORECONFIG_DBG, "CoreConfiguratorInit()\n"); PRINT_D(CORECONFIG_DBG, "CoreConfiguratorInit()\n");
sema_init(&SemHandleSendPkt, 1); sema_init(&SemHandleSendPkt, 1);
@ -769,9 +769,9 @@ u8 get_current_channel(u8 *pu8msa, u16 u16RxLen)
* @date 1 Mar 2012 * @date 1 Mar 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo) s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
tstrNetworkInfo *pstrNetworkInfo = NULL; tstrNetworkInfo *pstrNetworkInfo = NULL;
u8 u8MsgType = 0; u8 u8MsgType = 0;
u8 u8MsgID = 0; u8 u8MsgID = 0;
@ -891,9 +891,9 @@ WILC_Sint32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInf
* @date 1 Mar 2012 * @date 1 Mar 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo) s32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
if (pstrNetworkInfo != NULL) { if (pstrNetworkInfo != NULL) {
if (pstrNetworkInfo->pu8IEs != NULL) { if (pstrNetworkInfo->pu8IEs != NULL) {
@ -924,10 +924,10 @@ WILC_Sint32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo)
* @date 2 Apr 2012 * @date 2 Apr 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen, s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
tstrConnectRespInfo **ppstrConnectRespInfo) tstrConnectRespInfo **ppstrConnectRespInfo)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
tstrConnectRespInfo *pstrConnectRespInfo = NULL; tstrConnectRespInfo *pstrConnectRespInfo = NULL;
u16 u16AssocRespLen = 0; u16 u16AssocRespLen = 0;
u8 *pu8IEs = 0; u8 *pu8IEs = 0;
@ -976,9 +976,9 @@ WILC_Sint32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
* @date 2 Apr 2012 * @date 2 Apr 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo) s32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
if (pstrConnectRespInfo != NULL) { if (pstrConnectRespInfo != NULL) {
if (pstrConnectRespInfo->pu8RespIEs != NULL) { if (pstrConnectRespInfo->pu8RespIEs != NULL) {
@ -999,11 +999,11 @@ WILC_Sint32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo)
} }
#ifndef CONNECT_DIRECT #ifndef CONNECT_DIRECT
WILC_Sint32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE], s32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE],
wid_site_survey_reslts_s **ppstrSurveyResults, wid_site_survey_reslts_s **ppstrSurveyResults,
u32 *pu32SurveyResultsCount) u32 *pu32SurveyResultsCount)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
wid_site_survey_reslts_s *pstrSurveyResults = NULL; wid_site_survey_reslts_s *pstrSurveyResults = NULL;
u32 u32SurveyResultsCount = 0; u32 u32SurveyResultsCount = 0;
u32 u32SurveyBytesLength = 0; u32 u32SurveyBytesLength = 0;
@ -1057,9 +1057,9 @@ WILC_Sint32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_
} }
WILC_Sint32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults) s32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
if (pstrSurveyResults != NULL) { if (pstrSurveyResults != NULL) {
WILC_FREE(pstrSurveyResults); WILC_FREE(pstrSurveyResults);
@ -1096,12 +1096,12 @@ WILC_Sint32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults)
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
void ProcessCharWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, void ProcessCharWid(WILC_Char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, s8 *ps8WidVal) tstrWID *pstrWID, s8 *ps8WidVal)
{ {
u8 *pu8val = (u8 *)ps8WidVal; u8 *pu8val = (u8 *)ps8WidVal;
u8 u8val = 0; u8 u8val = 0;
WILC_Sint32 s32PktLen = *ps32PktLen; s32 s32PktLen = *ps32PktLen;
if (pstrWID == NULL) { if (pstrWID == NULL) {
PRINT_WRN(CORECONFIG_DBG, "Can't set CHAR val 0x%x ,NULL structure\n", u8val); PRINT_WRN(CORECONFIG_DBG, "Can't set CHAR val 0x%x ,NULL structure\n", u8val);
return; return;
@ -1150,12 +1150,12 @@ void ProcessCharWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
void ProcessShortWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, void ProcessShortWid(WILC_Char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, s8 *ps8WidVal) tstrWID *pstrWID, s8 *ps8WidVal)
{ {
u16 *pu16val = (u16 *)ps8WidVal; u16 *pu16val = (u16 *)ps8WidVal;
u16 u16val = 0; u16 u16val = 0;
WILC_Sint32 s32PktLen = *ps32PktLen; s32 s32PktLen = *ps32PktLen;
if (pstrWID == NULL) { if (pstrWID == NULL) {
PRINT_WRN(CORECONFIG_DBG, "Can't set SHORT val 0x%x ,NULL structure\n", u16val); PRINT_WRN(CORECONFIG_DBG, "Can't set SHORT val 0x%x ,NULL structure\n", u16val);
return; return;
@ -1205,12 +1205,12 @@ void ProcessShortWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
void ProcessIntWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, void ProcessIntWid(WILC_Char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, s8 *ps8WidVal) tstrWID *pstrWID, s8 *ps8WidVal)
{ {
u32 *pu32val = (u32 *)ps8WidVal; u32 *pu32val = (u32 *)ps8WidVal;
u32 u32val = 0; u32 u32val = 0;
WILC_Sint32 s32PktLen = *ps32PktLen; s32 s32PktLen = *ps32PktLen;
if (pstrWID == NULL) { if (pstrWID == NULL) {
PRINT_WRN(CORECONFIG_DBG, "Can't set INT val 0x%x , NULL structure\n", u32val); PRINT_WRN(CORECONFIG_DBG, "Can't set INT val 0x%x , NULL structure\n", u32val);
return; return;
@ -1263,11 +1263,11 @@ void ProcessIntWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
void ProcessIPwid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, void ProcessIPwid(WILC_Char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, u8 *pu8ip) tstrWID *pstrWID, u8 *pu8ip)
{ {
u32 u32val = 0; u32 u32val = 0;
WILC_Sint32 s32PktLen = *ps32PktLen; s32 s32PktLen = *ps32PktLen;
if (pstrWID == NULL) { if (pstrWID == NULL) {
PRINT_WRN(CORECONFIG_DBG, "Can't set IP Addr , NULL structure\n"); PRINT_WRN(CORECONFIG_DBG, "Can't set IP Addr , NULL structure\n");
@ -1321,12 +1321,12 @@ void ProcessIPwid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
void ProcessStrWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, void ProcessStrWid(WILC_Char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, u8 *pu8val, WILC_Sint32 s32ValueSize) tstrWID *pstrWID, u8 *pu8val, s32 s32ValueSize)
{ {
u16 u16MsgLen = 0; u16 u16MsgLen = 0;
u16 idx = 0; u16 idx = 0;
WILC_Sint32 s32PktLen = *ps32PktLen; s32 s32PktLen = *ps32PktLen;
if (pstrWID == NULL) { if (pstrWID == NULL) {
PRINT_WRN(CORECONFIG_DBG, "Can't set STR val, NULL structure\n"); PRINT_WRN(CORECONFIG_DBG, "Can't set STR val, NULL structure\n");
return; return;
@ -1378,11 +1378,11 @@ void ProcessStrWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
void ProcessAdrWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, void ProcessAdrWid(WILC_Char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, u8 *pu8val) tstrWID *pstrWID, u8 *pu8val)
{ {
u16 u16MsgLen = 0; u16 u16MsgLen = 0;
WILC_Sint32 s32PktLen = *ps32PktLen; s32 s32PktLen = *ps32PktLen;
if (pstrWID == NULL) { if (pstrWID == NULL) {
PRINT_WRN(CORECONFIG_DBG, "Can't set Addr WID, NULL structure\n"); PRINT_WRN(CORECONFIG_DBG, "Can't set Addr WID, NULL structure\n");
@ -1442,14 +1442,14 @@ void ProcessAdrWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
void ProcessBinWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, void ProcessBinWid(WILC_Char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, u8 *pu8val, WILC_Sint32 s32ValueSize) tstrWID *pstrWID, u8 *pu8val, s32 s32ValueSize)
{ {
/* WILC_ERROR("processing Binary WIDs is not supported\n"); */ /* WILC_ERROR("processing Binary WIDs is not supported\n"); */
u16 u16MsgLen = 0; u16 u16MsgLen = 0;
u16 idx = 0; u16 idx = 0;
WILC_Sint32 s32PktLen = *ps32PktLen; s32 s32PktLen = *ps32PktLen;
u8 u8checksum = 0; u8 u8checksum = 0;
if (pstrWID == NULL) { if (pstrWID == NULL) {
@ -1517,7 +1517,7 @@ void ProcessBinWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
WILC_Sint32 further_process_response(u8 *resp, s32 further_process_response(u8 *resp,
u16 u16WIDid, u16 u16WIDid,
u16 cfg_len, u16 cfg_len,
WILC_Bool process_wid_num, WILC_Bool process_wid_num,
@ -1551,7 +1551,7 @@ WILC_Sint32 further_process_response(u8 *resp,
u16 *pu16val = (u16 *)(pstrWIDresult->ps8WidVal); u16 *pu16val = (u16 *)(pstrWIDresult->ps8WidVal);
cfg_sht = MAKE_WORD16(resp[idx], resp[idx + 1]); cfg_sht = MAKE_WORD16(resp[idx], resp[idx + 1]);
/*Set local copy of WID*/ /*Set local copy of WID*/
/* pstrWIDresult->ps8WidVal = (s8*)(WILC_Sint32)cfg_sht; */ /* pstrWIDresult->ps8WidVal = (s8*)(s32)cfg_sht; */
*pu16val = cfg_sht; *pu16val = cfg_sht;
break; break;
} }
@ -1687,7 +1687,7 @@ WILC_Sint32 further_process_response(u8 *resp,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
WILC_Sint32 ParseResponse(u8 *resp, tstrWID *pstrWIDcfgResult) s32 ParseResponse(u8 *resp, tstrWID *pstrWIDcfgResult)
{ {
u16 u16RespLen = 0; u16 u16RespLen = 0;
u16 u16WIDid = 0; u16 u16WIDid = 0;
@ -1760,9 +1760,9 @@ WILC_Sint32 ParseResponse(u8 *resp, tstrWID *pstrWIDcfgResult)
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 ParseWriteResponse(u8 *pu8RespBuffer) s32 ParseWriteResponse(u8 *pu8RespBuffer)
{ {
WILC_Sint32 s32Error = WILC_FAIL; s32 s32Error = WILC_FAIL;
u16 u16RespLen = 0; u16 u16RespLen = 0;
u16 u16WIDtype = (u16)WID_NIL; u16 u16WIDtype = (u16)WID_NIL;
@ -1803,9 +1803,9 @@ WILC_Sint32 ParseWriteResponse(u8 *pu8RespBuffer)
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 CreatePacketHeader(WILC_Char *pcpacket, WILC_Sint32 *ps32PacketLength) s32 CreatePacketHeader(WILC_Char *pcpacket, s32 *ps32PacketLength)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
u16 u16MsgLen = (u16)(*ps32PacketLength); u16 u16MsgLen = (u16)(*ps32PacketLength);
u16 u16MsgInd = 0; u16 u16MsgInd = 0;
@ -1857,10 +1857,10 @@ WILC_Sint32 CreatePacketHeader(WILC_Char *pcpacket, WILC_Sint32 *ps32PacketLengt
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 CreateConfigPacket(s8 *ps8packet, WILC_Sint32 *ps32PacketLength, s32 CreateConfigPacket(s8 *ps8packet, s32 *ps32PacketLength,
tstrWID *pstrWIDs, u32 u32WIDsCount) tstrWID *pstrWIDs, u32 u32WIDsCount)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
u32 u32idx = 0; u32 u32idx = 0;
*ps32PacketLength = MSG_HEADER_LEN; *ps32PacketLength = MSG_HEADER_LEN;
for (u32idx = 0; u32idx < u32WIDsCount; u32idx++) { for (u32idx = 0; u32idx < u32WIDsCount; u32idx++) {
@ -1912,10 +1912,10 @@ WILC_Sint32 CreateConfigPacket(s8 *ps8packet, WILC_Sint32 *ps32PacketLength,
return s32Error; return s32Error;
} }
WILC_Sint32 ConfigWaitResponse(WILC_Char *pcRespBuffer, WILC_Sint32 s32MaxRespBuffLen, WILC_Sint32 *ps32BytesRead, s32 ConfigWaitResponse(WILC_Char *pcRespBuffer, s32 s32MaxRespBuffLen, s32 *ps32BytesRead,
WILC_Bool bRespRequired) WILC_Bool bRespRequired)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
/*bug 3878*/ /*bug 3878*/
/*removed to caller function*/ /*removed to caller function*/
/*gstrConfigPktInfo.pcRespBuffer = pcRespBuffer; /*gstrConfigPktInfo.pcRespBuffer = pcRespBuffer;
@ -1949,13 +1949,13 @@ WILC_Sint32 ConfigWaitResponse(WILC_Char *pcRespBuffer, WILC_Sint32 s32MaxRespBu
* @version 1.0 * @version 1.0
*/ */
#ifdef SIMULATION #ifdef SIMULATION
WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs, s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
u32 u32WIDsCount, WILC_Bool bRespRequired, u32 drvHandler) u32 u32WIDsCount, WILC_Bool bRespRequired, u32 drvHandler)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
WILC_Sint32 err = WILC_SUCCESS; s32 err = WILC_SUCCESS;
WILC_Sint32 s32ConfigPacketLen = 0; s32 s32ConfigPacketLen = 0;
WILC_Sint32 s32RcvdRespLen = 0; s32 s32RcvdRespLen = 0;
down(&SemHandleSendPkt); down(&SemHandleSendPkt);
@ -2017,9 +2017,9 @@ WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
return s32Error; return s32Error;
} }
#endif #endif
WILC_Sint32 ConfigProvideResponse(WILC_Char *pcRespBuffer, WILC_Sint32 s32RespLen) s32 ConfigProvideResponse(WILC_Char *pcRespBuffer, s32 s32RespLen)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
if (gstrConfigPktInfo.bRespRequired == WILC_TRUE) { if (gstrConfigPktInfo.bRespRequired == WILC_TRUE) {
if (s32RespLen <= gstrConfigPktInfo.s32MaxRespBuffLen) { if (s32RespLen <= gstrConfigPktInfo.s32MaxRespBuffLen) {
@ -2050,9 +2050,9 @@ WILC_Sint32 ConfigProvideResponse(WILC_Char *pcRespBuffer, WILC_Sint32 s32RespLe
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 ConfigPktReceived(u8 *pu8RxPacket, WILC_Sint32 s32RxPacketLen) s32 ConfigPktReceived(u8 *pu8RxPacket, s32 s32RxPacketLen)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
u8 u8MsgType = 0; u8 u8MsgType = 0;
u8MsgType = pu8RxPacket[0]; u8MsgType = pu8RxPacket[0];
@ -2094,9 +2094,9 @@ WILC_Sint32 ConfigPktReceived(u8 *pu8RxPacket, WILC_Sint32 s32RxPacketLen)
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 CoreConfiguratorDeInit(void) s32 CoreConfiguratorDeInit(void)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
PRINT_D(CORECONFIG_DBG, "CoreConfiguratorDeInit()\n"); PRINT_D(CORECONFIG_DBG, "CoreConfiguratorDeInit()\n");
@ -2128,10 +2128,10 @@ extern wilc_wlan_oup_t *gpstrWlanOps;
* @date 1 Mar 2012 * @date 1 Mar 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs, s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
u32 u32WIDsCount, WILC_Bool bRespRequired, u32 drvHandler) u32 u32WIDsCount, WILC_Bool bRespRequired, u32 drvHandler)
{ {
WILC_Sint32 counter = 0, ret = 0; s32 counter = 0, ret = 0;
if (gpstrWlanOps == NULL) { if (gpstrWlanOps == NULL) {
PRINT_D(CORECONFIG_DBG, "Net Dev is still not initialized\n"); PRINT_D(CORECONFIG_DBG, "Net Dev is still not initialized\n");
return 1; return 1;

22
drivers/staging/wilc1000/coreconfigurator.h
View file

@ -396,7 +396,7 @@ typedef enum {
typedef struct { typedef struct {
u16 u16WIDid; u16 u16WIDid;
tenuWIDtype enuWIDtype; tenuWIDtype enuWIDtype;
WILC_Sint32 s32ValueSize; s32 s32ValueSize;
s8 *ps8WidVal; s8 *ps8WidVal;
} tstrWID; } tstrWID;
@ -472,25 +472,25 @@ typedef struct wid_site_survey_reslts {
} wid_site_survey_reslts_s; } wid_site_survey_reslts_s;
#endif #endif
extern WILC_Sint32 CoreConfiguratorInit(void); extern s32 CoreConfiguratorInit(void);
extern WILC_Sint32 CoreConfiguratorDeInit(void); extern s32 CoreConfiguratorDeInit(void);
extern WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs, extern s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
u32 u32WIDsCount, WILC_Bool bRespRequired, u32 drvHandler); u32 u32WIDsCount, WILC_Bool bRespRequired, u32 drvHandler);
extern WILC_Sint32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo); extern s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo);
extern WILC_Sint32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo); extern s32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo);
extern WILC_Sint32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen, extern s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
tstrConnectRespInfo **ppstrConnectRespInfo); tstrConnectRespInfo **ppstrConnectRespInfo);
extern WILC_Sint32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo); extern s32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo);
#ifndef CONNECT_DIRECT #ifndef CONNECT_DIRECT
extern WILC_Sint32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE], extern s32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE],
wid_site_survey_reslts_s **ppstrSurveyResults, u32 *pu32SurveyResultsCount); wid_site_survey_reslts_s **ppstrSurveyResults, u32 *pu32SurveyResultsCount);
extern WILC_Sint32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults); extern s32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults);
#endif #endif
extern WILC_Sint32 SendRawPacket(s8 *pspacket, WILC_Sint32 s32PacketLen); extern s32 SendRawPacket(s8 *pspacket, s32 s32PacketLen);
extern void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length); extern void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length);
void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length); void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length);
void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length); void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length);

362
drivers/staging/wilc1000/host_interface.c
View file

File diff suppressed because it is too large Load diff

124
drivers/staging/wilc1000/host_interface.h
View file

@ -277,7 +277,7 @@ typedef void (*tWILCpfRemainOnChanReady)(void *); /*Remain on channel callback f
/* typedef u32 WILC_WFIDrvHandle; */ /* typedef u32 WILC_WFIDrvHandle; */
typedef struct { typedef struct {
WILC_Sint32 s32Dummy; s32 s32Dummy;
} *WILC_WFIDrvHandle; } *WILC_WFIDrvHandle;
/*! /*!
@ -496,7 +496,7 @@ typedef struct {
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_remove_key(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8StaAddress); s32 host_int_remove_key(WILC_WFIDrvHandle 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.
@ -511,7 +511,7 @@ WILC_Sint32 host_int_remove_key(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8StaAddre
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_remove_wep_key(WILC_WFIDrvHandle hWFIDrv, u8 u8Index); s32 host_int_remove_wep_key(WILC_WFIDrvHandle hWFIDrv, u8 u8Index);
/** /**
* @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,
@ -524,7 +524,7 @@ WILC_Sint32 host_int_remove_wep_key(WILC_WFIDrvHandle hWFIDrv, u8 u8Index);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_set_WEPDefaultKeyID(WILC_WFIDrvHandle hWFIDrv, u8 u8Index); s32 host_int_set_WEPDefaultKeyID(WILC_WFIDrvHandle hWFIDrv, u8 u8Index);
/** /**
* @brief sets WEP deafault key * @brief sets WEP deafault key
@ -545,7 +545,7 @@ WILC_Sint32 host_int_set_WEPDefaultKeyID(WILC_WFIDrvHandle hWFIDrv, u8 u8Index);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_add_wep_key_bss_sta(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx); s32 host_int_add_wep_key_bss_sta(WILC_WFIDrvHandle 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.
@ -560,7 +560,7 @@ WILC_Sint32 host_int_add_wep_key_bss_sta(WILC_WFIDrvHandle hWFIDrv, const u8 *pu
* @date 28 Feb 2013 * @date 28 Feb 2013
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx, u8 u8mode, AUTHTYPE_T tenuAuth_type); s32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx, u8 u8mode, AUTHTYPE_T tenuAuth_type);
/** /**
* @brief adds ptk Key * @brief adds ptk Key
@ -578,7 +578,7 @@ WILC_Sint32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_add_ptk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen, s32 host_int_add_ptk(WILC_WFIDrvHandle 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);
/** /**
@ -593,7 +593,7 @@ WILC_Sint32 host_int_add_ptk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8Ptk, u8 u8P
* @date 15 April 2013 * @date 15 April 2013
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_inactive_time(WILC_WFIDrvHandle hWFIDrv, const u8 *mac, u32 *pu32InactiveTime); s32 host_int_get_inactive_time(WILC_WFIDrvHandle hWFIDrv, const u8 *mac, u32 *pu32InactiveTime);
/** /**
* @brief adds Rx GTk Key * @brief adds Rx GTk Key
@ -611,7 +611,7 @@ WILC_Sint32 host_int_get_inactive_time(WILC_WFIDrvHandle hWFIDrv, const u8 *mac,
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKeylen, s32 host_int_add_rx_gtk(WILC_WFIDrvHandle 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);
@ -632,7 +632,7 @@ WILC_Sint32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, u
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_add_tx_gtk(WILC_WFIDrvHandle hWFIDrv, u8 u8KeyLen, u8 *pu8TxGtk, u8 u8KeyIdx); s32 host_int_add_tx_gtk(WILC_WFIDrvHandle hWFIDrv, u8 u8KeyLen, u8 *pu8TxGtk, u8 u8KeyIdx);
/** /**
* @brief caches the pmkid * @brief caches the pmkid
@ -655,7 +655,7 @@ WILC_Sint32 host_int_add_tx_gtk(WILC_WFIDrvHandle hWFIDrv, u8 u8KeyLen, u8 *pu8T
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_set_pmkid_info(WILC_WFIDrvHandle hWFIDrv, tstrHostIFpmkidAttr *pu8PmkidInfoArray); s32 host_int_set_pmkid_info(WILC_WFIDrvHandle hWFIDrv, tstrHostIFpmkidAttr *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
@ -679,7 +679,7 @@ WILC_Sint32 host_int_set_pmkid_info(WILC_WFIDrvHandle hWFIDrv, tstrHostIFpmkidAt
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_pmkid_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PmkidInfoArray, s32 host_int_get_pmkid_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PmkidInfoArray,
u32 u32PmkidInfoLen); u32 u32PmkidInfoLen);
/** /**
@ -696,7 +696,7 @@ WILC_Sint32 host_int_get_pmkid_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PmkidInfoA
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_set_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PassPhrase, s32 host_int_set_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PassPhrase,
u8 u8Psklength); u8 u8Psklength);
/** /**
* @brief gets the pass phrase * @brief gets the pass phrase
@ -712,7 +712,7 @@ WILC_Sint32 host_int_set_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv, u8 *
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv, s32 host_int_get_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv,
u8 *pu8PassPhrase, u8 u8Psklength); u8 *pu8PassPhrase, u8 u8Psklength);
/** /**
@ -726,7 +726,7 @@ WILC_Sint32 host_int_get_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv,
* @date 19 April 2012 * @date 19 April 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_MacAddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8MacAddress); s32 host_int_get_MacAddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8MacAddress);
/** /**
* @brief sets mac address * @brief sets mac address
@ -739,7 +739,7 @@ WILC_Sint32 host_int_get_MacAddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8MacAddress
* @date 16 July 2012 * @date 16 July 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_set_MacAddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8MacAddress); s32 host_int_set_MacAddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8MacAddress);
/** /**
* @brief wait until msg q is empty * @brief wait until msg q is empty
@ -752,7 +752,7 @@ WILC_Sint32 host_int_set_MacAddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8MacAddress
* @date 19 march 2014 * @date 19 march 2014
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_wait_msg_queue_idle(void); s32 host_int_wait_msg_queue_idle(void);
/** /**
* @brief gets the site survey results * @brief gets the site survey results
@ -784,7 +784,7 @@ WILC_Sint32 host_int_wait_msg_queue_idle(void);
* @version 1.0 * @version 1.0
*/ */
#ifndef CONNECT_DIRECT #ifndef CONNECT_DIRECT
WILC_Sint32 host_int_get_site_survey_results(WILC_WFIDrvHandle hWFIDrv, s32 host_int_get_site_survey_results(WILC_WFIDrvHandle hWFIDrv,
u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE], u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE],
u32 u32MaxSiteSrvyFragLen); u32 u32MaxSiteSrvyFragLen);
#endif #endif
@ -805,7 +805,7 @@ WILC_Sint32 host_int_get_site_survey_results(WILC_WFIDrvHandle hWFIDrv,
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_set_start_scan_req(WILC_WFIDrvHandle hWFIDrv, u8 scanSource); s32 host_int_set_start_scan_req(WILC_WFIDrvHandle hWFIDrv, u8 scanSource);
/** /**
* @brief gets scan source of the last scan * @brief gets scan source of the last scan
* @details * @details
@ -821,7 +821,7 @@ WILC_Sint32 host_int_set_start_scan_req(WILC_WFIDrvHandle hWFIDrv, u8 scanSource
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_start_scan_req(WILC_WFIDrvHandle hWFIDrv, u8 *pu8ScanSource); s32 host_int_get_start_scan_req(WILC_WFIDrvHandle hWFIDrv, u8 *pu8ScanSource);
/** /**
* @brief sets a join request * @brief sets a join request
@ -835,7 +835,7 @@ WILC_Sint32 host_int_get_start_scan_req(WILC_WFIDrvHandle hWFIDrv, u8 *pu8ScanSo
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_set_join_req(WILC_WFIDrvHandle hWFIDrv, u8 *pu8bssid, s32 host_int_set_join_req(WILC_WFIDrvHandle 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,
tWILCpfConnectResult pfConnectResult, void *pvUserArg, tWILCpfConnectResult pfConnectResult, void *pvUserArg,
@ -855,7 +855,7 @@ WILC_Sint32 host_int_set_join_req(WILC_WFIDrvHandle hWFIDrv, u8 *pu8bssid,
* @version 8.0 * @version 8.0
*/ */
WILC_Sint32 host_int_flush_join_req(WILC_WFIDrvHandle hWFIDrv); s32 host_int_flush_join_req(WILC_WFIDrvHandle hWFIDrv);
/** /**
@ -869,7 +869,7 @@ WILC_Sint32 host_int_flush_join_req(WILC_WFIDrvHandle hWFIDrv);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_disconnect(WILC_WFIDrvHandle hWFIDrv, u16 u16ReasonCode); s32 host_int_disconnect(WILC_WFIDrvHandle hWFIDrv, u16 u16ReasonCode);
/** /**
* @brief disconnects a sta * @brief disconnects a sta
@ -882,7 +882,7 @@ WILC_Sint32 host_int_disconnect(WILC_WFIDrvHandle hWFIDrv, u16 u16ReasonCode);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_disconnect_station(WILC_WFIDrvHandle hWFIDrv, u8 assoc_id); s32 host_int_disconnect_station(WILC_WFIDrvHandle hWFIDrv, u8 assoc_id);
/** /**
* @brief gets a Association request info * @brief gets a Association request info
* @details * @details
@ -909,7 +909,7 @@ WILC_Sint32 host_int_disconnect_station(WILC_WFIDrvHandle hWFIDrv, u8 assoc_id);
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocReqInfo, s32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocReqInfo,
u32 u32AssocReqInfoLen); u32 u32AssocReqInfoLen);
/** /**
* @brief gets a Association Response info * @brief gets a Association Response info
@ -923,7 +923,7 @@ WILC_Sint32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocR
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocRespInfo, s32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocRespInfo,
u32 u32MaxAssocRespInfoLen, u32 *pu32RcvdAssocRespInfoLen); u32 u32MaxAssocRespInfoLen, u32 *pu32RcvdAssocRespInfoLen);
/** /**
* @brief gets a Association Response info * @brief gets a Association Response info
@ -940,7 +940,7 @@ WILC_Sint32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocR
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_rx_power_level(WILC_WFIDrvHandle hWFIDrv, u8 *pu8RxPowerLevel, s32 host_int_get_rx_power_level(WILC_WFIDrvHandle hWFIDrv, u8 *pu8RxPowerLevel,
u32 u32RxPowerLevelLen); u32 u32RxPowerLevelLen);
/** /**
@ -958,7 +958,7 @@ WILC_Sint32 host_int_get_rx_power_level(WILC_WFIDrvHandle hWFIDrv, u8 *pu8RxPowe
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_set_mac_chnl_num(WILC_WFIDrvHandle hWFIDrv, u8 u8ChNum); s32 host_int_set_mac_chnl_num(WILC_WFIDrvHandle hWFIDrv, u8 u8ChNum);
/** /**
* @brief gets the current channel index * @brief gets the current channel index
@ -975,7 +975,7 @@ WILC_Sint32 host_int_set_mac_chnl_num(WILC_WFIDrvHandle hWFIDrv, u8 u8ChNum);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_host_chnl_num(WILC_WFIDrvHandle hWFIDrv, u8 *pu8ChNo); s32 host_int_get_host_chnl_num(WILC_WFIDrvHandle 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.
@ -989,8 +989,8 @@ WILC_Sint32 host_int_get_host_chnl_num(WILC_WFIDrvHandle hWFIDrv, u8 *pu8ChNo);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_rssi(WILC_WFIDrvHandle hWFIDrv, s8 *ps8Rssi); s32 host_int_get_rssi(WILC_WFIDrvHandle hWFIDrv, s8 *ps8Rssi);
WILC_Sint32 host_int_get_link_speed(WILC_WFIDrvHandle hWFIDrv, s8 *ps8lnkspd); s32 host_int_get_link_speed(WILC_WFIDrvHandle hWFIDrv, s8 *ps8lnkspd);
/** /**
* @brief scans a set of channels * @brief scans a set of channels
* @details * @details
@ -1008,7 +1008,7 @@ WILC_Sint32 host_int_get_link_speed(WILC_WFIDrvHandle hWFIDrv, s8 *ps8lnkspd);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_scan(WILC_WFIDrvHandle hWFIDrv, u8 u8ScanSource, s32 host_int_scan(WILC_WFIDrvHandle hWFIDrv, u8 u8ScanSource,
u8 u8ScanType, u8 *pu8ChnlFreqList, u8 u8ScanType, u8 *pu8ChnlFreqList,
u8 u8ChnlListLen, const u8 *pu8IEs, u8 u8ChnlListLen, const u8 *pu8IEs,
size_t IEsLen, tWILCpfScanResult ScanResult, size_t IEsLen, tWILCpfScanResult ScanResult,
@ -1024,7 +1024,7 @@ WILC_Sint32 host_int_scan(WILC_WFIDrvHandle hWFIDrv, u8 u8ScanSource,
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 hif_set_cfg(WILC_WFIDrvHandle hWFIDrv, tstrCfgParamVal *pstrCfgParamVal); s32 hif_set_cfg(WILC_WFIDrvHandle hWFIDrv, tstrCfgParamVal *pstrCfgParamVal);
/** /**
* @brief gets configuration wids values * @brief gets configuration wids values
@ -1038,7 +1038,7 @@ WILC_Sint32 hif_set_cfg(WILC_WFIDrvHandle hWFIDrv, tstrCfgParamVal *pstrCfgParam
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 hif_get_cfg(WILC_WFIDrvHandle hWFIDrv, u16 u16WID, u16 *pu16WID_Value); s32 hif_get_cfg(WILC_WFIDrvHandle hWFIDrv, u16 u16WID, u16 *pu16WID_Value);
/*****************************************************************************/ /*****************************************************************************/
/* Notification Functions */ /* Notification Functions */
/*****************************************************************************/ /*****************************************************************************/
@ -1085,7 +1085,7 @@ void host_int_send_network_info_to_host
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_init(WILC_WFIDrvHandle *phWFIDrv); s32 host_int_init(WILC_WFIDrvHandle *phWFIDrv);
/** /**
* @brief host interface initialization function * @brief host interface initialization function
@ -1096,11 +1096,11 @@ WILC_Sint32 host_int_init(WILC_WFIDrvHandle *phWFIDrv);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_deinit(WILC_WFIDrvHandle hWFIDrv); s32 host_int_deinit(WILC_WFIDrvHandle hWFIDrv);
/*! /*!
* @fn WILC_Sint32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv,u8 u8Index) * @fn s32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv,u8 u8Index)
* @brief Sends a beacon to the firmware to be transmitted over the air * @brief Sends a beacon to the firmware to be transmitted over the air
* @details * @details
* @param[in,out] hWFIDrv handle to the wifi driver * @param[in,out] hWFIDrv handle to the wifi driver
@ -1121,14 +1121,14 @@ WILC_Sint32 host_int_deinit(WILC_WFIDrvHandle hWFIDrv);
* @version 1.0 Description * @version 1.0 Description
* *
*/ */
WILC_Sint32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv, u32 u32Interval, s32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv, u32 u32Interval,
u32 u32DTIMPeriod, u32 u32DTIMPeriod,
u32 u32HeadLen, u8 *pu8Head, u32 u32HeadLen, u8 *pu8Head,
u32 u32TailLen, u8 *pu8tail); u32 u32TailLen, u8 *pu8tail);
/*! /*!
* @fn WILC_Sint32 host_int_del_beacon(WILC_WFIDrvHandle hWFIDrv) * @fn s32 host_int_del_beacon(WILC_WFIDrvHandle hWFIDrv)
* @brief Removes the beacon and stops trawilctting it over the air * @brief Removes the beacon and stops trawilctting it over the air
* @details * @details
* @param[in,out] hWFIDrv handle to the wifi driver * @param[in,out] hWFIDrv handle to the wifi driver
@ -1139,10 +1139,10 @@ WILC_Sint32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv, u32 u32Interval,
* @date 10 Julys 2012 * @date 10 Julys 2012
* @version 1.0 Description * @version 1.0 Description
*/ */
WILC_Sint32 host_int_del_beacon(WILC_WFIDrvHandle hWFIDrv); s32 host_int_del_beacon(WILC_WFIDrvHandle hWFIDrv);
/*! /*!
* @fn WILC_Sint32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam strStaParams) * @fn s32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam strStaParams)
* @brief Notifies the firmware with a new associated stations * @brief Notifies the firmware with a new associated stations
* @details * @details
* @param[in,out] hWFIDrv handle to the wifi driver * @param[in,out] hWFIDrv handle to the wifi driver
@ -1154,10 +1154,10 @@ WILC_Sint32 host_int_del_beacon(WILC_WFIDrvHandle hWFIDrv);
* @date 12 July 2012 * @date 12 July 2012
* @version 1.0 Description * @version 1.0 Description
*/ */
WILC_Sint32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam *pstrStaParams); s32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam *pstrStaParams);
/*! /*!
* @fn WILC_Sint32 host_int_del_allstation(WILC_WFIDrvHandle hWFIDrv, const u8* pu8MacAddr) * @fn s32 host_int_del_allstation(WILC_WFIDrvHandle hWFIDrv, const u8* pu8MacAddr)
* @brief Deauthenticates clients when group is terminating * @brief Deauthenticates clients when group is terminating
* @details * @details
* @param[in,out] hWFIDrv handle to the wifi driver * @param[in,out] hWFIDrv handle to the wifi driver
@ -1169,10 +1169,10 @@ WILC_Sint32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam
* @date 09 April 2014 * @date 09 April 2014
* @version 1.0 Description * @version 1.0 Description
*/ */
WILC_Sint32 host_int_del_allstation(WILC_WFIDrvHandle hWFIDrv, u8 pu8MacAddr[][ETH_ALEN]); s32 host_int_del_allstation(WILC_WFIDrvHandle hWFIDrv, u8 pu8MacAddr[][ETH_ALEN]);
/*! /*!
* @fn WILC_Sint32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, u8* pu8MacAddr) * @fn s32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, u8* pu8MacAddr)
* @brief Notifies the firmware with a new deleted station * @brief Notifies the firmware with a new deleted station
* @details * @details
* @param[in,out] hWFIDrv handle to the wifi driver * @param[in,out] hWFIDrv handle to the wifi driver
@ -1184,10 +1184,10 @@ WILC_Sint32 host_int_del_allstation(WILC_WFIDrvHandle hWFIDrv, u8 pu8MacAddr[][E
* @date 15 July 2012 * @date 15 July 2012
* @version 1.0 Description * @version 1.0 Description
*/ */
WILC_Sint32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8MacAddr); s32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8MacAddr);
/*! /*!
* @fn WILC_Sint32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam strStaParams) * @fn s32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam strStaParams)
* @brief Notifies the firmware with new parameters of an already associated station * @brief Notifies the firmware with new parameters of an already associated station
* @details * @details
* @param[in,out] hWFIDrv handle to the wifi driver * @param[in,out] hWFIDrv handle to the wifi driver
@ -1199,10 +1199,10 @@ WILC_Sint32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8MacAddr
* @date 15 July 2012 * @date 15 July 2012
* @version 1.0 Description * @version 1.0 Description
*/ */
WILC_Sint32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam *pstrStaParams); s32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam *pstrStaParams);
/*! /*!
* @fn WILC_Sint32 host_int_set_power_mgmt(WILC_WFIDrvHandle hWFIDrv, WILC_Bool bIsEnabled, u32 u32Timeout) * @fn s32 host_int_set_power_mgmt(WILC_WFIDrvHandle hWFIDrv, WILC_Bool bIsEnabled, u32 u32Timeout)
* @brief Set the power management mode to enabled or disabled * @brief Set the power management mode to enabled or disabled
* @details * @details
* @param[in,out] hWFIDrv handle to the wifi driver * @param[in,out] hWFIDrv handle to the wifi driver
@ -1216,7 +1216,7 @@ WILC_Sint32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaPara
* @date 24 November 2012 * @date 24 November 2012
* @version 1.0 Description * @version 1.0 Description
*/ */
WILC_Sint32 host_int_set_power_mgmt(WILC_WFIDrvHandle hWFIDrv, WILC_Bool bIsEnabled, u32 u32Timeout); s32 host_int_set_power_mgmt(WILC_WFIDrvHandle hWFIDrv, WILC_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
@ -1228,7 +1228,7 @@ WILC_Sint32 host_int_set_power_mgmt(WILC_WFIDrvHandle hWFIDrv, WILC_Bool bIsEnab
* @date 24 November 2012 * @date 24 November 2012
* @version 1.0 Description * @version 1.0 Description
*/ */
WILC_Sint32 host_int_setup_multicast_filter(WILC_WFIDrvHandle hWFIDrv, WILC_Bool bIsEnabled, u32 u32count); s32 host_int_setup_multicast_filter(WILC_WFIDrvHandle hWFIDrv, WILC_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
@ -1238,7 +1238,7 @@ WILC_Sint32 host_int_setup_multicast_filter(WILC_WFIDrvHandle hWFIDrv, WILC_Bool
* @date * @date
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_setup_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8IPAddr, u8 idx); s32 host_int_setup_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8IPAddr, u8 idx);
/** /**
@ -1250,7 +1250,7 @@ WILC_Sint32 host_int_setup_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8IPAddr, u
* @date * @date
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_delBASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char TID); s32 host_int_delBASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char TID);
/** /**
* @brief host_int_delBASession * @brief host_int_delBASession
@ -1261,7 +1261,7 @@ WILC_Sint32 host_int_delBASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char
* @date * @date
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_del_All_Rx_BASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char TID); s32 host_int_del_All_Rx_BASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char TID);
/** /**
@ -1273,7 +1273,7 @@ WILC_Sint32 host_int_del_All_Rx_BASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSI
* @date * @date
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8IPAddr, u8 idx); s32 host_int_get_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8IPAddr, u8 idx);
#ifdef WILC_P2P #ifdef WILC_P2P
/** /**
@ -1285,7 +1285,7 @@ WILC_Sint32 host_int_get_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8IPAddr, u8
* @date * @date
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_remain_on_channel(WILC_WFIDrvHandle hWFIDrv, u32 u32SessionID, u32 u32duration, u16 chan, tWILCpfRemainOnChanExpired RemainOnChanExpired, tWILCpfRemainOnChanReady RemainOnChanReady, void *pvUserArg); s32 host_int_remain_on_channel(WILC_WFIDrvHandle hWFIDrv, u32 u32SessionID, u32 u32duration, u16 chan, tWILCpfRemainOnChanExpired RemainOnChanExpired, tWILCpfRemainOnChanReady RemainOnChanReady, void *pvUserArg);
/** /**
* @brief host_int_ListenStateExpired * @brief host_int_ListenStateExpired
@ -1301,7 +1301,7 @@ WILC_Sint32 host_int_remain_on_channel(WILC_WFIDrvHandle hWFIDrv, u32 u32Session
* @date * @date
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_ListenStateExpired(WILC_WFIDrvHandle hWFIDrv, u32 u32SessionID); s32 host_int_ListenStateExpired(WILC_WFIDrvHandle hWFIDrv, u32 u32SessionID);
/** /**
* @brief host_int_frame_register * @brief host_int_frame_register
@ -1312,7 +1312,7 @@ WILC_Sint32 host_int_ListenStateExpired(WILC_WFIDrvHandle hWFIDrv, u32 u32Sessio
* @date * @date
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_frame_register(WILC_WFIDrvHandle hWFIDrv, u16 u16FrameType, WILC_Bool bReg); s32 host_int_frame_register(WILC_WFIDrvHandle hWFIDrv, u16 u16FrameType, WILC_Bool bReg);
#endif #endif
/** /**
* @brief host_int_set_wfi_drv_handler * @brief host_int_set_wfi_drv_handler
@ -1323,10 +1323,10 @@ WILC_Sint32 host_int_frame_register(WILC_WFIDrvHandle hWFIDrv, u16 u16FrameType,
* @date * @date
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_set_wfi_drv_handler(u32 u32address); s32 host_int_set_wfi_drv_handler(u32 u32address);
WILC_Sint32 host_int_set_operation_mode(WILC_WFIDrvHandle hWFIDrv, u32 u32mode); s32 host_int_set_operation_mode(WILC_WFIDrvHandle hWFIDrv, u32 u32mode);
static WILC_Sint32 Handle_ScanDone(void *drvHandler, tenuScanEvent enuEvent); static s32 Handle_ScanDone(void *drvHandler, tenuScanEvent enuEvent);
static int host_int_addBASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char TID, short int BufferSize, static int host_int_addBASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char TID, short int BufferSize,
short int SessionTimeout, void *drvHandler); short int SessionTimeout, void *drvHandler);
@ -1334,7 +1334,7 @@ static int host_int_addBASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char T
void host_int_freeJoinParams(void *pJoinParams); void host_int_freeJoinParams(void *pJoinParams);
WILC_Sint32 host_int_get_statistics(WILC_WFIDrvHandle hWFIDrv, tstrStatistics *pstrStatistics); s32 host_int_get_statistics(WILC_WFIDrvHandle hWFIDrv, tstrStatistics *pstrStatistics);
/*****************************************************************************/ /*****************************************************************************/
/* */ /* */

2
drivers/staging/wilc1000/linux_wlan.c
View file

@ -2379,7 +2379,7 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
u32 size = 0, length = 0; u32 size = 0, length = 0;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;

2
drivers/staging/wilc1000/wilc_errorsupport.h
View file

@ -37,7 +37,7 @@
/* Error type */ /* Error type */
typedef WILC_Sint32 WILC_ErrNo; typedef s32 WILC_ErrNo;
#define WILC_IS_ERR(__status__) (__status__ < WILC_SUCCESS) #define WILC_IS_ERR(__status__) (__status__ < WILC_SUCCESS)

1
drivers/staging/wilc1000/wilc_oswrapper.h
View file

@ -14,7 +14,6 @@
#define WILC_OSW_INTERFACE_VER 2 #define WILC_OSW_INTERFACE_VER 2
/* Integer Types */ /* Integer Types */
typedef signed int WILC_Sint32;
typedef signed long long WILC_Sint64; typedef signed long long WILC_Sint64;
/* Boolean type */ /* Boolean type */

6
drivers/staging/wilc1000/wilc_strutils.c
View file

@ -9,7 +9,7 @@
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 WILC_memcmp(const void *pvArg1, const void *pvArg2, u32 u32Count) s32 WILC_memcmp(const void *pvArg1, const void *pvArg2, u32 u32Count)
{ {
return memcmp(pvArg1, pvArg2, u32Count); return memcmp(pvArg1, pvArg2, u32Count);
} }
@ -46,10 +46,10 @@ WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource,
return strncpy(pcTarget, pcSource, u32Count); return strncpy(pcTarget, pcSource, u32Count);
} }
WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2, s32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2,
u32 u32Count) u32 u32Count)
{ {
WILC_Sint32 s32Result; s32 s32Result;
if (pcStr1 == NULL && pcStr2 == NULL) { if (pcStr1 == NULL && pcStr2 == NULL) {
s32Result = 0; s32Result = 0;

4
drivers/staging/wilc1000/wilc_strutils.h
View file

@ -22,7 +22,7 @@
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 WILC_memcmp(const void *pvArg1, const void *pvArg2, u32 u32Count); s32 WILC_memcmp(const void *pvArg1, const void *pvArg2, u32 u32Count);
/*! /*!
* @brief Internal implementation for memory copy * @brief Internal implementation for memory copy
@ -113,7 +113,7 @@ WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource,
* @date 7 Dec 2010 * @date 7 Dec 2010
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2, s32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2,
u32 u32Count); u32 u32Count);
/*! /*!

78
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View file

@ -195,19 +195,19 @@ void refresh_scan(void *pUserVoid, uint8_t all, WILC_Bool bDirectScan)
if ((!pstrNetworkInfo->u8Found) || all) { if ((!pstrNetworkInfo->u8Found) || all) {
WILC_Sint32 s32Freq; s32 s32Freq;
struct ieee80211_channel *channel; struct ieee80211_channel *channel;
if (pstrNetworkInfo != NULL) { if (pstrNetworkInfo != NULL) {
s32Freq = ieee80211_channel_to_frequency((WILC_Sint32)pstrNetworkInfo->u8channel, IEEE80211_BAND_2GHZ); s32Freq = ieee80211_channel_to_frequency((s32)pstrNetworkInfo->u8channel, IEEE80211_BAND_2GHZ);
channel = ieee80211_get_channel(wiphy, s32Freq); channel = ieee80211_get_channel(wiphy, s32Freq);
rssi = get_rssi_avg(pstrNetworkInfo); rssi = get_rssi_avg(pstrNetworkInfo);
if (WILC_memcmp("DIRECT-", pstrNetworkInfo->au8ssid, 7) || bDirectScan) { if (WILC_memcmp("DIRECT-", pstrNetworkInfo->au8ssid, 7) || bDirectScan) {
bss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, pstrNetworkInfo->au8bssid, pstrNetworkInfo->u64Tsf, pstrNetworkInfo->u16CapInfo, bss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, pstrNetworkInfo->au8bssid, pstrNetworkInfo->u64Tsf, pstrNetworkInfo->u16CapInfo,
pstrNetworkInfo->u16BeaconPeriod, (const u8 *)pstrNetworkInfo->pu8IEs, pstrNetworkInfo->u16BeaconPeriod, (const u8 *)pstrNetworkInfo->pu8IEs,
(size_t)pstrNetworkInfo->u16IEsLen, (((WILC_Sint32)rssi) * 100), GFP_KERNEL); (size_t)pstrNetworkInfo->u16IEsLen, (((s32)rssi) * 100), GFP_KERNEL);
cfg80211_put_bss(wiphy, bss); cfg80211_put_bss(wiphy, bss);
} }
} }
@ -380,9 +380,9 @@ static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetwo
{ {
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
struct wiphy *wiphy; struct wiphy *wiphy;
WILC_Sint32 s32Freq; s32 s32Freq;
struct ieee80211_channel *channel; struct ieee80211_channel *channel;
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct cfg80211_bss *bss = NULL; struct cfg80211_bss *bss = NULL;
priv = (struct WILC_WFI_priv *)pUserVoid; priv = (struct WILC_WFI_priv *)pUserVoid;
@ -392,21 +392,21 @@ static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetwo
WILC_NULLCHECK(s32Error, wiphy); WILC_NULLCHECK(s32Error, wiphy);
if (wiphy->signal_type == CFG80211_SIGNAL_TYPE_UNSPEC if (wiphy->signal_type == CFG80211_SIGNAL_TYPE_UNSPEC
&& &&
((((WILC_Sint32)pstrNetworkInfo->s8rssi) * 100) < 0 ((((s32)pstrNetworkInfo->s8rssi) * 100) < 0
|| ||
(((WILC_Sint32)pstrNetworkInfo->s8rssi) * 100) > 100) (((s32)pstrNetworkInfo->s8rssi) * 100) > 100)
) { ) {
WILC_ERRORREPORT(s32Error, WILC_FAIL); WILC_ERRORREPORT(s32Error, WILC_FAIL);
} }
if (pstrNetworkInfo != NULL) { if (pstrNetworkInfo != NULL) {
s32Freq = ieee80211_channel_to_frequency((WILC_Sint32)pstrNetworkInfo->u8channel, IEEE80211_BAND_2GHZ); s32Freq = ieee80211_channel_to_frequency((s32)pstrNetworkInfo->u8channel, IEEE80211_BAND_2GHZ);
channel = ieee80211_get_channel(wiphy, s32Freq); channel = ieee80211_get_channel(wiphy, s32Freq);
WILC_NULLCHECK(s32Error, channel); WILC_NULLCHECK(s32Error, channel);
PRINT_INFO(CFG80211_DBG, "Network Info:: CHANNEL Frequency: %d, RSSI: %d, CapabilityInfo: %d," PRINT_INFO(CFG80211_DBG, "Network Info:: CHANNEL Frequency: %d, RSSI: %d, CapabilityInfo: %d,"
"BeaconPeriod: %d \n", channel->center_freq, (((WILC_Sint32)pstrNetworkInfo->s8rssi) * 100), "BeaconPeriod: %d \n", channel->center_freq, (((s32)pstrNetworkInfo->s8rssi) * 100),
pstrNetworkInfo->u16CapInfo, pstrNetworkInfo->u16BeaconPeriod); pstrNetworkInfo->u16CapInfo, pstrNetworkInfo->u16BeaconPeriod);
if (pstrNetworkInfo->bNewNetwork == WILC_TRUE) { if (pstrNetworkInfo->bNewNetwork == WILC_TRUE) {
@ -429,7 +429,7 @@ static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetwo
if (!(WILC_memcmp("DIRECT-", pstrNetworkInfo->au8ssid, 7))) { if (!(WILC_memcmp("DIRECT-", pstrNetworkInfo->au8ssid, 7))) {
bss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, pstrNetworkInfo->au8bssid, pstrNetworkInfo->u64Tsf, pstrNetworkInfo->u16CapInfo, bss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, pstrNetworkInfo->au8bssid, pstrNetworkInfo->u64Tsf, pstrNetworkInfo->u16CapInfo,
pstrNetworkInfo->u16BeaconPeriod, (const u8 *)pstrNetworkInfo->pu8IEs, pstrNetworkInfo->u16BeaconPeriod, (const u8 *)pstrNetworkInfo->pu8IEs,
(size_t)pstrNetworkInfo->u16IEsLen, (((WILC_Sint32)pstrNetworkInfo->s8rssi) * 100), GFP_KERNEL); (size_t)pstrNetworkInfo->u16IEsLen, (((s32)pstrNetworkInfo->s8rssi) * 100), GFP_KERNEL);
cfg80211_put_bss(wiphy, bss); cfg80211_put_bss(wiphy, bss);
} }
@ -510,7 +510,7 @@ static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetwo
int WILC_WFI_Set_PMKSA(u8 *bssid, struct WILC_WFI_priv *priv) int WILC_WFI_Set_PMKSA(u8 *bssid, struct WILC_WFI_priv *priv)
{ {
u32 i; u32 i;
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
for (i = 0; i < priv->pmkid_list.numpmkid; i++) { for (i = 0; i < priv->pmkid_list.numpmkid; i++) {
@ -701,7 +701,7 @@ static int WILC_WFI_CfgSetChannel(struct wiphy *wiphy,
u32 channelnum = 0; u32 channelnum = 0;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
channelnum = ieee80211_frequency_to_channel(chandef->chan->center_freq); channelnum = ieee80211_frequency_to_channel(chandef->chan->center_freq);
@ -737,7 +737,7 @@ static int WILC_WFI_CfgScan(struct wiphy *wiphy, struct cfg80211_scan_request *r
{ {
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
u32 i; u32 i;
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
u8 au8ScanChanList[MAX_NUM_SCANNED_NETWORKS]; u8 au8ScanChanList[MAX_NUM_SCANNED_NETWORKS];
tstrHiddenNetwork strHiddenNetwork; tstrHiddenNetwork strHiddenNetwork;
@ -825,7 +825,7 @@ static int WILC_WFI_CfgScan(struct wiphy *wiphy, struct cfg80211_scan_request *r
static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev, static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_connect_params *sme) struct cfg80211_connect_params *sme)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
u32 i; u32 i;
u8 u8security = NO_ENCRYPT; u8 u8security = NO_ENCRYPT;
AUTHTYPE_T tenuAuth_type = ANY; AUTHTYPE_T tenuAuth_type = ANY;
@ -1079,7 +1079,7 @@ static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev,
*/ */
static int WILC_WFI_disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_code) static int WILC_WFI_disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_code)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
#ifdef WILC_P2P #ifdef WILC_P2P
tstrWILC_WFIDrv *pstrWFIDrv; tstrWILC_WFIDrv *pstrWFIDrv;
@ -1130,7 +1130,7 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
const u8 *mac_addr, struct key_params *params) const u8 *mac_addr, struct key_params *params)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS, KeyLen = params->key_len; s32 s32Error = WILC_SUCCESS, KeyLen = params->key_len;
u32 i; u32 i;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
const u8 *pu8RxMic = NULL; const u8 *pu8RxMic = NULL;
@ -1424,7 +1424,7 @@ static int WILC_WFI_del_key(struct wiphy *wiphy, struct net_device *netdev,
const u8 *mac_addr) const u8 *mac_addr)
{ {
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
@ -1534,7 +1534,7 @@ static int WILC_WFI_get_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
const u8 *mac_addr, void *cookie, void (*callback)(void *cookie, struct key_params *)) const u8 *mac_addr, void *cookie, void (*callback)(void *cookie, struct key_params *))
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
struct key_params key_params; struct key_params key_params;
@ -1582,7 +1582,7 @@ static int WILC_WFI_get_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
static int WILC_WFI_set_default_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, static int WILC_WFI_set_default_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
bool unicast, bool multicast) bool unicast, bool multicast)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
@ -1610,7 +1610,7 @@ static int WILC_WFI_set_default_key(struct wiphy *wiphy, struct net_device *netd
static int WILC_WFI_dump_survey(struct wiphy *wiphy, struct net_device *netdev, static int WILC_WFI_dump_survey(struct wiphy *wiphy, struct net_device *netdev,
int idx, struct survey_info *info) int idx, struct survey_info *info)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
if (idx != 0) { if (idx != 0) {
@ -1637,7 +1637,7 @@ extern uint32_t Statisitcs_totalAcks, Statisitcs_DroppedAcks;
static int WILC_WFI_get_station(struct wiphy *wiphy, struct net_device *dev, static int WILC_WFI_get_station(struct wiphy *wiphy, struct net_device *dev,
const u8 *mac, struct station_info *sinfo) const u8 *mac, struct station_info *sinfo)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
#ifdef WILC_AP_EXTERNAL_MLME #ifdef WILC_AP_EXTERNAL_MLME
@ -1819,7 +1819,7 @@ static int WILC_WFI_disassoc(struct wiphy *wiphy, struct net_device *dev,
*/ */
static int WILC_WFI_set_wiphy_params(struct wiphy *wiphy, u32 changed) static int WILC_WFI_set_wiphy_params(struct wiphy *wiphy, u32 changed)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
tstrCfgParamVal pstrCfgParamVal; tstrCfgParamVal pstrCfgParamVal;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
@ -1878,7 +1878,7 @@ static int WILC_WFI_set_bitrate_mask(struct wiphy *wiphy,
struct net_device *dev, const u8 *peer, struct net_device *dev, const u8 *peer,
const struct cfg80211_bitrate_mask *mask) const struct cfg80211_bitrate_mask *mask)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
PRINT_D(CFG80211_DBG, "Setting Bitrate mask function\n"); PRINT_D(CFG80211_DBG, "Setting Bitrate mask function\n");
return s32Error; return s32Error;
@ -1900,7 +1900,7 @@ static int WILC_WFI_set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
struct cfg80211_pmksa *pmksa) struct cfg80211_pmksa *pmksa)
{ {
u32 i; u32 i;
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
u8 flag = 0; u8 flag = 0;
struct WILC_WFI_priv *priv = wiphy_priv(wiphy); struct WILC_WFI_priv *priv = wiphy_priv(wiphy);
@ -1952,7 +1952,7 @@ static int WILC_WFI_del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
u32 i; u32 i;
u8 flag = 0; u8 flag = 0;
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv = wiphy_priv(wiphy); struct WILC_WFI_priv *priv = wiphy_priv(wiphy);
@ -2213,7 +2213,7 @@ void WILC_WFI_p2p_rx (struct net_device *dev, uint8_t *buff, uint32_t size)
u32 header, pkt_offset; u32 header, pkt_offset;
tstrWILC_WFIDrv *pstrWFIDrv; tstrWILC_WFIDrv *pstrWFIDrv;
u32 i = 0; u32 i = 0;
WILC_Sint32 s32Freq; s32 s32Freq;
priv = wiphy_priv(dev->ieee80211_ptr->wiphy); priv = wiphy_priv(dev->ieee80211_ptr->wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv;
@ -2413,7 +2413,7 @@ static int WILC_WFI_remain_on_channel(struct wiphy *wiphy,
struct ieee80211_channel *chan, struct ieee80211_channel *chan,
unsigned int duration, u64 *cookie) unsigned int duration, u64 *cookie)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
@ -2464,7 +2464,7 @@ static int WILC_WFI_cancel_remain_on_channel(struct wiphy *wiphy,
struct wireless_dev *wdev, struct wireless_dev *wdev,
u64 cookie) u64 cookie)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
@ -2511,7 +2511,7 @@ int WILC_WFI_mgmt_tx(struct wiphy *wiphy,
const struct ieee80211_mgmt *mgmt; const struct ieee80211_mgmt *mgmt;
struct p2p_mgmt_data *mgmt_tx; struct p2p_mgmt_data *mgmt_tx;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
tstrWILC_WFIDrv *pstrWFIDrv; tstrWILC_WFIDrv *pstrWFIDrv;
u32 i; u32 i;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
@ -2841,7 +2841,7 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic);
static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev, static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev,
enum nl80211_iftype type, u32 *flags, struct vif_params *params) enum nl80211_iftype type, u32 *flags, struct vif_params *params)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
u8 interface_type; u8 interface_type;
@ -3229,7 +3229,7 @@ static int WILC_WFI_start_ap(struct wiphy *wiphy, struct net_device *dev,
{ {
struct cfg80211_beacon_data *beacon = &(settings->beacon); struct cfg80211_beacon_data *beacon = &(settings->beacon);
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
PRINT_D(HOSTAPD_DBG, "Starting ap\n"); PRINT_D(HOSTAPD_DBG, "Starting ap\n");
@ -3277,7 +3277,7 @@ static int WILC_WFI_change_beacon(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_beacon_data *beacon) struct cfg80211_beacon_data *beacon)
{ {
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
PRINT_D(HOSTAPD_DBG, "Setting beacon\n"); PRINT_D(HOSTAPD_DBG, "Setting beacon\n");
@ -3311,7 +3311,7 @@ static int WILC_WFI_change_beacon(struct wiphy *wiphy, struct net_device *dev,
*/ */
static int WILC_WFI_stop_ap(struct wiphy *wiphy, struct net_device *dev) static int WILC_WFI_stop_ap(struct wiphy *wiphy, struct net_device *dev)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
u8 NullBssid[ETH_ALEN] = {0}; u8 NullBssid[ETH_ALEN] = {0};
@ -3351,7 +3351,7 @@ static int WILC_WFI_stop_ap(struct wiphy *wiphy, struct net_device *dev)
static int WILC_WFI_add_station(struct wiphy *wiphy, struct net_device *dev, static int WILC_WFI_add_station(struct wiphy *wiphy, struct net_device *dev,
const u8 *mac, struct station_parameters *params) const u8 *mac, struct station_parameters *params)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
tstrWILC_AddStaParam strStaParams = {{0}}; tstrWILC_AddStaParam strStaParams = {{0}};
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
@ -3437,7 +3437,7 @@ static int WILC_WFI_del_station(struct wiphy *wiphy, struct net_device *dev,
struct station_del_parameters *params) struct station_del_parameters *params)
{ {
const u8 *mac = params->mac; const u8 *mac = params->mac;
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
WILC_NULLCHECK(s32Error, wiphy); WILC_NULLCHECK(s32Error, wiphy);
@ -3482,7 +3482,7 @@ static int WILC_WFI_del_station(struct wiphy *wiphy, struct net_device *dev,
static int WILC_WFI_change_station(struct wiphy *wiphy, struct net_device *dev, static int WILC_WFI_change_station(struct wiphy *wiphy, struct net_device *dev,
const u8 *mac, struct station_parameters *params) const u8 *mac, struct station_parameters *params)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
tstrWILC_AddStaParam strStaParams = {{0}}; tstrWILC_AddStaParam strStaParams = {{0}};
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
@ -3767,7 +3767,7 @@ struct wireless_dev *WILC_WFI_WiphyRegister(struct net_device *net)
{ {
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
struct wireless_dev *wdev; struct wireless_dev *wdev;
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
PRINT_D(CFG80211_DBG, "Registering wifi device\n"); PRINT_D(CFG80211_DBG, "Registering wifi device\n");
@ -3849,7 +3849,7 @@ struct wireless_dev *WILC_WFI_WiphyRegister(struct net_device *net)
int WILC_WFI_InitHostInt(struct net_device *net) int WILC_WFI_InitHostInt(struct net_device *net)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
@ -3890,7 +3890,7 @@ int WILC_WFI_InitHostInt(struct net_device *net)
*/ */
int WILC_WFI_DeInitHostInt(struct net_device *net) int WILC_WFI_DeInitHostInt(struct net_device *net)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
priv = wdev_priv(net->ieee80211_ptr); priv = wdev_priv(net->ieee80211_ptr);