Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 4 年多

通知 15
Star 8
Fork 2
K
kernel_linux
You need to sign in or sign up before continuing.
提交 fb4ec9ca 编写于 作者: C Chaehyun Lim 提交者： Greg Kroah-Hartman
浏览文件
操作

staging: wilc1000: remove WILC_Sint32 

Use s32 instead of WILC_Sint32.
Signed-off-by: NChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 4320f6fe
展开全部 隐藏空白更改
内联 并排
Showing with 359 addition and 360 deletion
drivers/staging/wilc1000/coreconfigsimulator.h
浏览文件 @ fb4ec9ca
...@@ -13,8 +13,8 @@ ...@@ -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
\ No newline at end of file
drivers/staging/wilc1000/coreconfigurator.c
浏览文件 @ fb4ec9ca
...@@ -143,8 +143,8 @@ typedef enum { ...@@ -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 { ...@@ -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) ...@@ -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) ...@@ -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 ...@@ -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) ...@@ -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, ...@@ -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) ...@@ -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_ ...@@ -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) ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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) ...@@ -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) ...@@ -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 ...@@ -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, ...@@ -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 ...@@ -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, ...@@ -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 ...@@ -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) ...@@ -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; ...@@ -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;
......
drivers/staging/wilc1000/coreconfigurator.h
浏览文件 @ fb4ec9ca
...@@ -396,7 +396,7 @@ typedef enum { ...@@ -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 { ...@@ -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);
......
drivers/staging/wilc1000/linux_wlan.c
浏览文件 @ fb4ec9ca
...@@ -2379,7 +2379,7 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd) ...@@ -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;
......
drivers/staging/wilc1000/wilc_errorsupport.h
浏览文件 @ fb4ec9ca
...@@ -37,7 +37,7 @@ ...@@ -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)
......
drivers/staging/wilc1000/wilc_oswrapper.h
浏览文件 @ fb4ec9ca
...@@ -14,7 +14,6 @@ ...@@ -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 */
......
drivers/staging/wilc1000/wilc_strutils.c
浏览文件 @ fb4ec9ca
...@@ -9,7 +9,7 @@ ...@@ -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, ...@@ -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;
......
drivers/staging/wilc1000/wilc_strutils.h
浏览文件 @ fb4ec9ca
...@@ -22,7 +22,7 @@ ...@@ -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, ...@@ -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);
/*! /*!
......
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
浏览文件 @ fb4ec9ca
...@@ -195,19 +195,19 @@ void refresh_scan(void *pUserVoid, uint8_t all, WILC_Bool bDirectScan) ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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, ...@@ -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 ...@@ -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 ...@@ -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, ...@@ -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 ...@@ -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, ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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; ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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) ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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); ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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) ...@@ -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, ...@@ -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, ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或