Commit 902d2411 authored by Charles Clément's avatar Charles Clément Committed by Greg Kroah-Hartman

Staging: vt6655: remove U32 custom macro

Remove custom macro for unsigned 32-bit integers, replace by u32.
Signed-off-by: default avatarCharles Clément <caratorn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c17ce8c2
......@@ -291,11 +291,11 @@ SRDES1;
typedef struct tagSRxDesc {
volatile SRDES0 m_rd0RD0;
volatile SRDES1 m_rd1RD1;
volatile U32 buff_addr;
volatile U32 next_desc;
volatile u32 buff_addr;
volatile u32 next_desc;
struct tagSRxDesc *next;//4 bytes
volatile PDEVICE_RD_INFO pRDInfo;//4 bytes
volatile U32 Reserved[2];//8 bytes
volatile u32 Reserved[2];//8 bytes
} __attribute__ ((__packed__))
SRxDesc, *PSRxDesc;
typedef const SRxDesc *PCSRxDesc;
......@@ -378,11 +378,11 @@ static inline PDEVICE_TD_INFO alloc_td_info(void) {
typedef struct tagSTxDesc {
volatile STDES0 m_td0TD0;
volatile STDES1 m_td1TD1;
volatile U32 buff_addr;
volatile U32 next_desc;
volatile u32 buff_addr;
volatile u32 next_desc;
struct tagSTxDesc* next; //4 bytes
volatile PDEVICE_TD_INFO pTDInfo;//4 bytes
volatile U32 Reserved[2];//8 bytes
volatile u32 Reserved[2];//8 bytes
} __attribute__ ((__packed__))
STxDesc, *PSTxDesc;
typedef const STxDesc *PCSTxDesc;
......
......@@ -291,7 +291,7 @@ typedef struct __chip_info_tbl{
char* name;
int io_size;
int nTxQueue;
U32 flags;
u32 flags;
} CHIP_INFO, *PCHIP_INFO;
......@@ -386,7 +386,7 @@ typedef struct __device_opt {
int short_retry;
int long_retry;
int bbp_type;
U32 flags;
u32 flags;
} OPTIONS, *POPTIONS;
......@@ -423,11 +423,11 @@ typedef struct __device_info {
CHIP_TYPE chip_id;
U32 PortOffset;
u32 PortOffset;
DWORD dwIsr;
U32 memaddr;
U32 ioaddr;
U32 io_size;
u32 memaddr;
u32 ioaddr;
u32 io_size;
BYTE byRevId;
WORD SubSystemID;
......@@ -454,9 +454,9 @@ typedef struct __device_info {
OPTIONS sOpts;
U32 flags;
u32 flags;
U32 rx_buf_sz;
u32 rx_buf_sz;
int multicast_limit;
BYTE byRxMode;
......@@ -472,7 +472,7 @@ typedef struct __device_info {
//PLICE_DEBUG <-
U32 rx_bytes;
u32 rx_bytes;
// Version control
BYTE byLocalID;
......
......@@ -384,7 +384,7 @@ device_set_int_opt(int *opt, int val, int min, int max, int def,char* name,char*
}
static void
device_set_bool_opt(unsigned int *opt, int val,BOOL def,U32 flag, char* name,char* devname) {
device_set_bool_opt(unsigned int *opt, int val,BOOL def,u32 flag, char* name,char* devname) {
(*opt)&=(~flag);
if (val==-1)
*opt|=(def ? flag : 0);
......@@ -976,7 +976,7 @@ device_found1(struct pci_dev *pcid, const struct pci_device_id *ent)
printk("after get pci_info memaddr is %x, io addr is %x,io_size is %d\n",pDevice->memaddr,pDevice->ioaddr,pDevice->io_size);
{
int i;
U32 bar,len;
u32 bar,len;
u32 address[] = {
PCI_BASE_ADDRESS_0,
PCI_BASE_ADDRESS_1,
......
......@@ -135,7 +135,7 @@ typedef struct tagSCmdBSSJoin {
u16 wBSSType;
u16 wBBPType;
u8 ssid[SSID_MAXLEN + 2];
U32 uChannel;
u32 uChannel;
BOOL bPSEnable;
BOOL bShareKeyAuth;
......@@ -167,8 +167,8 @@ typedef struct tagSCmdStartAP {
u16 wBSSType;
u16 wBBPType;
u8 ssid[SSID_MAXLEN + 2];
U32 uChannel;
U32 uBeaconInt;
u32 uChannel;
u32 uBeaconInt;
BOOL bShareKeyAuth;
u8 byBasicRate;
......@@ -181,7 +181,7 @@ typedef struct tagSCmdSetWEP {
u8 byKeyIndex;
u8 abyWepKey[WEP_NKEYS][WEP_KEYMAXLEN];
BOOL bWepKeyAvailable[WEP_NKEYS];
U32 auWepKeyLength[WEP_NKEYS];
u32 auWepKeyLength[WEP_NKEYS];
} SCmdSetWEP, *PSCmdSetWEP;
......@@ -189,7 +189,7 @@ typedef struct tagSCmdSetWEP {
typedef struct tagSBSSIDItem {
U32 uChannel;
u32 uChannel;
u8 abyBSSID[BSSID_LEN];
u8 abySSID[SSID_MAXLEN + 1];
//2006-1116-01,<Modify> by NomadZhao
......@@ -201,14 +201,14 @@ typedef struct tagSBSSIDItem {
u16 wCapInfo; // for address of byNetType at align 4
BOOL bWEPOn;
U32 uRSSI;
u32 uRSSI;
} SBSSIDItem;
typedef struct tagSBSSIDList {
U32 uItem;
u32 uItem;
SBSSIDItem sBSSIDList[0];
} SBSSIDList, *PSBSSIDList;
......@@ -220,8 +220,8 @@ typedef struct tagSCmdLinkStatus {
u8 byState;
u8 abyBSSID[BSSID_LEN];
u8 abySSID[SSID_MAXLEN + 2];
U32 uChannel;
U32 uLinkRate;
u32 uChannel;
u32 uLinkRate;
} SCmdLinkStatus, *PSCmdLinkStatus;
......@@ -229,18 +229,18 @@ typedef struct tagSCmdLinkStatus {
// 802.11 counter
//
typedef struct tagSDot11MIBCount {
U32 TransmittedFragmentCount;
U32 MulticastTransmittedFrameCount;
U32 FailedCount;
U32 RetryCount;
U32 MultipleRetryCount;
U32 RTSSuccessCount;
U32 RTSFailureCount;
U32 ACKFailureCount;
U32 FrameDuplicateCount;
U32 ReceivedFragmentCount;
U32 MulticastReceivedFrameCount;
U32 FCSErrorCount;
u32 TransmittedFragmentCount;
u32 MulticastTransmittedFrameCount;
u32 FailedCount;
u32 RetryCount;
u32 MultipleRetryCount;
u32 RTSSuccessCount;
u32 RTSFailureCount;
u32 ACKFailureCount;
u32 FrameDuplicateCount;
u32 ReceivedFragmentCount;
u32 MulticastReceivedFrameCount;
u32 FCSErrorCount;
} SDot11MIBCount, *PSDot11MIBCount;
......@@ -252,102 +252,102 @@ typedef struct tagSStatMIBCount {
//
// ISR status count
//
U32 dwIsrTx0OK;
U32 dwIsrTx1OK;
U32 dwIsrBeaconTxOK;
U32 dwIsrRxOK;
U32 dwIsrTBTTInt;
U32 dwIsrSTIMERInt;
U32 dwIsrUnrecoverableError;
U32 dwIsrSoftInterrupt;
U32 dwIsrRxNoBuf;
u32 dwIsrTx0OK;
u32 dwIsrTx1OK;
u32 dwIsrBeaconTxOK;
u32 dwIsrRxOK;
u32 dwIsrTBTTInt;
u32 dwIsrSTIMERInt;
u32 dwIsrUnrecoverableError;
u32 dwIsrSoftInterrupt;
u32 dwIsrRxNoBuf;
/////////////////////////////////////
U32 dwIsrUnknown; // unknown interrupt count
u32 dwIsrUnknown; // unknown interrupt count
// RSR status count
//
U32 dwRsrFrmAlgnErr;
U32 dwRsrErr;
U32 dwRsrCRCErr;
U32 dwRsrCRCOk;
U32 dwRsrBSSIDOk;
U32 dwRsrADDROk;
U32 dwRsrICVOk;
U32 dwNewRsrShortPreamble;
U32 dwRsrLong;
U32 dwRsrRunt;
U32 dwRsrRxControl;
U32 dwRsrRxData;
U32 dwRsrRxManage;
U32 dwRsrRxPacket;
U32 dwRsrRxOctet;
U32 dwRsrBroadcast;
U32 dwRsrMulticast;
U32 dwRsrDirected;
u32 dwRsrFrmAlgnErr;
u32 dwRsrErr;
u32 dwRsrCRCErr;
u32 dwRsrCRCOk;
u32 dwRsrBSSIDOk;
u32 dwRsrADDROk;
u32 dwRsrICVOk;
u32 dwNewRsrShortPreamble;
u32 dwRsrLong;
u32 dwRsrRunt;
u32 dwRsrRxControl;
u32 dwRsrRxData;
u32 dwRsrRxManage;
u32 dwRsrRxPacket;
u32 dwRsrRxOctet;
u32 dwRsrBroadcast;
u32 dwRsrMulticast;
u32 dwRsrDirected;
// 64-bit OID
U32 ullRsrOK;
u32 ullRsrOK;
// for some optional OIDs (64 bits) and DMI support
U32 ullRxBroadcastBytes;
U32 ullRxMulticastBytes;
U32 ullRxDirectedBytes;
U32 ullRxBroadcastFrames;
U32 ullRxMulticastFrames;
U32 ullRxDirectedFrames;
U32 dwRsrRxFragment;
U32 dwRsrRxFrmLen64;
U32 dwRsrRxFrmLen65_127;
U32 dwRsrRxFrmLen128_255;
U32 dwRsrRxFrmLen256_511;
U32 dwRsrRxFrmLen512_1023;
U32 dwRsrRxFrmLen1024_1518;
u32 ullRxBroadcastBytes;
u32 ullRxMulticastBytes;
u32 ullRxDirectedBytes;
u32 ullRxBroadcastFrames;
u32 ullRxMulticastFrames;
u32 ullRxDirectedFrames;
u32 dwRsrRxFragment;
u32 dwRsrRxFrmLen64;
u32 dwRsrRxFrmLen65_127;
u32 dwRsrRxFrmLen128_255;
u32 dwRsrRxFrmLen256_511;
u32 dwRsrRxFrmLen512_1023;
u32 dwRsrRxFrmLen1024_1518;
// TSR0,1 status count
//
U32 dwTsrTotalRetry[2]; // total collision retry count
U32 dwTsrOnceRetry[2]; // this packet only occur one collision
U32 dwTsrMoreThanOnceRetry[2]; // this packet occur more than one collision
U32 dwTsrRetry[2]; // this packet has ever occur collision,
u32 dwTsrTotalRetry[2]; // total collision retry count
u32 dwTsrOnceRetry[2]; // this packet only occur one collision
u32 dwTsrMoreThanOnceRetry[2]; // this packet occur more than one collision
u32 dwTsrRetry[2]; // this packet has ever occur collision,
// that is (dwTsrOnceCollision0 + dwTsrMoreThanOnceCollision0)
U32 dwTsrACKData[2];
U32 dwTsrErr[2];
U32 dwAllTsrOK[2];
U32 dwTsrRetryTimeout[2];
U32 dwTsrTransmitTimeout[2];
U32 dwTsrTxPacket[2];
U32 dwTsrTxOctet[2];
U32 dwTsrBroadcast[2];
U32 dwTsrMulticast[2];
U32 dwTsrDirected[2];
u32 dwTsrACKData[2];
u32 dwTsrErr[2];
u32 dwAllTsrOK[2];
u32 dwTsrRetryTimeout[2];
u32 dwTsrTransmitTimeout[2];
u32 dwTsrTxPacket[2];
u32 dwTsrTxOctet[2];
u32 dwTsrBroadcast[2];
u32 dwTsrMulticast[2];
u32 dwTsrDirected[2];
// RD/TD count
U32 dwCntRxFrmLength;
U32 dwCntTxBufLength;
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
U32 dwCntDecryptErr; // rx buffer data software compare CRC err count
U32 dwCntRxICVErr; // rx buffer data software compare CRC err count
U32 idxRxErrorDesc; // index for rx data error RD
u32 dwCntRxDataErr; // rx buffer data software compare CRC err count
u32 dwCntDecryptErr; // rx buffer data software compare CRC err count
u32 dwCntRxICVErr; // rx buffer data software compare CRC err count
u32 idxRxErrorDesc; // index for rx data error RD
// 64-bit OID
U32 ullTsrOK[2];
u32 ullTsrOK[2];
// for some optional OIDs (64 bits) and DMI support
U32 ullTxBroadcastFrames[2];
U32 ullTxMulticastFrames[2];
U32 ullTxDirectedFrames[2];
U32 ullTxBroadcastBytes[2];
U32 ullTxMulticastBytes[2];
U32 ullTxDirectedBytes[2];
u32 ullTxBroadcastFrames[2];
u32 ullTxMulticastFrames[2];
u32 ullTxDirectedFrames[2];
u32 ullTxBroadcastBytes[2];
u32 ullTxMulticastBytes[2];
u32 ullTxDirectedBytes[2];
} SStatMIBCount, *PSStatMIBCount;
......@@ -365,8 +365,8 @@ typedef struct tagSNodeItem {
u8 abyWepKey[WEP_KEYMAXLEN];
// Auto rate fallback vars
BOOL bIsInFallback;
U32 uTxFailures;
U32 uTxAttempts;
u32 uTxFailures;
u32 uTxAttempts;
u16 wFailureRatio;
} SNodeItem;
......@@ -374,7 +374,7 @@ typedef struct tagSNodeItem {
typedef struct tagSNodeList {
U32 uItem;
u32 uItem;
SNodeItem sNodeList[0];
} SNodeList, *PSNodeList;
......@@ -383,7 +383,7 @@ typedef struct tagSNodeList {
typedef struct tagSCmdValue {
U32 dwValue;
u32 dwValue;
} SCmdValue, *PSCmdValue;
......@@ -418,7 +418,7 @@ enum {
struct viawget_hostapd_param {
U32 cmd;
u32 cmd;
u8 sta_addr[6];
union {
struct {
......@@ -427,20 +427,20 @@ struct viawget_hostapd_param {
u8 tx_supp_rates;
} add_sta;
struct {
U32 inactive_sec;
u32 inactive_sec;
} get_info_sta;
struct {
u8 alg;
U32 flags;
U32 err;
u32 flags;
u32 err;
u8 idx;
u8 seq[8];
u16 key_len;
u8 key[0];
} crypt;
struct {
U32 flags_and;
U32 flags_or;
u32 flags_and;
u32 flags_or;
} set_flags_sta;
struct {
u16 rid;
......
......@@ -116,7 +116,7 @@ struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev)
pDevice->wstats.discard.nwid = 0;
pDevice->wstats.discard.code = 0;
pDevice->wstats.discard.fragment = 0;
pDevice->wstats.discard.retries = (U32)pDevice->scStatistic.dwTsrErr;
pDevice->wstats.discard.retries = (u32)pDevice->scStatistic.dwTsrErr;
pDevice->wstats.discard.misc = 0;
pDevice->wstats.miss.beacon = 0;
......
......@@ -68,9 +68,6 @@ typedef int BOOL;
* but it doesn't matter if they're signed or unsigned.
*/
typedef unsigned long U32; /* 32-bit unsigned integer */
typedef char CHAR;
typedef signed short SHORT;
typedef signed int INT;
......
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