Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Staging: vt6655: remove custom ULONG typedef 



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

drivers/staging/vt6655/baseband.c

+5 −5
Original line number Diff line number Diff line
@@ -1719,7 +1719,7 @@ const WORD awcFrameTime[MAX_RATE] = 
/*---------------------  Static Functions  --------------------------*/



static

ULONG

unsigned long

s_ulGetRatio(PSDevice pDevice);



static
@@ -2651,12 +2651,12 @@ BBvExitDeepSleep (DWORD_PTR dwIoBase, BYTE byLocalID) 




static

ULONG

unsigned long

s_ulGetRatio (PSDevice pDevice)

{

ULONG   ulRatio = 0;

ULONG   ulMaxPacket;

ULONG   ulPacketNum;

unsigned long ulRatio = 0;

unsigned long ulMaxPacket;

unsigned long ulPacketNum;



    //This is a thousand-ratio

    ulMaxPacket = pDevice->uNumSQ3[RATE_54M];

drivers/staging/vt6655/bssdb.c

+3 −3
Original line number Diff line number Diff line
@@ -1680,9 +1680,9 @@ void s_uCalculateLinkQual( 
    )

{

   PSDevice        pDevice = (PSDevice)hDeviceContext;

   ULONG TxOkRatio, TxCnt;

   ULONG RxOkRatio,RxCnt;

   ULONG RssiRatio;

   unsigned long TxOkRatio, TxCnt;

   unsigned long RxOkRatio,RxCnt;

   unsigned long RssiRatio;

   long ldBm;



TxCnt = pDevice->scStatistic.TxNoRetryOkCount +

drivers/staging/vt6655/bssdb.h

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ typedef struct tagKnownNodeDB { 
    BOOL            bPSEnable;

    BOOL            bRxPSPoll;

    BYTE            byAuthSequence;

    ULONG           ulLastRxJiffer;

    unsigned long ulLastRxJiffer;

    BYTE            bySuppRate;

    DWORD           dwFlags;

    WORD            wEnQueueCnt;

drivers/staging/vt6655/card.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ void CARDvUpdateNextTBTT(DWORD_PTR dwIoBase, QWORD qwTSF, WORD wBeaconInterval); 
BOOL CARDbGetCurrentTSF(DWORD_PTR dwIoBase, PQWORD pqwCurrTSF);

QWORD CARDqGetNextTBTT(QWORD qwTSF, WORD wBeaconInterval);

QWORD CARDqGetTSFOffset(BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2);

BOOL CARDbSetTxPower(void *pDeviceHandler, ULONG ulTxPower);

BOOL CARDbSetTxPower(void *pDeviceHandler, unsigned long ulTxPower);

BYTE CARDbyGetPktType(void *pDeviceHandler);

void CARDvSafeResetTx(void *pDeviceHandler);

void CARDvSafeResetRx(void *pDeviceHandler);

drivers/staging/vt6655/device.h

+14 −14
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ typedef enum _NDIS_802_11_STATUS_TYPE 
//Added new types for PMKID Candidate lists.

typedef struct _PMKID_CANDIDATE {

    NDIS_802_11_MAC_ADDRESS BSSID;

    ULONG Flags;

    unsigned long Flags;

} PMKID_CANDIDATE, *PPMKID_CANDIDATE;
@@ -261,15 +261,15 @@ typedef struct _BSSID_INFO 
} BSSID_INFO, *PBSSID_INFO;



typedef struct tagSPMKID {

    ULONG Length;

    ULONG BSSIDInfoCount;

    unsigned long Length;

    unsigned long BSSIDInfoCount;

    BSSID_INFO BSSIDInfo[MAX_BSSIDINFO_4_PMKID];

} SPMKID, *PSPMKID;



typedef struct tagSPMKIDCandidateEvent {

    NDIS_802_11_STATUS_TYPE     StatusType;

    ULONG Version;       // Version of the structure

    ULONG NumCandidates; // No. of pmkid candidates

    unsigned long Version;       // Version of the structure

    unsigned long NumCandidates; // No. of pmkid candidates

    PMKID_CANDIDATE CandidateList[MAX_PMKIDLIST];

} SPMKIDCandidateEvent, *PSPMKIDCandidateEvent;
@@ -618,7 +618,7 @@ typedef struct __device_info { 
    //WOW

    BYTE                    abyIPAddr[4];



    ULONG                   ulTxPower;

    unsigned long ulTxPower;

    NDIS_802_11_WEP_STATUS  eEncryptionStatus;

    BOOL                    bTransmitKey;

//2007-0925-01<Add>by MikeLiu
@@ -712,7 +712,7 @@ typedef struct __device_info { 
    struct timer_list       sTimerCommand;

#ifdef TxInSleep

     struct timer_list       sTimerTxData;

     ULONG                       nTxDataTimeCout;

     unsigned long nTxDataTimeCout;

     BOOL  fTxDataInSleep;

     BOOL  IsTxDataTrigger;

#endif
@@ -728,18 +728,18 @@ typedef struct __device_info { 


    BOOL                    bDiversityRegCtlON;

    BOOL                    bDiversityEnable;

    ULONG                   ulDiversityNValue;

    ULONG                   ulDiversityMValue;

    unsigned long ulDiversityNValue;

    unsigned long ulDiversityMValue;

    BYTE                    byTMax;

    BYTE                    byTMax2;

    BYTE                    byTMax3;

    ULONG                   ulSQ3TH;

    unsigned long ulSQ3TH;



// ANT diversity

    ULONG                   uDiversityCnt;

    unsigned long uDiversityCnt;

    BYTE                    byAntennaState;

    ULONG                   ulRatio_State0;

    ULONG                   ulRatio_State1;

    unsigned long ulRatio_State0;

    unsigned long ulRatio_State1;



    //SQ3 functions for antenna diversity

    struct timer_list           TimerSQ3Tmax1;
@@ -747,7 +747,7 @@ typedef struct __device_info { 
    struct timer_list           TimerSQ3Tmax3;





    ULONG                   uNumSQ3[MAX_RATE];

    unsigned long uNumSQ3[MAX_RATE];

    WORD                    wAntDiversityMaxRate;