mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-25 11:55:37 +00:00
Code Issues Releases Wiki Activity

staging: wilc1000: remove WILC_Uint8

Browse source 
Just use u8, as that's what you really want in a kernel driver.

Cc: Johnny Kim <johnny.kim@atmel.com>
Cc: Rachel Kim <rachel.kim@atmel.com>
Cc: Dean Lee <dean.lee@atmel.com>
Cc: Chris Park <chris.park@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2015-06-02 14:16:04 +09:00
parent b1413b6084
commit 63d03e4773
16 changed files with 508 additions and 509 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -158,9 +158,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(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length); extern void NetworkInfoReceived(u8 *pu8Buffer, WILC_Uint32 u32Length);
extern void GnrlAsyncInfoReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length); extern void GnrlAsyncInfoReceived(u8 *pu8Buffer, WILC_Uint32 u32Length);
extern void host_int_ScanCompleteReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length); extern void host_int_ScanCompleteReceived(u8 *pu8Buffer, WILC_Uint32 u32Length);
/*****************************************************************************/ /*****************************************************************************/
/* Global Variables */ /* Global Variables */
/*****************************************************************************/ /*****************************************************************************/
@ -171,13 +171,13 @@ static WILC_Sint8 *gps8ConfigPacket;
static tstrConfigPktInfo gstrConfigPktInfo; static tstrConfigPktInfo gstrConfigPktInfo;
static WILC_Uint8 g_seqno; static u8 g_seqno;
static WILC_Sint16 g_wid_num = -1; static WILC_Sint16 g_wid_num = -1;
static WILC_Uint16 Res_Len; static WILC_Uint16 Res_Len;
static WILC_Uint8 g_oper_mode = SET_CFG; static u8 g_oper_mode = SET_CFG;
/* WID Switches */ /* WID Switches */
static tstrWID gastrWIDs[] = { static tstrWID gastrWIDs[] = {
@ -318,7 +318,7 @@ WILC_Uint16 g_num_total_switches = (sizeof(gastrWIDs) / sizeof(tstrWID));
/*****************************************************************************/ /*****************************************************************************/
/* Functions */ /* Functions */
/*****************************************************************************/ /*****************************************************************************/
INLINE WILC_Uint8 ascii_hex_to_dec(WILC_Uint8 num) INLINE u8 ascii_hex_to_dec(u8 num)
{ {
if ((num >= '0') && (num <= '9')) if ((num >= '0') && (num <= '9'))
return (num - '0'); return (num - '0');
@ -330,16 +330,16 @@ INLINE WILC_Uint8 ascii_hex_to_dec(WILC_Uint8 num)
return INVALID; return INVALID;
} }
INLINE WILC_Uint8 get_hex_char(WILC_Uint8 inp) INLINE u8 get_hex_char(u8 inp)
{ {
WILC_Uint8 *d2htab = "0123456789ABCDEF"; u8 *d2htab = "0123456789ABCDEF";
return d2htab[inp & 0xF]; return d2htab[inp & 0xF];
} }
/* This function extracts the MAC address held in a string in standard format */ /* This function extracts the MAC address held in a string in standard format */
/* into another buffer as integers. */ /* into another buffer as integers. */
INLINE WILC_Uint16 extract_mac_addr(WILC_Char *str, WILC_Uint8 *buff) INLINE WILC_Uint16 extract_mac_addr(WILC_Char *str, u8 *buff)
{ {
*buff = 0; *buff = 0;
while (*str != '\0') { while (*str != '\0') {
@ -356,14 +356,14 @@ INLINE WILC_Uint16 extract_mac_addr(WILC_Char *str, WILC_Uint8 *buff)
/* This function creates MAC address in standard format from a buffer of */ /* This function creates MAC address in standard format from a buffer of */
/* integers. */ /* integers. */
INLINE void create_mac_addr(WILC_Uint8 *str, WILC_Uint8 *buff) INLINE void create_mac_addr(u8 *str, u8 *buff)
{ {
WILC_Uint32 i = 0; WILC_Uint32 i = 0;
WILC_Uint32 j = 0; WILC_Uint32 j = 0;
for (i = 0; i < MAC_ADDR_LEN; i++) { for (i = 0; i < MAC_ADDR_LEN; i++) {
str[j++] = get_hex_char((WILC_Uint8)((buff[i] >> 4) & 0x0F)); str[j++] = get_hex_char((u8)((buff[i] >> 4) & 0x0F));
str[j++] = get_hex_char((WILC_Uint8)(buff[i] & 0x0F)); str[j++] = get_hex_char((u8)(buff[i] & 0x0F));
str[j++] = ':'; str[j++] = ':';
} }
str[--j] = '\0'; str[--j] = '\0';
@ -375,10 +375,10 @@ INLINE void create_mac_addr(WILC_Uint8 *str, WILC_Uint8 *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 WILC_Uint8 conv_ip_to_int(WILC_Uint8 *ips, WILC_Uint32 *ipn) INLINE u8 conv_ip_to_int(u8 *ips, WILC_Uint32 *ipn)
{ {
WILC_Uint8 i = 0; u8 i = 0;
WILC_Uint8 ipb = 0; u8 ipb = 0;
*ipn = 0; *ipn = 0;
/* Integer to string for each component */ /* Integer to string for each component */
while (ips[i] != '\0') { while (ips[i] != '\0') {
@ -402,12 +402,12 @@ INLINE WILC_Uint8 conv_ip_to_int(WILC_Uint8 *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 WILC_Uint8 conv_int_to_ip(WILC_Uint8 *ips, WILC_Uint32 ipn) INLINE u8 conv_int_to_ip(u8 *ips, WILC_Uint32 ipn)
{ {
WILC_Uint8 i = 0; u8 i = 0;
WILC_Uint8 ipb = 0; u8 ipb = 0;
WILC_Uint8 cnt = 0; u8 cnt = 0;
WILC_Uint8 ipbsize = 0; u8 ipbsize = 0;
for (cnt = 4; cnt > 0; cnt--) { for (cnt = 4; cnt > 0; cnt--) {
ipb = (ipn >> (8 * (cnt - 1))) & 0xFF; ipb = (ipn >> (8 * (cnt - 1))) & 0xFF;
@ -475,7 +475,7 @@ INLINE tenuWIDtype get_wid_type(WILC_Uint32 wid_num)
/* This function extracts the beacon period field from the beacon or probe */ /* This function extracts the beacon period field from the beacon or probe */
/* response frame. */ /* response frame. */
INLINE WILC_Uint16 get_beacon_period(WILC_Uint8 *data) INLINE WILC_Uint16 get_beacon_period(u8 *data)
{ {
WILC_Uint16 bcn_per = 0; WILC_Uint16 bcn_per = 0;
@ -485,7 +485,7 @@ INLINE WILC_Uint16 get_beacon_period(WILC_Uint8 *data)
return bcn_per; return bcn_per;
} }
INLINE WILC_Uint32 get_beacon_timestamp_lo(WILC_Uint8 *data) INLINE WILC_Uint32 get_beacon_timestamp_lo(u8 *data)
{ {
WILC_Uint32 time_stamp = 0; WILC_Uint32 time_stamp = 0;
WILC_Uint32 index = MAC_HDR_LEN; WILC_Uint32 index = MAC_HDR_LEN;
@ -514,7 +514,7 @@ INLINE UWORD32 get_beacon_timestamp_hi(UWORD8 *data)
/* This function extracts the 'frame type' bits from the MAC header of the */ /* This function extracts the 'frame type' bits from the MAC header of the */
/* input frame. */ /* input frame. */
/* Returns the value in the LSB of the returned value. */ /* Returns the value in the LSB of the returned value. */
INLINE tenuBasicFrmType get_type(WILC_Uint8 *header) INLINE tenuBasicFrmType get_type(u8 *header)
{ {
return ((tenuBasicFrmType)(header[0] & 0x0C)); return ((tenuBasicFrmType)(header[0] & 0x0C));
} }
@ -522,7 +522,7 @@ INLINE tenuBasicFrmType get_type(WILC_Uint8 *header)
/* This function extracts the 'frame type and sub type' bits from the MAC */ /* This function extracts the 'frame type and sub type' bits from the MAC */
/* header of the input frame. */ /* header of the input frame. */
/* Returns the value in the LSB of the returned value. */ /* Returns the value in the LSB of the returned value. */
INLINE tenuFrmSubtype get_sub_type(WILC_Uint8 *header) INLINE tenuFrmSubtype get_sub_type(u8 *header)
{ {
return ((tenuFrmSubtype)(header[0] & 0xFC)); return ((tenuFrmSubtype)(header[0] & 0xFC));
} }
@ -530,7 +530,7 @@ INLINE tenuFrmSubtype get_sub_type(WILC_Uint8 *header)
/* This function extracts the 'to ds' bit from the MAC header of the input */ /* This function extracts the 'to ds' bit from the MAC header of the input */
/* frame. */ /* frame. */
/* Returns the value in the LSB of the returned value. */ /* Returns the value in the LSB of the returned value. */
INLINE WILC_Uint8 get_to_ds(WILC_Uint8 *header) INLINE u8 get_to_ds(u8 *header)
{ {
return (header[1] & 0x01); return (header[1] & 0x01);
} }
@ -538,28 +538,28 @@ INLINE WILC_Uint8 get_to_ds(WILC_Uint8 *header)
/* This function extracts the 'from ds' bit from the MAC header of the input */ /* This function extracts the 'from ds' bit from the MAC header of the input */
/* frame. */ /* frame. */
/* Returns the value in the LSB of the returned value. */ /* Returns the value in the LSB of the returned value. */
INLINE WILC_Uint8 get_from_ds(WILC_Uint8 *header) INLINE u8 get_from_ds(u8 *header)
{ {
return ((header[1] & 0x02) >> 1); return ((header[1] & 0x02) >> 1);
} }
/* This function extracts the MAC Address in 'address1' field of the MAC */ /* This function extracts the MAC Address in 'address1' field of the MAC */
/* header and updates the MAC Address in the allocated 'addr' variable. */ /* header and updates the MAC Address in the allocated 'addr' variable. */
INLINE void get_address1(WILC_Uint8 *pu8msa, WILC_Uint8 *addr) INLINE void get_address1(u8 *pu8msa, u8 *addr)
{ {
WILC_memcpy(addr, pu8msa + 4, 6); WILC_memcpy(addr, pu8msa + 4, 6);
} }
/* This function extracts the MAC Address in 'address2' field of the MAC */ /* This function extracts the MAC Address in 'address2' field of the MAC */
/* header and updates the MAC Address in the allocated 'addr' variable. */ /* header and updates the MAC Address in the allocated 'addr' variable. */
INLINE void get_address2(WILC_Uint8 *pu8msa, WILC_Uint8 *addr) INLINE void get_address2(u8 *pu8msa, u8 *addr)
{ {
WILC_memcpy(addr, pu8msa + 10, 6); WILC_memcpy(addr, pu8msa + 10, 6);
} }
/* This function extracts the MAC Address in 'address3' field of the MAC */ /* This function extracts the MAC Address in 'address3' field of the MAC */
/* header and updates the MAC Address in the allocated 'addr' variable. */ /* header and updates the MAC Address in the allocated 'addr' variable. */
INLINE void get_address3(WILC_Uint8 *pu8msa, WILC_Uint8 *addr) INLINE void get_address3(u8 *pu8msa, u8 *addr)
{ {
WILC_memcpy(addr, pu8msa + 16, 6); WILC_memcpy(addr, pu8msa + 16, 6);
} }
@ -567,7 +567,7 @@ INLINE void get_address3(WILC_Uint8 *pu8msa, WILC_Uint8 *addr)
/* This function extracts the BSSID from the incoming WLAN packet based on */ /* This function extracts the BSSID from the incoming WLAN packet based on */
/* the 'from ds' bit, and updates the MAC Address in the allocated 'addr' */ /* the 'from ds' bit, and updates the MAC Address in the allocated 'addr' */
/* variable. */ /* variable. */
INLINE void get_BSSID(WILC_Uint8 *data, WILC_Uint8 *bssid) INLINE void get_BSSID(u8 *data, u8 *bssid)
{ {
if (get_from_ds(data) == 1) if (get_from_ds(data) == 1)
get_address2(data, bssid); get_address2(data, bssid);
@ -578,11 +578,11 @@ INLINE void get_BSSID(WILC_Uint8 *data, WILC_Uint8 *bssid)
} }
/* This function extracts the SSID from a beacon/probe response frame */ /* This function extracts the SSID from a beacon/probe response frame */
INLINE void get_ssid(WILC_Uint8 *data, WILC_Uint8 *ssid, WILC_Uint8 *p_ssid_len) INLINE void get_ssid(u8 *data, u8 *ssid, u8 *p_ssid_len)
{ {
WILC_Uint8 len = 0; u8 len = 0;
WILC_Uint8 i = 0; u8 i = 0;
WILC_Uint8 j = 0; u8 j = 0;
len = data[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + len = data[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN +
CAP_INFO_LEN + 1]; CAP_INFO_LEN + 1];
@ -604,7 +604,7 @@ INLINE void get_ssid(WILC_Uint8 *data, WILC_Uint8 *ssid, WILC_Uint8 *p_ssid_len)
/* This function extracts the capability info field from the beacon or probe */ /* This function extracts the capability info field from the beacon or probe */
/* response frame. */ /* response frame. */
INLINE WILC_Uint16 get_cap_info(WILC_Uint8 *data) INLINE WILC_Uint16 get_cap_info(u8 *data)
{ {
WILC_Uint16 cap_info = 0; WILC_Uint16 cap_info = 0;
WILC_Uint16 index = MAC_HDR_LEN; WILC_Uint16 index = MAC_HDR_LEN;
@ -625,7 +625,7 @@ INLINE WILC_Uint16 get_cap_info(WILC_Uint8 *data)
/* This function extracts the capability info field from the Association */ /* This function extracts the capability info field from the Association */
/* response frame. */ /* response frame. */
INLINE WILC_Uint16 get_assoc_resp_cap_info(WILC_Uint8 *data) INLINE WILC_Uint16 get_assoc_resp_cap_info(u8 *data)
{ {
WILC_Uint16 cap_info = 0; WILC_Uint16 cap_info = 0;
@ -637,7 +637,7 @@ INLINE WILC_Uint16 get_assoc_resp_cap_info(WILC_Uint8 *data)
/* This funcion extracts the association status code from the incoming */ /* This funcion extracts the association status code from the incoming */
/* association response frame and returns association status code */ /* association response frame and returns association status code */
INLINE WILC_Uint16 get_asoc_status(WILC_Uint8 *data) INLINE WILC_Uint16 get_asoc_status(u8 *data)
{ {
WILC_Uint16 asoc_status = 0; WILC_Uint16 asoc_status = 0;
@ -649,7 +649,7 @@ INLINE WILC_Uint16 get_asoc_status(WILC_Uint8 *data)
/* This function extracts association ID from the incoming association */ /* This function extracts association ID from the incoming association */
/* response frame */ /* response frame */
INLINE WILC_Uint16 get_asoc_id(WILC_Uint8 *data) INLINE WILC_Uint16 get_asoc_id(u8 *data)
{ {
WILC_Uint16 asoc_id = 0; WILC_Uint16 asoc_id = 0;
@ -691,7 +691,7 @@ WILC_Sint32 CoreConfiguratorInit(void)
return s32Error; return s32Error;
} }
WILC_Uint8 *get_tim_elm(WILC_Uint8 *pu8msa, WILC_Uint16 u16RxLen, WILC_Uint16 u16TagParamOffset) u8 *get_tim_elm(u8 *pu8msa, WILC_Uint16 u16RxLen, WILC_Uint16 u16TagParamOffset)
{ {
WILC_Uint16 u16index = 0; WILC_Uint16 u16index = 0;
@ -721,7 +721,7 @@ WILC_Uint8 *get_tim_elm(WILC_Uint8 *pu8msa, WILC_Uint16 u16RxLen, WILC_Uint16 u1
/* This function gets the current channel information from /* This function gets the current channel information from
* the 802.11n beacon/probe response frame */ * the 802.11n beacon/probe response frame */
WILC_Uint8 get_current_channel_802_11n(WILC_Uint8 *pu8msa, WILC_Uint16 u16RxLen) u8 get_current_channel_802_11n(u8 *pu8msa, WILC_Uint16 u16RxLen)
{ {
WILC_Uint16 index; WILC_Uint16 index;
@ -740,7 +740,7 @@ WILC_Uint8 get_current_channel_802_11n(WILC_Uint8 *pu8msa, WILC_Uint16 u16RxLen)
return 0; /* no MIB here */ return 0; /* no MIB here */
} }
WILC_Uint8 get_current_channel(WILC_Uint8 *pu8msa, WILC_Uint16 u16RxLen) u8 get_current_channel(u8 *pu8msa, WILC_Uint16 u16RxLen)
{ {
#ifdef PHY_802_11n #ifdef PHY_802_11n
#ifdef FIVE_GHZ_BAND #ifdef FIVE_GHZ_BAND
@ -768,17 +768,17 @@ WILC_Uint8 get_current_channel(WILC_Uint8 *pu8msa, WILC_Uint16 u16RxLen)
* @date 1 Mar 2012 * @date 1 Mar 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 ParseNetworkInfo(WILC_Uint8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo) WILC_Sint32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
tstrNetworkInfo *pstrNetworkInfo = NULL; tstrNetworkInfo *pstrNetworkInfo = NULL;
WILC_Uint8 u8MsgType = 0; u8 u8MsgType = 0;
WILC_Uint8 u8MsgID = 0; u8 u8MsgID = 0;
WILC_Uint16 u16MsgLen = 0; WILC_Uint16 u16MsgLen = 0;
WILC_Uint16 u16WidID = (WILC_Uint16)WID_NIL; WILC_Uint16 u16WidID = (WILC_Uint16)WID_NIL;
WILC_Uint16 u16WidLen = 0; WILC_Uint16 u16WidLen = 0;
WILC_Uint8 *pu8WidVal = 0; u8 *pu8WidVal = 0;
u8MsgType = pu8MsgBuffer[0]; u8MsgType = pu8MsgBuffer[0];
@ -805,12 +805,12 @@ WILC_Sint32 ParseNetworkInfo(WILC_Uint8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNe
/* parse the WID value of the WID "WID_NEWORK_INFO" */ /* parse the WID value of the WID "WID_NEWORK_INFO" */
{ {
WILC_Uint8 *pu8msa = 0; u8 *pu8msa = 0;
WILC_Uint16 u16RxLen = 0; WILC_Uint16 u16RxLen = 0;
WILC_Uint8 *pu8TimElm = 0; u8 *pu8TimElm = 0;
WILC_Uint8 *pu8IEs = 0; u8 *pu8IEs = 0;
WILC_Uint16 u16IEsLen = 0; WILC_Uint16 u16IEsLen = 0;
WILC_Uint8 u8index = 0; u8 u8index = 0;
WILC_Uint32 u32Tsf_Lo; WILC_Uint32 u32Tsf_Lo;
WILC_Uint32 u32Tsf_Hi; WILC_Uint32 u32Tsf_Hi;
@ -865,7 +865,7 @@ WILC_Sint32 ParseNetworkInfo(WILC_Uint8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNe
u16IEsLen = u16RxLen - (MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN); u16IEsLen = u16RxLen - (MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN);
if (u16IEsLen > 0) { if (u16IEsLen > 0) {
pstrNetworkInfo->pu8IEs = (WILC_Uint8 *)WILC_MALLOC(u16IEsLen); pstrNetworkInfo->pu8IEs = (u8 *)WILC_MALLOC(u16IEsLen);
WILC_memset((void *)(pstrNetworkInfo->pu8IEs), 0, u16IEsLen); WILC_memset((void *)(pstrNetworkInfo->pu8IEs), 0, u16IEsLen);
WILC_memcpy(pstrNetworkInfo->pu8IEs, pu8IEs, u16IEsLen); WILC_memcpy(pstrNetworkInfo->pu8IEs, pu8IEs, u16IEsLen);
@ -923,13 +923,13 @@ WILC_Sint32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo)
* @date 2 Apr 2012 * @date 2 Apr 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 ParseAssocRespInfo(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32BufferLen, WILC_Sint32 ParseAssocRespInfo(u8 *pu8Buffer, WILC_Uint32 u32BufferLen,
tstrConnectRespInfo **ppstrConnectRespInfo) tstrConnectRespInfo **ppstrConnectRespInfo)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
tstrConnectRespInfo *pstrConnectRespInfo = NULL; tstrConnectRespInfo *pstrConnectRespInfo = NULL;
WILC_Uint16 u16AssocRespLen = 0; WILC_Uint16 u16AssocRespLen = 0;
WILC_Uint8 *pu8IEs = 0; u8 *pu8IEs = 0;
WILC_Uint16 u16IEsLen = 0; WILC_Uint16 u16IEsLen = 0;
pstrConnectRespInfo = (tstrConnectRespInfo *)WILC_MALLOC(sizeof(tstrConnectRespInfo)); pstrConnectRespInfo = (tstrConnectRespInfo *)WILC_MALLOC(sizeof(tstrConnectRespInfo));
@ -952,7 +952,7 @@ WILC_Sint32 ParseAssocRespInfo(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32BufferLen,
pu8IEs = &pu8Buffer[CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN]; pu8IEs = &pu8Buffer[CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN];
u16IEsLen = u16AssocRespLen - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN); u16IEsLen = u16AssocRespLen - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN);
pstrConnectRespInfo->pu8RespIEs = (WILC_Uint8 *)WILC_MALLOC(u16IEsLen); pstrConnectRespInfo->pu8RespIEs = (u8 *)WILC_MALLOC(u16IEsLen);
WILC_memset((void *)(pstrConnectRespInfo->pu8RespIEs), 0, u16IEsLen); WILC_memset((void *)(pstrConnectRespInfo->pu8RespIEs), 0, u16IEsLen);
WILC_memcpy(pstrConnectRespInfo->pu8RespIEs, pu8IEs, u16IEsLen); WILC_memcpy(pstrConnectRespInfo->pu8RespIEs, pu8IEs, u16IEsLen);
@ -998,7 +998,7 @@ WILC_Sint32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo)
} }
#ifndef CONNECT_DIRECT #ifndef CONNECT_DIRECT
WILC_Sint32 ParseSurveyResults(WILC_Uint8 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) WILC_Uint32 *pu32SurveyResultsCount)
{ {
@ -1006,9 +1006,9 @@ WILC_Sint32 ParseSurveyResults(WILC_Uint8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY
wid_site_survey_reslts_s *pstrSurveyResults = NULL; wid_site_survey_reslts_s *pstrSurveyResults = NULL;
WILC_Uint32 u32SurveyResultsCount = 0; WILC_Uint32 u32SurveyResultsCount = 0;
WILC_Uint32 u32SurveyBytesLength = 0; WILC_Uint32 u32SurveyBytesLength = 0;
WILC_Uint8 *pu8BufferPtr; u8 *pu8BufferPtr;
WILC_Uint32 u32RcvdSurveyResultsNum = 2; WILC_Uint32 u32RcvdSurveyResultsNum = 2;
WILC_Uint8 u8ReadSurveyResFragNum; u8 u8ReadSurveyResFragNum;
WILC_Uint32 i; WILC_Uint32 i;
WILC_Uint32 j; WILC_Uint32 j;
@ -1098,8 +1098,8 @@ WILC_Sint32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults)
void ProcessCharWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, void ProcessCharWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
tstrWID *pstrWID, WILC_Sint8 *ps8WidVal) tstrWID *pstrWID, WILC_Sint8 *ps8WidVal)
{ {
WILC_Uint8 *pu8val = (WILC_Uint8 *)ps8WidVal; u8 *pu8val = (u8 *)ps8WidVal;
WILC_Uint8 u8val = 0; u8 u8val = 0;
WILC_Sint32 s32PktLen = *ps32PktLen; WILC_Sint32 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);
@ -1107,13 +1107,13 @@ void ProcessCharWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
} }
/* WID */ /* WID */
pcPacket[s32PktLen++] = (WILC_Uint8)(pstrWID->u16WIDid & 0xFF); pcPacket[s32PktLen++] = (u8)(pstrWID->u16WIDid & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)(pstrWID->u16WIDid >> 8) & 0xFF; pcPacket[s32PktLen++] = (u8)(pstrWID->u16WIDid >> 8) & 0xFF;
if (g_oper_mode == SET_CFG) { if (g_oper_mode == SET_CFG) {
u8val = *pu8val; u8val = *pu8val;
/* Length */ /* Length */
pcPacket[s32PktLen++] = sizeof(WILC_Uint8); pcPacket[s32PktLen++] = sizeof(u8);
/* Value */ /* Value */
@ -1161,8 +1161,8 @@ void ProcessShortWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
} }
/* WID */ /* WID */
pcPacket[s32PktLen++] = (WILC_Uint8)(pstrWID->u16WIDid & 0xFF); pcPacket[s32PktLen++] = (u8)(pstrWID->u16WIDid & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)((pstrWID->u16WIDid >> 8) & 0xFF); pcPacket[s32PktLen++] = (u8)((pstrWID->u16WIDid >> 8) & 0xFF);
if (g_oper_mode == SET_CFG) { if (g_oper_mode == SET_CFG) {
u16val = *pu16val; u16val = *pu16val;
@ -1171,8 +1171,8 @@ void ProcessShortWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
pcPacket[s32PktLen++] = sizeof(WILC_Uint16); pcPacket[s32PktLen++] = sizeof(WILC_Uint16);
/* Value */ /* Value */
pcPacket[s32PktLen++] = (WILC_Uint8)(u16val & 0xFF); pcPacket[s32PktLen++] = (u8)(u16val & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)((u16val >> 8) & 0xFF); pcPacket[s32PktLen++] = (u8)((u16val >> 8) & 0xFF);
} }
*ps32PktLen = s32PktLen; *ps32PktLen = s32PktLen;
} }
@ -1216,8 +1216,8 @@ void ProcessIntWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
} }
/* WID */ /* WID */
pcPacket[s32PktLen++] = (WILC_Uint8)(pstrWID->u16WIDid & 0xFF); pcPacket[s32PktLen++] = (u8)(pstrWID->u16WIDid & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)((pstrWID->u16WIDid >> 8) & 0xFF); pcPacket[s32PktLen++] = (u8)((pstrWID->u16WIDid >> 8) & 0xFF);
if (g_oper_mode == SET_CFG) { if (g_oper_mode == SET_CFG) {
u32val = *pu32val; u32val = *pu32val;
@ -1226,10 +1226,10 @@ void ProcessIntWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
pcPacket[s32PktLen++] = sizeof(WILC_Uint32); pcPacket[s32PktLen++] = sizeof(WILC_Uint32);
/* Value */ /* Value */
pcPacket[s32PktLen++] = (WILC_Uint8)(u32val & 0xFF); pcPacket[s32PktLen++] = (u8)(u32val & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)((u32val >> 8) & 0xFF); pcPacket[s32PktLen++] = (u8)((u32val >> 8) & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)((u32val >> 16) & 0xFF); pcPacket[s32PktLen++] = (u8)((u32val >> 16) & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)((u32val >> 24) & 0xFF); pcPacket[s32PktLen++] = (u8)((u32val >> 24) & 0xFF);
} }
*ps32PktLen = s32PktLen; *ps32PktLen = s32PktLen;
} }
@ -1263,7 +1263,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, WILC_Uint8 *pu8ip) tstrWID *pstrWID, u8 *pu8ip)
{ {
WILC_Uint32 u32val = 0; WILC_Uint32 u32val = 0;
WILC_Sint32 s32PktLen = *ps32PktLen; WILC_Sint32 s32PktLen = *ps32PktLen;
@ -1274,8 +1274,8 @@ void ProcessIPwid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
} }
/* WID */ /* WID */
pcPacket[s32PktLen++] = (WILC_Uint8)(pstrWID->u16WIDid & 0xFF); pcPacket[s32PktLen++] = (u8)(pstrWID->u16WIDid & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)((pstrWID->u16WIDid >> 8) & 0xFF); pcPacket[s32PktLen++] = (u8)((pstrWID->u16WIDid >> 8) & 0xFF);
if (g_oper_mode == SET_CFG) { if (g_oper_mode == SET_CFG) {
/* Length */ /* Length */
@ -1285,10 +1285,10 @@ void ProcessIPwid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
conv_ip_to_int(pu8ip, &u32val); conv_ip_to_int(pu8ip, &u32val);
/* Value */ /* Value */
pcPacket[s32PktLen++] = (WILC_Uint8)(u32val & 0xFF); pcPacket[s32PktLen++] = (u8)(u32val & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)((u32val >> 8) & 0xFF); pcPacket[s32PktLen++] = (u8)((u32val >> 8) & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)((u32val >> 16) & 0xFF); pcPacket[s32PktLen++] = (u8)((u32val >> 16) & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)((u32val >> 24) & 0xFF); pcPacket[s32PktLen++] = (u8)((u32val >> 24) & 0xFF);
} }
*ps32PktLen = s32PktLen; *ps32PktLen = s32PktLen;
} }
@ -1321,7 +1321,7 @@ void ProcessIPwid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
/*****************************************************************************/ /*****************************************************************************/
void ProcessStrWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, void ProcessStrWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
tstrWID *pstrWID, WILC_Uint8 *pu8val, WILC_Sint32 s32ValueSize) tstrWID *pstrWID, u8 *pu8val, WILC_Sint32 s32ValueSize)
{ {
WILC_Uint16 u16MsgLen = 0; WILC_Uint16 u16MsgLen = 0;
WILC_Uint16 idx = 0; WILC_Uint16 idx = 0;
@ -1332,8 +1332,8 @@ void ProcessStrWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
} }
/* WID */ /* WID */
pcPacket[s32PktLen++] = (WILC_Uint8)(pstrWID->u16WIDid & 0xFF); pcPacket[s32PktLen++] = (u8)(pstrWID->u16WIDid & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)((pstrWID->u16WIDid >> 8) & 0xFF); pcPacket[s32PktLen++] = (u8)((pstrWID->u16WIDid >> 8) & 0xFF);
if (g_oper_mode == SET_CFG) { if (g_oper_mode == SET_CFG) {
/* Message Length */ /* Message Length */
@ -1341,7 +1341,7 @@ void ProcessStrWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
u16MsgLen = (WILC_Uint16)s32ValueSize; u16MsgLen = (WILC_Uint16)s32ValueSize;
/* Length */ /* Length */
pcPacket[s32PktLen++] = (WILC_Uint8)u16MsgLen; pcPacket[s32PktLen++] = (u8)u16MsgLen;
/* Value */ /* Value */
for (idx = 0; idx < u16MsgLen; idx++) for (idx = 0; idx < u16MsgLen; idx++)
@ -1378,7 +1378,7 @@ void ProcessStrWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
/*****************************************************************************/ /*****************************************************************************/
void ProcessAdrWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, void ProcessAdrWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
tstrWID *pstrWID, WILC_Uint8 *pu8val) tstrWID *pstrWID, u8 *pu8val)
{ {
WILC_Uint16 u16MsgLen = 0; WILC_Uint16 u16MsgLen = 0;
WILC_Sint32 s32PktLen = *ps32PktLen; WILC_Sint32 s32PktLen = *ps32PktLen;
@ -1389,15 +1389,15 @@ void ProcessAdrWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
} }
/* WID */ /* WID */
pcPacket[s32PktLen++] = (WILC_Uint8)(pstrWID->u16WIDid & 0xFF); pcPacket[s32PktLen++] = (u8)(pstrWID->u16WIDid & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)((pstrWID->u16WIDid >> 8) & 0xFF); pcPacket[s32PktLen++] = (u8)((pstrWID->u16WIDid >> 8) & 0xFF);
if (g_oper_mode == SET_CFG) { if (g_oper_mode == SET_CFG) {
/* Message Length */ /* Message Length */
u16MsgLen = MAC_ADDR_LEN; u16MsgLen = MAC_ADDR_LEN;
/* Length */ /* Length */
pcPacket[s32PktLen++] = (WILC_Uint8)u16MsgLen; pcPacket[s32PktLen++] = (u8)u16MsgLen;
/* Value */ /* Value */
extract_mac_addr(pu8val, pcPacket + s32PktLen); extract_mac_addr(pu8val, pcPacket + s32PktLen);
@ -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, WILC_Sint32 *ps32PktLen,
tstrWID *pstrWID, WILC_Uint8 *pu8val, WILC_Sint32 s32ValueSize) tstrWID *pstrWID, u8 *pu8val, WILC_Sint32 s32ValueSize)
{ {
/* WILC_ERROR("processing Binary WIDs is not supported \n"); */ /* WILC_ERROR("processing Binary WIDs is not supported \n"); */
WILC_Uint16 u16MsgLen = 0; WILC_Uint16 u16MsgLen = 0;
WILC_Uint16 idx = 0; WILC_Uint16 idx = 0;
WILC_Sint32 s32PktLen = *ps32PktLen; WILC_Sint32 s32PktLen = *ps32PktLen;
WILC_Uint8 u8checksum = 0; u8 u8checksum = 0;
if (pstrWID == NULL) { if (pstrWID == NULL) {
PRINT_WRN(CORECONFIG_DBG, "Can't set BIN val, NULL structure\n"); PRINT_WRN(CORECONFIG_DBG, "Can't set BIN val, NULL structure\n");
@ -1457,17 +1457,17 @@ void ProcessBinWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
} }
/* WID */ /* WID */
pcPacket[s32PktLen++] = (WILC_Uint8)(pstrWID->u16WIDid & 0xFF); pcPacket[s32PktLen++] = (u8)(pstrWID->u16WIDid & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)((pstrWID->u16WIDid >> 8) & 0xFF); pcPacket[s32PktLen++] = (u8)((pstrWID->u16WIDid >> 8) & 0xFF);
if (g_oper_mode == SET_CFG) { if (g_oper_mode == SET_CFG) {
/* Message Length */ /* Message Length */
u16MsgLen = (WILC_Uint16)s32ValueSize; u16MsgLen = (WILC_Uint16)s32ValueSize;
/* Length */ /* Length */
/* pcPacket[s32PktLen++] = (WILC_Uint8)u16MsgLen; */ /* pcPacket[s32PktLen++] = (u8)u16MsgLen; */
pcPacket[s32PktLen++] = (WILC_Uint8)(u16MsgLen & 0xFF); pcPacket[s32PktLen++] = (u8)(u16MsgLen & 0xFF);
pcPacket[s32PktLen++] = (WILC_Uint8)((u16MsgLen >> 8) & 0xFF); pcPacket[s32PktLen++] = (u8)((u16MsgLen >> 8) & 0xFF);
/* Value */ /* Value */
for (idx = 0; idx < u16MsgLen; idx++) for (idx = 0; idx < u16MsgLen; idx++)
@ -1516,7 +1516,7 @@ void ProcessBinWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
WILC_Sint32 further_process_response(WILC_Uint8 *resp, WILC_Sint32 further_process_response(u8 *resp,
WILC_Uint16 u16WIDid, WILC_Uint16 u16WIDid,
WILC_Uint16 cfg_len, WILC_Uint16 cfg_len,
WILC_Bool process_wid_num, WILC_Bool process_wid_num,
@ -1525,10 +1525,10 @@ WILC_Sint32 further_process_response(WILC_Uint8 *resp,
{ {
WILC_Uint32 retval = 0; WILC_Uint32 retval = 0;
WILC_Uint32 idx = 0; WILC_Uint32 idx = 0;
WILC_Uint8 cfg_chr = 0; u8 cfg_chr = 0;
WILC_Uint16 cfg_sht = 0; WILC_Uint16 cfg_sht = 0;
WILC_Uint32 cfg_int = 0; WILC_Uint32 cfg_int = 0;
WILC_Uint8 cfg_str[256] = {0}; u8 cfg_str[256] = {0};
tenuWIDtype enuWIDtype = WID_UNDEF; tenuWIDtype enuWIDtype = WID_UNDEF;
if (process_wid_num) { if (process_wid_num) {
@ -1621,7 +1621,7 @@ WILC_Sint32 further_process_response(WILC_Uint8 *resp,
case WID_BIN_DATA: case WID_BIN_DATA:
#if 0 #if 0
/* FILE *fp_bin = NULL; */ /* FILE *fp_bin = NULL; */
WILC_Uint8 first_bin_wid = 1; u8 first_bin_wid = 1;
if (first_bin_wid) { if (first_bin_wid) {
/* fp_bin = fopen("wid_response.bin","wb"); */ /* fp_bin = fopen("wid_response.bin","wb"); */
first_bin_wid = 0; first_bin_wid = 0;
@ -1686,7 +1686,7 @@ WILC_Sint32 further_process_response(WILC_Uint8 *resp,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
WILC_Sint32 ParseResponse(WILC_Uint8 *resp, tstrWID *pstrWIDcfgResult) WILC_Sint32 ParseResponse(u8 *resp, tstrWID *pstrWIDcfgResult)
{ {
WILC_Uint16 u16RespLen = 0; WILC_Uint16 u16RespLen = 0;
WILC_Uint16 u16WIDid = 0; WILC_Uint16 u16WIDid = 0;
@ -1759,7 +1759,7 @@ WILC_Sint32 ParseResponse(WILC_Uint8 *resp, tstrWID *pstrWIDcfgResult)
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 ParseWriteResponse(WILC_Uint8 *pu8RespBuffer) WILC_Sint32 ParseWriteResponse(u8 *pu8RespBuffer)
{ {
WILC_Sint32 s32Error = WILC_FAIL; WILC_Sint32 s32Error = WILC_FAIL;
WILC_Uint16 u16RespLen = 0; WILC_Uint16 u16RespLen = 0;
@ -1834,8 +1834,8 @@ WILC_Sint32 CreatePacketHeader(WILC_Char *pcpacket, WILC_Sint32 *ps32PacketLengt
pcpacket[u16MsgInd++] = g_seqno++; pcpacket[u16MsgInd++] = g_seqno++;
/* Message Length */ /* Message Length */
pcpacket[u16MsgInd++] = (WILC_Uint8)(u16MsgLen & 0xFF); pcpacket[u16MsgInd++] = (u8)(u16MsgLen & 0xFF);
pcpacket[u16MsgInd++] = (WILC_Uint8)((u16MsgLen >> 8) & 0xFF); pcpacket[u16MsgInd++] = (u8)((u16MsgLen >> 8) & 0xFF);
*ps32PacketLength = u16MsgLen; *ps32PacketLength = u16MsgLen;
@ -1948,7 +1948,7 @@ WILC_Sint32 ConfigWaitResponse(WILC_Char *pcRespBuffer, WILC_Sint32 s32MaxRespBu
* @version 1.0 * @version 1.0
*/ */
#ifdef SIMULATION #ifdef SIMULATION
WILC_Sint32 SendConfigPkt(WILC_Uint8 u8Mode, tstrWID *pstrWIDs, WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
WILC_Uint32 u32WIDsCount, WILC_Bool bRespRequired, WILC_Uint32 drvHandler) WILC_Uint32 u32WIDsCount, WILC_Bool bRespRequired, WILC_Uint32 drvHandler)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
@ -2049,10 +2049,10 @@ WILC_Sint32 ConfigProvideResponse(WILC_Char *pcRespBuffer, WILC_Sint32 s32RespLe
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 ConfigPktReceived(WILC_Uint8 *pu8RxPacket, WILC_Sint32 s32RxPacketLen) WILC_Sint32 ConfigPktReceived(u8 *pu8RxPacket, WILC_Sint32 s32RxPacketLen)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
WILC_Uint8 u8MsgType = 0; u8 u8MsgType = 0;
u8MsgType = pu8RxPacket[0]; u8MsgType = pu8RxPacket[0];
@ -2127,7 +2127,7 @@ extern wilc_wlan_oup_t *gpstrWlanOps;
* @date 1 Mar 2012 * @date 1 Mar 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 SendConfigPkt(WILC_Uint8 u8Mode, tstrWID *pstrWIDs, WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
WILC_Uint32 u32WIDsCount, WILC_Bool bRespRequired, WILC_Uint32 drvHandler) WILC_Uint32 u32WIDsCount, WILC_Bool bRespRequired, WILC_Uint32 drvHandler)
{ {
WILC_Sint32 counter = 0, ret = 0; WILC_Sint32 counter = 0, ret = 0;

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

@ -402,30 +402,30 @@ typedef struct {
} tstrWID; } tstrWID;
typedef struct { typedef struct {
WILC_Uint8 u8Full; u8 u8Full;
WILC_Uint8 u8Index; u8 u8Index;
WILC_Sint8 as8RSSI[NUM_RSSI]; WILC_Sint8 as8RSSI[NUM_RSSI];
} tstrRSSI; } tstrRSSI;
/* This structure is used to support parsing of the received 'N' message */ /* This structure is used to support parsing of the received 'N' message */
typedef struct { typedef struct {
WILC_Sint8 s8rssi; WILC_Sint8 s8rssi;
WILC_Uint16 u16CapInfo; WILC_Uint16 u16CapInfo;
WILC_Uint8 au8ssid[MAX_SSID_LEN]; u8 au8ssid[MAX_SSID_LEN];
WILC_Uint8 u8SsidLen; u8 u8SsidLen;
WILC_Uint8 au8bssid[6]; u8 au8bssid[6];
WILC_Uint16 u16BeaconPeriod; WILC_Uint16 u16BeaconPeriod;
WILC_Uint8 u8DtimPeriod; u8 u8DtimPeriod;
WILC_Uint8 u8channel; u8 u8channel;
unsigned long u32TimeRcvdInScanCached; /* of type unsigned long to be accepted by the linux kernel macro time_after() */ unsigned long u32TimeRcvdInScanCached; /* of type unsigned long to be accepted by the linux kernel macro time_after() */
unsigned long u32TimeRcvdInScan; unsigned long u32TimeRcvdInScan;
WILC_Bool bNewNetwork; WILC_Bool bNewNetwork;
#ifdef AGING_ALG #ifdef AGING_ALG
WILC_Uint8 u8Found; u8 u8Found;
#endif #endif
#ifdef WILC_P2P #ifdef WILC_P2P
WILC_Uint32 u32Tsf; /* time-stamp [Low only 32 bit] */ WILC_Uint32 u32Tsf; /* time-stamp [Low only 32 bit] */
#endif #endif
WILC_Uint8 *pu8IEs; u8 *pu8IEs;
WILC_Uint16 u16IEsLen; WILC_Uint16 u16IEsLen;
void *pJoinParams; void *pJoinParams;
tstrRSSI strRssi; tstrRSSI strRssi;
@ -437,16 +437,16 @@ typedef struct {
WILC_Uint16 u16capability; WILC_Uint16 u16capability;
WILC_Uint16 u16ConnectStatus; WILC_Uint16 u16ConnectStatus;
WILC_Uint16 u16AssocID; WILC_Uint16 u16AssocID;
WILC_Uint8 *pu8RespIEs; u8 *pu8RespIEs;
WILC_Uint16 u16RespIEsLen; WILC_Uint16 u16RespIEsLen;
} tstrConnectRespInfo; } tstrConnectRespInfo;
typedef struct { typedef struct {
WILC_Uint8 au8bssid[6]; u8 au8bssid[6];
WILC_Uint8 *pu8ReqIEs; u8 *pu8ReqIEs;
size_t ReqIEsLen; size_t ReqIEsLen;
WILC_Uint8 *pu8RespIEs; u8 *pu8RespIEs;
WILC_Uint16 u16RespIEsLen; WILC_Uint16 u16RespIEsLen;
WILC_Uint16 u16ConnectStatus; WILC_Uint16 u16ConnectStatus;
} tstrConnectInfo; } tstrConnectInfo;
@ -455,19 +455,19 @@ typedef struct {
typedef struct { typedef struct {
WILC_Uint16 u16reason; WILC_Uint16 u16reason;
WILC_Uint8 *ie; u8 *ie;
size_t ie_len; size_t ie_len;
} tstrDisconnectNotifInfo; } tstrDisconnectNotifInfo;
#ifndef CONNECT_DIRECT #ifndef CONNECT_DIRECT
typedef struct wid_site_survey_reslts { typedef struct wid_site_survey_reslts {
WILC_Char SSID[MAX_SSID_LEN]; WILC_Char SSID[MAX_SSID_LEN];
WILC_Uint8 BssType; u8 BssType;
WILC_Uint8 Channel; u8 Channel;
WILC_Uint8 SecurityStatus; u8 SecurityStatus;
WILC_Uint8 BSSID[6]; u8 BSSID[6];
WILC_Char RxPower; WILC_Char RxPower;
WILC_Uint8 Reserved; u8 Reserved;
} wid_site_survey_reslts_s; } wid_site_survey_reslts_s;
#endif #endif
@ -475,24 +475,24 @@ typedef struct wid_site_survey_reslts {
extern WILC_Sint32 CoreConfiguratorInit(void); extern WILC_Sint32 CoreConfiguratorInit(void);
extern WILC_Sint32 CoreConfiguratorDeInit(void); extern WILC_Sint32 CoreConfiguratorDeInit(void);
extern WILC_Sint32 SendConfigPkt(WILC_Uint8 u8Mode, tstrWID *pstrWIDs, extern WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
WILC_Uint32 u32WIDsCount, WILC_Bool bRespRequired, WILC_Uint32 drvHandler); WILC_Uint32 u32WIDsCount, WILC_Bool bRespRequired, WILC_Uint32 drvHandler);
extern WILC_Sint32 ParseNetworkInfo(WILC_Uint8 *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(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32BufferLen, extern WILC_Sint32 ParseAssocRespInfo(u8 *pu8Buffer, WILC_Uint32 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(WILC_Uint8 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, WILC_Uint32 *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(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length); extern void NetworkInfoReceived(u8 *pu8Buffer, WILC_Uint32 u32Length);
void GnrlAsyncInfoReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length); void GnrlAsyncInfoReceived(u8 *pu8Buffer, WILC_Uint32 u32Length);
void host_int_ScanCompleteReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length); void host_int_ScanCompleteReceived(u8 *pu8Buffer, WILC_Uint32 u32Length);
#endif #endif

4
drivers/staging/wilc1000/fifo_buffer.c
View file

@ -45,7 +45,7 @@ WILC_Uint32 FIFO_DeInit(tHANDLE hFifo)
return u32Error; return u32Error;
} }
WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, WILC_Uint8 *pu8Buffer, WILC_Uint32 u32BytesToRead, WILC_Uint32 *pu32BytesRead) WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, u8 *pu8Buffer, WILC_Uint32 u32BytesToRead, WILC_Uint32 *pu32BytesRead)
{ {
WILC_Uint32 u32Error = 0; WILC_Uint32 u32Error = 0;
tstrFifoHandler *pstrFifoHandler = (tstrFifoHandler *) hFifo; tstrFifoHandler *pstrFifoHandler = (tstrFifoHandler *) hFifo;
@ -86,7 +86,7 @@ WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, WILC_Uint8 *pu8Buffer, WILC_Uint32 u32
return u32Error; return u32Error;
} }
WILC_Uint32 FIFO_WriteBytes(tHANDLE hFifo, WILC_Uint8 *pu8Buffer, WILC_Uint32 u32BytesToWrite, WILC_Bool bForceOverWrite) WILC_Uint32 FIFO_WriteBytes(tHANDLE hFifo, u8 *pu8Buffer, WILC_Uint32 u32BytesToWrite, WILC_Bool bForceOverWrite)
{ {
WILC_Uint32 u32Error = 0; WILC_Uint32 u32Error = 0;
tstrFifoHandler *pstrFifoHandler = (tstrFifoHandler *) hFifo; tstrFifoHandler *pstrFifoHandler = (tstrFifoHandler *) hFifo;

8
drivers/staging/wilc1000/fifo_buffer.h
View file

@ -5,7 +5,7 @@
#define tHANDLE void * #define tHANDLE void *
typedef struct { typedef struct {
WILC_Uint8 *pu8Buffer; u8 *pu8Buffer;
WILC_Uint32 u32BufferLength; WILC_Uint32 u32BufferLength;
WILC_Uint32 u32WriteOffset; WILC_Uint32 u32WriteOffset;
WILC_Uint32 u32ReadOffset; WILC_Uint32 u32ReadOffset;
@ -17,7 +17,7 @@ typedef struct {
extern WILC_Uint32 FIFO_InitBuffer(tHANDLE *hBuffer, extern WILC_Uint32 FIFO_InitBuffer(tHANDLE *hBuffer,
WILC_Uint32 u32BufferLength); WILC_Uint32 u32BufferLength);
extern WILC_Uint32 FIFO_DeInit(tHANDLE hFifo); extern WILC_Uint32 FIFO_DeInit(tHANDLE hFifo);
extern WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, WILC_Uint8 *pu8Buffer, extern WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, u8 *pu8Buffer,
WILC_Uint32 u32BytesToRead, WILC_Uint32 *pu32BytesRead); WILC_Uint32 u32BytesToRead, WILC_Uint32 *pu32BytesRead);
extern WILC_Uint32 FIFO_WriteBytes(tHANDLE hFifo, WILC_Uint8 *pu8Buffer, extern WILC_Uint32 FIFO_WriteBytes(tHANDLE hFifo, u8 *pu8Buffer,
WILC_Uint32 u32BytesToWrite, WILC_Bool bForceOverWrite); WILC_Uint32 u32BytesToWrite, WILC_Bool bForceOverWrite);

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

File diff suppressed because it is too large Load diff

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

@ -132,7 +132,7 @@ typedef struct {
} cfg_param_t; } cfg_param_t;
typedef struct _tstrStatistics { typedef struct _tstrStatistics {
WILC_Uint8 u8LinkSpeed; u8 u8LinkSpeed;
WILC_Sint8 s8RSSI; WILC_Sint8 s8RSSI;
WILC_Uint32 u32TxCount; WILC_Uint32 u32TxCount;
WILC_Uint32 u32RxCount; WILC_Uint32 u32RxCount;
@ -152,12 +152,12 @@ typedef enum {
} tenuHostIFstate; } tenuHostIFstate;
typedef struct _tstrHostIFpmkid { typedef struct _tstrHostIFpmkid {
WILC_Uint8 bssid[ETH_ALEN]; u8 bssid[ETH_ALEN];
WILC_Uint8 pmkid[PMKID_LEN]; u8 pmkid[PMKID_LEN];
} tstrHostIFpmkid; } tstrHostIFpmkid;
typedef struct _tstrHostIFpmkidAttr { typedef struct _tstrHostIFpmkidAttr {
WILC_Uint8 numpmkid; u8 numpmkid;
tstrHostIFpmkid pmkidlist[WILC_MAX_NUM_PMKIDS]; tstrHostIFpmkid pmkidlist[WILC_MAX_NUM_PMKIDS];
} tstrHostIFpmkidAttr; } tstrHostIFpmkidAttr;
#if 0 #if 0
@ -190,23 +190,23 @@ typedef enum {
typedef struct { typedef struct {
WILC_Uint32 u32SetCfgFlag; WILC_Uint32 u32SetCfgFlag;
WILC_Uint8 ht_enable; u8 ht_enable;
WILC_Uint8 bss_type; u8 bss_type;
WILC_Uint8 auth_type; u8 auth_type;
WILC_Uint16 auth_timeout; WILC_Uint16 auth_timeout;
WILC_Uint8 power_mgmt_mode; u8 power_mgmt_mode;
WILC_Uint16 short_retry_limit; WILC_Uint16 short_retry_limit;
WILC_Uint16 long_retry_limit; WILC_Uint16 long_retry_limit;
WILC_Uint16 frag_threshold; WILC_Uint16 frag_threshold;
WILC_Uint16 rts_threshold; WILC_Uint16 rts_threshold;
WILC_Uint16 preamble_type; WILC_Uint16 preamble_type;
WILC_Uint8 short_slot_allowed; u8 short_slot_allowed;
WILC_Uint8 txop_prot_disabled; u8 txop_prot_disabled;
WILC_Uint16 beacon_interval; WILC_Uint16 beacon_interval;
WILC_Uint16 dtim_period; WILC_Uint16 dtim_period;
SITE_SURVEY_T site_survey_enabled; SITE_SURVEY_T site_survey_enabled;
WILC_Uint16 site_survey_scan_time; WILC_Uint16 site_survey_scan_time;
WILC_Uint8 scan_source; u8 scan_source;
WILC_Uint16 active_scan_time; WILC_Uint16 active_scan_time;
WILC_Uint16 passive_scan_time; WILC_Uint16 passive_scan_time;
CURRENT_TX_RATE_T curr_tx_rate; CURRENT_TX_RATE_T curr_tx_rate;
@ -236,7 +236,7 @@ typedef enum {
} tenuCfgParam; } tenuCfgParam;
typedef struct { typedef struct {
WILC_Uint8 au8bssid[6]; u8 au8bssid[6];
WILC_Sint8 s8rssi; WILC_Sint8 s8rssi;
} tstrFoundNetworkInfo; } tstrFoundNetworkInfo;
@ -266,7 +266,7 @@ typedef void (*tWILCpfScanResult)(tenuScanEvent, tstrNetworkInfo *, void *, void
/*Connect callBack function definition*/ /*Connect callBack function definition*/
typedef void (*tWILCpfConnectResult)(tenuConnDisconnEvent, typedef void (*tWILCpfConnectResult)(tenuConnDisconnEvent,
tstrConnectInfo *, tstrConnectInfo *,
WILC_Uint8, u8,
tstrDisconnectNotifInfo *, tstrDisconnectNotifInfo *,
void *); void *);
@ -291,21 +291,21 @@ typedef struct {
* @version 1.0 * @version 1.0
*/ */
typedef struct _tstrRcvdNetworkInfo { typedef struct _tstrRcvdNetworkInfo {
WILC_Uint8 *pu8Buffer; u8 *pu8Buffer;
WILC_Uint32 u32Length; WILC_Uint32 u32Length;
} tstrRcvdNetworkInfo; } tstrRcvdNetworkInfo;
/*BugID_4156*/ /*BugID_4156*/
typedef struct _tstrHiddenNetworkInfo { typedef struct _tstrHiddenNetworkInfo {
WILC_Uint8 *pu8ssid; u8 *pu8ssid;
WILC_Uint8 u8ssidlen; u8 u8ssidlen;
} tstrHiddenNetworkInfo; } tstrHiddenNetworkInfo;
typedef struct _tstrHiddenNetwork { typedef struct _tstrHiddenNetwork {
/* MAX_SSID_LEN */ /* MAX_SSID_LEN */
tstrHiddenNetworkInfo *pstrHiddenNetworkInfo; tstrHiddenNetworkInfo *pstrHiddenNetworkInfo;
WILC_Uint8 u8ssidnum; u8 u8ssidnum;
} tstrHiddenNetwork; } tstrHiddenNetwork;
@ -321,12 +321,12 @@ typedef struct {
} tstrWILC_UsrScanReq; } tstrWILC_UsrScanReq;
typedef struct { typedef struct {
WILC_Uint8 *pu8bssid; u8 *pu8bssid;
WILC_Uint8 *pu8ssid; u8 *pu8ssid;
WILC_Uint8 u8security; u8 u8security;
AUTHTYPE_T tenuAuth_type; AUTHTYPE_T tenuAuth_type;
size_t ssidLen; size_t ssidLen;
WILC_Uint8 *pu8ConnReqIEs; u8 *pu8ConnReqIEs;
size_t ConnReqIEsLen; size_t ConnReqIEsLen;
/* Connect user call back function */ /* Connect user call back function */
tWILCpfConnectResult pfUserConnectResult; tWILCpfConnectResult pfUserConnectResult;
@ -345,18 +345,18 @@ typedef struct {
/*BugID_5077*/ /*BugID_5077*/
typedef struct { typedef struct {
WILC_Uint8 u8MacAddress[ETH_ALEN]; u8 u8MacAddress[ETH_ALEN];
} tstrHostIfSetMacAddress; } tstrHostIfSetMacAddress;
/*BugID_5213*/ /*BugID_5213*/
typedef struct { typedef struct {
WILC_Uint8 *u8MacAddress; u8 *u8MacAddress;
} tstrHostIfGetMacAddress; } tstrHostIfGetMacAddress;
/*BugID_5222*/ /*BugID_5222*/
typedef struct { typedef struct {
WILC_Uint8 au8Bssid[ETH_ALEN]; u8 au8Bssid[ETH_ALEN];
WILC_Uint8 u8Ted; u8 u8Ted;
WILC_Uint16 u16BufferSize; WILC_Uint16 u16BufferSize;
WILC_Uint16 u16SessionTimeout; WILC_Uint16 u16SessionTimeout;
} tstrHostIfBASessionInfo; } tstrHostIfBASessionInfo;
@ -375,7 +375,7 @@ typedef struct {
WILC_Bool bReg; WILC_Bool bReg;
WILC_Uint16 u16FrameType; WILC_Uint16 u16FrameType;
WILC_Uint8 u8Regid; u8 u8Regid;
} tstrHostIfRegisterFrame; } tstrHostIfRegisterFrame;
@ -405,9 +405,9 @@ typedef struct {
#ifdef WILC_P2P #ifdef WILC_P2P
/*Remain on channel struvture*/ /*Remain on channel struvture*/
tstrHostIfRemainOnChan strHostIfRemainOnChan; tstrHostIfRemainOnChan strHostIfRemainOnChan;
WILC_Uint8 u8RemainOnChan_pendingreq; u8 u8RemainOnChan_pendingreq;
WILC_Uint64 u64P2p_MgmtTimeout; WILC_Uint64 u64P2p_MgmtTimeout;
WILC_Uint8 u8P2PConnect; u8 u8P2PConnect;
#endif #endif
tenuHostIFstate enuHostIFstate; tenuHostIFstate enuHostIFstate;
@ -419,7 +419,7 @@ typedef struct {
wid_site_survey_reslts_s astrSurveyResults[MAX_NUM_SCANNED_NETWORKS]; wid_site_survey_reslts_s astrSurveyResults[MAX_NUM_SCANNED_NETWORKS];
#endif #endif
WILC_Uint8 au8AssociatedBSSID[ETH_ALEN]; u8 au8AssociatedBSSID[ETH_ALEN];
tstrCfgParamVal strCfgValues; tstrCfgParamVal strCfgValues;
/* semaphores */ /* semaphores */
struct semaphore gtOsCfgValuesSem; struct semaphore gtOsCfgValuesSem;
@ -461,22 +461,22 @@ typedef enum {
} tenuWILC_StaFlag; } tenuWILC_StaFlag;
typedef struct { typedef struct {
WILC_Uint8 au8BSSID[ETH_ALEN]; u8 au8BSSID[ETH_ALEN];
WILC_Uint16 u16AssocID; WILC_Uint16 u16AssocID;
WILC_Uint8 u8NumRates; u8 u8NumRates;
const u8 *pu8Rates; const u8 *pu8Rates;
WILC_Bool bIsHTSupported; WILC_Bool bIsHTSupported;
WILC_Uint16 u16HTCapInfo; WILC_Uint16 u16HTCapInfo;
WILC_Uint8 u8AmpduParams; u8 u8AmpduParams;
WILC_Uint8 au8SuppMCsSet[16]; u8 au8SuppMCsSet[16];
WILC_Uint16 u16HTExtParams; WILC_Uint16 u16HTExtParams;
WILC_Uint32 u32TxBeamformingCap; WILC_Uint32 u32TxBeamformingCap;
WILC_Uint8 u8ASELCap; u8 u8ASELCap;
WILC_Uint16 u16FlagsMask; /*<! Determines which of u16FlagsSet were changed>*/ WILC_Uint16 u16FlagsMask; /*<! Determines which of u16FlagsSet were changed>*/
WILC_Uint16 u16FlagsSet; /*<! Decoded according to tenuWILC_StaFlag */ WILC_Uint16 u16FlagsSet; /*<! Decoded according to tenuWILC_StaFlag */
} tstrWILC_AddStaParam; } tstrWILC_AddStaParam;
/* extern void CfgDisconnected(void* pUserVoid, WILC_Uint16 u16reason, WILC_Uint8 * ie, size_t ie_len); */ /* extern void CfgDisconnected(void* pUserVoid, WILC_Uint16 u16reason, u8 * ie, size_t ie_len); */
/*****************************************************************************/ /*****************************************************************************/
/* */ /* */
@ -496,7 +496,7 @@ typedef struct {
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_remove_key(WILC_WFIDrvHandle hWFIDrv, const WILC_Uint8 *pu8StaAddress); WILC_Sint32 host_int_remove_key(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8StaAddress);
/** /**
* @brief removes WEP key * @brief removes WEP key
* @details valid only in BSS STA mode if External Supplicant support is enabled. * @details valid only in BSS STA mode if External Supplicant support is enabled.
@ -511,7 +511,7 @@ WILC_Sint32 host_int_remove_key(WILC_WFIDrvHandle hWFIDrv, const WILC_Uint8 *pu8
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_remove_wep_key(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8Index); WILC_Sint32 host_int_remove_wep_key(WILC_WFIDrvHandle hWFIDrv, u8 u8Index);
/** /**
* @brief sets WEP deafault key * @brief sets WEP deafault key
* @details Sets the index of the WEP encryption key in use, * @details Sets the index of the WEP encryption key in use,
@ -524,7 +524,7 @@ WILC_Sint32 host_int_remove_wep_key(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8Inde
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_set_WEPDefaultKeyID(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8Index); WILC_Sint32 host_int_set_WEPDefaultKeyID(WILC_WFIDrvHandle hWFIDrv, u8 u8Index);
/** /**
* @brief sets WEP deafault key * @brief sets WEP deafault key
@ -545,7 +545,7 @@ WILC_Sint32 host_int_set_WEPDefaultKeyID(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_add_wep_key_bss_sta(WILC_WFIDrvHandle hWFIDrv, const WILC_Uint8 *pu8WepKey, WILC_Uint8 u8WepKeylen, WILC_Uint8 u8Keyidx); WILC_Sint32 host_int_add_wep_key_bss_sta(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx);
/** /**
* @brief host_int_add_wep_key_bss_ap * @brief host_int_add_wep_key_bss_ap
* @details valid only in AP mode if External Supplicant support is enabled. * @details valid only in AP mode if External Supplicant support is enabled.
@ -560,7 +560,7 @@ WILC_Sint32 host_int_add_wep_key_bss_sta(WILC_WFIDrvHandle hWFIDrv, const WILC_U
* @date 28 Feb 2013 * @date 28 Feb 2013
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const WILC_Uint8 *pu8WepKey, WILC_Uint8 u8WepKeylen, WILC_Uint8 u8Keyidx, WILC_Uint8 u8mode, AUTHTYPE_T tenuAuth_type); WILC_Sint32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx, u8 u8mode, AUTHTYPE_T tenuAuth_type);
/** /**
* @brief adds ptk Key * @brief adds ptk Key
@ -578,8 +578,8 @@ WILC_Sint32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const WILC_Ui
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_add_ptk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8Ptk, WILC_Uint8 u8PtkKeylen, WILC_Sint32 host_int_add_ptk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
const u8 *mac_addr, const u8 *pu8RxMic, const u8 *pu8TxMic, WILC_Uint8 mode, WILC_Uint8 u8Ciphermode, WILC_Uint8 u8Idx); const u8 *mac_addr, const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode, u8 u8Idx);
/** /**
* @brief host_int_get_inactive_time * @brief host_int_get_inactive_time
@ -611,9 +611,9 @@ WILC_Sint32 host_int_get_inactive_time(WILC_WFIDrvHandle hWFIDrv, const u8 *mac,
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, WILC_Uint8 u8GtkKeylen, WILC_Sint32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKeylen,
WILC_Uint8 u8KeyIdx, WILC_Uint32 u32KeyRSClen, const u8 *KeyRSC, u8 u8KeyIdx, WILC_Uint32 u32KeyRSClen, const u8 *KeyRSC,
const u8 *pu8RxMic, const u8 *pu8TxMic, WILC_Uint8 mode, WILC_Uint8 u8Ciphermode); const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode);
/** /**
@ -632,7 +632,7 @@ WILC_Sint32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, W
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_add_tx_gtk(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8KeyLen, WILC_Uint8 *pu8TxGtk, WILC_Uint8 u8KeyIdx); WILC_Sint32 host_int_add_tx_gtk(WILC_WFIDrvHandle hWFIDrv, u8 u8KeyLen, u8 *pu8TxGtk, u8 u8KeyIdx);
/** /**
* @brief caches the pmkid * @brief caches the pmkid
@ -679,7 +679,7 @@ WILC_Sint32 host_int_set_pmkid_info(WILC_WFIDrvHandle hWFIDrv, tstrHostIFpmkidAt
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_pmkid_info(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8PmkidInfoArray, WILC_Sint32 host_int_get_pmkid_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PmkidInfoArray,
WILC_Uint32 u32PmkidInfoLen); WILC_Uint32 u32PmkidInfoLen);
/** /**
@ -696,8 +696,8 @@ WILC_Sint32 host_int_get_pmkid_info(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8Pm
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_set_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8PassPhrase, WILC_Sint32 host_int_set_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PassPhrase,
WILC_Uint8 u8Psklength); u8 u8Psklength);
/** /**
* @brief gets the pass phrase * @brief gets the pass phrase
* @details AP/STA mode. This function gets the pass phrase used to * @details AP/STA mode. This function gets the pass phrase used to
@ -713,7 +713,7 @@ WILC_Sint32 host_int_set_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv, WILC
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv, WILC_Sint32 host_int_get_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv,
WILC_Uint8 *pu8PassPhrase, WILC_Uint8 u8Psklength); u8 *pu8PassPhrase, u8 u8Psklength);
/** /**
* @brief gets mac address * @brief gets mac address
@ -726,7 +726,7 @@ WILC_Sint32 host_int_get_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv,
* @date 19 April 2012 * @date 19 April 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_MacAddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8MacAddress); WILC_Sint32 host_int_get_MacAddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8MacAddress);
/** /**
* @brief sets mac address * @brief sets mac address
@ -739,7 +739,7 @@ WILC_Sint32 host_int_get_MacAddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8Ma
* @date 16 July 2012 * @date 16 July 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_set_MacAddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8MacAddress); WILC_Sint32 host_int_set_MacAddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8MacAddress);
/** /**
* @brief wait until msg q is empty * @brief wait until msg q is empty
@ -785,7 +785,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,
WILC_Uint8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE], u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE],
WILC_Uint32 u32MaxSiteSrvyFragLen); WILC_Uint32 u32MaxSiteSrvyFragLen);
#endif #endif
@ -805,7 +805,7 @@ WILC_Sint32 host_int_get_site_survey_results(WILC_WFIDrvHandle hWFIDrv,
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_set_start_scan_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 scanSource); WILC_Sint32 host_int_set_start_scan_req(WILC_WFIDrvHandle hWFIDrv, u8 scanSource);
/** /**
* @brief gets scan source of the last scan * @brief gets scan source of the last scan
* @details * @details
@ -821,7 +821,7 @@ WILC_Sint32 host_int_set_start_scan_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 sc
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_start_scan_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8ScanSource); WILC_Sint32 host_int_get_start_scan_req(WILC_WFIDrvHandle hWFIDrv, u8 *pu8ScanSource);
/** /**
* @brief sets a join request * @brief sets a join request
@ -835,12 +835,12 @@ WILC_Sint32 host_int_get_start_scan_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *p
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_set_join_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8bssid, WILC_Sint32 host_int_set_join_req(WILC_WFIDrvHandle hWFIDrv, u8 *pu8bssid,
const u8 *pu8ssid, size_t ssidLen, const u8 *pu8ssid, size_t ssidLen,
const WILC_Uint8 *pu8IEs, size_t IEsLen, const u8 *pu8IEs, size_t IEsLen,
tWILCpfConnectResult pfConnectResult, void *pvUserArg, tWILCpfConnectResult pfConnectResult, void *pvUserArg,
WILC_Uint8 u8security, AUTHTYPE_T tenuAuth_type, u8 u8security, AUTHTYPE_T tenuAuth_type,
WILC_Uint8 u8channel, u8 u8channel,
void *pJoinParams); void *pJoinParams);
/** /**
@ -882,7 +882,7 @@ WILC_Sint32 host_int_disconnect(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16Reason
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_disconnect_station(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 assoc_id); WILC_Sint32 host_int_disconnect_station(WILC_WFIDrvHandle hWFIDrv, u8 assoc_id);
/** /**
* @brief gets a Association request info * @brief gets a Association request info
* @details * @details
@ -909,7 +909,7 @@ WILC_Sint32 host_int_disconnect_station(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 as
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8AssocReqInfo, WILC_Sint32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocReqInfo,
WILC_Uint32 u32AssocReqInfoLen); WILC_Uint32 u32AssocReqInfoLen);
/** /**
* @brief gets a Association Response info * @brief gets a Association Response info
@ -923,7 +923,7 @@ WILC_Sint32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *p
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8AssocRespInfo, WILC_Sint32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocRespInfo,
WILC_Uint32 u32MaxAssocRespInfoLen, WILC_Uint32 *pu32RcvdAssocRespInfoLen); WILC_Uint32 u32MaxAssocRespInfoLen, WILC_Uint32 *pu32RcvdAssocRespInfoLen);
/** /**
* @brief gets a Association Response info * @brief gets a Association Response info
@ -940,7 +940,7 @@ WILC_Sint32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *p
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_rx_power_level(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8RxPowerLevel, WILC_Sint32 host_int_get_rx_power_level(WILC_WFIDrvHandle hWFIDrv, u8 *pu8RxPowerLevel,
WILC_Uint32 u32RxPowerLevelLen); WILC_Uint32 u32RxPowerLevelLen);
/** /**
@ -958,7 +958,7 @@ WILC_Sint32 host_int_get_rx_power_level(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *p
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_set_mac_chnl_num(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8ChNum); WILC_Sint32 host_int_set_mac_chnl_num(WILC_WFIDrvHandle hWFIDrv, u8 u8ChNum);
/** /**
* @brief gets the current channel index * @brief gets the current channel index
@ -975,7 +975,7 @@ WILC_Sint32 host_int_set_mac_chnl_num(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8Ch
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_host_chnl_num(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8ChNo); WILC_Sint32 host_int_get_host_chnl_num(WILC_WFIDrvHandle hWFIDrv, u8 *pu8ChNo);
/** /**
* @brief gets the sta rssi * @brief gets the sta rssi
* @details gets the currently maintained RSSI value for the station. * @details gets the currently maintained RSSI value for the station.
@ -1008,9 +1008,9 @@ WILC_Sint32 host_int_get_link_speed(WILC_WFIDrvHandle hWFIDrv, WILC_Sint8 *ps8ln
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_scan(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8ScanSource, WILC_Sint32 host_int_scan(WILC_WFIDrvHandle hWFIDrv, u8 u8ScanSource,
WILC_Uint8 u8ScanType, WILC_Uint8 *pu8ChnlFreqList, u8 u8ScanType, u8 *pu8ChnlFreqList,
WILC_Uint8 u8ChnlListLen, const WILC_Uint8 *pu8IEs, u8 u8ChnlListLen, const u8 *pu8IEs,
size_t IEsLen, tWILCpfScanResult ScanResult, size_t IEsLen, tWILCpfScanResult ScanResult,
void *pvUserArg, tstrHiddenNetwork *pstrHiddenNetwork); void *pvUserArg, tstrHiddenNetwork *pstrHiddenNetwork);
/** /**
@ -1058,7 +1058,7 @@ WILC_Sint32 hif_get_cfg(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16WID, WILC_Uint
* @version 1.0 * @version 1.0
*/ */
void host_int_send_join_leave_info_to_host void host_int_send_join_leave_info_to_host
(WILC_Uint16 assocId, WILC_Uint8 *stationAddr, WILC_Bool joining); (WILC_Uint16 assocId, u8 *stationAddr, WILC_Bool joining);
/** /**
* @brief notifies host with stations found in scan * @brief notifies host with stations found in scan
@ -1074,7 +1074,7 @@ void host_int_send_join_leave_info_to_host
* @version 1.0 * @version 1.0
*/ */
void host_int_send_network_info_to_host void host_int_send_network_info_to_host
(WILC_Uint8 *macStartAddress, WILC_Uint16 u16RxFrameLen, WILC_Sint8 s8Rssi); (u8 *macStartAddress, WILC_Uint16 u16RxFrameLen, WILC_Sint8 s8Rssi);
/** /**
* @brief host interface initialization function * @brief host interface initialization function
@ -1100,7 +1100,7 @@ WILC_Sint32 host_int_deinit(WILC_WFIDrvHandle hWFIDrv);
/*! /*!
* @fn WILC_Sint32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv,WILC_Uint8 u8Index) * @fn WILC_Sint32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv,u8 u8Index)
* @brief Sends a beacon to the firmware to be transmitted over the air * @brief Sends a beacon to the firmware to be transmitted over the air
* @details * @details
* @param[in,out] hWFIDrv handle to the wifi driver * @param[in,out] hWFIDrv handle to the wifi driver
@ -1123,8 +1123,8 @@ WILC_Sint32 host_int_deinit(WILC_WFIDrvHandle hWFIDrv);
*/ */
WILC_Sint32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u32Interval, WILC_Sint32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u32Interval,
WILC_Uint32 u32DTIMPeriod, WILC_Uint32 u32DTIMPeriod,
WILC_Uint32 u32HeadLen, WILC_Uint8 *pu8Head, WILC_Uint32 u32HeadLen, u8 *pu8Head,
WILC_Uint32 u32TailLen, WILC_Uint8 *pu8tail); WILC_Uint32 u32TailLen, u8 *pu8tail);
/*! /*!
@ -1238,7 +1238,7 @@ WILC_Sint32 host_int_setup_multicast_filter(WILC_WFIDrvHandle hWFIDrv, WILC_Bool
* @date * @date
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_setup_ipaddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8IPAddr, WILC_Uint8 idx); WILC_Sint32 host_int_setup_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8IPAddr, u8 idx);
/** /**
@ -1273,7 +1273,7 @@ WILC_Sint32 host_int_del_All_Rx_BASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSI
* @date * @date
* @version 1.0 * @version 1.0
*/ */
WILC_Sint32 host_int_get_ipaddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8IPAddr, WILC_Uint8 idx); WILC_Sint32 host_int_get_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8IPAddr, u8 idx);
#ifdef WILC_P2P #ifdef WILC_P2P
/** /**

12
drivers/staging/wilc1000/linux_mon.c
View file

@ -46,9 +46,9 @@ extern int mac_xmit(struct sk_buff *skb, struct net_device *dev);
#endif #endif
WILC_Uint8 srcAdd[6]; u8 srcAdd[6];
WILC_Uint8 bssid[6]; u8 bssid[6];
WILC_Uint8 broadcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 broadcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
/** /**
* @brief WILC_WFI_monitor_rx * @brief WILC_WFI_monitor_rx
* @details * @details
@ -186,7 +186,7 @@ static void mgmt_tx_complete(void *priv, int status)
/* struct wilc_wfi_radiotap_cb_hdr *cb_hdr; */ /* struct wilc_wfi_radiotap_cb_hdr *cb_hdr; */
struct tx_complete_mon_data *pv_data = (struct tx_complete_mon_data *)priv; struct tx_complete_mon_data *pv_data = (struct tx_complete_mon_data *)priv;
WILC_Uint8 *buf = pv_data->buff; u8 *buf = pv_data->buff;
@ -418,7 +418,7 @@ void WILC_mgm_HOSTAPD_ACK(void *priv, WILC_Bool bStatus)
struct wilc_wfi_radiotap_cb_hdr *cb_hdr; struct wilc_wfi_radiotap_cb_hdr *cb_hdr;
struct tx_complete_mon_data *pv_data = (struct tx_complete_mon_data *)priv; struct tx_complete_mon_data *pv_data = (struct tx_complete_mon_data *)priv;
WILC_Uint8 *buf = pv_data->buff; u8 *buf = pv_data->buff;
/* len of the original frame without the added pointer at the tail */ /* len of the original frame without the added pointer at the tail */
WILC_Uint16 u16len = (pv_data->size) - sizeof(struct tx_complete_mon_data *); WILC_Uint16 u16len = (pv_data->size) - sizeof(struct tx_complete_mon_data *);
@ -502,7 +502,7 @@ static void WILC_WFI_mon_setup(struct net_device *dev)
/* u8 * mac_add; */ /* u8 * mac_add; */
unsigned char mac_add[] = {0x00, 0x50, 0xc2, 0x5e, 0x10, 0x8f}; unsigned char mac_add[] = {0x00, 0x50, 0xc2, 0x5e, 0x10, 0x8f};
/* priv = wiphy_priv(priv->dev->ieee80211_ptr->wiphy); */ /* priv = wiphy_priv(priv->dev->ieee80211_ptr->wiphy); */
/* mac_add = (WILC_Uint8*)WILC_MALLOC(ETH_ALEN); */ /* mac_add = (u8*)WILC_MALLOC(ETH_ALEN); */
/* status = host_int_get_MacAddress(priv->hWILCWFIDrv,mac_add); */ /* status = host_int_get_MacAddress(priv->hWILCWFIDrv,mac_add); */
/* mac_add[ETH_ALEN-1]+=1; */ /* mac_add[ETH_ALEN-1]+=1; */
memcpy(dev->dev_addr, mac_add, ETH_ALEN); memcpy(dev->dev_addr, mac_add, ETH_ALEN);

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

@ -69,7 +69,7 @@ extern WILC_Bool g_obtainingIP;
#endif #endif
extern WILC_Uint16 Set_machw_change_vir_if(WILC_Bool bValue); extern WILC_Uint16 Set_machw_change_vir_if(WILC_Bool bValue);
extern void resolve_disconnect_aberration(void *drvHandler); extern void resolve_disconnect_aberration(void *drvHandler);
extern WILC_Uint8 gau8MulticastMacAddrList[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN]; extern u8 gau8MulticastMacAddrList[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];
void wilc1000_wlan_deinit(linux_wlan_t *nic); void wilc1000_wlan_deinit(linux_wlan_t *nic);
#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
extern WILC_TimerHandle hDuringIpTimer; extern WILC_TimerHandle hDuringIpTimer;
@ -258,10 +258,10 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv; tstrWILC_WFIDrv *pstrWFIDrv;
struct net_device *dev; struct net_device *dev;
WILC_Uint8 *pIP_Add_buff; u8 *pIP_Add_buff;
WILC_Sint32 s32status = WILC_FAIL; WILC_Sint32 s32status = WILC_FAIL;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
WILC_Uint8 null_ip[4] = {0}; u8 null_ip[4] = {0};
char wlan_dev_name[5] = "wlan0"; char wlan_dev_name[5] = "wlan0";
if (dev_iface == NULL || dev_iface->ifa_dev == NULL || dev_iface->ifa_dev->dev == NULL) { if (dev_iface == NULL || dev_iface->ifa_dev == NULL || dev_iface->ifa_dev->dev == NULL) {
@ -2377,7 +2377,7 @@ int mac_close(struct net_device *ndev)
int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd) int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
{ {
WILC_Uint8 *buff = NULL; u8 *buff = NULL;
WILC_Sint8 rssi; WILC_Sint8 rssi;
WILC_Uint32 size = 0, length = 0; WILC_Uint32 size = 0, length = 0;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;

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

@ -19,7 +19,7 @@
*/ */
typedef struct { typedef struct {
/* a dummy member to avoid compiler errors*/ /* a dummy member to avoid compiler errors*/
WILC_Uint8 dummy; u8 dummy;
} tstrWILC_MsgQueueAttrs; } tstrWILC_MsgQueueAttrs;

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

@ -14,7 +14,6 @@
#define WILC_OSW_INTERFACE_VER 2 #define WILC_OSW_INTERFACE_VER 2
/* Integer Types */ /* Integer Types */
typedef unsigned char WILC_Uint8;
typedef unsigned short WILC_Uint16; typedef unsigned short WILC_Uint16;
typedef unsigned int WILC_Uint32; typedef unsigned int WILC_Uint32;
typedef unsigned long long WILC_Uint64; typedef unsigned long long WILC_Uint64;

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

@ -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, WILC_Uint8 u8SetValue, WILC_Uint32 u32Count) void *WILC_memset(void *pvTarget, u8 u8SetValue, WILC_Uint32 u32Count)
{ {
return memset(pvTarget, u8SetValue, u32Count); return memset(pvTarget, u8SetValue, u32Count);
} }

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

@ -53,11 +53,11 @@ void WILC_memcpy_INTERNAL(void *pvTarget, const void *pvSource, WILC_Uint32 u32C
static WILC_ErrNo WILC_memcpy(void *pvTarget, const void *pvSource, WILC_Uint32 u32Count) static WILC_ErrNo WILC_memcpy(void *pvTarget, const void *pvSource, WILC_Uint32 u32Count)
{ {
if ( if (
(((WILC_Uint8 *)pvTarget <= (WILC_Uint8 *)pvSource) (((u8 *)pvTarget <= (u8 *)pvSource)
&& (((WILC_Uint8 *)pvTarget + u32Count) > (WILC_Uint8 *)pvSource)) && (((u8 *)pvTarget + u32Count) > (u8 *)pvSource))
|| (((WILC_Uint8 *)pvSource <= (WILC_Uint8 *)pvTarget) || (((u8 *)pvSource <= (u8 *)pvTarget)
&& (((WILC_Uint8 *)pvSource + u32Count) > (WILC_Uint8 *)pvTarget)) && (((u8 *)pvSource + u32Count) > (u8 *)pvTarget))
) { ) {
/* ovelapped memory, return Error */ /* ovelapped memory, return Error */
return WILC_FAIL; return WILC_FAIL;
@ -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, WILC_Uint8 u8SetValue, WILC_Uint32 u32Count); void *WILC_memset(void *pvTarget, u8 u8SetValue, WILC_Uint32 u32Count);
/*! /*!
* @brief copies the contents of source string into the target string * @brief copies the contents of source string into the target string

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

@ -21,7 +21,7 @@ typedef void (*tpfWILC_TimerFunction)(void *);
*/ */
typedef struct { typedef struct {
/* a dummy member to avoid compiler errors*/ /* a dummy member to avoid compiler errors*/
WILC_Uint8 dummy; u8 dummy;
} tstrWILC_TimerAttrs; } tstrWILC_TimerAttrs;
/*! /*!

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

@ -36,11 +36,11 @@ WILC_Uint32 u32LastScannedNtwrksCountShadow;
WILC_TimerHandle hDuringIpTimer; WILC_TimerHandle hDuringIpTimer;
#endif #endif
WILC_TimerHandle hAgingTimer; WILC_TimerHandle hAgingTimer;
static WILC_Uint8 op_ifcs; static u8 op_ifcs;
extern WILC_Uint8 u8ConnectedSSID[6]; extern u8 u8ConnectedSSID[6];
/*BugID_5137*/ /*BugID_5137*/
WILC_Uint8 g_wilc_initialized = 1; u8 g_wilc_initialized = 1;
extern linux_wlan_t *g_linux_wlan; extern linux_wlan_t *g_linux_wlan;
#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
extern WILC_Bool g_obtainingIP; extern WILC_Bool g_obtainingIP;
@ -103,15 +103,15 @@ struct p2p_mgmt_data {
}; };
/*Global variable used to state the current connected STA channel*/ /*Global variable used to state the current connected STA channel*/
WILC_Uint8 u8WLANChannel = INVALID_CHANNEL; u8 u8WLANChannel = INVALID_CHANNEL;
/*BugID_5442*/ /*BugID_5442*/
WILC_Uint8 u8CurrChannel; u8 u8CurrChannel;
WILC_Uint8 u8P2P_oui[] = {0x50, 0x6f, 0x9A, 0x09}; u8 u8P2P_oui[] = {0x50, 0x6f, 0x9A, 0x09};
WILC_Uint8 u8P2Plocalrandom = 0x01; u8 u8P2Plocalrandom = 0x01;
WILC_Uint8 u8P2Precvrandom = 0x00; u8 u8P2Precvrandom = 0x00;
WILC_Uint8 u8P2P_vendorspec[] = {0xdd, 0x05, 0x00, 0x08, 0x40, 0x03}; u8 u8P2P_vendorspec[] = {0xdd, 0x05, 0x00, 0x08, 0x40, 0x03};
WILC_Bool bWilc_ie = WILC_FALSE; WILC_Bool bWilc_ie = WILC_FALSE;
#endif #endif
@ -134,7 +134,7 @@ struct wilc_wfi_key g_key_gtk_params;
struct add_key_params g_add_ptk_key_params; struct add_key_params g_add_ptk_key_params;
struct wilc_wfi_key g_key_ptk_params; struct wilc_wfi_key g_key_ptk_params;
struct wilc_wfi_wep_key g_key_wep_params; struct wilc_wfi_wep_key g_key_wep_params;
WILC_Uint8 g_flushing_in_progress; u8 g_flushing_in_progress;
WILC_Bool g_ptk_keys_saved = WILC_FALSE; WILC_Bool g_ptk_keys_saved = WILC_FALSE;
WILC_Bool g_gtk_keys_saved = WILC_FALSE; WILC_Bool g_gtk_keys_saved = WILC_FALSE;
WILC_Bool g_wep_keys_saved = WILC_FALSE; WILC_Bool g_wep_keys_saved = WILC_FALSE;
@ -349,7 +349,7 @@ void add_network_to_shadow(tstrNetworkInfo *pstrNetworkInfo, void *pUserVoid, vo
if (ap_found != -1) if (ap_found != -1)
WILC_FREE(astrLastScannedNtwrksShadow[ap_index].pu8IEs); WILC_FREE(astrLastScannedNtwrksShadow[ap_index].pu8IEs);
astrLastScannedNtwrksShadow[ap_index].pu8IEs = astrLastScannedNtwrksShadow[ap_index].pu8IEs =
(WILC_Uint8 *)WILC_MALLOC(pstrNetworkInfo->u16IEsLen); /* will be deallocated by the WILC_WFI_CfgScan() function */ (u8 *)WILC_MALLOC(pstrNetworkInfo->u16IEsLen); /* will be deallocated by the WILC_WFI_CfgScan() function */
WILC_memcpy(astrLastScannedNtwrksShadow[ap_index].pu8IEs, WILC_memcpy(astrLastScannedNtwrksShadow[ap_index].pu8IEs,
pstrNetworkInfo->pu8IEs, pstrNetworkInfo->u16IEsLen); pstrNetworkInfo->pu8IEs, pstrNetworkInfo->u16IEsLen);
@ -507,7 +507,7 @@ static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetwo
* @date 01 MAR 2012 * @date 01 MAR 2012
* @version 1.0 * @version 1.0
*/ */
int WILC_WFI_Set_PMKSA(WILC_Uint8 *bssid, struct WILC_WFI_priv *priv) int WILC_WFI_Set_PMKSA(u8 *bssid, struct WILC_WFI_priv *priv)
{ {
WILC_Uint32 i; WILC_Uint32 i;
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
@ -542,7 +542,7 @@ int linux_wlan_set_bssid(struct net_device *wilc_netdev, uint8_t *pBSSID);
* @param[in] tenuConnDisconnEvent enuConnDisconnEvent: Type of connection response either * @param[in] tenuConnDisconnEvent enuConnDisconnEvent: Type of connection response either
* connection response or disconnection notification. * connection response or disconnection notification.
* tstrConnectInfo* pstrConnectInfo: COnnection information. * tstrConnectInfo* pstrConnectInfo: COnnection information.
* WILC_Uint8 u8MacStatus: Mac Status from firmware * u8 u8MacStatus: Mac Status from firmware
* tstrDisconnectNotifInfo* pstrDisconnectNotifInfo: Disconnection Notification * tstrDisconnectNotifInfo* pstrDisconnectNotifInfo: Disconnection Notification
* void* pUserVoid: Private data associated with wireless interface * void* pUserVoid: Private data associated with wireless interface
* @return NONE * @return NONE
@ -554,7 +554,7 @@ int connecting;
static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent,
tstrConnectInfo *pstrConnectInfo, tstrConnectInfo *pstrConnectInfo,
WILC_Uint8 u8MacStatus, u8 u8MacStatus,
tstrDisconnectNotifInfo *pstrDisconnectNotifInfo, tstrDisconnectNotifInfo *pstrDisconnectNotifInfo,
void *pUserVoid) void *pUserVoid)
{ {
@ -563,7 +563,7 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent,
#ifdef WILC_P2P #ifdef WILC_P2P
tstrWILC_WFIDrv *pstrWFIDrv; tstrWILC_WFIDrv *pstrWFIDrv;
#endif #endif
WILC_Uint8 NullBssid[ETH_ALEN] = {0}; u8 NullBssid[ETH_ALEN] = {0};
connecting = 0; connecting = 0;
priv = (struct WILC_WFI_priv *)pUserVoid; priv = (struct WILC_WFI_priv *)pUserVoid;
@ -742,7 +742,7 @@ static int WILC_WFI_CfgScan(struct wiphy *wiphy, struct cfg80211_scan_request *r
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
WILC_Uint32 i; WILC_Uint32 i;
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
WILC_Uint8 au8ScanChanList[MAX_NUM_SCANNED_NETWORKS]; u8 au8ScanChanList[MAX_NUM_SCANNED_NETWORKS];
tstrHiddenNetwork strHiddenNetwork; tstrHiddenNetwork strHiddenNetwork;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
@ -773,7 +773,7 @@ static int WILC_WFI_CfgScan(struct wiphy *wiphy, struct cfg80211_scan_request *r
if (request->n_channels <= MAX_NUM_SCANNED_NETWORKS) { /* TODO: mostafa: to be replaced by */ if (request->n_channels <= MAX_NUM_SCANNED_NETWORKS) { /* TODO: mostafa: to be replaced by */
/* max_scan_ssids */ /* max_scan_ssids */
for (i = 0; i < request->n_channels; i++) { for (i = 0; i < request->n_channels; i++) {
au8ScanChanList[i] = (WILC_Uint8)ieee80211_frequency_to_channel(request->channels[i]->center_freq); au8ScanChanList[i] = (u8)ieee80211_frequency_to_channel(request->channels[i]->center_freq);
PRINT_INFO(CFG80211_DBG, "ScanChannel List[%d] = %d,", i, au8ScanChanList[i]); PRINT_INFO(CFG80211_DBG, "ScanChannel List[%d] = %d,", i, au8ScanChanList[i]);
} }
@ -804,13 +804,13 @@ static int WILC_WFI_CfgScan(struct wiphy *wiphy, struct cfg80211_scan_request *r
PRINT_D(CFG80211_DBG, "Trigger Scan Request \n"); PRINT_D(CFG80211_DBG, "Trigger Scan Request \n");
s32Error = host_int_scan(priv->hWILCWFIDrv, USER_SCAN, ACTIVE_SCAN, s32Error = host_int_scan(priv->hWILCWFIDrv, USER_SCAN, ACTIVE_SCAN,
au8ScanChanList, request->n_channels, au8ScanChanList, request->n_channels,
(const WILC_Uint8 *)request->ie, request->ie_len, (const u8 *)request->ie, request->ie_len,
CfgScanResult, (void *)priv, &strHiddenNetwork); CfgScanResult, (void *)priv, &strHiddenNetwork);
} else { } else {
PRINT_D(CFG80211_DBG, "Trigger Scan Request \n"); PRINT_D(CFG80211_DBG, "Trigger Scan Request \n");
s32Error = host_int_scan(priv->hWILCWFIDrv, USER_SCAN, ACTIVE_SCAN, s32Error = host_int_scan(priv->hWILCWFIDrv, USER_SCAN, ACTIVE_SCAN,
au8ScanChanList, request->n_channels, au8ScanChanList, request->n_channels,
(const WILC_Uint8 *)request->ie, request->ie_len, (const u8 *)request->ie, request->ie_len,
CfgScanResult, (void *)priv, NULL); CfgScanResult, (void *)priv, NULL);
} }
@ -845,7 +845,7 @@ static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev,
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
WILC_Uint32 i; WILC_Uint32 i;
/* SECURITY_T tenuSecurity_t = NO_SECURITY; */ /* SECURITY_T tenuSecurity_t = NO_SECURITY; */
WILC_Uint8 u8security = NO_ENCRYPT; u8 u8security = NO_ENCRYPT;
AUTHTYPE_T tenuAuth_type = ANY; AUTHTYPE_T tenuAuth_type = ANY;
WILC_Char *pcgroup_encrypt_val; WILC_Char *pcgroup_encrypt_val;
WILC_Char *pccipher_group; WILC_Char *pccipher_group;
@ -1161,10 +1161,10 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
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;
WILC_Uint8 u8mode = NO_ENCRYPT; u8 u8mode = NO_ENCRYPT;
#ifdef WILC_AP_EXTERNAL_MLME #ifdef WILC_AP_EXTERNAL_MLME
WILC_Uint8 u8gmode = NO_ENCRYPT; u8 u8gmode = NO_ENCRYPT;
WILC_Uint8 u8pmode = NO_ENCRYPT; u8 u8pmode = NO_ENCRYPT;
AUTHTYPE_T tenuAuth_type = ANY; AUTHTYPE_T tenuAuth_type = ANY;
#endif #endif
@ -1261,7 +1261,7 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
if (priv->wilc_gtk[key_index]->key) if (priv->wilc_gtk[key_index]->key)
WILC_FREE(priv->wilc_gtk[key_index]->key); WILC_FREE(priv->wilc_gtk[key_index]->key);
priv->wilc_gtk[key_index]->key = (WILC_Uint8 *)WILC_MALLOC(params->key_len); priv->wilc_gtk[key_index]->key = (u8 *)WILC_MALLOC(params->key_len);
WILC_memcpy(priv->wilc_gtk[key_index]->key, params->key, params->key_len); WILC_memcpy(priv->wilc_gtk[key_index]->key, params->key, params->key_len);
/* if there has been previous allocation for the same index through its seq, free that memory and allocate again*/ /* if there has been previous allocation for the same index through its seq, free that memory and allocate again*/
@ -1269,7 +1269,7 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
WILC_FREE(priv->wilc_gtk[key_index]->seq); WILC_FREE(priv->wilc_gtk[key_index]->seq);
if ((params->seq_len) > 0) { if ((params->seq_len) > 0) {
priv->wilc_gtk[key_index]->seq = (WILC_Uint8 *)WILC_MALLOC(params->seq_len); priv->wilc_gtk[key_index]->seq = (u8 *)WILC_MALLOC(params->seq_len);
WILC_memcpy(priv->wilc_gtk[key_index]->seq, params->seq, params->seq_len); WILC_memcpy(priv->wilc_gtk[key_index]->seq, params->seq, params->seq_len);
} }
@ -1307,13 +1307,13 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 k
if (priv->wilc_ptk[key_index]->key) if (priv->wilc_ptk[key_index]->key)
WILC_FREE(priv->wilc_ptk[key_index]->key); WILC_FREE(priv->wilc_ptk[key_index]->key);
priv->wilc_ptk[key_index]->key = (WILC_Uint8 *)WILC_MALLOC(params->key_len); priv->wilc_ptk[key_index]->key = (u8 *)WILC_MALLOC(params->key_len);
if (priv->wilc_ptk[key_index]->seq) if (priv->wilc_ptk[key_index]->seq)
WILC_FREE(priv->wilc_ptk[key_index]->seq); WILC_FREE(priv->wilc_ptk[key_index]->seq);
if ((params->seq_len) > 0) if ((params->seq_len) > 0)
priv->wilc_ptk[key_index]->seq = (WILC_Uint8 *)WILC_MALLOC(params->seq_len); priv->wilc_ptk[key_index]->seq = (u8 *)WILC_MALLOC(params->seq_len);
if (INFO) { if (INFO) {
for (i = 0; i < params->key_len; i++) for (i = 0; i < params->key_len; i++)
@ -1943,7 +1943,7 @@ static int WILC_WFI_set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
{ {
WILC_Uint32 i; WILC_Uint32 i;
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
WILC_Uint8 flag = 0; u8 flag = 0;
struct WILC_WFI_priv *priv = wiphy_priv(wiphy); struct WILC_WFI_priv *priv = wiphy_priv(wiphy);
@ -1993,7 +1993,7 @@ static int WILC_WFI_del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
{ {
WILC_Uint32 i; WILC_Uint32 i;
WILC_Uint8 flag = 0; u8 flag = 0;
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv = wiphy_priv(wiphy); struct WILC_WFI_priv *priv = wiphy_priv(wiphy);
@ -2067,19 +2067,19 @@ static int WILC_WFI_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev)
* @version * @version
*/ */
void WILC_WFI_CfgParseRxAction(WILC_Uint8 *buf, WILC_Uint32 len) void WILC_WFI_CfgParseRxAction(u8 *buf, WILC_Uint32 len)
{ {
WILC_Uint32 index = 0; WILC_Uint32 index = 0;
WILC_Uint32 i = 0, j = 0; WILC_Uint32 i = 0, j = 0;
/*BugID_5460*/ /*BugID_5460*/
#ifdef USE_SUPPLICANT_GO_INTENT #ifdef USE_SUPPLICANT_GO_INTENT
WILC_Uint8 intent; u8 intent;
WILC_Uint8 tie_breaker; u8 tie_breaker;
WILC_Bool is_wilc_go = WILC_TRUE; WILC_Bool is_wilc_go = WILC_TRUE;
#endif #endif
WILC_Uint8 op_channel_attr_index = 0; u8 op_channel_attr_index = 0;
WILC_Uint8 channel_list_attr_index = 0; u8 channel_list_attr_index = 0;
while (index < len) { while (index < len) {
if (buf[index] == GO_INTENT_ATTR_ID) { if (buf[index] == GO_INTENT_ATTR_ID) {
@ -2163,13 +2163,13 @@ void WILC_WFI_CfgParseRxAction(WILC_Uint8 *buf, WILC_Uint32 len)
* @date 12 DEC 2012 * @date 12 DEC 2012
* @version * @version
*/ */
void WILC_WFI_CfgParseTxAction(WILC_Uint8 *buf, WILC_Uint32 len, WILC_Bool bOperChan, WILC_Uint8 iftype) void WILC_WFI_CfgParseTxAction(u8 *buf, WILC_Uint32 len, WILC_Bool bOperChan, u8 iftype)
{ {
WILC_Uint32 index = 0; WILC_Uint32 index = 0;
WILC_Uint32 i = 0, j = 0; WILC_Uint32 i = 0, j = 0;
WILC_Uint8 op_channel_attr_index = 0; u8 op_channel_attr_index = 0;
WILC_Uint8 channel_list_attr_index = 0; u8 channel_list_attr_index = 0;
#ifdef USE_SUPPLICANT_GO_INTENT #ifdef USE_SUPPLICANT_GO_INTENT
WILC_Bool is_wilc_go = WILC_FALSE; WILC_Bool is_wilc_go = WILC_FALSE;
@ -2521,13 +2521,13 @@ static int WILC_WFI_cancel_remain_on_channel(struct wiphy *wiphy,
* @brief WILC_WFI_add_wilcvendorspec * @brief WILC_WFI_add_wilcvendorspec
* @details Adding WILC information elemet to allow two WILC devices to * @details Adding WILC information elemet to allow two WILC devices to
* identify each other and connect * identify each other and connect
* @param[in] WILC_Uint8 * buf * @param[in] u8 * buf
* @return void * @return void
* @author mdaftedar * @author mdaftedar
* @date 01 JAN 2014 * @date 01 JAN 2014
* @version 1.0 * @version 1.0
*/ */
void WILC_WFI_add_wilcvendorspec(WILC_Uint8 *buff) void WILC_WFI_add_wilcvendorspec(u8 *buff)
{ {
WILC_memcpy(buff, u8P2P_vendorspec, sizeof(u8P2P_vendorspec)); WILC_memcpy(buff, u8P2P_vendorspec, sizeof(u8P2P_vendorspec));
} }
@ -2904,10 +2904,10 @@ static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
/* struct WILC_WFI_mon_priv* mon_priv; */ /* struct WILC_WFI_mon_priv* mon_priv; */
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
WILC_Uint8 interface_type; u8 interface_type;
WILC_Uint16 TID = 0; WILC_Uint16 TID = 0;
#ifdef WILC_P2P #ifdef WILC_P2P
WILC_Uint8 i; u8 i;
#endif #endif
nic = netdev_priv(dev); nic = netdev_priv(dev);
@ -3330,14 +3330,14 @@ static int WILC_WFI_start_ap(struct wiphy *wiphy, struct net_device *dev,
s32Error = host_int_add_beacon(priv->hWILCWFIDrv, s32Error = host_int_add_beacon(priv->hWILCWFIDrv,
settings->beacon_interval, settings->beacon_interval,
settings->dtim_period, settings->dtim_period,
beacon->head_len, (WILC_Uint8 *)beacon->head, beacon->head_len, (u8 *)beacon->head,
beacon->tail_len, (WILC_Uint8 *)beacon->tail); beacon->tail_len, (u8 *)beacon->tail);
#else #else
s32Error = host_add_beacon(priv->hWILCWFIDrv, s32Error = host_add_beacon(priv->hWILCWFIDrv,
settings->beacon_interval, settings->beacon_interval,
settings->dtim_period, settings->dtim_period,
beacon->head_len, (WILC_Uint8 *)beacon->head, beacon->head_len, (u8 *)beacon->head,
beacon->tail_len, (WILC_Uint8 *)beacon->tail); beacon->tail_len, (u8 *)beacon->tail);
#endif #endif
return s32Error; return s32Error;
@ -3369,14 +3369,14 @@ static int WILC_WFI_change_beacon(struct wiphy *wiphy, struct net_device *dev,
s32Error = host_int_add_beacon(priv->hWILCWFIDrv, s32Error = host_int_add_beacon(priv->hWILCWFIDrv,
0, 0,
0, 0,
beacon->head_len, (WILC_Uint8 *)beacon->head, beacon->head_len, (u8 *)beacon->head,
beacon->tail_len, (WILC_Uint8 *)beacon->tail); beacon->tail_len, (u8 *)beacon->tail);
#else #else
s32Error = host_add_beacon(priv->hWILCWFIDrv, s32Error = host_add_beacon(priv->hWILCWFIDrv,
0, 0,
0, 0,
beacon->head_len, (WILC_Uint8 *)beacon->head, beacon->head_len, (u8 *)beacon->head,
beacon->tail_len, (WILC_Uint8 *)beacon->tail); beacon->tail_len, (u8 *)beacon->tail);
#endif #endif
return s32Error; return s32Error;
@ -3395,7 +3395,7 @@ static int WILC_WFI_stop_ap(struct wiphy *wiphy, struct net_device *dev)
{ {
WILC_Sint32 s32Error = WILC_SUCCESS; WILC_Sint32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
WILC_Uint8 NullBssid[ETH_ALEN] = {0}; u8 NullBssid[ETH_ALEN] = {0};
WILC_NULLCHECK(s32Error, wiphy); WILC_NULLCHECK(s32Error, wiphy);

16
drivers/staging/wilc1000/wilc_wfi_netdevice.h
View file

@ -109,7 +109,7 @@ struct wilc_wfi_wep_key {
}; };
struct sta_info { struct sta_info {
WILC_Uint8 au8Sta_AssociatedBss[MAX_NUM_STA][ETH_ALEN]; u8 au8Sta_AssociatedBss[MAX_NUM_STA][ETH_ALEN];
}; };
#ifdef WILC_P2P #ifdef WILC_P2P
@ -139,10 +139,10 @@ struct WILC_WFI_priv {
WILC_Uint8 au8AssociatedBss[ETH_ALEN]; u8 au8AssociatedBss[ETH_ALEN];
struct sta_info assoc_stainfo; struct sta_info assoc_stainfo;
struct net_device_stats stats; struct net_device_stats stats;
WILC_Uint8 monitor_flag; u8 monitor_flag;
int status; int status;
struct WILC_WFI_packet *ppool; struct WILC_WFI_packet *ppool;
struct WILC_WFI_packet *rx_queue; /* List of incoming packets */ struct WILC_WFI_packet *rx_queue; /* List of incoming packets */
@ -157,13 +157,13 @@ struct WILC_WFI_priv {
WILC_WFIDrvHandle hWILCWFIDrv_2; WILC_WFIDrvHandle hWILCWFIDrv_2;
tstrHostIFpmkidAttr pmkid_list; tstrHostIFpmkidAttr pmkid_list;
struct WILC_WFI_stats netstats; struct WILC_WFI_stats netstats;
WILC_Uint8 WILC_WFI_wep_default; u8 WILC_WFI_wep_default;
WILC_Uint8 WILC_WFI_wep_key[4][WLAN_KEY_LEN_WEP104]; u8 WILC_WFI_wep_key[4][WLAN_KEY_LEN_WEP104];
WILC_Uint8 WILC_WFI_wep_key_len[4]; u8 WILC_WFI_wep_key_len[4];
struct net_device *real_ndev; /* The real interface that the monitor is on */ struct net_device *real_ndev; /* The real interface that the monitor is on */
struct wilc_wfi_key *wilc_gtk[MAX_NUM_STA]; struct wilc_wfi_key *wilc_gtk[MAX_NUM_STA];
struct wilc_wfi_key *wilc_ptk[MAX_NUM_STA]; struct wilc_wfi_key *wilc_ptk[MAX_NUM_STA];
WILC_Uint8 wilc_groupkey; u8 wilc_groupkey;
/* semaphores */ /* semaphores */
struct semaphore SemHandleUpdateStats; struct semaphore SemHandleUpdateStats;
struct semaphore hSemScanReq; struct semaphore hSemScanReq;
@ -250,7 +250,7 @@ typedef struct {
typedef struct { typedef struct {
uint8_t u8IfIdx; uint8_t u8IfIdx;
WILC_Uint8 iftype; u8 iftype;
int monitor_flag; int monitor_flag;
int mac_opened; int mac_opened;
#ifdef WILC_P2P #ifdef WILC_P2P

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

@ -21,7 +21,7 @@ extern wilc_hif_func_t hif_sdio;
extern wilc_hif_func_t hif_spi; extern wilc_hif_func_t hif_spi;
extern wilc_cfg_func_t mac_cfg; extern wilc_cfg_func_t mac_cfg;
#if defined(PLAT_RK3026_TCHIP) #if defined(PLAT_RK3026_TCHIP)
extern WILC_Uint8 g_wilc_initialized; /* AMR : 0422 RK3026 Crash issue */ extern u8 g_wilc_initialized; /* AMR : 0422 RK3026 Crash issue */
#endif #endif
extern void WILC_WFI_mgmt_rx(uint8_t *buff, uint32_t size); extern void WILC_WFI_mgmt_rx(uint8_t *buff, uint32_t size);
extern void frmw_to_linux(uint8_t *buff, uint32_t size); extern void frmw_to_linux(uint8_t *buff, uint32_t size);