Commit 0f4c60d6 authored by Charles Clément's avatar Charles Clément Committed by Greg Kroah-Hartman
Browse files

Staging: vt6655: remove DWORD typedef 



Replace all occurrences with unsigned long type, except for pointer fields that
should be u32 in packed structures and 8-byte-aligned 8 byte long structure
QWORD.

Thanks to Jiri Slaby for pointing out that simply replacing by unsigned long is
wrong on x86-64 arch.

Signed-off-by: default avatarCharles Clément <caratorn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 17701d14

drivers/staging/vt6655/bssdb.h

+3 −3
Original line number Diff line number Diff line
@@ -207,15 +207,15 @@ typedef struct tagKnownNodeDB { 
    BYTE            byAuthSequence;

    unsigned long ulLastRxJiffer;

    BYTE            bySuppRate;

    DWORD           dwFlags;

    unsigned long dwFlags;

    WORD            wEnQueueCnt;



    BOOL            bOnFly;

    unsigned long long       KeyRSC;

    BYTE            byKeyIndex;

    DWORD           dwKeyIndex;

    unsigned long dwKeyIndex;

    BYTE            byCipherSuite;

    DWORD           dwTSC47_16;

    unsigned long dwTSC47_16;

    WORD            wTSC15_0;

    unsigned int	uWepKeyLength;

    BYTE            abyWepKey[WLAN_WEPMAX_KEYLEN];

drivers/staging/vt6655/card.c

+8 −8
Original line number Diff line number Diff line
@@ -1336,7 +1336,7 @@ CARDbSetQuiet ( 
        pDevice->sQuiet[pDevice->uQuietEnqueue].bEnable = TRUE;

        pDevice->sQuiet[pDevice->uQuietEnqueue].byPeriod = byQuietPeriod;

        pDevice->sQuiet[pDevice->uQuietEnqueue].wDuration = wQuietDuration;

        pDevice->sQuiet[pDevice->uQuietEnqueue].dwStartTime = (DWORD) byQuietCount;

        pDevice->sQuiet[pDevice->uQuietEnqueue].dwStartTime = (unsigned long) byQuietCount;

        pDevice->sQuiet[pDevice->uQuietEnqueue].dwStartTime *= pDevice->wBeaconInterval;

        pDevice->sQuiet[pDevice->uQuietEnqueue].dwStartTime += wQuietOffset;

        pDevice->uQuietEnqueue++;
@@ -1372,11 +1372,11 @@ CARDbStartQuiet ( 
{

    PSDevice    pDevice = (PSDevice) pDeviceHandler;

    unsigned int ii = 0;

    DWORD       dwStartTime = 0xFFFFFFFF;

    unsigned long dwStartTime = 0xFFFFFFFF;

    unsigned int uCurrentQuietIndex = 0;

    DWORD       dwNextTime = 0;

    DWORD       dwGap = 0;

    DWORD       dwDuration = 0;

    unsigned long dwNextTime = 0;

    unsigned long dwGap = 0;

    unsigned long dwDuration = 0;



    for(ii=0;ii<MAX_QUIET_COUNT;ii++) {

        if ((pDevice->sQuiet[ii].bEnable == TRUE) &&
@@ -1434,7 +1434,7 @@ CARDbStartQuiet ( 
            pDevice->sQuiet[uCurrentQuietIndex].bEnable = FALSE;

        } else {

            // set next period start time

            dwNextTime = (DWORD) pDevice->sQuiet[uCurrentQuietIndex].byPeriod;

            dwNextTime = (unsigned long) pDevice->sQuiet[uCurrentQuietIndex].byPeriod;

            dwNextTime *= pDevice->wBeaconInterval;

            pDevice->sQuiet[uCurrentQuietIndex].dwStartTime = dwNextTime;

        }
@@ -2063,8 +2063,8 @@ QWORD CARDqGetTSFOffset (BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2) 
    HIDWORD(qwTSFOffset) = 0;

    LODWORD(qwTSFOffset) = 0;

    wRxBcnTSFOffst = cwRXBCNTSFOff[byRxRate%MAX_RATE];

    (qwTSF2).u.dwLowDword += (DWORD)(wRxBcnTSFOffst);

    if ((qwTSF2).u.dwLowDword < (DWORD)(wRxBcnTSFOffst)) {

    (qwTSF2).u.dwLowDword += (unsigned long)(wRxBcnTSFOffst);

    if ((qwTSF2).u.dwLowDword < (unsigned long)(wRxBcnTSFOffst)) {

        (qwTSF2).u.dwHighDword++;

    }

    LODWORD(qwTSFOffset) = LODWORD(qwTSF1) - LODWORD(qwTSF2);

drivers/staging/vt6655/datarate.c

+4 −4
Original line number Diff line number Diff line
@@ -316,12 +316,12 @@ RATEvTxRateFallBack ( 
PSDevice        pDevice = (PSDevice) pDeviceHandler;

WORD            wIdxDownRate = 0;

unsigned int ii;

//DWORD           dwRateTable[MAX_RATE]  = {1,   2,   5,   11,  6,    9,    12,   18,  24,  36,  48,  54};

//unsigned long dwRateTable[MAX_RATE]  = {1,   2,   5,   11,  6,    9,    12,   18,  24,  36,  48,  54};

BOOL            bAutoRate[MAX_RATE]    = {TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE};

DWORD           dwThroughputTbl[MAX_RATE] = {10, 20, 55, 110, 60, 90, 120, 180, 240, 360, 480, 540};

DWORD           dwThroughput = 0;

	unsigned long dwThroughputTbl[MAX_RATE] = {10, 20, 55, 110, 60, 90, 120, 180, 240, 360, 480, 540};

	unsigned long dwThroughput = 0;

WORD            wIdxUpRate = 0;

DWORD           dwTxDiff = 0;

	unsigned long dwTxDiff = 0;



    if (pDevice->pMgmt->eScanState != WMAC_NO_SCANNING) {

        // Don't do Fallback when scanning Channel

drivers/staging/vt6655/desc.h

+19 −19
Original line number Diff line number Diff line
@@ -354,8 +354,8 @@ typedef struct tagDEVICE_TD_INFO{ 
    dma_addr_t          skb_dma;

    dma_addr_t          buf_dma;

    dma_addr_t          curr_desc;

    DWORD               dwReqCount;

    DWORD               dwHeaderLength;

    unsigned long dwReqCount;

    unsigned long dwHeaderLength;

    BYTE                byFlags;

} DEVICE_TD_INFO,    *PDEVICE_TD_INFO;
@@ -391,13 +391,13 @@ typedef const STxDesc *PCSTxDesc; 
typedef struct tagSTxSyncDesc {

    volatile    STDES0  m_td0TD0;

    volatile    STDES1  m_td1TD1;

    volatile    DWORD   buff_addr; // pointer to logical buffer

    volatile    DWORD   next_desc; // pointer to next logical descriptor

    volatile    u32 buff_addr; // pointer to logical buffer

    volatile    u32 next_desc; // pointer to next logical descriptor

    volatile    WORD    m_wFIFOCtl;

    volatile    WORD    m_wTimeStamp;

    struct tagSTxSyncDesc*  next; //4 bytes

    volatile    PDEVICE_TD_INFO pTDInfo;//4 bytes

    volatile    DWORD   m_dwReserved2;

    volatile    u32 m_dwReserved2;

} __attribute__ ((__packed__))

STxSyncDesc, *PSTxSyncDesc;

typedef const STxSyncDesc *PCSTxSyncDesc;
@@ -556,7 +556,7 @@ typedef const SCTS_FB *PCSCTS_FB; 
// Tx FIFO header

//

typedef struct tagSTxBufHead {

    DWORD   adwTxKey[4];

    u32 adwTxKey[4];

    WORD    wFIFOCtl;

    WORD    wTimeStamp;

    WORD    wFragCtl;
@@ -636,24 +636,24 @@ typedef const STxDataHead_a_FB *PCSTxDataHead_a_FB; 
// MICHDR data header

//

typedef struct tagSMICHDRHead {

    DWORD   adwHDR0[4];

    DWORD   adwHDR1[4];

    DWORD   adwHDR2[4];

    u32 adwHDR0[4];

    u32 adwHDR1[4];

    u32 adwHDR2[4];

}__attribute__ ((__packed__))

SMICHDRHead, *PSMICHDRHead;

typedef const SMICHDRHead *PCSMICHDRHead;



typedef struct tagSBEACONCtl {

    DWORD   BufReady : 1;

    DWORD   TSF      : 15;

    DWORD   BufLen   : 11;

    DWORD   Reserved : 5;

    u32 BufReady : 1;

    u32 TSF      : 15;

    u32 BufLen   : 11;

    u32 Reserved : 5;

}__attribute__ ((__packed__))

SBEACONCtl;





typedef struct tagSSecretKey {

    DWORD   dwLowDword;

    u32 dwLowDword;

    BYTE    byHighByte;

}__attribute__ ((__packed__))

SSecretKey;
@@ -662,11 +662,11 @@ typedef struct tagSKeyEntry { 
    BYTE  abyAddrHi[2];

    WORD  wKCTL;

    BYTE  abyAddrLo[4];

    DWORD dwKey0[4];

    DWORD dwKey1[4];

    DWORD dwKey2[4];

    DWORD dwKey3[4];

    DWORD dwKey4[4];

    u32 dwKey0[4];

    u32 dwKey1[4];

    u32 dwKey2[4];

    u32 dwKey3[4];

    u32 dwKey4[4];

}__attribute__ ((__packed__))

SKeyEntry;

/*---------------------  Export Macros ------------------------------*/

drivers/staging/vt6655/device.h

+12 −12
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ typedef struct tagSPMKIDCandidateEvent { 


typedef struct tagSQuietControl {

    BOOL        bEnable;

    DWORD       dwStartTime;

    unsigned long dwStartTime;

    BYTE        byPeriod;

    WORD        wDuration;

} SQuietControl, *PSQuietControl;
@@ -424,7 +424,7 @@ typedef struct __device_info { 
    CHIP_TYPE                   chip_id;



    unsigned long               PortOffset;

    DWORD                       dwIsr;

    unsigned long dwIsr;

    u32                         memaddr;

    u32                         ioaddr;

    u32                         io_size;
@@ -500,8 +500,8 @@ typedef struct __device_info { 
    unsigned int	uCurrRSSI;

    BYTE                        byCurrSQ;



    DWORD                       dwTxAntennaSel;

    DWORD                       dwRxAntennaSel;

    unsigned long dwTxAntennaSel;

    unsigned long dwRxAntennaSel;

    BYTE                        byAntennaCount;

    BYTE                        byRxAntennaMode;

    BYTE                        byTxAntennaMode;
@@ -554,7 +554,7 @@ typedef struct __device_info { 
    BYTE                        byRTSServiceField;  // update while speed change

    BYTE                        byRTSSignalField;   // update while speed change



    DWORD                       dwMaxReceiveLifetime;       // dot11MaxReceiveLifetime

    unsigned long dwMaxReceiveLifetime;       // dot11MaxReceiveLifetime



    BOOL                        bCCK;

    BOOL                        bEncryptionEnable;
@@ -626,7 +626,7 @@ typedef struct __device_info { 
    NDIS_802_11_WEP_STATUS  eOldEncryptionStatus;



    SKeyManagement          sKey;

    DWORD                   dwIVCounter;

    unsigned long dwIVCounter;



    QWORD                   qwPacketNumber; //For CCMP and TKIP as TSC(6 bytes)

    unsigned int	uCurrentWEPMode;
@@ -673,7 +673,7 @@ typedef struct __device_info { 




    BOOL                    bRadioCmd;

    DWORD                   dwDiagRefCount;

    unsigned long dwDiagRefCount;



    // For FOE Tuning

    BYTE                    byFOETuning;
@@ -756,7 +756,7 @@ typedef struct __device_info { 
    BYTE                    abyBroadcastAddr[ETH_ALEN];

    BYTE                    abySNAP_RFC1042[ETH_ALEN];

    BYTE                    abySNAP_Bridgetunnel[ETH_ALEN];

     BYTE                        abyEEPROM[EEP_MAX_CONTEXT_SIZE];  //DWORD alignment

     BYTE                        abyEEPROM[EEP_MAX_CONTEXT_SIZE];  //unsigned long alignment

    // Pre-Authentication & PMK cache

    SPMKID                  gsPMKID;

    SPMKIDCandidateEvent    gsPMKIDCandidate;
@@ -771,12 +771,12 @@ typedef struct __device_info { 
    BOOL                    bMeasureInProgress;

    BYTE                    byOrgChannel;

    BYTE                    byOrgRCR;

    DWORD                   dwOrgMAR0;

    DWORD                   dwOrgMAR4;

    unsigned long dwOrgMAR0;

    unsigned long dwOrgMAR4;

    BYTE                    byBasicMap;

    BYTE                    byCCAFraction;

    BYTE                    abyRPIs[8];

    DWORD                   dwRPIs[8];

    unsigned long dwRPIs[8];

    BOOL                    bChannelSwitch;

    BYTE                    byNewChannel;

    BYTE                    byChannelSwitchCount;
@@ -784,7 +784,7 @@ typedef struct __device_info { 
    BOOL                    bEnableFirstQuiet;

    BYTE                    byQuietStartCount;

    unsigned int	uQuietEnqueue;

    DWORD                   dwCurrentQuietEndTime;

    unsigned long dwCurrentQuietEndTime;

    SQuietControl           sQuiet[MAX_QUIET_COUNT];

    // for 802.11h TPC

    BOOL                    bCountryInfo5G;