Skip to content

L
linux
Commit 576917ad authored by Dean Lee's avatar Dean Lee Committed by Greg Kroah-Hartman
Browse files
Options

staging: wilc1000: change WILC_Char to char 

change own data type(WILC_Char) to common data type(char)
Signed-off-by: default avatarDean Lee <dean.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e968542c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 78 deletions
drivers/staging/wilc1000/coreconfigurator.c
View file @ 576917ad
...@@ -141,7 +141,7 @@ typedef enum { ...@@ -141,7 +141,7 @@ typedef enum {
typedef struct { typedef struct {
WILC_Char *pcRespBuffer; char *pcRespBuffer;
s32 s32MaxRespBuffLen; s32 s32MaxRespBuffLen;
s32 s32BytesRead; s32 s32BytesRead;
bool bRespRequired; bool bRespRequired;
...@@ -339,7 +339,7 @@ INLINE u8 get_hex_char(u8 inp) ...@@ -339,7 +339,7 @@ INLINE u8 get_hex_char(u8 inp)
/* 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 u16 extract_mac_addr(WILC_Char *str, u8 *buff) INLINE u16 extract_mac_addr(char *str, u8 *buff)
{ {
*buff = 0; *buff = 0;
while (*str != '\0') { while (*str != '\0') {
...@@ -1095,7 +1095,7 @@ s32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults) ...@@ -1095,7 +1095,7 @@ s32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults)
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
void ProcessCharWid(WILC_Char *pcPacket, s32 *ps32PktLen, void ProcessCharWid(char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, s8 *ps8WidVal) tstrWID *pstrWID, s8 *ps8WidVal)
{ {
u8 *pu8val = (u8 *)ps8WidVal; u8 *pu8val = (u8 *)ps8WidVal;
...@@ -1149,7 +1149,7 @@ void ProcessCharWid(WILC_Char *pcPacket, s32 *ps32PktLen, ...@@ -1149,7 +1149,7 @@ void ProcessCharWid(WILC_Char *pcPacket, s32 *ps32PktLen,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
void ProcessShortWid(WILC_Char *pcPacket, s32 *ps32PktLen, void ProcessShortWid(char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, s8 *ps8WidVal) tstrWID *pstrWID, s8 *ps8WidVal)
{ {
u16 *pu16val = (u16 *)ps8WidVal; u16 *pu16val = (u16 *)ps8WidVal;
...@@ -1204,7 +1204,7 @@ void ProcessShortWid(WILC_Char *pcPacket, s32 *ps32PktLen, ...@@ -1204,7 +1204,7 @@ void ProcessShortWid(WILC_Char *pcPacket, s32 *ps32PktLen,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
void ProcessIntWid(WILC_Char *pcPacket, s32 *ps32PktLen, void ProcessIntWid(char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, s8 *ps8WidVal) tstrWID *pstrWID, s8 *ps8WidVal)
{ {
u32 *pu32val = (u32 *)ps8WidVal; u32 *pu32val = (u32 *)ps8WidVal;
...@@ -1262,7 +1262,7 @@ void ProcessIntWid(WILC_Char *pcPacket, s32 *ps32PktLen, ...@@ -1262,7 +1262,7 @@ void ProcessIntWid(WILC_Char *pcPacket, s32 *ps32PktLen,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
void ProcessIPwid(WILC_Char *pcPacket, s32 *ps32PktLen, void ProcessIPwid(char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, u8 *pu8ip) tstrWID *pstrWID, u8 *pu8ip)
{ {
u32 u32val = 0; u32 u32val = 0;
...@@ -1320,7 +1320,7 @@ void ProcessIPwid(WILC_Char *pcPacket, s32 *ps32PktLen, ...@@ -1320,7 +1320,7 @@ void ProcessIPwid(WILC_Char *pcPacket, s32 *ps32PktLen,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
void ProcessStrWid(WILC_Char *pcPacket, s32 *ps32PktLen, void ProcessStrWid(char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, u8 *pu8val, s32 s32ValueSize) tstrWID *pstrWID, u8 *pu8val, s32 s32ValueSize)
{ {
u16 u16MsgLen = 0; u16 u16MsgLen = 0;
...@@ -1377,7 +1377,7 @@ void ProcessStrWid(WILC_Char *pcPacket, s32 *ps32PktLen, ...@@ -1377,7 +1377,7 @@ void ProcessStrWid(WILC_Char *pcPacket, s32 *ps32PktLen,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
void ProcessAdrWid(WILC_Char *pcPacket, s32 *ps32PktLen, void ProcessAdrWid(char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, u8 *pu8val) tstrWID *pstrWID, u8 *pu8val)
{ {
u16 u16MsgLen = 0; u16 u16MsgLen = 0;
...@@ -1441,7 +1441,7 @@ void ProcessAdrWid(WILC_Char *pcPacket, s32 *ps32PktLen, ...@@ -1441,7 +1441,7 @@ void ProcessAdrWid(WILC_Char *pcPacket, s32 *ps32PktLen,
/* */ /* */
/*****************************************************************************/ /*****************************************************************************/
void ProcessBinWid(WILC_Char *pcPacket, s32 *ps32PktLen, void ProcessBinWid(char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, u8 *pu8val, s32 s32ValueSize) tstrWID *pstrWID, u8 *pu8val, s32 s32ValueSize)
{ {
/* WILC_ERROR("processing Binary WIDs is not supported\n"); */ /* WILC_ERROR("processing Binary WIDs is not supported\n"); */
...@@ -1802,7 +1802,7 @@ s32 ParseWriteResponse(u8 *pu8RespBuffer) ...@@ -1802,7 +1802,7 @@ s32 ParseWriteResponse(u8 *pu8RespBuffer)
* @version 1.0 * @version 1.0
*/ */
s32 CreatePacketHeader(WILC_Char *pcpacket, s32 *ps32PacketLength) s32 CreatePacketHeader(char *pcpacket, s32 *ps32PacketLength)
{ {
s32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
u16 u16MsgLen = (u16)(*ps32PacketLength); u16 u16MsgLen = (u16)(*ps32PacketLength);
...@@ -1911,7 +1911,7 @@ s32 CreateConfigPacket(s8 *ps8packet, s32 *ps32PacketLength, ...@@ -1911,7 +1911,7 @@ s32 CreateConfigPacket(s8 *ps8packet, s32 *ps32PacketLength,
return s32Error; return s32Error;
} }
s32 ConfigWaitResponse(WILC_Char *pcRespBuffer, s32 s32MaxRespBuffLen, s32 *ps32BytesRead, s32 ConfigWaitResponse(char *pcRespBuffer, s32 s32MaxRespBuffLen, s32 *ps32BytesRead,
bool bRespRequired) bool bRespRequired)
{ {
s32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
...@@ -2016,7 +2016,7 @@ s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs, ...@@ -2016,7 +2016,7 @@ s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
return s32Error; return s32Error;
} }
#endif #endif
s32 ConfigProvideResponse(WILC_Char *pcRespBuffer, s32 s32RespLen) s32 ConfigProvideResponse(char *pcRespBuffer, s32 s32RespLen)
{ {
s32 s32Error = WILC_SUCCESS; s32 s32Error = WILC_SUCCESS;
......
drivers/staging/wilc1000/coreconfigurator.h
View file @ 576917ad
...@@ -461,12 +461,12 @@ typedef struct { ...@@ -461,12 +461,12 @@ typedef struct {
#ifndef CONNECT_DIRECT #ifndef CONNECT_DIRECT
typedef struct wid_site_survey_reslts { typedef struct wid_site_survey_reslts {
WILC_Char SSID[MAX_SSID_LEN]; char SSID[MAX_SSID_LEN];
u8 BssType; u8 BssType;
u8 Channel; u8 Channel;
u8 SecurityStatus; u8 SecurityStatus;
u8 BSSID[6]; u8 BSSID[6];
WILC_Char RxPower; char RxPower;
u8 Reserved; u8 Reserved;
} wid_site_survey_reslts_s; } wid_site_survey_reslts_s;
......
drivers/staging/wilc1000/host_interface.c
View file @ 576917ad
This diff is collapsed.
drivers/staging/wilc1000/wilc_memory.c
View file @ 576917ad
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* @version 1.0 * @version 1.0
*/ */
void *WILC_MemoryAlloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs, void *WILC_MemoryAlloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
WILC_Char *pcFileName, u32 u32LineNo) char *pcFileName, u32 u32LineNo)
{ {
if (u32Size > 0) { if (u32Size > 0) {
return kmalloc(u32Size, GFP_ATOMIC); return kmalloc(u32Size, GFP_ATOMIC);
...@@ -22,7 +22,7 @@ void *WILC_MemoryAlloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs, ...@@ -22,7 +22,7 @@ void *WILC_MemoryAlloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
* @version 1.0 * @version 1.0
*/ */
void *WILC_MemoryCalloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs, void *WILC_MemoryCalloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
WILC_Char *pcFileName, u32 u32LineNo) char *pcFileName, u32 u32LineNo)
{ {
return kcalloc(u32Size, 1, GFP_KERNEL); return kcalloc(u32Size, 1, GFP_KERNEL);
} }
...@@ -33,7 +33,7 @@ void *WILC_MemoryCalloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs, ...@@ -33,7 +33,7 @@ void *WILC_MemoryCalloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
* @version 1.0 * @version 1.0
*/ */
void *WILC_MemoryRealloc(void *pvOldBlock, u32 u32NewSize, void *WILC_MemoryRealloc(void *pvOldBlock, u32 u32NewSize,
tstrWILC_MemoryAttrs *strAttrs, WILC_Char *pcFileName, u32 u32LineNo) tstrWILC_MemoryAttrs *strAttrs, char *pcFileName, u32 u32LineNo)
{ {
if (u32NewSize == 0) { if (u32NewSize == 0) {
kfree(pvOldBlock); kfree(pvOldBlock);
...@@ -52,7 +52,7 @@ void *WILC_MemoryRealloc(void *pvOldBlock, u32 u32NewSize, ...@@ -52,7 +52,7 @@ void *WILC_MemoryRealloc(void *pvOldBlock, u32 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, u32 u32LineNo) char *pcFileName, u32 u32LineNo)
{ {
kfree(pvBlock); kfree(pvBlock);
} }
drivers/staging/wilc1000/wilc_memory.h
View file @ 576917ad
...@@ -42,7 +42,7 @@ typedef struct { ...@@ -42,7 +42,7 @@ typedef struct {
* @version 1.0 * @version 1.0
*/ */
void *WILC_MemoryAlloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs, void *WILC_MemoryAlloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
WILC_Char *pcFileName, u32 u32LineNo); 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
...@@ -66,7 +66,7 @@ void *WILC_MemoryAlloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs, ...@@ -66,7 +66,7 @@ void *WILC_MemoryAlloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
* @version 1.0 * @version 1.0
*/ */
void *WILC_MemoryCalloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs, void *WILC_MemoryCalloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
WILC_Char *pcFileName, u32 u32LineNo); char *pcFileName, u32 u32LineNo);
/*! /*!
* @brief Reallocates a given block to a new size * @brief Reallocates a given block to a new size
...@@ -94,7 +94,7 @@ void *WILC_MemoryCalloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs, ...@@ -94,7 +94,7 @@ void *WILC_MemoryCalloc(u32 u32Size, tstrWILC_MemoryAttrs *strAttrs,
* @version 1.0 * @version 1.0
*/ */
void *WILC_MemoryRealloc(void *pvOldBlock, u32 u32NewSize, void *WILC_MemoryRealloc(void *pvOldBlock, u32 u32NewSize,
tstrWILC_MemoryAttrs *strAttrs, WILC_Char *pcFileName, u32 u32LineNo); tstrWILC_MemoryAttrs *strAttrs, char *pcFileName, u32 u32LineNo);
/*! /*!
* @brief Frees given block * @brief Frees given block
...@@ -114,7 +114,7 @@ void *WILC_MemoryRealloc(void *pvOldBlock, u32 u32NewSize, ...@@ -114,7 +114,7 @@ void *WILC_MemoryRealloc(void *pvOldBlock, u32 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, u32 u32LineNo); char *pcFileName, u32 u32LineNo);
/*! /*!
* @brief standrad malloc wrapper with custom attributes * @brief standrad malloc wrapper with custom attributes
......
drivers/staging/wilc1000/wilc_oswrapper.h
View file @ 576917ad
...@@ -13,9 +13,6 @@ ...@@ -13,9 +13,6 @@
/* OS Wrapper interface version */ /* OS Wrapper interface version */
#define WILC_OSW_INTERFACE_VER 2 #define WILC_OSW_INTERFACE_VER 2
/* Character types */
typedef char WILC_Char;
/* Os Configuration File */ /* Os Configuration File */
#include "wilc_osconfig.h" #include "wilc_osconfig.h"
#include "wilc_platform.h" #include "wilc_platform.h"
......
drivers/staging/wilc1000/wilc_strutils.c
View file @ 576917ad
...@@ -40,13 +40,13 @@ void *WILC_memset(void *pvTarget, u8 u8SetValue, u32 u32Count) ...@@ -40,13 +40,13 @@ void *WILC_memset(void *pvTarget, u8 u8SetValue, u32 u32Count)
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource, char *WILC_strncpy(char *pcTarget, const char *pcSource,
u32 u32Count) u32 u32Count)
{ {
return strncpy(pcTarget, pcSource, u32Count); return strncpy(pcTarget, pcSource, u32Count);
} }
s32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2, s32 WILC_strncmp(const char *pcStr1, const char *pcStr2,
u32 u32Count) u32 u32Count)
{ {
s32 s32Result; s32 s32Result;
...@@ -74,7 +74,7 @@ s32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2, ...@@ -74,7 +74,7 @@ s32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2,
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
u32 WILC_strlen(const WILC_Char *pcStr) u32 WILC_strlen(const char *pcStr)
{ {
return (u32)strlen(pcStr); return (u32)strlen(pcStr);
} }
drivers/staging/wilc1000/wilc_strutils.h
View file @ 576917ad
...@@ -92,7 +92,7 @@ void *WILC_memset(void *pvTarget, u8 u8SetValue, u32 u32Count); ...@@ -92,7 +92,7 @@ void *WILC_memset(void *pvTarget, u8 u8SetValue, u32 u32Count);
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource, char *WILC_strncpy(char *pcTarget, const char *pcSource,
u32 u32Count); u32 u32Count);
/*! /*!
...@@ -113,7 +113,7 @@ WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource, ...@@ -113,7 +113,7 @@ WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource,
* @date 7 Dec 2010 * @date 7 Dec 2010
* @version 1.0 * @version 1.0
*/ */
s32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2, s32 WILC_strncmp(const char *pcStr1, const char *pcStr2,
u32 u32Count); u32 u32Count);
/*! /*!
...@@ -125,6 +125,6 @@ s32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2, ...@@ -125,6 +125,6 @@ s32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2,
* @date 18 Aug 2010 * @date 18 Aug 2010
* @version 1.0 * @version 1.0
*/ */
u32 WILC_strlen(const WILC_Char *pcStr); u32 WILC_strlen(const char *pcStr);
#endif #endif
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View file @ 576917ad
...@@ -829,9 +829,9 @@ static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev, ...@@ -829,9 +829,9 @@ static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev,
u32 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; char *pcgroup_encrypt_val = NULL;
WILC_Char *pccipher_group = NULL; char *pccipher_group = NULL;
WILC_Char *pcwpa_version = NULL; char *pcwpa_version = NULL;
struct WILC_WFI_priv *priv; struct WILC_WFI_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv; tstrWILC_WFIDrv *pstrWFIDrv;
......
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