Commit 4c42080f authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman

staging: ath6kl: Convert A_CHAR to char

Remove obfuscating A_CHAR uses, just use char.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1071a134
...@@ -120,15 +120,15 @@ void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription); ...@@ -120,15 +120,15 @@ void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription);
typedef struct { typedef struct {
A_UINT32 Mask; A_UINT32 Mask;
A_CHAR Description[ATH_DEBUG_MAX_MASK_DESC_LENGTH]; char Description[ATH_DEBUG_MAX_MASK_DESC_LENGTH];
} ATH_DEBUG_MASK_DESCRIPTION; } ATH_DEBUG_MASK_DESCRIPTION;
#define ATH_DEBUG_INFO_FLAGS_REGISTERED (1 << 0) #define ATH_DEBUG_INFO_FLAGS_REGISTERED (1 << 0)
typedef struct _ATH_DEBUG_MODULE_DBG_INFO{ typedef struct _ATH_DEBUG_MODULE_DBG_INFO{
struct _ATH_DEBUG_MODULE_DBG_INFO *pNext; struct _ATH_DEBUG_MODULE_DBG_INFO *pNext;
A_CHAR ModuleName[16]; char ModuleName[16];
A_CHAR ModuleDescription[ATH_DEBUG_MAX_MOD_DESC_LENGTH]; char ModuleDescription[ATH_DEBUG_MAX_MOD_DESC_LENGTH];
A_UINT32 Flags; A_UINT32 Flags;
A_UINT32 CurrentMask; A_UINT32 CurrentMask;
int MaxDescriptions; int MaxDescriptions;
...@@ -181,9 +181,9 @@ void a_register_module_debug_info(ATH_DEBUG_MODULE_DBG_INFO *pInfo); ...@@ -181,9 +181,9 @@ void a_register_module_debug_info(ATH_DEBUG_MODULE_DBG_INFO *pInfo);
#endif #endif
int a_get_module_mask(A_CHAR *module_name, A_UINT32 *pMask); int a_get_module_mask(char *module_name, A_UINT32 *pMask);
int a_set_module_mask(A_CHAR *module_name, A_UINT32 Mask); int a_set_module_mask(char *module_name, A_UINT32 Mask);
void a_dump_module_debug_info_by_name(A_CHAR *module_name); void a_dump_module_debug_info_by_name(char *module_name);
void a_module_debug_support_init(void); void a_module_debug_support_init(void);
void a_module_debug_support_cleanup(void); void a_module_debug_support_cleanup(void);
......
...@@ -65,7 +65,7 @@ typedef struct _ATHBT_FILTER_INSTANCE { ...@@ -65,7 +65,7 @@ typedef struct _ATHBT_FILTER_INSTANCE {
#ifdef UNDER_CE #ifdef UNDER_CE
WCHAR *pWlanAdapterName; /* filled in by user */ WCHAR *pWlanAdapterName; /* filled in by user */
#else #else
char *pWlanAdapterName; /* filled in by user */ char *pWlanAdapterName; /* filled in by user */
#endif /* UNDER_CE */ #endif /* UNDER_CE */
int FilterEnabled; /* filtering is enabled */ int FilterEnabled; /* filtering is enabled */
int Attached; /* filter library is attached */ int Attached; /* filter library is attached */
......
...@@ -125,11 +125,11 @@ enum searchType { ...@@ -125,11 +125,11 @@ enum searchType {
*/ */
typedef PREPACK struct dbMasterTable_t { /* Hold ptrs to Table data structures */ typedef PREPACK struct dbMasterTable_t { /* Hold ptrs to Table data structures */
A_UCHAR numOfEntries; A_UCHAR numOfEntries;
A_CHAR entrySize; /* Entry size per table row */ char entrySize; /* Entry size per table row */
A_CHAR searchType; /* Index based access or key based */ char searchType; /* Index based access or key based */
A_CHAR reserved[3]; /* for alignment */ char reserved[3]; /* for alignment */
A_UINT16 tableSize; /* Size of this table */ A_UINT16 tableSize; /* Size of this table */
A_CHAR *dataPtr; /* Ptr to the actual Table */ char *dataPtr; /* Ptr to the actual Table */
} POSTPACK dbMasterTable; /* Master table - table of tables */ } POSTPACK dbMasterTable; /* Master table - table of tables */
...@@ -190,8 +190,8 @@ typedef PREPACK struct reg_dmn_pair_mapping { ...@@ -190,8 +190,8 @@ typedef PREPACK struct reg_dmn_pair_mapping {
typedef PREPACK struct { typedef PREPACK struct {
A_UINT16 countryCode; A_UINT16 countryCode;
A_UINT16 regDmnEnum; A_UINT16 regDmnEnum;
A_CHAR isoName[3]; char isoName[3];
A_CHAR allowMode; /* what mode is allowed - bit 0: OFDM; bit 1: MCS_HT20; bit 2: MCS_HT40_A; bit 3: MCS_HT40_G */ char allowMode; /* what mode is allowed - bit 0: OFDM; bit 1: MCS_HT20; bit 2: MCS_HT40_A; bit 3: MCS_HT40_G */
} POSTPACK COUNTRY_CODE_TO_ENUM_RD; } POSTPACK COUNTRY_CODE_TO_ENUM_RD;
/* lower 16 bits of ht40ChanMask */ /* lower 16 bits of ht40ChanMask */
......
...@@ -782,7 +782,7 @@ typedef PREPACK struct { ...@@ -782,7 +782,7 @@ typedef PREPACK struct {
typedef PREPACK struct { typedef PREPACK struct {
A_UINT32 opcode; A_UINT32 opcode;
A_UINT32 length; A_UINT32 length;
A_CHAR buffer[1]; /* WMI_SET_PARAMS */ char buffer[1]; /* WMI_SET_PARAMS */
} POSTPACK WMI_SET_PARAMS_CMD; } POSTPACK WMI_SET_PARAMS_CMD;
typedef PREPACK struct { typedef PREPACK struct {
......
...@@ -310,7 +310,7 @@ int wmi_del_wow_pattern_cmd(struct wmi_t *wmip, ...@@ -310,7 +310,7 @@ int wmi_del_wow_pattern_cmd(struct wmi_t *wmip,
int wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status); int wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status);
int int
wmi_set_params_cmd(struct wmi_t *wmip, A_UINT32 opcode, A_UINT32 length, A_CHAR* buffer); wmi_set_params_cmd(struct wmi_t *wmip, A_UINT32 opcode, A_UINT32 length, char *buffer);
int int
wmi_set_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 dot1, A_UINT8 dot2, A_UINT8 dot3, A_UINT8 dot4); wmi_set_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 dot1, A_UINT8 dot2, A_UINT8 dot3, A_UINT8 dot4);
......
...@@ -277,7 +277,7 @@ static int AR3KConfigureHCIBaud(AR3K_CONFIG_INFO *pConfig) ...@@ -277,7 +277,7 @@ static int AR3KConfigureHCIBaud(AR3K_CONFIG_INFO *pConfig)
static int AR3KExitMinBoot(AR3K_CONFIG_INFO *pConfig) static int AR3KExitMinBoot(AR3K_CONFIG_INFO *pConfig)
{ {
int status; int status;
A_CHAR exitMinBootCmd[] = {0x25,0xFC,0x0c,0x03,0x00,0x00,0x00,0x00,0x00,0x00, char exitMinBootCmd[] = {0x25,0xFC,0x0c,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00}; 0x00,0x00,0x00,0x00,0x00};
A_UINT8 *pEvent = NULL; A_UINT8 *pEvent = NULL;
A_UINT8 *pBufferToFree = NULL; A_UINT8 *pBufferToFree = NULL;
...@@ -338,7 +338,7 @@ static int AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig) ...@@ -338,7 +338,7 @@ static int AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig)
{ {
int status; int status;
/* AR3K vendor specific command for Host Wakeup Config */ /* AR3K vendor specific command for Host Wakeup Config */
A_CHAR hostWakeupConfig[] = {0x31,0xFC,0x18, char hostWakeupConfig[] = {0x31,0xFC,0x18,
0x02,0x00,0x00,0x00, 0x02,0x00,0x00,0x00,
0x01,0x00,0x00,0x00, 0x01,0x00,0x00,0x00,
TLPM_DEFAULT_IDLE_TIMEOUT_LSB,TLPM_DEFAULT_IDLE_TIMEOUT_MSB,0x00,0x00, //idle timeout in ms TLPM_DEFAULT_IDLE_TIMEOUT_LSB,TLPM_DEFAULT_IDLE_TIMEOUT_MSB,0x00,0x00, //idle timeout in ms
...@@ -346,7 +346,7 @@ static int AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig) ...@@ -346,7 +346,7 @@ static int AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig)
TLPM_DEFAULT_WAKEUP_TIMEOUT_MS,0x00,0x00,0x00, //wakeup timeout in ms TLPM_DEFAULT_WAKEUP_TIMEOUT_MS,0x00,0x00,0x00, //wakeup timeout in ms
0x00,0x00,0x00,0x00}; 0x00,0x00,0x00,0x00};
/* AR3K vendor specific command for Target Wakeup Config */ /* AR3K vendor specific command for Target Wakeup Config */
A_CHAR targetWakeupConfig[] = {0x31,0xFC,0x18, char targetWakeupConfig[] = {0x31,0xFC,0x18,
0x04,0x00,0x00,0x00, 0x04,0x00,0x00,0x00,
0x01,0x00,0x00,0x00, 0x01,0x00,0x00,0x00,
TLPM_DEFAULT_IDLE_TIMEOUT_LSB,TLPM_DEFAULT_IDLE_TIMEOUT_MSB,0x00,0x00, //idle timeout in ms TLPM_DEFAULT_IDLE_TIMEOUT_LSB,TLPM_DEFAULT_IDLE_TIMEOUT_MSB,0x00,0x00, //idle timeout in ms
...@@ -354,13 +354,13 @@ static int AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig) ...@@ -354,13 +354,13 @@ static int AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig)
TLPM_DEFAULT_WAKEUP_TIMEOUT_MS,0x00,0x00,0x00, //wakeup timeout in ms TLPM_DEFAULT_WAKEUP_TIMEOUT_MS,0x00,0x00,0x00, //wakeup timeout in ms
0x00,0x00,0x00,0x00}; 0x00,0x00,0x00,0x00};
/* AR3K vendor specific command for Host Wakeup Enable */ /* AR3K vendor specific command for Host Wakeup Enable */
A_CHAR hostWakeupEnable[] = {0x31,0xFC,0x4, char hostWakeupEnable[] = {0x31,0xFC,0x4,
0x01,0x00,0x00,0x00}; 0x01,0x00,0x00,0x00};
/* AR3K vendor specific command for Target Wakeup Enable */ /* AR3K vendor specific command for Target Wakeup Enable */
A_CHAR targetWakeupEnable[] = {0x31,0xFC,0x4, char targetWakeupEnable[] = {0x31,0xFC,0x4,
0x06,0x00,0x00,0x00}; 0x06,0x00,0x00,0x00};
/* AR3K vendor specific command for Sleep Enable */ /* AR3K vendor specific command for Sleep Enable */
A_CHAR sleepEnable[] = {0x4,0xFC,0x1, char sleepEnable[] = {0x4,0xFC,0x1,
0x1}; 0x1};
A_UINT8 *pEvent = NULL; A_UINT8 *pEvent = NULL;
A_UINT8 *pBufferToFree = NULL; A_UINT8 *pBufferToFree = NULL;
......
...@@ -129,7 +129,7 @@ tRamPatch RamPatch[MAX_NUM_PATCH_ENTRY]; ...@@ -129,7 +129,7 @@ tRamPatch RamPatch[MAX_NUM_PATCH_ENTRY];
int AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat); int AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat);
char AthReadChar(A_UCHAR *buffer, A_UINT32 len,A_UINT32 *pos); char AthReadChar(A_UCHAR *buffer, A_UINT32 len,A_UINT32 *pos);
char * AthGetLine(char * buffer, int maxlen, A_UCHAR *srcbuffer,A_UINT32 len,A_UINT32 *pos); char *AthGetLine(char *buffer, int maxlen, A_UCHAR *srcbuffer,A_UINT32 len,A_UINT32 *pos);
static int AthPSCreateHCICommand(A_UCHAR Opcode, A_UINT32 Param1,PSCmdPacket *PSPatchPacket,A_UINT32 *index); static int AthPSCreateHCICommand(A_UCHAR Opcode, A_UINT32 Param1,PSCmdPacket *PSPatchPacket,A_UINT32 *index);
/* Function to reads the next character from the input buffer */ /* Function to reads the next character from the input buffer */
...@@ -146,7 +146,7 @@ char AthReadChar(A_UCHAR *buffer, A_UINT32 len,A_UINT32 *pos) ...@@ -146,7 +146,7 @@ char AthReadChar(A_UCHAR *buffer, A_UINT32 len,A_UINT32 *pos)
} }
} }
/* PS parser helper function */ /* PS parser helper function */
unsigned int uGetInputDataFormat(char* pCharLine, ST_PS_DATA_FORMAT *pstFormat) unsigned int uGetInputDataFormat(char *pCharLine, ST_PS_DATA_FORMAT *pstFormat)
{ {
if(pCharLine[0] != '[') { if(pCharLine[0] != '[') {
pstFormat->eDataType = eHex; pstFormat->eDataType = eHex;
...@@ -317,8 +317,8 @@ unsigned int uReadDataInSection(char *pCharLine, ST_PS_DATA_FORMAT stPS_DataForm ...@@ -317,8 +317,8 @@ unsigned int uReadDataInSection(char *pCharLine, ST_PS_DATA_FORMAT stPS_DataForm
} }
int AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat) int AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat)
{ {
char *Buffer; char *Buffer;
char *pCharLine; char *pCharLine;
A_UINT8 TagCount; A_UINT8 TagCount;
A_UINT16 ByteCount; A_UINT16 ByteCount;
A_UINT8 ParseSection=RAM_PS_SECTION; A_UINT8 ParseSection=RAM_PS_SECTION;
...@@ -558,7 +558,7 @@ int AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat) ...@@ -558,7 +558,7 @@ int AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat)
/********************/ /********************/
int GetNextTwoChar(A_UCHAR *srcbuffer,A_UINT32 len, A_UINT32 *pos, char * buffer) int GetNextTwoChar(A_UCHAR *srcbuffer,A_UINT32 len, A_UINT32 *pos, char *buffer)
{ {
unsigned char ch; unsigned char ch;
...@@ -582,8 +582,8 @@ int GetNextTwoChar(A_UCHAR *srcbuffer,A_UINT32 len, A_UINT32 *pos, char * buffer ...@@ -582,8 +582,8 @@ int GetNextTwoChar(A_UCHAR *srcbuffer,A_UINT32 len, A_UINT32 *pos, char * buffer
int AthDoParsePatch(A_UCHAR *patchbuffer, A_UINT32 patchlen) int AthDoParsePatch(A_UCHAR *patchbuffer, A_UINT32 patchlen)
{ {
char Byte[3]; char Byte[3];
char Line[MAX_BYTE_LENGTH + 1]; char Line[MAX_BYTE_LENGTH + 1];
int ByteCount,ByteCount_Org; int ByteCount,ByteCount_Org;
int count; int count;
int i,j,k; int i,j,k;
...@@ -713,7 +713,7 @@ int AthDoParsePS(A_UCHAR *srcbuffer, A_UINT32 srclen) ...@@ -713,7 +713,7 @@ int AthDoParsePS(A_UCHAR *srcbuffer, A_UINT32 srclen)
return status; return status;
} }
char * AthGetLine(char * buffer, int maxlen, A_UCHAR *srcbuffer,A_UINT32 len,A_UINT32 *pos) char *AthGetLine(char *buffer, int maxlen, A_UCHAR *srcbuffer,A_UINT32 len,A_UINT32 *pos)
{ {
int count; int count;
......
...@@ -799,8 +799,8 @@ ar6002_REV1_reset_force_host (HIF_DEVICE *hifDevice) ...@@ -799,8 +799,8 @@ ar6002_REV1_reset_force_host (HIF_DEVICE *hifDevice)
void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription) void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription)
{ {
A_CHAR stream[60]; char stream[60];
A_CHAR byteOffsetStr[10]; char byteOffsetStr[10];
A_UINT32 i; A_UINT32 i;
A_UINT16 offset, count, byteOffset; A_UINT16 offset, count, byteOffset;
...@@ -868,7 +868,7 @@ void a_dump_module_debug_info(ATH_DEBUG_MODULE_DBG_INFO *pInfo) ...@@ -868,7 +868,7 @@ void a_dump_module_debug_info(ATH_DEBUG_MODULE_DBG_INFO *pInfo)
} }
static ATH_DEBUG_MODULE_DBG_INFO *FindModule(A_CHAR *module_name) static ATH_DEBUG_MODULE_DBG_INFO *FindModule(char *module_name)
{ {
ATH_DEBUG_MODULE_DBG_INFO *pInfo = g_pModuleInfoHead; ATH_DEBUG_MODULE_DBG_INFO *pInfo = g_pModuleInfoHead;
...@@ -909,7 +909,7 @@ void a_register_module_debug_info(ATH_DEBUG_MODULE_DBG_INFO *pInfo) ...@@ -909,7 +909,7 @@ void a_register_module_debug_info(ATH_DEBUG_MODULE_DBG_INFO *pInfo)
A_MUTEX_UNLOCK(&g_ModuleListLock); A_MUTEX_UNLOCK(&g_ModuleListLock);
} }
void a_dump_module_debug_info_by_name(A_CHAR *module_name) void a_dump_module_debug_info_by_name(char *module_name)
{ {
ATH_DEBUG_MODULE_DBG_INFO *pInfo = g_pModuleInfoHead; ATH_DEBUG_MODULE_DBG_INFO *pInfo = g_pModuleInfoHead;
...@@ -934,7 +934,7 @@ void a_dump_module_debug_info_by_name(A_CHAR *module_name) ...@@ -934,7 +934,7 @@ void a_dump_module_debug_info_by_name(A_CHAR *module_name)
} }
int a_get_module_mask(A_CHAR *module_name, A_UINT32 *pMask) int a_get_module_mask(char *module_name, A_UINT32 *pMask)
{ {
ATH_DEBUG_MODULE_DBG_INFO *pInfo = FindModule(module_name); ATH_DEBUG_MODULE_DBG_INFO *pInfo = FindModule(module_name);
...@@ -946,7 +946,7 @@ int a_get_module_mask(A_CHAR *module_name, A_UINT32 *pMask) ...@@ -946,7 +946,7 @@ int a_get_module_mask(A_CHAR *module_name, A_UINT32 *pMask)
return A_OK; return A_OK;
} }
int a_set_module_mask(A_CHAR *module_name, A_UINT32 Mask) int a_set_module_mask(char *module_name, A_UINT32 Mask)
{ {
ATH_DEBUG_MODULE_DBG_INFO *pInfo = FindModule(module_name); ATH_DEBUG_MODULE_DBG_INFO *pInfo = FindModule(module_name);
......
...@@ -155,7 +155,7 @@ int android_logger_lv(void *module, int mask) ...@@ -155,7 +155,7 @@ int android_logger_lv(void *module, int mask)
} }
} }
static int android_readwrite_file(const A_CHAR *filename, A_CHAR *rbuf, const A_CHAR *wbuf, size_t length) static int android_readwrite_file(const char *filename, char *rbuf, const char *wbuf, size_t length)
{ {
int ret = 0; int ret = 0;
struct file *filp = (struct file *)-ENOENT; struct file *filp = (struct file *)-ENOENT;
......
...@@ -970,7 +970,7 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size) ...@@ -970,7 +970,7 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size)
ptr_mac[5] = random32() & 0xff; ptr_mac[5] = random32() & 0xff;
if ((A_REQUEST_FIRMWARE(&softmac_entry, "softmac", ((struct device *)ar->osDevInfo.pOSDevice))) == 0) if ((A_REQUEST_FIRMWARE(&softmac_entry, "softmac", ((struct device *)ar->osDevInfo.pOSDevice))) == 0)
{ {
A_CHAR *macbuf = A_MALLOC_NOWAIT(softmac_entry->size+1); char *macbuf = A_MALLOC_NOWAIT(softmac_entry->size+1);
if (macbuf) { if (macbuf) {
unsigned int softmac[6]; unsigned int softmac[6];
memcpy(macbuf, softmac_entry->data, softmac_entry->size); memcpy(macbuf, softmac_entry->data, softmac_entry->size);
...@@ -1190,7 +1190,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, A_UINT32 mode) ...@@ -1190,7 +1190,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, A_UINT32 mode)
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Requesting device specific configuration\n")); AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Requesting device specific configuration\n"));
if (mode == WLAN_INIT_MODE_UDEV) { if (mode == WLAN_INIT_MODE_UDEV) {
A_CHAR version[16]; char version[16];
const struct firmware *fw_entry; const struct firmware *fw_entry;
/* Get config using udev through a script in user space */ /* Get config using udev through a script in user space */
...@@ -2344,7 +2344,7 @@ ar6000_close(struct net_device *dev) ...@@ -2344,7 +2344,7 @@ ar6000_close(struct net_device *dev)
/* connect to a service */ /* connect to a service */
static int ar6000_connectservice(AR_SOFTC_T *ar, static int ar6000_connectservice(AR_SOFTC_T *ar,
HTC_SERVICE_CONNECT_REQ *pConnect, HTC_SERVICE_CONNECT_REQ *pConnect,
char *pDesc) char *pDesc)
{ {
int status; int status;
HTC_SERVICE_CONNECT_RESP response; HTC_SERVICE_CONNECT_RESP response;
...@@ -5941,7 +5941,7 @@ rssi_compensation_reverse_calc(AR_SOFTC_T *ar, A_INT16 rssi, bool Above) ...@@ -5941,7 +5941,7 @@ rssi_compensation_reverse_calc(AR_SOFTC_T *ar, A_INT16 rssi, bool Above)
void ap_wapi_rekey_event(AR_SOFTC_T *ar, A_UINT8 type, A_UINT8 *mac) void ap_wapi_rekey_event(AR_SOFTC_T *ar, A_UINT8 type, A_UINT8 *mac)
{ {
union iwreq_data wrqu; union iwreq_data wrqu;
A_CHAR buf[20]; char buf[20];
A_MEMZERO(buf, sizeof(buf)); A_MEMZERO(buf, sizeof(buf));
......
...@@ -103,7 +103,7 @@ wmic_ether_aton(const char *orig, A_UINT8 *eth) ...@@ -103,7 +103,7 @@ wmic_ether_aton(const char *orig, A_UINT8 *eth)
} }
static void static void
update_mac(unsigned char* eeprom, int size, unsigned char* macaddr) update_mac(unsigned char *eeprom, int size, unsigned char *macaddr)
{ {
int i; int i;
A_UINT16* ptr = (A_UINT16*)(eeprom+4); A_UINT16* ptr = (A_UINT16*)(eeprom+4);
......
...@@ -672,8 +672,8 @@ static inline void *ar6k_priv(struct net_device *dev) ...@@ -672,8 +672,8 @@ static inline void *ar6k_priv(struct net_device *dev)
#define arEndpoint2RawStreamID(ar,ep) (ar)->arRawHtc->arEp2RawMapping[(ep)] #define arEndpoint2RawStreamID(ar,ep) (ar)->arRawHtc->arEp2RawMapping[(ep)]
struct ar_giwscan_param { struct ar_giwscan_param {
char *current_ev; char *current_ev;
char *end_buf; char *end_buf;
A_UINT32 bytes_needed; A_UINT32 bytes_needed;
struct iw_request_info *info; struct iw_request_info *info;
}; };
......
...@@ -1198,7 +1198,7 @@ struct prof_count_s { ...@@ -1198,7 +1198,7 @@ struct prof_count_s {
/* AR6000_XIOCTL_MODULE_DEBUG_GET_MASK */ /* AR6000_XIOCTL_MODULE_DEBUG_GET_MASK */
/* AR6000_XIOCTL_DUMP_MODULE_DEBUG_INFO */ /* AR6000_XIOCTL_DUMP_MODULE_DEBUG_INFO */
struct drv_debug_module_s { struct drv_debug_module_s {
A_CHAR modulename[128]; /* name of module */ char modulename[128]; /* name of module */
A_UINT32 mask; /* new mask to set .. or .. current mask */ A_UINT32 mask; /* new mask to set .. or .. current mask */
}; };
......
...@@ -937,7 +937,7 @@ ar6000_ioctl_set_disconnect_timeout(struct net_device *dev, struct ifreq *rq) ...@@ -937,7 +937,7 @@ ar6000_ioctl_set_disconnect_timeout(struct net_device *dev, struct ifreq *rq)
} }
static int static int
ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char * userdata) ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char *userdata)
{ {
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_VOICE_PKT_SIZE_CMD cmd; WMI_SET_VOICE_PKT_SIZE_CMD cmd;
...@@ -963,7 +963,7 @@ ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char * userdata) ...@@ -963,7 +963,7 @@ ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char * userdata)
} }
static int static int
ar6000_xioctl_set_max_sp_len(struct net_device *dev, char * userdata) ar6000_xioctl_set_max_sp_len(struct net_device *dev, char *userdata)
{ {
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_MAX_SP_LEN_CMD cmd; WMI_SET_MAX_SP_LEN_CMD cmd;
...@@ -989,7 +989,7 @@ ar6000_xioctl_set_max_sp_len(struct net_device *dev, char * userdata) ...@@ -989,7 +989,7 @@ ar6000_xioctl_set_max_sp_len(struct net_device *dev, char * userdata)
static int static int
ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char * userdata) ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char *userdata)
{ {
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BT_STATUS_CMD cmd; WMI_SET_BT_STATUS_CMD cmd;
...@@ -1014,7 +1014,7 @@ ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char * userdata) ...@@ -1014,7 +1014,7 @@ ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char * userdata)
} }
static int static int
ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char * userdata) ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char *userdata)
{ {
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BT_PARAMS_CMD cmd; WMI_SET_BT_PARAMS_CMD cmd;
...@@ -1039,7 +1039,7 @@ ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char * userdata) ...@@ -1039,7 +1039,7 @@ ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char * userdata)
} }
static int static int
ar6000_xioctl_set_btcoex_fe_ant_cmd(struct net_device * dev, char * userdata) ar6000_xioctl_set_btcoex_fe_ant_cmd(struct net_device * dev, char *userdata)
{ {
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_FE_ANT_CMD cmd; WMI_SET_BTCOEX_FE_ANT_CMD cmd;
...@@ -1063,7 +1063,7 @@ ar6000_xioctl_set_btcoex_fe_ant_cmd(struct net_device * dev, char * userdata) ...@@ -1063,7 +1063,7 @@ ar6000_xioctl_set_btcoex_fe_ant_cmd(struct net_device * dev, char * userdata)
} }
static int static int
ar6000_xioctl_set_btcoex_colocated_bt_dev_cmd(struct net_device * dev, char * userdata) ar6000_xioctl_set_btcoex_colocated_bt_dev_cmd(struct net_device * dev, char *userdata)
{ {
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD cmd; WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD cmd;
...@@ -1088,7 +1088,7 @@ ar6000_xioctl_set_btcoex_colocated_bt_dev_cmd(struct net_device * dev, char * us ...@@ -1088,7 +1088,7 @@ ar6000_xioctl_set_btcoex_colocated_bt_dev_cmd(struct net_device * dev, char * us
} }
static int static int
ar6000_xioctl_set_btcoex_btinquiry_page_config_cmd(struct net_device * dev, char * userdata) ar6000_xioctl_set_btcoex_btinquiry_page_config_cmd(struct net_device * dev, char *userdata)
{ {
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD cmd; WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD cmd;
...@@ -1113,7 +1113,7 @@ ar6000_xioctl_set_btcoex_btinquiry_page_config_cmd(struct net_device * dev, cha ...@@ -1113,7 +1113,7 @@ ar6000_xioctl_set_btcoex_btinquiry_page_config_cmd(struct net_device * dev, cha
} }
static int static int
ar6000_xioctl_set_btcoex_sco_config_cmd(struct net_device * dev, char * userdata) ar6000_xioctl_set_btcoex_sco_config_cmd(struct net_device * dev, char *userdata)
{ {
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_SCO_CONFIG_CMD cmd; WMI_SET_BTCOEX_SCO_CONFIG_CMD cmd;
...@@ -1139,7 +1139,7 @@ ar6000_xioctl_set_btcoex_sco_config_cmd(struct net_device * dev, char * userdata ...@@ -1139,7 +1139,7 @@ ar6000_xioctl_set_btcoex_sco_config_cmd(struct net_device * dev, char * userdata
static int static int
ar6000_xioctl_set_btcoex_a2dp_config_cmd(struct net_device * dev, ar6000_xioctl_set_btcoex_a2dp_config_cmd(struct net_device * dev,
char * userdata) char *userdata)
{ {
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_A2DP_CONFIG_CMD cmd; WMI_SET_BTCOEX_A2DP_CONFIG_CMD cmd;
...@@ -1164,7 +1164,7 @@ ar6000_xioctl_set_btcoex_a2dp_config_cmd(struct net_device * dev, ...@@ -1164,7 +1164,7 @@ ar6000_xioctl_set_btcoex_a2dp_config_cmd(struct net_device * dev,
} }
static int static int
ar6000_xioctl_set_btcoex_aclcoex_config_cmd(struct net_device * dev, char * userdata) ar6000_xioctl_set_btcoex_aclcoex_config_cmd(struct net_device * dev, char *userdata)
{ {
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD cmd; WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD cmd;
...@@ -1189,7 +1189,7 @@ ar6000_xioctl_set_btcoex_aclcoex_config_cmd(struct net_device * dev, char * user ...@@ -1189,7 +1189,7 @@ ar6000_xioctl_set_btcoex_aclcoex_config_cmd(struct net_device * dev, char * user
} }
static int static int
ar60000_xioctl_set_btcoex_debug_cmd(struct net_device * dev, char * userdata) ar60000_xioctl_set_btcoex_debug_cmd(struct net_device * dev, char *userdata)
{ {
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_DEBUG_CMD cmd; WMI_SET_BTCOEX_DEBUG_CMD cmd;
...@@ -1214,7 +1214,7 @@ ar60000_xioctl_set_btcoex_debug_cmd(struct net_device * dev, char * userdata) ...@@ -1214,7 +1214,7 @@ ar60000_xioctl_set_btcoex_debug_cmd(struct net_device * dev, char * userdata)
} }
static int static int
ar6000_xioctl_set_btcoex_bt_operating_status_cmd(struct net_device * dev, char * userdata) ar6000_xioctl_set_btcoex_bt_operating_status_cmd(struct net_device * dev, char *userdata)
{ {
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD cmd; WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD cmd;
...@@ -1238,7 +1238,7 @@ ar6000_xioctl_set_btcoex_bt_operating_status_cmd(struct net_device * dev, char * ...@@ -1238,7 +1238,7 @@ ar6000_xioctl_set_btcoex_bt_operating_status_cmd(struct net_device * dev, char *
} }
static int static int
ar6000_xioctl_get_btcoex_config_cmd(struct net_device * dev, char * userdata, ar6000_xioctl_get_btcoex_config_cmd(struct net_device * dev, char *userdata,
struct ifreq *rq) struct ifreq *rq)
{ {
...@@ -1283,7 +1283,7 @@ ar6000_xioctl_get_btcoex_config_cmd(struct net_device * dev, char * userdata, ...@@ -1283,7 +1283,7 @@ ar6000_xioctl_get_btcoex_config_cmd(struct net_device * dev, char * userdata,
} }
static int static int
ar6000_xioctl_get_btcoex_stats_cmd(struct net_device * dev, char * userdata, struct ifreq *rq) ar6000_xioctl_get_btcoex_stats_cmd(struct net_device * dev, char *userdata, struct ifreq *rq)
{ {
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev); AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
AR6000_BTCOEX_STATS btcoexStats; AR6000_BTCOEX_STATS btcoexStats;
......
...@@ -94,10 +94,10 @@ ar6000_scan_node(void *arg, bss_t *ni) ...@@ -94,10 +94,10 @@ ar6000_scan_node(void *arg, bss_t *ni)
char buf[256]; char buf[256];
#endif #endif
struct ar_giwscan_param *param; struct ar_giwscan_param *param;
A_CHAR *current_ev; char *current_ev;
A_CHAR *end_buf; char *end_buf;
struct ieee80211_common_ie *cie; struct ieee80211_common_ie *cie;
A_CHAR *current_val; char *current_val;
A_INT32 j; A_INT32 j;
A_UINT32 rate_len, data_len = 0; A_UINT32 rate_len, data_len = 0;
......
...@@ -5215,7 +5215,7 @@ wmi_set_keepalive_cmd(struct wmi_t *wmip, A_UINT8 keepaliveInterval) ...@@ -5215,7 +5215,7 @@ wmi_set_keepalive_cmd(struct wmi_t *wmip, A_UINT8 keepaliveInterval)
} }
int int
wmi_set_params_cmd(struct wmi_t *wmip, A_UINT32 opcode, A_UINT32 length, A_CHAR* buffer) wmi_set_params_cmd(struct wmi_t *wmip, A_UINT32 opcode, A_UINT32 length, char *buffer)
{ {
void *osbuf; void *osbuf;
WMI_SET_PARAMS_CMD *cmd; WMI_SET_PARAMS_CMD *cmd;
......
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