Skip to content

L
linux
Commit 4e4467fd authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files
Options

staging: wilc1000: remove WILC_Uint32 

Use u32 instead of WILC_Uint32.
Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d85f5326
Expand all Show whitespace changes
Inline Side-by-side
Showing with 321 additions and 322 deletions
drivers/staging/wilc1000/coreconfigurator.c
View file @ 4e4467fd
...@@ -159,9 +159,9 @@ typedef struct { ...@@ -159,9 +159,9 @@ typedef struct {
/* Extern Function Declarations */ /* Extern Function Declarations */
/*****************************************************************************/ /*****************************************************************************/
extern WILC_Sint32 SendRawPacket(WILC_Sint8 *ps8Packet, WILC_Sint32 s32PacketLen); extern WILC_Sint32 SendRawPacket(WILC_Sint8 *ps8Packet, WILC_Sint32 s32PacketLen);
extern void NetworkInfoReceived(u8 *pu8Buffer, WILC_Uint32 u32Length); extern void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length);
extern void GnrlAsyncInfoReceived(u8 *pu8Buffer, WILC_Uint32 u32Length); extern void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length);
extern void host_int_ScanCompleteReceived(u8 *pu8Buffer, WILC_Uint32 u32Length); extern void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length);
/*****************************************************************************/ /*****************************************************************************/
/* Global Variables */ /* Global Variables */
/*****************************************************************************/ /*****************************************************************************/
...@@ -359,8 +359,8 @@ INLINE u16 extract_mac_addr(WILC_Char *str, u8 *buff) ...@@ -359,8 +359,8 @@ INLINE u16 extract_mac_addr(WILC_Char *str, u8 *buff)
/* integers. */ /* integers. */
INLINE void create_mac_addr(u8 *str, u8 *buff) INLINE void create_mac_addr(u8 *str, u8 *buff)
{ {
WILC_Uint32 i = 0; u32 i = 0;
WILC_Uint32 j = 0; u32 j = 0;
for (i = 0; i < MAC_ADDR_LEN; i++) { for (i = 0; i < MAC_ADDR_LEN; i++) {
str[j++] = get_hex_char((u8)((buff[i] >> 4) & 0x0F)); str[j++] = get_hex_char((u8)((buff[i] >> 4) & 0x0F));
...@@ -376,7 +376,7 @@ INLINE void create_mac_addr(u8 *str, u8 *buff) ...@@ -376,7 +376,7 @@ INLINE void create_mac_addr(u8 *str, u8 *buff)
/* inet_addr is platform independent. */ /* inet_addr is platform independent. */
/* ips=>IP Address String in dotted decimal format */ /* ips=>IP Address String in dotted decimal format */
/* ipn=>Pointer to IP Address in integer format */ /* ipn=>Pointer to IP Address in integer format */
INLINE u8 conv_ip_to_int(u8 *ips, WILC_Uint32 *ipn) INLINE u8 conv_ip_to_int(u8 *ips, u32 *ipn)
{ {
u8 i = 0; u8 i = 0;
u8 ipb = 0; u8 ipb = 0;
...@@ -403,7 +403,7 @@ INLINE u8 conv_ip_to_int(u8 *ips, WILC_Uint32 *ipn) ...@@ -403,7 +403,7 @@ INLINE u8 conv_ip_to_int(u8 *ips, WILC_Uint32 *ipn)
/* decimal string format. Alternative to std library fn inet_ntoa(). */ /* decimal string format. Alternative to std library fn inet_ntoa(). */
/* ips=>Buffer to hold IP Address String dotted decimal format (Min 17B) */ /* ips=>Buffer to hold IP Address String dotted decimal format (Min 17B) */
/* ipn=>IP Address in integer format */ /* ipn=>IP Address in integer format */
INLINE u8 conv_int_to_ip(u8 *ips, WILC_Uint32 ipn) INLINE u8 conv_int_to_ip(u8 *ips, u32 ipn)
{ {
u8 i = 0; u8 i = 0;
u8 ipb = 0; u8 ipb = 0;
...@@ -442,7 +442,7 @@ INLINE u8 conv_int_to_ip(u8 *ips, WILC_Uint32 ipn) ...@@ -442,7 +442,7 @@ INLINE u8 conv_int_to_ip(u8 *ips, WILC_Uint32 ipn)
return i; return i;
} }
INLINE tenuWIDtype get_wid_type(WILC_Uint32 wid_num) INLINE tenuWIDtype get_wid_type(u32 wid_num)
{ {
/* Check for iconfig specific WID types first */ /* Check for iconfig specific WID types first */
if ((wid_num == WID_BSSID) || if ((wid_num == WID_BSSID) ||
...@@ -486,10 +486,10 @@ INLINE u16 get_beacon_period(u8 *data) ...@@ -486,10 +486,10 @@ INLINE u16 get_beacon_period(u8 *data)
return bcn_per; return bcn_per;
} }
INLINE WILC_Uint32 get_beacon_timestamp_lo(u8 *data) INLINE u32 get_beacon_timestamp_lo(u8 *data)
{ {
WILC_Uint32 time_stamp = 0; u32 time_stamp = 0;
WILC_Uint32 index = MAC_HDR_LEN; u32 index = MAC_HDR_LEN;
time_stamp |= data[index++]; time_stamp |= data[index++];
time_stamp |= (data[index++] << 8); time_stamp |= (data[index++] << 8);
...@@ -812,8 +812,8 @@ WILC_Sint32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInf ...@@ -812,8 +812,8 @@ WILC_Sint32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInf
u8 *pu8IEs = 0; u8 *pu8IEs = 0;
u16 u16IEsLen = 0; u16 u16IEsLen = 0;
u8 u8index = 0; u8 u8index = 0;
WILC_Uint32 u32Tsf_Lo; u32 u32Tsf_Lo;
WILC_Uint32 u32Tsf_Hi; u32 u32Tsf_Hi;
pstrNetworkInfo = (tstrNetworkInfo *)WILC_MALLOC(sizeof(tstrNetworkInfo)); pstrNetworkInfo = (tstrNetworkInfo *)WILC_MALLOC(sizeof(tstrNetworkInfo));
WILC_memset((void *)(pstrNetworkInfo), 0, sizeof(tstrNetworkInfo)); WILC_memset((void *)(pstrNetworkInfo), 0, sizeof(tstrNetworkInfo));
...@@ -924,7 +924,7 @@ WILC_Sint32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo) ...@@ -924,7 +924,7 @@ WILC_Sint32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo)
* @date 2 Apr 2012 * @date 2 Apr 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 ParseAssocRespInfo(u8 *pu8Buffer, WILC_Uint32 u32BufferLen, WILC_Sint32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
tstrConnectRespInfo **ppstrConnectRespInfo) tstrConnectRespInfo **ppstrConnectRespInfo)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
...@@ -1001,17 +1001,17 @@ WILC_Sint32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo) ...@@ -1001,17 +1001,17 @@ WILC_Sint32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo)
#ifndef CONNECT_DIRECT #ifndef CONNECT_DIRECT
WILC_Sint32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE], WILC_Sint32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE],
wid_site_survey_reslts_s **ppstrSurveyResults, wid_site_survey_reslts_s **ppstrSurveyResults,
WILC_Uint32 *pu32SurveyResultsCount) u32 *pu32SurveyResultsCount)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
wid_site_survey_reslts_s *pstrSurveyResults = NULL; wid_site_survey_reslts_s *pstrSurveyResults = NULL;
WILC_Uint32 u32SurveyResultsCount = 0; u32 u32SurveyResultsCount = 0;
WILC_Uint32 u32SurveyBytesLength = 0; u32 u32SurveyBytesLength = 0;
u8 *pu8BufferPtr; u8 *pu8BufferPtr;
WILC_Uint32 u32RcvdSurveyResultsNum = 2; u32 u32RcvdSurveyResultsNum = 2;
u8 u8ReadSurveyResFragNum; u8 u8ReadSurveyResFragNum;
WILC_Uint32 i; u32 i;
WILC_Uint32 j; u32 j;
for (i = 0; i < u32RcvdSurveyResultsNum; i++) { for (i = 0; i < u32RcvdSurveyResultsNum; i++) {
u32SurveyBytesLength = ppu8RcvdSiteSurveyResults[i][0]; u32SurveyBytesLength = ppu8RcvdSiteSurveyResults[i][0];
...@@ -1208,8 +1208,8 @@ void ProcessShortWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, ...@@ -1208,8 +1208,8 @@ void ProcessShortWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
void ProcessIntWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, void ProcessIntWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
tstrWID *pstrWID, WILC_Sint8 *ps8WidVal) tstrWID *pstrWID, WILC_Sint8 *ps8WidVal)
{ {
WILC_Uint32 *pu32val = (WILC_Uint32 *)ps8WidVal; u32 *pu32val = (u32 *)ps8WidVal;
WILC_Uint32 u32val = 0; u32 u32val = 0;
WILC_Sint32 s32PktLen = *ps32PktLen; WILC_Sint32 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);
...@@ -1224,7 +1224,7 @@ void ProcessIntWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, ...@@ -1224,7 +1224,7 @@ void ProcessIntWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
u32val = *pu32val; u32val = *pu32val;
/* Length */ /* Length */
pcPacket[s32PktLen++] = sizeof(WILC_Uint32); pcPacket[s32PktLen++] = sizeof(u32);
/* Value */ /* Value */
pcPacket[s32PktLen++] = (u8)(u32val & 0xFF); pcPacket[s32PktLen++] = (u8)(u32val & 0xFF);
...@@ -1266,7 +1266,7 @@ void ProcessIntWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, ...@@ -1266,7 +1266,7 @@ void ProcessIntWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
void ProcessIPwid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, void ProcessIPwid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
tstrWID *pstrWID, u8 *pu8ip) tstrWID *pstrWID, u8 *pu8ip)
{ {
WILC_Uint32 u32val = 0; u32 u32val = 0;
WILC_Sint32 s32PktLen = *ps32PktLen; WILC_Sint32 s32PktLen = *ps32PktLen;
if (pstrWID == NULL) { if (pstrWID == NULL) {
...@@ -1280,7 +1280,7 @@ void ProcessIPwid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, ...@@ -1280,7 +1280,7 @@ void ProcessIPwid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
if (g_oper_mode == SET_CFG) { if (g_oper_mode == SET_CFG) {
/* Length */ /* Length */
pcPacket[s32PktLen++] = sizeof(WILC_Uint32); pcPacket[s32PktLen++] = sizeof(u32);
/* Convert the IP Address String to Integer */ /* Convert the IP Address String to Integer */
conv_ip_to_int(pu8ip, &u32val); conv_ip_to_int(pu8ip, &u32val);
...@@ -1521,14 +1521,14 @@ WILC_Sint32 further_process_response(u8 *resp, ...@@ -1521,14 +1521,14 @@ WILC_Sint32 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,
WILC_Uint32 cnt, u32 cnt,
tstrWID *pstrWIDresult) tstrWID *pstrWIDresult)
{ {
WILC_Uint32 retval = 0; u32 retval = 0;
WILC_Uint32 idx = 0; u32 idx = 0;
u8 cfg_chr = 0; u8 cfg_chr = 0;
u16 cfg_sht = 0; u16 cfg_sht = 0;
WILC_Uint32 cfg_int = 0; u32 cfg_int = 0;
u8 cfg_str[256] = {0}; u8 cfg_str[256] = {0};
tenuWIDtype enuWIDtype = WID_UNDEF; tenuWIDtype enuWIDtype = WID_UNDEF;
...@@ -1558,7 +1558,7 @@ WILC_Sint32 further_process_response(u8 *resp, ...@@ -1558,7 +1558,7 @@ WILC_Sint32 further_process_response(u8 *resp,
case WID_INT: case WID_INT:
{ {
WILC_Uint32 *pu32val = (WILC_Uint32 *)(pstrWIDresult->ps8WidVal); u32 *pu32val = (u32 *)(pstrWIDresult->ps8WidVal);
cfg_int = MAKE_WORD32( cfg_int = MAKE_WORD32(
MAKE_WORD16(resp[idx], resp[idx + 1]), MAKE_WORD16(resp[idx], resp[idx + 1]),
MAKE_WORD16(resp[idx + 2], resp[idx + 3]) MAKE_WORD16(resp[idx + 2], resp[idx + 3])
...@@ -1694,9 +1694,9 @@ WILC_Sint32 ParseResponse(u8 *resp, tstrWID *pstrWIDcfgResult) ...@@ -1694,9 +1694,9 @@ WILC_Sint32 ParseResponse(u8 *resp, tstrWID *pstrWIDcfgResult)
u16 cfg_len = 0; u16 cfg_len = 0;
tenuWIDtype enuWIDtype = WID_UNDEF; tenuWIDtype enuWIDtype = WID_UNDEF;
WILC_Bool num_wid_processed = WILC_FALSE; WILC_Bool num_wid_processed = WILC_FALSE;
WILC_Uint32 cnt = 0; u32 cnt = 0;
WILC_Uint32 idx = 0; u32 idx = 0;
WILC_Uint32 ResCnt = 0; u32 ResCnt = 0;
/* Check whether the received frame is a valid response */ /* Check whether the received frame is a valid response */
if (RESP_MSG_TYPE != resp[0]) { if (RESP_MSG_TYPE != resp[0]) {
PRINT_INFO(CORECONFIG_DBG, "Received Message format incorrect.\n"); PRINT_INFO(CORECONFIG_DBG, "Received Message format incorrect.\n");
...@@ -1858,10 +1858,10 @@ WILC_Sint32 CreatePacketHeader(WILC_Char *pcpacket, WILC_Sint32 *ps32PacketLengt ...@@ -1858,10 +1858,10 @@ WILC_Sint32 CreatePacketHeader(WILC_Char *pcpacket, WILC_Sint32 *ps32PacketLengt
*/ */
WILC_Sint32 CreateConfigPacket(WILC_Sint8 *ps8packet, WILC_Sint32 *ps32PacketLength, WILC_Sint32 CreateConfigPacket(WILC_Sint8 *ps8packet, WILC_Sint32 *ps32PacketLength,
tstrWID *pstrWIDs, WILC_Uint32 u32WIDsCount) tstrWID *pstrWIDs, u32 u32WIDsCount)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
WILC_Uint32 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++) {
switch (pstrWIDs[u32idx].enuWIDtype) { switch (pstrWIDs[u32idx].enuWIDtype) {
...@@ -1950,7 +1950,7 @@ WILC_Sint32 ConfigWaitResponse(WILC_Char *pcRespBuffer, WILC_Sint32 s32MaxRespBu ...@@ -1950,7 +1950,7 @@ WILC_Sint32 ConfigWaitResponse(WILC_Char *pcRespBuffer, WILC_Sint32 s32MaxRespBu
*/ */
#ifdef SIMULATION #ifdef SIMULATION
WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs, WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
WILC_Uint32 u32WIDsCount, WILC_Bool bRespRequired, WILC_Uint32 drvHandler) u32 u32WIDsCount, WILC_Bool bRespRequired, u32 drvHandler)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
WILC_Sint32 err = WILC_SUCCESS; WILC_Sint32 err = WILC_SUCCESS;
...@@ -2129,7 +2129,7 @@ extern wilc_wlan_oup_t *gpstrWlanOps; ...@@ -2129,7 +2129,7 @@ extern wilc_wlan_oup_t *gpstrWlanOps;
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs, WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
WILC_Uint32 u32WIDsCount, WILC_Bool bRespRequired, WILC_Uint32 drvHandler) u32 u32WIDsCount, WILC_Bool bRespRequired, u32 drvHandler)
{ {
WILC_Sint32 counter = 0, ret = 0; WILC_Sint32 counter = 0, ret = 0;
if (gpstrWlanOps == NULL) { if (gpstrWlanOps == NULL) {
......
drivers/staging/wilc1000/coreconfigurator.h
View file @ 4e4467fd
...@@ -66,7 +66,7 @@ extern u16 g_num_total_switches; ...@@ -66,7 +66,7 @@ extern u16 g_num_total_switches;
/* Function Macros */ /* Function Macros */
/*****************************************************************************/ /*****************************************************************************/
#define MAKE_WORD16(lsb, msb) ((((u16)(msb) << 8) & 0xFF00) | (lsb)) #define MAKE_WORD16(lsb, msb) ((((u16)(msb) << 8) & 0xFF00) | (lsb))
#define MAKE_WORD32(lsw, msw) ((((WILC_Uint32)(msw) << 16) & 0xFFFF0000) | (lsw)) #define MAKE_WORD32(lsw, msw) ((((u32)(msw) << 16) & 0xFFFF0000) | (lsw))
/*****************************************************************************/ /*****************************************************************************/
...@@ -423,7 +423,7 @@ typedef struct { ...@@ -423,7 +423,7 @@ typedef struct {
u8 u8Found; u8 u8Found;
#endif #endif
#ifdef WILC_P2P #ifdef WILC_P2P
WILC_Uint32 u32Tsf; /* time-stamp [Low only 32 bit] */ u32 u32Tsf; /* time-stamp [Low only 32 bit] */
#endif #endif
u8 *pu8IEs; u8 *pu8IEs;
u16 u16IEsLen; u16 u16IEsLen;
...@@ -476,23 +476,23 @@ extern WILC_Sint32 CoreConfiguratorInit(void); ...@@ -476,23 +476,23 @@ extern WILC_Sint32 CoreConfiguratorInit(void);
extern WILC_Sint32 CoreConfiguratorDeInit(void); extern WILC_Sint32 CoreConfiguratorDeInit(void);
extern WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs, extern WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
WILC_Uint32 u32WIDsCount, WILC_Bool bRespRequired, WILC_Uint32 drvHandler); u32 u32WIDsCount, WILC_Bool bRespRequired, u32 drvHandler);
extern WILC_Sint32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo); extern WILC_Sint32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo);
extern WILC_Sint32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo); extern WILC_Sint32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo);
extern WILC_Sint32 ParseAssocRespInfo(u8 *pu8Buffer, WILC_Uint32 u32BufferLen, extern WILC_Sint32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
tstrConnectRespInfo **ppstrConnectRespInfo); tstrConnectRespInfo **ppstrConnectRespInfo);
extern WILC_Sint32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo); extern WILC_Sint32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo);
#ifndef CONNECT_DIRECT #ifndef CONNECT_DIRECT
extern WILC_Sint32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE], extern WILC_Sint32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE],
wid_site_survey_reslts_s **ppstrSurveyResults, WILC_Uint32 *pu32SurveyResultsCount); wid_site_survey_reslts_s **ppstrSurveyResults, u32 *pu32SurveyResultsCount);
extern WILC_Sint32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults); extern WILC_Sint32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults);
#endif #endif
extern WILC_Sint32 SendRawPacket(WILC_Sint8 *pspacket, WILC_Sint32 s32PacketLen); extern WILC_Sint32 SendRawPacket(WILC_Sint8 *pspacket, WILC_Sint32 s32PacketLen);
extern void NetworkInfoReceived(u8 *pu8Buffer, WILC_Uint32 u32Length); extern void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length);
void GnrlAsyncInfoReceived(u8 *pu8Buffer, WILC_Uint32 u32Length); void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length);
void host_int_ScanCompleteReceived(u8 *pu8Buffer, WILC_Uint32 u32Length); void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length);
#endif #endif
drivers/staging/wilc1000/fifo_buffer.c
View file @ 4e4467fd
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
WILC_Uint32 FIFO_InitBuffer(tHANDLE *hBuffer, WILC_Uint32 u32BufferLength) u32 FIFO_InitBuffer(tHANDLE *hBuffer, u32 u32BufferLength)
{ {
WILC_Uint32 u32Error = 0; u32 u32Error = 0;
tstrFifoHandler *pstrFifoHandler = WILC_MALLOC (sizeof (tstrFifoHandler)); tstrFifoHandler *pstrFifoHandler = WILC_MALLOC (sizeof (tstrFifoHandler));
if (pstrFifoHandler) { if (pstrFifoHandler) {
WILC_memset (pstrFifoHandler, 0, sizeof (tstrFifoHandler)); WILC_memset (pstrFifoHandler, 0, sizeof (tstrFifoHandler));
...@@ -27,9 +27,9 @@ WILC_Uint32 FIFO_InitBuffer(tHANDLE *hBuffer, WILC_Uint32 u32BufferLength) ...@@ -27,9 +27,9 @@ WILC_Uint32 FIFO_InitBuffer(tHANDLE *hBuffer, WILC_Uint32 u32BufferLength)
} }
return u32Error; return u32Error;
} }
WILC_Uint32 FIFO_DeInit(tHANDLE hFifo) u32 FIFO_DeInit(tHANDLE hFifo)
{ {
WILC_Uint32 u32Error = 0; u32 u32Error = 0;
tstrFifoHandler *pstrFifoHandler = (tstrFifoHandler *) hFifo; tstrFifoHandler *pstrFifoHandler = (tstrFifoHandler *) hFifo;
if (pstrFifoHandler) { if (pstrFifoHandler) {
if (pstrFifoHandler->pu8Buffer) { if (pstrFifoHandler->pu8Buffer) {
...@@ -45,9 +45,9 @@ WILC_Uint32 FIFO_DeInit(tHANDLE hFifo) ...@@ -45,9 +45,9 @@ WILC_Uint32 FIFO_DeInit(tHANDLE hFifo)
return u32Error; return u32Error;
} }
WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, u8 *pu8Buffer, WILC_Uint32 u32BytesToRead, WILC_Uint32 *pu32BytesRead) u32 FIFO_ReadBytes(tHANDLE hFifo, u8 *pu8Buffer, u32 u32BytesToRead, u32 *pu32BytesRead)
{ {
WILC_Uint32 u32Error = 0; u32 u32Error = 0;
tstrFifoHandler *pstrFifoHandler = (tstrFifoHandler *) hFifo; tstrFifoHandler *pstrFifoHandler = (tstrFifoHandler *) hFifo;
if (pstrFifoHandler && pu32BytesRead) { if (pstrFifoHandler && pu32BytesRead) {
if (pstrFifoHandler->u32TotalBytes) { if (pstrFifoHandler->u32TotalBytes) {
...@@ -66,7 +66,7 @@ WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, u8 *pu8Buffer, WILC_Uint32 u32BytesToR ...@@ -66,7 +66,7 @@ WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, u8 *pu8Buffer, WILC_Uint32 u32BytesToR
pstrFifoHandler->u32TotalBytes -= u32BytesToRead; pstrFifoHandler->u32TotalBytes -= u32BytesToRead;
} else { } else {
WILC_Uint32 u32FirstPart = u32 u32FirstPart =
pstrFifoHandler->u32BufferLength - pstrFifoHandler->u32ReadOffset; pstrFifoHandler->u32BufferLength - pstrFifoHandler->u32ReadOffset;
WILC_memcpy(pu8Buffer, pstrFifoHandler->pu8Buffer + pstrFifoHandler->u32ReadOffset, WILC_memcpy(pu8Buffer, pstrFifoHandler->pu8Buffer + pstrFifoHandler->u32ReadOffset,
u32FirstPart); u32FirstPart);
...@@ -86,9 +86,9 @@ WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, u8 *pu8Buffer, WILC_Uint32 u32BytesToR ...@@ -86,9 +86,9 @@ WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, u8 *pu8Buffer, WILC_Uint32 u32BytesToR
return u32Error; return u32Error;
} }
WILC_Uint32 FIFO_WriteBytes(tHANDLE hFifo, u8 *pu8Buffer, WILC_Uint32 u32BytesToWrite, WILC_Bool bForceOverWrite) u32 FIFO_WriteBytes(tHANDLE hFifo, u8 *pu8Buffer, u32 u32BytesToWrite, WILC_Bool bForceOverWrite)
{ {
WILC_Uint32 u32Error = 0; u32 u32Error = 0;
tstrFifoHandler *pstrFifoHandler = (tstrFifoHandler *) hFifo; tstrFifoHandler *pstrFifoHandler = (tstrFifoHandler *) hFifo;
if (pstrFifoHandler) { if (pstrFifoHandler) {
if (u32BytesToWrite < pstrFifoHandler->u32BufferLength) { if (u32BytesToWrite < pstrFifoHandler->u32BufferLength) {
...@@ -103,7 +103,7 @@ WILC_Uint32 FIFO_WriteBytes(tHANDLE hFifo, u8 *pu8Buffer, WILC_Uint32 u32BytesTo ...@@ -103,7 +103,7 @@ WILC_Uint32 FIFO_WriteBytes(tHANDLE hFifo, u8 *pu8Buffer, WILC_Uint32 u32BytesTo
pstrFifoHandler->u32TotalBytes += u32BytesToWrite; pstrFifoHandler->u32TotalBytes += u32BytesToWrite;
} else { } else {
WILC_Uint32 u32FirstPart = u32 u32FirstPart =
pstrFifoHandler->u32BufferLength - pstrFifoHandler->u32WriteOffset; pstrFifoHandler->u32BufferLength - pstrFifoHandler->u32WriteOffset;
WILC_memcpy(pstrFifoHandler->pu8Buffer + pstrFifoHandler->u32WriteOffset, pu8Buffer, WILC_memcpy(pstrFifoHandler->pu8Buffer + pstrFifoHandler->u32WriteOffset, pu8Buffer,
u32FirstPart); u32FirstPart);
......
drivers/staging/wilc1000/fifo_buffer.h
View file @ 4e4467fd
...@@ -6,18 +6,18 @@ ...@@ -6,18 +6,18 @@
typedef struct { typedef struct {
u8 *pu8Buffer; u8 *pu8Buffer;
WILC_Uint32 u32BufferLength; u32 u32BufferLength;
WILC_Uint32 u32WriteOffset; u32 u32WriteOffset;
WILC_Uint32 u32ReadOffset; u32 u32ReadOffset;
WILC_Uint32 u32TotalBytes; u32 u32TotalBytes;
struct semaphore SemBuffer; struct semaphore SemBuffer;
} tstrFifoHandler; } tstrFifoHandler;
extern WILC_Uint32 FIFO_InitBuffer(tHANDLE *hBuffer, extern u32 FIFO_InitBuffer(tHANDLE *hBuffer,
WILC_Uint32 u32BufferLength); u32 u32BufferLength);
extern WILC_Uint32 FIFO_DeInit(tHANDLE hFifo); extern u32 FIFO_DeInit(tHANDLE hFifo);
extern WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, u8 *pu8Buffer, extern u32 FIFO_ReadBytes(tHANDLE hFifo, u8 *pu8Buffer,
WILC_Uint32 u32BytesToRead, WILC_Uint32 *pu32BytesRead); u32 u32BytesToRead, u32 *pu32BytesRead);
extern WILC_Uint32 FIFO_WriteBytes(tHANDLE hFifo, u8 *pu8Buffer, extern u32 FIFO_WriteBytes(tHANDLE hFifo, u8 *pu8Buffer,
WILC_Uint32 u32BytesToWrite, WILC_Bool bForceOverWrite); u32 u32BytesToWrite, WILC_Bool bForceOverWrite);
drivers/staging/wilc1000/host_interface.c
View file @ 4e4467fd
This diff is collapsed.
drivers/staging/wilc1000/host_interface.h
View file @ 4e4467fd
...@@ -62,9 +62,9 @@ ...@@ -62,9 +62,9 @@
#define IP_ALEN 4 #define IP_ALEN 4
#define BIT2 ((WILC_Uint32)(1 << 2)) #define BIT2 ((u32)(1 << 2))
#define BIT1 ((WILC_Uint32)(1 << 1)) #define BIT1 ((u32)(1 << 1))
#define BIT0 ((WILC_Uint32)(1 << 0)) #define BIT0 ((u32)(1 << 0))
#define AP_MODE 0x01 #define AP_MODE 0x01
#define STATION_MODE 0x02 #define STATION_MODE 0x02
...@@ -134,9 +134,9 @@ typedef struct { ...@@ -134,9 +134,9 @@ typedef struct {
typedef struct _tstrStatistics { typedef struct _tstrStatistics {
u8 u8LinkSpeed; u8 u8LinkSpeed;
WILC_Sint8 s8RSSI; WILC_Sint8 s8RSSI;
WILC_Uint32 u32TxCount; u32 u32TxCount;
WILC_Uint32 u32RxCount; u32 u32RxCount;
WILC_Uint32 u32TxFailureCount; u32 u32TxFailureCount;
} tstrStatistics; } tstrStatistics;
...@@ -189,7 +189,7 @@ typedef enum { ...@@ -189,7 +189,7 @@ typedef enum {
} CURRENT_TX_RATE_T; } CURRENT_TX_RATE_T;
typedef struct { typedef struct {
WILC_Uint32 u32SetCfgFlag; u32 u32SetCfgFlag;
u8 ht_enable; u8 ht_enable;
u8 bss_type; u8 bss_type;
u8 auth_type; u8 auth_type;
...@@ -271,11 +271,11 @@ typedef void (*tWILCpfConnectResult)(tenuConnDisconnEvent, ...@@ -271,11 +271,11 @@ typedef void (*tWILCpfConnectResult)(tenuConnDisconnEvent,
void *); void *);
#ifdef WILC_P2P #ifdef WILC_P2P
typedef void (*tWILCpfRemainOnChanExpired)(void *, WILC_Uint32); /*Remain on channel expiration callback function*/ typedef void (*tWILCpfRemainOnChanExpired)(void *, u32); /*Remain on channel expiration callback function*/
typedef void (*tWILCpfRemainOnChanReady)(void *); /*Remain on channel callback function*/ typedef void (*tWILCpfRemainOnChanReady)(void *); /*Remain on channel callback function*/
#endif #endif
/* typedef WILC_Uint32 WILC_WFIDrvHandle; */ /* typedef u32 WILC_WFIDrvHandle; */
typedef struct { typedef struct {
WILC_Sint32 s32Dummy; WILC_Sint32 s32Dummy;
} *WILC_WFIDrvHandle; } *WILC_WFIDrvHandle;
...@@ -292,7 +292,7 @@ typedef struct { ...@@ -292,7 +292,7 @@ typedef struct {
*/ */
typedef struct _tstrRcvdNetworkInfo { typedef struct _tstrRcvdNetworkInfo {
u8 *pu8Buffer; u8 *pu8Buffer;
WILC_Uint32 u32Length; u32 u32Length;
} tstrRcvdNetworkInfo; } tstrRcvdNetworkInfo;
/*BugID_4156*/ /*BugID_4156*/
...@@ -316,7 +316,7 @@ typedef struct { ...@@ -316,7 +316,7 @@ typedef struct {
/* User specific parameter to be delivered through the Scan User Callback function */ /* User specific parameter to be delivered through the Scan User Callback function */
void *u32UserScanPvoid; void *u32UserScanPvoid;
WILC_Uint32 u32RcvdChCount; u32 u32RcvdChCount;
tstrFoundNetworkInfo astrFoundNetworkInfo[MAX_NUM_SCANNED_NETWORKS]; tstrFoundNetworkInfo astrFoundNetworkInfo[MAX_NUM_SCANNED_NETWORKS];
} tstrWILC_UsrScanReq; } tstrWILC_UsrScanReq;
...@@ -336,11 +336,11 @@ typedef struct { ...@@ -336,11 +336,11 @@ typedef struct {
} tstrWILC_UsrConnReq; } tstrWILC_UsrConnReq;
typedef struct { typedef struct {
WILC_Uint32 u32Address; u32 u32Address;
} tstrHostIfSetDrvHandler; } tstrHostIfSetDrvHandler;
typedef struct { typedef struct {
WILC_Uint32 u32Mode; u32 u32Mode;
} tstrHostIfSetOperationMode; } tstrHostIfSetOperationMode;
/*BugID_5077*/ /*BugID_5077*/
...@@ -364,11 +364,11 @@ typedef struct { ...@@ -364,11 +364,11 @@ typedef struct {
#ifdef WILC_P2P #ifdef WILC_P2P
typedef struct { typedef struct {
u16 u16Channel; u16 u16Channel;
WILC_Uint32 u32duration; u32 u32duration;
tWILCpfRemainOnChanExpired pRemainOnChanExpired; tWILCpfRemainOnChanExpired pRemainOnChanExpired;
tWILCpfRemainOnChanReady pRemainOnChanReady; tWILCpfRemainOnChanReady pRemainOnChanReady;
void *pVoid; void *pVoid;
WILC_Uint32 u32ListenSessionID; u32 u32ListenSessionID;
} tstrHostIfRemainOnChan; } tstrHostIfRemainOnChan;
typedef struct { typedef struct {
...@@ -415,7 +415,7 @@ typedef struct { ...@@ -415,7 +415,7 @@ typedef struct {
/* WILC_Bool bPendingConnRequest; */ /* WILC_Bool bPendingConnRequest; */
#ifndef CONNECT_DIRECT #ifndef CONNECT_DIRECT
WILC_Uint32 u32SurveyResultsCount; u32 u32SurveyResultsCount;
wid_site_survey_reslts_s astrSurveyResults[MAX_NUM_SCANNED_NETWORKS]; wid_site_survey_reslts_s astrSurveyResults[MAX_NUM_SCANNED_NETWORKS];
#endif #endif
...@@ -470,7 +470,7 @@ typedef struct { ...@@ -470,7 +470,7 @@ typedef struct {
u8 u8AmpduParams; u8 u8AmpduParams;
u8 au8SuppMCsSet[16]; u8 au8SuppMCsSet[16];
u16 u16HTExtParams; u16 u16HTExtParams;
WILC_Uint32 u32TxBeamformingCap; u32 u32TxBeamformingCap;
u8 u8ASELCap; u8 u8ASELCap;
u16 u16FlagsMask; /*<! Determines which of u16FlagsSet were changed>*/ u16 u16FlagsMask; /*<! Determines which of u16FlagsSet were changed>*/
u16 u16FlagsSet; /*<! Decoded according to tenuWILC_StaFlag */ u16 u16FlagsSet; /*<! Decoded according to tenuWILC_StaFlag */
...@@ -593,7 +593,7 @@ WILC_Sint32 host_int_add_ptk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8Ptk, u8 u8P ...@@ -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, WILC_Uint32 *pu32InactiveTime); WILC_Sint32 host_int_get_inactive_time(WILC_WFIDrvHandle hWFIDrv, const u8 *mac, u32 *pu32InactiveTime);
/** /**
* @brief adds Rx GTk Key * @brief adds Rx GTk Key
...@@ -612,7 +612,7 @@ WILC_Sint32 host_int_get_inactive_time(WILC_WFIDrvHandle hWFIDrv, const u8 *mac, ...@@ -612,7 +612,7 @@ WILC_Sint32 host_int_get_inactive_time(WILC_WFIDrvHandle hWFIDrv, const u8 *mac,
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKeylen, WILC_Sint32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKeylen,
u8 u8KeyIdx, WILC_Uint32 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);
...@@ -680,7 +680,7 @@ WILC_Sint32 host_int_set_pmkid_info(WILC_WFIDrvHandle hWFIDrv, tstrHostIFpmkidAt ...@@ -680,7 +680,7 @@ WILC_Sint32 host_int_set_pmkid_info(WILC_WFIDrvHandle hWFIDrv, tstrHostIFpmkidAt
*/ */
WILC_Sint32 host_int_get_pmkid_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PmkidInfoArray, WILC_Sint32 host_int_get_pmkid_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PmkidInfoArray,
WILC_Uint32 u32PmkidInfoLen); u32 u32PmkidInfoLen);
/** /**
* @brief sets the pass phrase * @brief sets the pass phrase
...@@ -786,7 +786,7 @@ WILC_Sint32 host_int_wait_msg_queue_idle(void); ...@@ -786,7 +786,7 @@ WILC_Sint32 host_int_wait_msg_queue_idle(void);
#ifndef CONNECT_DIRECT #ifndef CONNECT_DIRECT
WILC_Sint32 host_int_get_site_survey_results(WILC_WFIDrvHandle hWFIDrv, WILC_Sint32 host_int_get_site_survey_results(WILC_WFIDrvHandle hWFIDrv,
u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE], u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE],
WILC_Uint32 u32MaxSiteSrvyFragLen); u32 u32MaxSiteSrvyFragLen);
#endif #endif
/** /**
...@@ -910,7 +910,7 @@ WILC_Sint32 host_int_disconnect_station(WILC_WFIDrvHandle hWFIDrv, u8 assoc_id); ...@@ -910,7 +910,7 @@ WILC_Sint32 host_int_disconnect_station(WILC_WFIDrvHandle hWFIDrv, u8 assoc_id);
*/ */
WILC_Sint32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocReqInfo, WILC_Sint32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocReqInfo,
WILC_Uint32 u32AssocReqInfoLen); u32 u32AssocReqInfoLen);
/** /**
* @brief gets a Association Response info * @brief gets a Association Response info
* @details * @details
...@@ -924,7 +924,7 @@ WILC_Sint32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocR ...@@ -924,7 +924,7 @@ WILC_Sint32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocR
*/ */
WILC_Sint32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocRespInfo, WILC_Sint32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocRespInfo,
WILC_Uint32 u32MaxAssocRespInfoLen, WILC_Uint32 *pu32RcvdAssocRespInfoLen); u32 u32MaxAssocRespInfoLen, u32 *pu32RcvdAssocRespInfoLen);
/** /**
* @brief gets a Association Response info * @brief gets a Association Response info
* @details Valid only in STA mode. This function gives the RSSI * @details Valid only in STA mode. This function gives the RSSI
...@@ -941,7 +941,7 @@ WILC_Sint32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocR ...@@ -941,7 +941,7 @@ WILC_Sint32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocR
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_rx_power_level(WILC_WFIDrvHandle hWFIDrv, u8 *pu8RxPowerLevel, WILC_Sint32 host_int_get_rx_power_level(WILC_WFIDrvHandle hWFIDrv, u8 *pu8RxPowerLevel,
WILC_Uint32 u32RxPowerLevelLen); u32 u32RxPowerLevelLen);
/** /**
* @brief sets a channel * @brief sets a channel
...@@ -1121,10 +1121,10 @@ WILC_Sint32 host_int_deinit(WILC_WFIDrvHandle hWFIDrv); ...@@ -1121,10 +1121,10 @@ 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, WILC_Uint32 u32Interval, WILC_Sint32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv, u32 u32Interval,
WILC_Uint32 u32DTIMPeriod, u32 u32DTIMPeriod,
WILC_Uint32 u32HeadLen, u8 *pu8Head, u32 u32HeadLen, u8 *pu8Head,
WILC_Uint32 u32TailLen, u8 *pu8tail); u32 u32TailLen, u8 *pu8tail);
/*! /*!
...@@ -1202,7 +1202,7 @@ WILC_Sint32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8MacAddr ...@@ -1202,7 +1202,7 @@ WILC_Sint32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8MacAddr
WILC_Sint32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam *pstrStaParams); WILC_Sint32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam *pstrStaParams);
/*! /*!
* @fn WILC_Sint32 host_int_set_power_mgmt(WILC_WFIDrvHandle hWFIDrv, WILC_Bool bIsEnabled, WILC_Uint32 u32Timeout) * @fn WILC_Sint32 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 ...@@ -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, WILC_Uint32 u32Timeout); WILC_Sint32 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 ...@@ -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, WILC_Uint32 u32count); WILC_Sint32 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
...@@ -1285,7 +1285,7 @@ WILC_Sint32 host_int_get_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8IPAddr, u8 ...@@ -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, WILC_Uint32 u32SessionID, WILC_Uint32 u32duration, u16 chan, tWILCpfRemainOnChanExpired RemainOnChanExpired, tWILCpfRemainOnChanReady RemainOnChanReady, void *pvUserArg); WILC_Sint32 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, WILC_Uint32 u3 ...@@ -1301,7 +1301,7 @@ WILC_Sint32 host_int_remain_on_channel(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u3
* @date * @date
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_ListenStateExpired(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u32SessionID); WILC_Sint32 host_int_ListenStateExpired(WILC_WFIDrvHandle hWFIDrv, u32 u32SessionID);
/** /**
* @brief host_int_frame_register * @brief host_int_frame_register
...@@ -1323,8 +1323,8 @@ WILC_Sint32 host_int_frame_register(WILC_WFIDrvHandle hWFIDrv, u16 u16FrameType, ...@@ -1323,8 +1323,8 @@ 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(WILC_Uint32 u32address); WILC_Sint32 host_int_set_wfi_drv_handler(u32 u32address);
WILC_Sint32 host_int_set_operation_mode(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u32mode); WILC_Sint32 host_int_set_operation_mode(WILC_WFIDrvHandle hWFIDrv, u32 u32mode);
static WILC_Sint32 Handle_ScanDone(void *drvHandler, tenuScanEvent enuEvent); static WILC_Sint32 Handle_ScanDone(void *drvHandler, tenuScanEvent enuEvent);
......
drivers/staging/wilc1000/linux_mon.c
View file @ 4e4467fd
...@@ -299,7 +299,7 @@ static netdev_tx_t WILC_WFI_mon_xmit(struct sk_buff *skb, ...@@ -299,7 +299,7 @@ static netdev_tx_t WILC_WFI_mon_xmit(struct sk_buff *skb,
struct net_device *dev) struct net_device *dev)
{ {
struct ieee80211_radiotap_header *rtap_hdr; struct ieee80211_radiotap_header *rtap_hdr;
WILC_Uint32 rtap_len, i, ret = 0; u32 rtap_len, i, ret = 0;
struct WILC_WFI_mon_priv *mon_priv; struct WILC_WFI_mon_priv *mon_priv;
struct sk_buff *skb2; struct sk_buff *skb2;
...@@ -526,7 +526,7 @@ struct net_device *WILC_WFI_init_mon_interface(const char *name, struct net_devi ...@@ -526,7 +526,7 @@ struct net_device *WILC_WFI_init_mon_interface(const char *name, struct net_devi
{ {
WILC_Uint32 ret = WILC_SUCCESS; u32 ret = WILC_SUCCESS;
struct WILC_WFI_mon_priv *priv; struct WILC_WFI_mon_priv *priv;
/*If monitor interface is already initialized, return it*/ /*If monitor interface is already initialized, return it*/
......
drivers/staging/wilc1000/linux_wlan.c
View file @ 4e4467fd
...@@ -561,7 +561,7 @@ static void deinit_irq(linux_wlan_t *nic) ...@@ -561,7 +561,7 @@ static void deinit_irq(linux_wlan_t *nic)
static void linux_wlan_msleep(uint32_t msc) static void linux_wlan_msleep(uint32_t msc)
{ {
if (msc <= 4000000) { if (msc <= 4000000) {
WILC_Uint32 u32Temp = msc * 1000; u32 u32Temp = msc * 1000;
usleep_range(u32Temp, u32Temp); usleep_range(u32Temp, u32Temp);
} else { } else {
msleep(msc); msleep(msc);
...@@ -634,7 +634,7 @@ static void linux_wlan_lock(void *vp) ...@@ -634,7 +634,7 @@ static void linux_wlan_lock(void *vp)
} }
} }
static int linux_wlan_lock_timeout(void *vp, WILC_Uint32 timeout) static int linux_wlan_lock_timeout(void *vp, u32 timeout)
{ {
int error = -1; int error = -1;
PRINT_D(LOCK_DBG, "Locking %p\n", vp); PRINT_D(LOCK_DBG, "Locking %p\n", vp);
...@@ -1124,7 +1124,7 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n ...@@ -1124,7 +1124,7 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n
goto _fail_; goto _fail_;
} }
*(int *)c_val = (WILC_Uint32)pstrWFIDrv; *(int *)c_val = (u32)pstrWFIDrv;
if (!g_linux_wlan->oup.wlan_cfg_set(1, WID_SET_DRV_HANDLER, c_val, 4, 0, 0)) if (!g_linux_wlan->oup.wlan_cfg_set(1, WID_SET_DRV_HANDLER, c_val, 4, 0, 0))
goto _fail_; goto _fail_;
...@@ -1364,7 +1364,7 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n ...@@ -1364,7 +1364,7 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n
goto _fail_; goto _fail_;
c_val[0] = 1; /* Enable N with immediate block ack. */ c_val[0] = 1; /* Enable N with immediate block ack. */
if (!g_linux_wlan->oup.wlan_cfg_set(0, WID_11N_IMMEDIATE_BA_ENABLED, c_val, 1, 1, (WILC_Uint32)pstrWFIDrv)) if (!g_linux_wlan->oup.wlan_cfg_set(0, WID_11N_IMMEDIATE_BA_ENABLED, c_val, 1, 1, (u32)pstrWFIDrv))
goto _fail_; goto _fail_;
return 0; return 0;
...@@ -2100,7 +2100,7 @@ int mac_open(struct net_device *ndev) ...@@ -2100,7 +2100,7 @@ int mac_open(struct net_device *ndev)
for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) { for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {
if (ndev == g_linux_wlan->strInterfaceInfo[i].wilc_netdev) { if (ndev == g_linux_wlan->strInterfaceInfo[i].wilc_netdev) {
memcpy(g_linux_wlan->strInterfaceInfo[i].aSrcAddress, mac_add, ETH_ALEN); memcpy(g_linux_wlan->strInterfaceInfo[i].aSrcAddress, mac_add, ETH_ALEN);
g_linux_wlan->strInterfaceInfo[i].drvHandler = (WILC_Uint32)priv->hWILCWFIDrv; g_linux_wlan->strInterfaceInfo[i].drvHandler = (u32)priv->hWILCWFIDrv;
break; break;
} }
} }
...@@ -2376,7 +2376,7 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd) ...@@ -2376,7 +2376,7 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
u8 *buff = NULL; u8 *buff = NULL;
WILC_Sint8 rssi; WILC_Sint8 rssi;
WILC_Uint32 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; WILC_Sint32 s32Error = WILC_SUCCESS;
......
drivers/staging/wilc1000/wilc_memory.c
View file @ 4e4467fd
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
void *WILC_MemoryAlloc(WILC_Uint32 u32Size, tstrWILC_MemoryAttrs *strAttrs, void *WILC_MemoryAlloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
WILC_Char *pcFileName, WILC_Uint32 u32LineNo) WILC_Char *pcFileName, u32 u32LineNo)
{ {
if (u32Size > 0) { if (u32Size > 0) {
return kmalloc(u32Size, GFP_ATOMIC); return kmalloc(u32Size, GFP_ATOMIC);
...@@ -21,8 +21,8 @@ void *WILC_MemoryAlloc(WILC_Uint32 u32Size, tstrWILC_MemoryAttrs *strAttrs, ...@@ -21,8 +21,8 @@ void *WILC_MemoryAlloc(WILC_Uint32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
void *WILC_MemoryCalloc(WILC_Uint32 u32Size, tstrWILC_MemoryAttrs *strAttrs, void *WILC_MemoryCalloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
WILC_Char *pcFileName, WILC_Uint32 u32LineNo) WILC_Char *pcFileName, u32 u32LineNo)
{ {
return kcalloc(u32Size, 1, GFP_KERNEL); return kcalloc(u32Size, 1, GFP_KERNEL);
} }
...@@ -32,8 +32,8 @@ void *WILC_MemoryCalloc(WILC_Uint32 u32Size, tstrWILC_MemoryAttrs *strAttrs, ...@@ -32,8 +32,8 @@ void *WILC_MemoryCalloc(WILC_Uint32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
void *WILC_MemoryRealloc(void *pvOldBlock, WILC_Uint32 u32NewSize, void *WILC_MemoryRealloc(void *pvOldBlock, u32 u32NewSize,
tstrWILC_MemoryAttrs *strAttrs, WILC_Char *pcFileName, WILC_Uint32 u32LineNo) tstrWILC_MemoryAttrs *strAttrs, WILC_Char *pcFileName, u32 u32LineNo)
{ {
if (u32NewSize == 0) { if (u32NewSize == 0) {
kfree(pvOldBlock); kfree(pvOldBlock);
...@@ -52,7 +52,7 @@ void *WILC_MemoryRealloc(void *pvOldBlock, WILC_Uint32 u32NewSize, ...@@ -52,7 +52,7 @@ void *WILC_MemoryRealloc(void *pvOldBlock, WILC_Uint32 u32NewSize,
* @version 1.0 * @version 1.0
*/ */
void WILC_MemoryFree(const void *pvBlock, tstrWILC_MemoryAttrs *strAttrs, void WILC_MemoryFree(const void *pvBlock, tstrWILC_MemoryAttrs *strAttrs,
WILC_Char *pcFileName, WILC_Uint32 u32LineNo) WILC_Char *pcFileName, u32 u32LineNo)
{ {
kfree(pvBlock); kfree(pvBlock);
} }
drivers/staging/wilc1000/wilc_memory.h
View file @ 4e4467fd
...@@ -41,8 +41,8 @@ typedef struct { ...@@ -41,8 +41,8 @@ typedef struct {
* @date 16 Aug 2010 * @date 16 Aug 2010
* @version 1.0 * @version 1.0
*/ */
void *WILC_MemoryAlloc(WILC_Uint32 u32Size, tstrWILC_MemoryAttrs *strAttrs, void *WILC_MemoryAlloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
WILC_Char *pcFileName, WILC_Uint32 u32LineNo); WILC_Char *pcFileName, u32 u32LineNo);
/*! /*!
* @brief Allocates a given size of bytes and zero filling it * @brief Allocates a given size of bytes and zero filling it
...@@ -65,8 +65,8 @@ void *WILC_MemoryAlloc(WILC_Uint32 u32Size, tstrWILC_MemoryAttrs *strAttrs, ...@@ -65,8 +65,8 @@ void *WILC_MemoryAlloc(WILC_Uint32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
* @date 16 Aug 2010 * @date 16 Aug 2010
* @version 1.0 * @version 1.0
*/ */
void *WILC_MemoryCalloc(WILC_Uint32 u32Size, tstrWILC_MemoryAttrs *strAttrs, void *WILC_MemoryCalloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
WILC_Char *pcFileName, WILC_Uint32 u32LineNo); WILC_Char *pcFileName, u32 u32LineNo);
/*! /*!
* @brief Reallocates a given block to a new size * @brief Reallocates a given block to a new size
...@@ -93,8 +93,8 @@ void *WILC_MemoryCalloc(WILC_Uint32 u32Size, tstrWILC_MemoryAttrs *strAttrs, ...@@ -93,8 +93,8 @@ void *WILC_MemoryCalloc(WILC_Uint32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
* @date 16 Aug 2010 * @date 16 Aug 2010
* @version 1.0 * @version 1.0
*/ */
void *WILC_MemoryRealloc(void *pvOldBlock, WILC_Uint32 u32NewSize, void *WILC_MemoryRealloc(void *pvOldBlock, u32 u32NewSize,
tstrWILC_MemoryAttrs *strAttrs, WILC_Char *pcFileName, WILC_Uint32 u32LineNo); tstrWILC_MemoryAttrs *strAttrs, WILC_Char *pcFileName, u32 u32LineNo);
/*! /*!
* @brief Frees given block * @brief Frees given block
...@@ -114,7 +114,7 @@ void *WILC_MemoryRealloc(void *pvOldBlock, WILC_Uint32 u32NewSize, ...@@ -114,7 +114,7 @@ void *WILC_MemoryRealloc(void *pvOldBlock, WILC_Uint32 u32NewSize,
* @version 1.0 * @version 1.0
*/ */
void WILC_MemoryFree(const void *pvBlock, tstrWILC_MemoryAttrs *strAttrs, void WILC_MemoryFree(const void *pvBlock, tstrWILC_MemoryAttrs *strAttrs,
WILC_Char *pcFileName, WILC_Uint32 u32LineNo); WILC_Char *pcFileName, u32 u32LineNo);
/*! /*!
* @brief standrad malloc wrapper with custom attributes * @brief standrad malloc wrapper with custom attributes
...@@ -149,7 +149,7 @@ void WILC_MemoryFree(const void *pvBlock, tstrWILC_MemoryAttrs *strAttrs, ...@@ -149,7 +149,7 @@ void WILC_MemoryFree(const void *pvBlock, tstrWILC_MemoryAttrs *strAttrs,
*/ */
#define WILC_NEW_EX(__struct_type__, __n_structs__, __attrs__) \ #define WILC_NEW_EX(__struct_type__, __n_structs__, __attrs__) \
((__struct_type__ *)WILC_MALLOC_EX( \ ((__struct_type__ *)WILC_MALLOC_EX( \
sizeof(__struct_type__) * (WILC_Uint32)(__n_structs__), __attrs__)) sizeof(__struct_type__) * (u32)(__n_structs__), __attrs__))
/*! /*!
* @brief Allocates a block (with custom attributes) of given type and number of * @brief Allocates a block (with custom attributes) of given type and number of
...@@ -157,7 +157,7 @@ void WILC_MemoryFree(const void *pvBlock, tstrWILC_MemoryAttrs *strAttrs, ...@@ -157,7 +157,7 @@ void WILC_MemoryFree(const void *pvBlock, tstrWILC_MemoryAttrs *strAttrs,
*/ */
#define WILC_NEW_0_EX(__struct_type__, __n_structs__, __attrs__) \ #define WILC_NEW_0_EX(__struct_type__, __n_structs__, __attrs__) \
((__struct_type__ *)WILC_CALLOC_EX( \ ((__struct_type__ *)WILC_CALLOC_EX( \
sizeof(__struct_type__) * (WILC_Uint32)(__n_structs__), __attrs__)) sizeof(__struct_type__) * (u32)(__n_structs__), __attrs__))
/*! /*!
* @brief Frees a block (with custom attributes), also setting the original pointer * @brief Frees a block (with custom attributes), also setting the original pointer
......
drivers/staging/wilc1000/wilc_msgqueue.c
View file @ 4e4467fd
...@@ -53,7 +53,7 @@ WILC_ErrNo WILC_MsgQueueDestroy(WILC_MsgQueueHandle *pHandle, ...@@ -53,7 +53,7 @@ WILC_ErrNo WILC_MsgQueueDestroy(WILC_MsgQueueHandle *pHandle,
* @version 1.0 * @version 1.0
*/ */
WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle, WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle,
const void *pvSendBuffer, WILC_Uint32 u32SendBufferSize, const void *pvSendBuffer, u32 u32SendBufferSize,
tstrWILC_MsgQueueAttrs *pstrAttrs) tstrWILC_MsgQueueAttrs *pstrAttrs)
{ {
WILC_ErrNo s32RetStatus = WILC_SUCCESS; WILC_ErrNo s32RetStatus = WILC_SUCCESS;
...@@ -118,8 +118,8 @@ WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle, ...@@ -118,8 +118,8 @@ WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle,
* @version 1.0 * @version 1.0
*/ */
WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle, WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle,
void *pvRecvBuffer, WILC_Uint32 u32RecvBufferSize, void *pvRecvBuffer, u32 u32RecvBufferSize,
WILC_Uint32 *pu32ReceivedLength, u32 *pu32ReceivedLength,
tstrWILC_MsgQueueAttrs *pstrAttrs) tstrWILC_MsgQueueAttrs *pstrAttrs)
{ {
......
drivers/staging/wilc1000/wilc_msgqueue.h
View file @ 4e4467fd
...@@ -58,7 +58,7 @@ WILC_ErrNo WILC_MsgQueueCreate(WILC_MsgQueueHandle *pHandle, ...@@ -58,7 +58,7 @@ WILC_ErrNo WILC_MsgQueueCreate(WILC_MsgQueueHandle *pHandle,
* @version 1.0 * @version 1.0
*/ */
WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle, WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle,
const void *pvSendBuffer, WILC_Uint32 u32SendBufferSize, const void *pvSendBuffer, u32 u32SendBufferSize,
tstrWILC_MsgQueueAttrs *pstrAttrs); tstrWILC_MsgQueueAttrs *pstrAttrs);
...@@ -80,8 +80,8 @@ WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle, ...@@ -80,8 +80,8 @@ WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle,
* @version 1.0 * @version 1.0
*/ */
WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle, WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle,
void *pvRecvBuffer, WILC_Uint32 u32RecvBufferSize, void *pvRecvBuffer, u32 u32RecvBufferSize,
WILC_Uint32 *pu32ReceivedLength, u32 *pu32ReceivedLength,
tstrWILC_MsgQueueAttrs *pstrAttrs); tstrWILC_MsgQueueAttrs *pstrAttrs);
......
drivers/staging/wilc1000/wilc_oswrapper.h
View file @ 4e4467fd
...@@ -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 unsigned int WILC_Uint32;
typedef unsigned long long WILC_Uint64; typedef unsigned long long WILC_Uint64;
typedef signed char WILC_Sint8; typedef signed char WILC_Sint8;
typedef signed short WILC_Sint16; typedef signed short WILC_Sint16;
......
drivers/staging/wilc1000/wilc_platform.h
View file @ 4e4467fd
...@@ -23,7 +23,7 @@ typedef struct timer_list WILC_TimerHandle; ...@@ -23,7 +23,7 @@ typedef struct timer_list WILC_TimerHandle;
/* Message Queue type is a structure */ /* Message Queue type is a structure */
typedef struct __Message_struct { typedef struct __Message_struct {
void *pvBuffer; void *pvBuffer;
WILC_Uint32 u32Length; u32 u32Length;
struct __Message_struct *pstrNext; struct __Message_struct *pstrNext;
} Message; } Message;
...@@ -31,7 +31,7 @@ typedef struct __MessageQueue_struct { ...@@ -31,7 +31,7 @@ typedef struct __MessageQueue_struct {
struct semaphore hSem; struct semaphore hSem;
spinlock_t strCriticalSection; spinlock_t strCriticalSection;
WILC_Bool bExiting; WILC_Bool bExiting;
WILC_Uint32 u32ReceiversCount; u32 u32ReceiversCount;
Message *pstrMessageList; Message *pstrMessageList;
} WILC_MsgQueueHandle; } WILC_MsgQueueHandle;
......
drivers/staging/wilc1000/wilc_sleep.c
View file @ 4e4467fd
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
* @date 10 Aug 2010 * @date 10 Aug 2010
* @version 1.0 * @version 1.0
*/ */
void WILC_Sleep(WILC_Uint32 u32TimeMilliSec) void WILC_Sleep(u32 u32TimeMilliSec)
{ {
if (u32TimeMilliSec <= 4000000) { if (u32TimeMilliSec <= 4000000) {
WILC_Uint32 u32Temp = u32TimeMilliSec * 1000; u32 u32Temp = u32TimeMilliSec * 1000;
usleep_range(u32Temp, u32Temp); usleep_range(u32Temp, u32Temp);
} else { } else {
msleep(u32TimeMilliSec); msleep(u32TimeMilliSec);
......
drivers/staging/wilc1000/wilc_sleep.h
View file @ 4e4467fd
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
* sleep, for accurate high resolution sleep use u32TimeMicoSec * sleep, for accurate high resolution sleep use u32TimeMicoSec
*/ */
/* TODO: remove and open-code in callers */ /* TODO: remove and open-code in callers */
void WILC_Sleep(WILC_Uint32 u32TimeMilliSec); void WILC_Sleep(u32 u32TimeMilliSec);
#endif #endif
drivers/staging/wilc1000/wilc_strutils.c
View file @ 4e4467fd
...@@ -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, WILC_Uint32 u32Count) WILC_Sint32 WILC_memcmp(const void *pvArg1, const void *pvArg2, u32 u32Count)
{ {
return memcmp(pvArg1, pvArg2, u32Count); return memcmp(pvArg1, pvArg2, u32Count);
} }
...@@ -20,7 +20,7 @@ WILC_Sint32 WILC_memcmp(const void *pvArg1, const void *pvArg2, WILC_Uint32 u32C ...@@ -20,7 +20,7 @@ WILC_Sint32 WILC_memcmp(const void *pvArg1, const void *pvArg2, WILC_Uint32 u32C
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
void WILC_memcpy_INTERNAL(void *pvTarget, const void *pvSource, WILC_Uint32 u32Count) void WILC_memcpy_INTERNAL(void *pvTarget, const void *pvSource, u32 u32Count)
{ {
memcpy(pvTarget, pvSource, u32Count); memcpy(pvTarget, pvSource, u32Count);
} }
...@@ -30,7 +30,7 @@ void WILC_memcpy_INTERNAL(void *pvTarget, const void *pvSource, WILC_Uint32 u32C ...@@ -30,7 +30,7 @@ void WILC_memcpy_INTERNAL(void *pvTarget, const void *pvSource, WILC_Uint32 u32C
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
void *WILC_memset(void *pvTarget, u8 u8SetValue, WILC_Uint32 u32Count) void *WILC_memset(void *pvTarget, u8 u8SetValue, u32 u32Count)
{ {
return memset(pvTarget, u8SetValue, u32Count); return memset(pvTarget, u8SetValue, u32Count);
} }
...@@ -41,13 +41,13 @@ void *WILC_memset(void *pvTarget, u8 u8SetValue, WILC_Uint32 u32Count) ...@@ -41,13 +41,13 @@ void *WILC_memset(void *pvTarget, u8 u8SetValue, WILC_Uint32 u32Count)
* @version 1.0 * @version 1.0
*/ */
WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource, WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource,
WILC_Uint32 u32Count) u32 u32Count)
{ {
return strncpy(pcTarget, pcSource, u32Count); return strncpy(pcTarget, pcSource, u32Count);
} }
WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2, WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2,
WILC_Uint32 u32Count) u32 u32Count)
{ {
WILC_Sint32 s32Result; WILC_Sint32 s32Result;
...@@ -74,7 +74,7 @@ WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2, ...@@ -74,7 +74,7 @@ WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2,
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
WILC_Uint32 WILC_strlen(const WILC_Char *pcStr) u32 WILC_strlen(const WILC_Char *pcStr)
{ {
return (WILC_Uint32)strlen(pcStr); return (u32)strlen(pcStr);
} }
drivers/staging/wilc1000/wilc_strutils.h
View file @ 4e4467fd
...@@ -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, WILC_Uint32 u32Count); WILC_Sint32 WILC_memcmp(const void *pvArg1, const void *pvArg2, u32 u32Count);
/*! /*!
* @brief Internal implementation for memory copy * @brief Internal implementation for memory copy
...@@ -34,7 +34,7 @@ WILC_Sint32 WILC_memcmp(const void *pvArg1, const void *pvArg2, WILC_Uint32 u32C ...@@ -34,7 +34,7 @@ WILC_Sint32 WILC_memcmp(const void *pvArg1, const void *pvArg2, WILC_Uint32 u32C
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
void WILC_memcpy_INTERNAL(void *pvTarget, const void *pvSource, WILC_Uint32 u32Count); void WILC_memcpy_INTERNAL(void *pvTarget, const void *pvSource, u32 u32Count);
/*! /*!
* @brief Copies the contents of a memory buffer into another * @brief Copies the contents of a memory buffer into another
...@@ -50,7 +50,7 @@ void WILC_memcpy_INTERNAL(void *pvTarget, const void *pvSource, WILC_Uint32 u32C ...@@ -50,7 +50,7 @@ void WILC_memcpy_INTERNAL(void *pvTarget, const void *pvSource, WILC_Uint32 u32C
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
static WILC_ErrNo WILC_memcpy(void *pvTarget, const void *pvSource, WILC_Uint32 u32Count) static WILC_ErrNo WILC_memcpy(void *pvTarget, const void *pvSource, u32 u32Count)
{ {
if ( if (
(((u8 *)pvTarget <= (u8 *)pvSource) (((u8 *)pvTarget <= (u8 *)pvSource)
...@@ -78,7 +78,7 @@ static WILC_ErrNo WILC_memcpy(void *pvTarget, const void *pvSource, WILC_Uint32 ...@@ -78,7 +78,7 @@ static WILC_ErrNo WILC_memcpy(void *pvTarget, const void *pvSource, WILC_Uint32
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
void *WILC_memset(void *pvTarget, u8 u8SetValue, WILC_Uint32 u32Count); void *WILC_memset(void *pvTarget, u8 u8SetValue, u32 u32Count);
/*! /*!
* @brief copies the contents of source string into the target string * @brief copies the contents of source string into the target string
...@@ -93,7 +93,7 @@ void *WILC_memset(void *pvTarget, u8 u8SetValue, WILC_Uint32 u32Count); ...@@ -93,7 +93,7 @@ void *WILC_memset(void *pvTarget, u8 u8SetValue, WILC_Uint32 u32Count);
* @version 1.0 * @version 1.0
*/ */
WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource, WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource,
WILC_Uint32 u32Count); u32 u32Count);
/*! /*!
* @brief Compares two strings up to u32Count characters * @brief Compares two strings up to u32Count characters
...@@ -114,7 +114,7 @@ WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource, ...@@ -114,7 +114,7 @@ WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource,
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2, WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2,
WILC_Uint32 u32Count); u32 u32Count);
/*! /*!
* @brief gets the length of a string * @brief gets the length of a string
...@@ -125,6 +125,6 @@ WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2, ...@@ -125,6 +125,6 @@ WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2,
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
WILC_Uint32 WILC_strlen(const WILC_Char *pcStr); u32 WILC_strlen(const WILC_Char *pcStr);
#endif #endif
drivers/staging/wilc1000/wilc_timer.c
View file @ 4e4467fd
...@@ -23,7 +23,7 @@ WILC_ErrNo WILC_TimerDestroy(WILC_TimerHandle *pHandle, ...@@ -23,7 +23,7 @@ WILC_ErrNo WILC_TimerDestroy(WILC_TimerHandle *pHandle,
} }
WILC_ErrNo WILC_TimerStart(WILC_TimerHandle *pHandle, WILC_Uint32 u32Timeout, WILC_ErrNo WILC_TimerStart(WILC_TimerHandle *pHandle, u32 u32Timeout,
void *pvArg, tstrWILC_TimerAttrs *pstrAttrs) void *pvArg, tstrWILC_TimerAttrs *pstrAttrs)
{ {
WILC_ErrNo s32RetStatus = WILC_FAIL; WILC_ErrNo s32RetStatus = WILC_FAIL;
......
drivers/staging/wilc1000/wilc_timer.h
View file @ 4e4467fd
...@@ -96,7 +96,7 @@ WILC_ErrNo WILC_TimerDestroy(WILC_TimerHandle *pHandle, ...@@ -96,7 +96,7 @@ WILC_ErrNo WILC_TimerDestroy(WILC_TimerHandle *pHandle,
* @date 16 Aug 2010 * @date 16 Aug 2010
* @version 1.0 * @version 1.0
*/ */
WILC_ErrNo WILC_TimerStart(WILC_TimerHandle *pHandle, WILC_Uint32 u32Timeout, void *pvArg, WILC_ErrNo WILC_TimerStart(WILC_TimerHandle *pHandle, u32 u32Timeout, void *pvArg,
tstrWILC_TimerAttrs *pstrAttrs); tstrWILC_TimerAttrs *pstrAttrs);
......
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View file @ 4e4467fd
...@@ -31,7 +31,7 @@ extern int mac_open(struct net_device *ndev); ...@@ -31,7 +31,7 @@ extern int mac_open(struct net_device *ndev);
extern int mac_close(struct net_device *ndev); extern int mac_close(struct net_device *ndev);
tstrNetworkInfo astrLastScannedNtwrksShadow[MAX_NUM_SCANNED_NETWORKS_SHADOW]; tstrNetworkInfo astrLastScannedNtwrksShadow[MAX_NUM_SCANNED_NETWORKS_SHADOW];
WILC_Uint32 u32LastScannedNtwrksCountShadow; u32 u32LastScannedNtwrksCountShadow;
#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
WILC_TimerHandle hDuringIpTimer; WILC_TimerHandle hDuringIpTimer;
#endif #endif
...@@ -438,7 +438,7 @@ static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetwo ...@@ -438,7 +438,7 @@ static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetwo
PRINT_ER("Discovered networks exceeded the max limit\n"); PRINT_ER("Discovered networks exceeded the max limit\n");
} }
} else { } else {
WILC_Uint32 i; u32 i;
/* So this network is discovered before, we'll just update its RSSI */ /* So this network is discovered before, we'll just update its RSSI */
for (i = 0; i < priv->u32RcvdChCount; i++) { for (i = 0; i < priv->u32RcvdChCount; i++) {
if (WILC_memcmp(astrLastScannedNtwrksShadow[i].au8bssid, pstrNetworkInfo->au8bssid, 6) == 0) { if (WILC_memcmp(astrLastScannedNtwrksShadow[i].au8bssid, pstrNetworkInfo->au8bssid, 6) == 0) {
...@@ -509,7 +509,7 @@ static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetwo ...@@ -509,7 +509,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)
{ {
WILC_Uint32 i; u32 i;
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
...@@ -600,7 +600,7 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, ...@@ -600,7 +600,7 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent,
if (u16ConnectStatus == WLAN_STATUS_SUCCESS) { if (u16ConnectStatus == WLAN_STATUS_SUCCESS) {
WILC_Bool bNeedScanRefresh = WILC_FALSE; WILC_Bool bNeedScanRefresh = WILC_FALSE;
WILC_Uint32 i; u32 i;
PRINT_INFO(CFG80211_DBG, "Connection Successful:: BSSID: %x%x%x%x%x%x\n", pstrConnectInfo->au8bssid[0], PRINT_INFO(CFG80211_DBG, "Connection Successful:: BSSID: %x%x%x%x%x%x\n", pstrConnectInfo->au8bssid[0],
pstrConnectInfo->au8bssid[1], pstrConnectInfo->au8bssid[2], pstrConnectInfo->au8bssid[3], pstrConnectInfo->au8bssid[4], pstrConnectInfo->au8bssid[5]); pstrConnectInfo->au8bssid[1], pstrConnectInfo->au8bssid[2], pstrConnectInfo->au8bssid[3], pstrConnectInfo->au8bssid[4], pstrConnectInfo->au8bssid[5]);
...@@ -699,7 +699,7 @@ static int WILC_WFI_CfgSetChannel(struct wiphy *wiphy, ...@@ -699,7 +699,7 @@ static int WILC_WFI_CfgSetChannel(struct wiphy *wiphy,
struct cfg80211_chan_def *chandef) struct cfg80211_chan_def *chandef)
{ {
WILC_Uint32 channelnum = 0; u32 channelnum = 0;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
...@@ -736,7 +736,7 @@ static int WILC_WFI_CfgSetChannel(struct wiphy *wiphy, ...@@ -736,7 +736,7 @@ static int WILC_WFI_CfgSetChannel(struct wiphy *wiphy,
static int WILC_WFI_CfgScan(struct wiphy *wiphy, struct cfg80211_scan_request *request) static int WILC_WFI_CfgScan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
{ {
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
WILC_Uint32 i; u32 i;
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
u8 au8ScanChanList[MAX_NUM_SCANNED_NETWORKS]; u8 au8ScanChanList[MAX_NUM_SCANNED_NETWORKS];
tstrHiddenNetwork strHiddenNetwork; tstrHiddenNetwork strHiddenNetwork;
...@@ -747,7 +747,7 @@ static int WILC_WFI_CfgScan(struct wiphy *wiphy, struct cfg80211_scan_request *r ...@@ -747,7 +747,7 @@ static int WILC_WFI_CfgScan(struct wiphy *wiphy, struct cfg80211_scan_request *r
priv->u32RcvdChCount = 0; priv->u32RcvdChCount = 0;
host_int_set_wfi_drv_handler((WILC_Uint32)priv->hWILCWFIDrv); host_int_set_wfi_drv_handler((u32)priv->hWILCWFIDrv);
reset_shadow_found(priv); reset_shadow_found(priv);
...@@ -826,7 +826,7 @@ static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev, ...@@ -826,7 +826,7 @@ 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; WILC_Sint32 s32Error = WILC_SUCCESS;
WILC_Uint32 i; u32 i;
u8 u8security = NO_ENCRYPT; u8 u8security = NO_ENCRYPT;
AUTHTYPE_T tenuAuth_type = ANY; AUTHTYPE_T tenuAuth_type = ANY;
WILC_Char *pcgroup_encrypt_val = NULL; WILC_Char *pcgroup_encrypt_val = NULL;
...@@ -842,7 +842,7 @@ static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev, ...@@ -842,7 +842,7 @@ static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev,
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)(priv->hWILCWFIDrv); pstrWFIDrv = (tstrWILC_WFIDrv *)(priv->hWILCWFIDrv);
host_int_set_wfi_drv_handler((WILC_Uint32)priv->hWILCWFIDrv); host_int_set_wfi_drv_handler((u32)priv->hWILCWFIDrv);
PRINT_D(CFG80211_DBG, "Connecting to SSID [%s] on netdev [%p] host if [%p]\n", sme->ssid, dev, priv->hWILCWFIDrv); PRINT_D(CFG80211_DBG, "Connecting to SSID [%s] on netdev [%p] host if [%p]\n", sme->ssid, dev, priv->hWILCWFIDrv);
#ifdef WILC_P2P #ifdef WILC_P2P
...@@ -1131,7 +1131,7 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 k ...@@ -1131,7 +1131,7 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
{ {
WILC_Sint32 s32Error = WILC_SUCCESS, KeyLen = params->key_len; WILC_Sint32 s32Error = WILC_SUCCESS, KeyLen = params->key_len;
WILC_Uint32 i; u32 i;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
const u8 *pu8RxMic = NULL; const u8 *pu8RxMic = NULL;
const u8 *pu8TxMic = NULL; const u8 *pu8TxMic = NULL;
...@@ -1538,7 +1538,7 @@ static int WILC_WFI_get_key(struct wiphy *wiphy, struct net_device *netdev, u8 k ...@@ -1538,7 +1538,7 @@ static int WILC_WFI_get_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
struct key_params key_params; struct key_params key_params;
WILC_Uint32 i; u32 i;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
...@@ -1641,9 +1641,9 @@ static int WILC_WFI_get_station(struct wiphy *wiphy, struct net_device *dev, ...@@ -1641,9 +1641,9 @@ static int WILC_WFI_get_station(struct wiphy *wiphy, struct net_device *dev,
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
WILC_Uint32 i = 0; u32 i = 0;
WILC_Uint32 associatedsta = 0; u32 associatedsta = 0;
WILC_Uint32 inactive_time = 0; u32 inactive_time = 0;
#endif #endif
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
nic = netdev_priv(dev); nic = netdev_priv(dev);
...@@ -1899,7 +1899,7 @@ static int WILC_WFI_set_bitrate_mask(struct wiphy *wiphy, ...@@ -1899,7 +1899,7 @@ static int WILC_WFI_set_bitrate_mask(struct wiphy *wiphy,
static int WILC_WFI_set_pmksa(struct wiphy *wiphy, struct net_device *netdev, static int WILC_WFI_set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
struct cfg80211_pmksa *pmksa) struct cfg80211_pmksa *pmksa)
{ {
WILC_Uint32 i; u32 i;
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
u8 flag = 0; u8 flag = 0;
...@@ -1950,7 +1950,7 @@ static int WILC_WFI_del_pmksa(struct wiphy *wiphy, struct net_device *netdev, ...@@ -1950,7 +1950,7 @@ static int WILC_WFI_del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
struct cfg80211_pmksa *pmksa) struct cfg80211_pmksa *pmksa)
{ {
WILC_Uint32 i; u32 i;
u8 flag = 0; u8 flag = 0;
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
...@@ -2023,10 +2023,10 @@ static int WILC_WFI_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev) ...@@ -2023,10 +2023,10 @@ static int WILC_WFI_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev)
* @version * @version
*/ */
void WILC_WFI_CfgParseRxAction(u8 *buf, WILC_Uint32 len) void WILC_WFI_CfgParseRxAction(u8 *buf, u32 len)
{ {
WILC_Uint32 index = 0; u32 index = 0;
WILC_Uint32 i = 0, j = 0; u32 i = 0, j = 0;
/*BugID_5460*/ /*BugID_5460*/
#ifdef USE_SUPPLICANT_GO_INTENT #ifdef USE_SUPPLICANT_GO_INTENT
...@@ -2119,10 +2119,10 @@ void WILC_WFI_CfgParseRxAction(u8 *buf, WILC_Uint32 len) ...@@ -2119,10 +2119,10 @@ void WILC_WFI_CfgParseRxAction(u8 *buf, WILC_Uint32 len)
* @date 12 DEC 2012 * @date 12 DEC 2012
* @version * @version
*/ */
void WILC_WFI_CfgParseTxAction(u8 *buf, WILC_Uint32 len, WILC_Bool bOperChan, u8 iftype) void WILC_WFI_CfgParseTxAction(u8 *buf, u32 len, WILC_Bool bOperChan, u8 iftype)
{ {
WILC_Uint32 index = 0; u32 index = 0;
WILC_Uint32 i = 0, j = 0; u32 i = 0, j = 0;
u8 op_channel_attr_index = 0; u8 op_channel_attr_index = 0;
u8 channel_list_attr_index = 0; u8 channel_list_attr_index = 0;
...@@ -2210,9 +2210,9 @@ void WILC_WFI_p2p_rx (struct net_device *dev, uint8_t *buff, uint32_t size) ...@@ -2210,9 +2210,9 @@ void WILC_WFI_p2p_rx (struct net_device *dev, uint8_t *buff, uint32_t size)
{ {
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
WILC_Uint32 header, pkt_offset; u32 header, pkt_offset;
tstrWILC_WFIDrv *pstrWFIDrv; tstrWILC_WFIDrv *pstrWFIDrv;
WILC_Uint32 i = 0; u32 i = 0;
WILC_Sint32 s32Freq; WILC_Sint32 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;
...@@ -2372,7 +2372,7 @@ static void WILC_WFI_RemainOnChannelReady(void *pUserVoid) ...@@ -2372,7 +2372,7 @@ static void WILC_WFI_RemainOnChannelReady(void *pUserVoid)
* @version * @version
*/ */
static void WILC_WFI_RemainOnChannelExpired(void *pUserVoid, WILC_Uint32 u32SessionID) static void WILC_WFI_RemainOnChannelExpired(void *pUserVoid, u32 u32SessionID)
{ {
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
priv = (struct WILC_WFI_priv *)pUserVoid; priv = (struct WILC_WFI_priv *)pUserVoid;
...@@ -2513,9 +2513,9 @@ int WILC_WFI_mgmt_tx(struct wiphy *wiphy, ...@@ -2513,9 +2513,9 @@ int WILC_WFI_mgmt_tx(struct wiphy *wiphy,
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
tstrWILC_WFIDrv *pstrWFIDrv; tstrWILC_WFIDrv *pstrWFIDrv;
WILC_Uint32 i; u32 i;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
WILC_Uint32 buf_len = len + sizeof(u8P2P_vendorspec) + sizeof(u8P2Plocalrandom); u32 buf_len = len + sizeof(u8P2P_vendorspec) + sizeof(u8P2Plocalrandom);
nic = netdev_priv(wdev->netdev); nic = netdev_priv(wdev->netdev);
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
......
drivers/staging/wilc1000/wilc_wfi_netdevice.h
View file @ 4e4467fd
...@@ -117,9 +117,9 @@ struct sta_info { ...@@ -117,9 +117,9 @@ struct sta_info {
struct wilc_wfi_p2pListenParams { struct wilc_wfi_p2pListenParams {
struct ieee80211_channel *pstrListenChan; struct ieee80211_channel *pstrListenChan;
enum nl80211_channel_type tenuChannelType; enum nl80211_channel_type tenuChannelType;
WILC_Uint32 u32ListenDuration; u32 u32ListenDuration;
WILC_Uint64 u64ListenCookie; WILC_Uint64 u64ListenCookie;
WILC_Uint32 u32ListenSessionID; u32 u32ListenSessionID;
}; };
#endif /*WILC_P2P*/ #endif /*WILC_P2P*/
...@@ -135,7 +135,7 @@ struct WILC_WFI_priv { ...@@ -135,7 +135,7 @@ struct WILC_WFI_priv {
#endif #endif
WILC_Bool bCfgScanning; WILC_Bool bCfgScanning;
WILC_Uint32 u32RcvdChCount; u32 u32RcvdChCount;
......
drivers/staging/wilc1000/wilc_wlan.c
View file @ 4e4467fd
...@@ -852,7 +852,7 @@ INLINE void chip_wakeup(void) ...@@ -852,7 +852,7 @@ INLINE void chip_wakeup(void)
genuChipPSstate = CHIP_WAKEDUP; genuChipPSstate = CHIP_WAKEDUP;
} }
#endif #endif
void chip_sleep_manually(WILC_Uint32 u32SleepTime) void chip_sleep_manually(u32 u32SleepTime)
{ {
if (genuChipPSstate != CHIP_WAKEDUP) { if (genuChipPSstate != CHIP_WAKEDUP) {
/* chip is already sleeping. Do nothing */ /* chip is already sleeping. Do nothing */
...@@ -1869,7 +1869,7 @@ static int wilc_wlan_cfg_commit(int type, uint32_t drvHandler) ...@@ -1869,7 +1869,7 @@ static int wilc_wlan_cfg_commit(int type, uint32_t drvHandler)
wilc_cfg_frame_t *cfg = &p->cfg_frame; wilc_cfg_frame_t *cfg = &p->cfg_frame;
int total_len = p->cfg_frame_offset + 4 + DRIVER_HANDLER_SIZE; int total_len = p->cfg_frame_offset + 4 + DRIVER_HANDLER_SIZE;
int seq_no = p->cfg_seq_no % 256; int seq_no = p->cfg_seq_no % 256;
int driver_handler = (WILC_Uint32)drvHandler; int driver_handler = (u32)drvHandler;
/** /**
...@@ -2328,7 +2328,7 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup) ...@@ -2328,7 +2328,7 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
u16 Set_machw_change_vir_if(WILC_Bool bValue) u16 Set_machw_change_vir_if(WILC_Bool bValue)
{ {
u16 ret; u16 ret;
WILC_Uint32 reg; u32 reg;
/*Reset WILC_CHANGING_VIR_IF register to allow adding futrue keys to CE H/W*/ /*Reset WILC_CHANGING_VIR_IF register to allow adding futrue keys to CE H/W*/
(&g_wlan)->os_func.os_enter_cs((&g_wlan)->hif_lock); (&g_wlan)->os_func.os_enter_cs((&g_wlan)->hif_lock);
......
drivers/staging/wilc1000/wilc_wlan_cfg.c
View file @ 4e4467fd
...@@ -541,7 +541,7 @@ static int wilc_wlan_cfg_indicate_rx(uint8_t *frame, int size, wilc_cfg_rsp_t *r ...@@ -541,7 +541,7 @@ static int wilc_wlan_cfg_indicate_rx(uint8_t *frame, int size, wilc_cfg_rsp_t *r
uint8_t msg_id; uint8_t msg_id;
uint16_t msg_len; uint16_t msg_len;
#ifdef WILC_FULLY_HOSTING_AP #ifdef WILC_FULLY_HOSTING_AP
WILC_Uint32 *ptru32Frame; u32 *ptru32Frame;
WILC_Bool bStatus = frame[2]; WILC_Bool bStatus = frame[2];
#ifdef BIG_ENDIAN #ifdef BIG_ENDIAN
......
drivers/staging/wilc1000/wilc_wlan_if.h
View file @ 4e4467fd
...@@ -92,7 +92,7 @@ typedef struct { ...@@ -92,7 +92,7 @@ typedef struct {
void (*os_free)(void *); void (*os_free)(void *);
void (*os_lock)(void *); void (*os_lock)(void *);
void (*os_unlock)(void *); void (*os_unlock)(void *);
int (*os_wait)(void *, WILC_Uint32); int (*os_wait)(void *, u32);
void (*os_signal)(void *); void (*os_signal)(void *);
void (*os_enter_cs)(void *); void (*os_enter_cs)(void *);
void (*os_leave_cs)(void *); void (*os_leave_cs)(void *);
...@@ -238,7 +238,7 @@ typedef struct { ...@@ -238,7 +238,7 @@ typedef struct {
#define MAX_SSID_LEN 33 #define MAX_SSID_LEN 33
#define MAX_RATES_SUPPORTED 12 #define MAX_RATES_SUPPORTED 12
#define INFINITE_SLEEP_TIME ((WILC_Uint32)0xFFFFFFFF) #define INFINITE_SLEEP_TIME ((u32)0xFFFFFFFF)
#ifdef WILC_PARSE_SCAN_IN_HOST #ifdef WILC_PARSE_SCAN_IN_HOST
typedef enum { typedef enum {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7