Commit 442f9cb5 authored by Andres More's avatar Andres More Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: code cleanup, replaced U8 macro with u8 



Removed custom macro for unsigned 8-bit integers.

Signed-off-by: default avatarAndres More <more.andres@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bf597e99

drivers/staging/vt6656/iocmd.h

+32 −32
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ typedef enum tagWZONETYPE { 
//

#pragma pack(1)

typedef struct tagSCmdRequest {

	U8 	    name[16];

	u8 name[16];

	void	*data;

	U16	    wResult;

	U16     wCmdCode;
@@ -121,7 +121,7 @@ typedef struct tagSCmdRequest { 


typedef struct tagSCmdScan {



    U8	    ssid[SSID_MAXLEN + 2];

    u8	    ssid[SSID_MAXLEN + 2];



} SCmdScan, *PSCmdScan;
@@ -134,7 +134,7 @@ typedef struct tagSCmdBSSJoin { 


    U16	    wBSSType;

    U16     wBBPType;

    U8	    ssid[SSID_MAXLEN + 2];

    u8	    ssid[SSID_MAXLEN + 2];

    U32	    uChannel;

    BOOL    bPSEnable;

    BOOL    bShareKeyAuth;
@@ -155,9 +155,9 @@ typedef struct tagSCmdZoneTypeSet { 
#ifdef WPA_SM_Transtatus

typedef struct tagSWPAResult {

         char	ifname[100];

         U8		proto;

         U8   key_mgmt;

         U8   eap_type;

	u8 proto;

	u8 key_mgmt;

	u8 eap_type;

         BOOL authenticated;

} SWPAResult, *PSWPAResult;

#endif
@@ -166,11 +166,11 @@ typedef struct tagSCmdStartAP { 


    U16	    wBSSType;

    U16     wBBPType;

    U8	    ssid[SSID_MAXLEN + 2];

    u8	    ssid[SSID_MAXLEN + 2];

    U32 	uChannel;

    U32     uBeaconInt;

    BOOL    bShareKeyAuth;

    U8      byBasicRate;

    u8      byBasicRate;



} SCmdStartAP, *PSCmdStartAP;
@@ -178,8 +178,8 @@ typedef struct tagSCmdStartAP { 
typedef struct tagSCmdSetWEP {



    BOOL    bEnableWep;

    U8      byKeyIndex;

    U8      abyWepKey[WEP_NKEYS][WEP_KEYMAXLEN];

    u8      byKeyIndex;

    u8      abyWepKey[WEP_NKEYS][WEP_KEYMAXLEN];

    BOOL    bWepKeyAvailable[WEP_NKEYS];

    U32     auWepKeyLength[WEP_NKEYS];
@@ -190,11 +190,11 @@ typedef struct tagSCmdSetWEP { 
typedef struct tagSBSSIDItem {



	U32	    uChannel;

    U8      abyBSSID[BSSID_LEN];

    U8      abySSID[SSID_MAXLEN + 1];

    u8      abyBSSID[BSSID_LEN];

    u8      abySSID[SSID_MAXLEN + 1];

    U16	    wBeaconInterval;

    U16	    wCapInfo;

    U8      byNetType;

    u8      byNetType;

    BOOL    bWEPOn;

    U32     uRSSI;
@@ -211,15 +211,15 @@ typedef struct tagSBSSIDList { 
typedef struct tagSNodeItem {

    // STA info

    U16            wAID;

    U8             abyMACAddr[6];

    u8             abyMACAddr[6];

    U16            wTxDataRate;

    U16            wInActiveCount;

    U16            wEnQueueCnt;

    U16            wFlags;

    BOOL           bPWBitOn;

    U8             byKeyIndex;

    u8             byKeyIndex;

    U16            wWepKeyLength;

    U8            abyWepKey[WEP_KEYMAXLEN];

    u8            abyWepKey[WEP_KEYMAXLEN];

    // Auto rate fallback vars

    BOOL           bIsInFallback;

    U32            uTxFailures;
@@ -241,9 +241,9 @@ typedef struct tagSCmdLinkStatus { 


    BOOL    bLink;

	U16	    wBSSType;

	U8      byState;

    U8      abyBSSID[BSSID_LEN];

    U8      abySSID[SSID_MAXLEN + 2];

	u8      byState;

    u8      abyBSSID[BSSID_LEN];

    u8      abySSID[SSID_MAXLEN + 2];

    U32     uChannel;

    U32     uLinkRate;
@@ -353,8 +353,8 @@ typedef struct tagSStatMIBCount { 
    U32   dwCntRxFrmLength;

    U32   dwCntTxBufLength;



    U8    abyCntRxPattern[16];

    U8    abyCntTxPattern[16];

    u8    abyCntRxPattern[16];

    u8    abyCntTxPattern[16];



    // Software check....

    U32   dwCntRxDataErr;             // rx buffer data software compare CRC err count
@@ -415,24 +415,24 @@ enum { 


struct viawget_hostapd_param {

	U32 cmd;

	U8 sta_addr[6];

	u8 sta_addr[6];

	union {

		struct {

			U16 aid;

			U16 capability;

			U8 tx_supp_rates;

			u8 tx_supp_rates;

		} add_sta;

		struct {

			U32 inactive_sec;

		} get_info_sta;

		struct {

			U8 alg;

			u8 alg;

			U32 flags;

			U32 err;

			U8 idx;

			U8 seq[8];

			u8 idx;

			u8 seq[8];

			U16 key_len;

			U8 key[0];

			u8 key[0];

		} crypt;

		struct {

			U32 flags_and;
@@ -441,19 +441,19 @@ struct viawget_hostapd_param { 
		struct {

			U16 rid;

			U16 len;

			U8 data[0];

			u8 data[0];

		} rid;

		struct {

			U8 len;

			U8 data[0];

			u8 len;

			u8 data[0];

		} generic_elem;

		struct {

			U16 cmd;

			U16 reason_code;

		} mlme;

		struct {

			U8 ssid_len;

			U8 ssid[32];

			u8 ssid_len;

			u8 ssid[32];

		} scan_req;

	} u;

};

drivers/staging/vt6656/ttype.h

+0 −8
Original line number Diff line number Diff line
@@ -26,11 +26,9 @@ 
 *

 */





#ifndef __TTYPE_H__

#define __TTYPE_H__





/******* Common definitions and typedefs ***********************************/



//2007-0115-05<Add>by MikeLiu
@@ -40,7 +38,6 @@ 


//DavidWang





//2007-0814-01<Add>by MikeLiu

#ifndef Safe_Close

#define Safe_Close
@@ -82,11 +79,9 @@ typedef int BOOL; 


typedef signed char             I8;     /* 8-bit signed integer */



typedef unsigned char           U8;     /* 8-bit unsigned integer */

typedef unsigned short          U16;    /* 16-bit unsigned integer */

typedef unsigned long           U32;    /* 32-bit unsigned integer */





typedef char            CHAR;

typedef signed short    SHORT;

typedef signed int      INT;
@@ -98,8 +93,6 @@ typedef unsigned int UINT; 
typedef unsigned long   ULONG;

typedef unsigned long long	ULONGLONG; //64 bit







typedef unsigned char   BYTE;           //  8-bit

typedef unsigned short  WORD;           // 16-bit

typedef unsigned long   DWORD;          // 32-bit
@@ -116,7 +109,6 @@ typedef union tagUQuadWord { 
} UQuadWord;

typedef UQuadWord       QWORD;          // 64-bit





/****** Common pointer types ***********************************************/



typedef unsigned long   ULONG_PTR;      // 32-bit