Commit a884847a authored by Jim Lieb's avatar Jim Lieb Committed by Greg Kroah-Hartman
Browse files

Staging: vt665x: Typedef and macro cleanup Part 2 



Clean up unused typedefs and macros to remove Win32'isms and
misc non-linux constructs.  Text edits to referencing
source for less frequently used macros.

Signed-off-by: default avatarJim Lieb <lieb@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 193a823c

drivers/staging/vt6655/bssdb.c

+0 −2
Original line number Diff line number Diff line
@@ -398,8 +398,6 @@ BSSpAddrIsInBSSList( 










/*+

 *

 * Routine Description:

drivers/staging/vt6655/bssdb.h

+4 −4
Original line number Diff line number Diff line
@@ -105,13 +105,13 @@ typedef enum _NDIS_802_11_NETWORK_TYPE 
typedef struct tagSERPObject {

    BOOL    bERPExist;

    BYTE    byERP;

}ERPObject, DEF* PERPObject;

}ERPObject, *PERPObject;





typedef struct tagSRSNCapObject {

    BOOL    bRSNCapExist;

    WORD    wRSNCap;

}SRSNCapObject, DEF* PSRSNCapObject;

}SRSNCapObject, *PSRSNCapObject;



// BSS info(AP)

#pragma pack(1)
@@ -177,7 +177,7 @@ typedef struct tagKnownBSS { 
    BYTE            abyIEs[1024];   // don't move this field !!



}__attribute__ ((__packed__))

KnownBSS , DEF* PKnownBSS;

KnownBSS , *PKnownBSS;



//2006-1116-01,<Add> by NomadZhao

#pragma pack()
@@ -248,7 +248,7 @@ typedef struct tagKnownNodeDB { 
    UINT            uTxFail[MAX_RATE+1];

    UINT            uTimeCount;



} KnownNodeDB, DEF* PKnownNodeDB;

} KnownNodeDB, *PKnownNodeDB;





/*---------------------  Export Functions  --------------------------*/

drivers/staging/vt6655/card.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ typedef struct tagSChannelTblElement { 
    UINT    uFrequency;

    BOOL    bValid;

    BYTE    byMAP;

}SChannelTblElement, DEF* PSChannelTblElement;

}SChannelTblElement, *PSChannelTblElement;



                                                              //1M,   2M,   5M,  11M,  18M,  24M,  36M,  54M

static BYTE abyDefaultSuppRatesG[] = {WLAN_EID_SUPP_RATES, 8, 0x02, 0x04, 0x0B, 0x16, 0x24, 0x30, 0x48, 0x6C};

drivers/staging/vt6655/country.h

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ typedef struct tagSCountryTable 
    CHAR    chCountryCode[2];

    BYTE    bChannelIdxList[CB_MAX_CHANNEL];  /* Available channels Index */

    BYTE    byPower[CB_MAX_CHANNEL];

}   SCountryTable, DEF* PSCountryTable;

}   SCountryTable, *PSCountryTable;



/*---------------------  Export Classes  ----------------------------*/

drivers/staging/vt6655/desc.h

+43 −43
Original line number Diff line number Diff line
@@ -306,8 +306,8 @@ typedef struct tagSRxDesc { 
    volatile PDEVICE_RD_INFO    pRDInfo;//4 bytes

    volatile U32    Reserved[2];//8 bytes

} __attribute__ ((__packed__))

SRxDesc, DEF* PSRxDesc;

typedef const SRxDesc DEF*      PCSRxDesc;

SRxDesc, *PSRxDesc;

typedef const SRxDesc *PCSRxDesc;



#ifdef __BIG_ENDIAN
@@ -392,8 +392,8 @@ typedef struct tagSTxDesc { 
    volatile    PDEVICE_TD_INFO pTDInfo;//4 bytes

    volatile    U32    Reserved[2];//8 bytes

} __attribute__ ((__packed__))

STxDesc, DEF* PSTxDesc;

typedef const STxDesc DEF*      PCSTxDesc;

STxDesc, *PSTxDesc;

typedef const STxDesc *PCSTxDesc;





typedef struct tagSTxSyncDesc {
@@ -407,8 +407,8 @@ typedef struct tagSTxSyncDesc { 
    volatile    PDEVICE_TD_INFO pTDInfo;//4 bytes

    volatile    DWORD   m_dwReserved2;

} __attribute__ ((__packed__))

STxSyncDesc, DEF* PSTxSyncDesc;

typedef const STxSyncDesc DEF*      PCSTxSyncDesc;

STxSyncDesc, *PSTxSyncDesc;

typedef const STxSyncDesc *PCSTxSyncDesc;





//
@@ -422,8 +422,8 @@ typedef struct tagSRrvTime_gRTS { 
    WORD        wTxRrvTime_b;

    WORD        wTxRrvTime_a;

}__attribute__ ((__packed__))

SRrvTime_gRTS, DEF* PSRrvTime_gRTS;

typedef const SRrvTime_gRTS DEF*     PCSRrvTime_gRTS;

SRrvTime_gRTS, *PSRrvTime_gRTS;

typedef const SRrvTime_gRTS *PCSRrvTime_gRTS;



typedef struct tagSRrvTime_gCTS {

    WORD        wCTSTxRrvTime_ba;
@@ -431,22 +431,22 @@ typedef struct tagSRrvTime_gCTS { 
    WORD        wTxRrvTime_b;

    WORD        wTxRrvTime_a;

}__attribute__ ((__packed__))

SRrvTime_gCTS, DEF* PSRrvTime_gCTS;

typedef const SRrvTime_gCTS DEF*     PCSRrvTime_gCTS;

SRrvTime_gCTS, *PSRrvTime_gCTS;

typedef const SRrvTime_gCTS *PCSRrvTime_gCTS;



typedef struct tagSRrvTime_ab {

    WORD        wRTSTxRrvTime;

    WORD        wTxRrvTime;

}__attribute__ ((__packed__))

SRrvTime_ab, DEF* PSRrvTime_ab;

typedef const SRrvTime_ab DEF*     PCSRrvTime_ab;

SRrvTime_ab, *PSRrvTime_ab;

typedef const SRrvTime_ab *PCSRrvTime_ab;



typedef struct tagSRrvTime_atim {

    WORD        wCTSTxRrvTime_ba;

    WORD        wTxRrvTime_a;

}__attribute__ ((__packed__))

SRrvTime_atim, DEF* PSRrvTime_atim;

typedef const SRrvTime_atim DEF*     PCSRrvTime_atim;

SRrvTime_atim, *PSRrvTime_atim;

typedef const SRrvTime_atim *PCSRrvTime_atim;



//

// RTS buffer header
@@ -457,8 +457,8 @@ typedef struct tagSRTSData { 
    BYTE    abyRA[U_ETHER_ADDR_LEN];

    BYTE    abyTA[U_ETHER_ADDR_LEN];

}__attribute__ ((__packed__))

SRTSData, DEF* PSRTSData;

typedef const SRTSData DEF*      PCSRTSData;

SRTSData, *PSRTSData;

typedef const SRTSData *PCSRTSData;



typedef struct tagSRTS_g {

    BYTE        bySignalField_b;
@@ -473,8 +473,8 @@ typedef struct tagSRTS_g { 
    WORD        wReserved;

    SRTSData    Data;

}__attribute__ ((__packed__))

SRTS_g, DEF* PSRTS_g;

typedef const SRTS_g DEF*     PCSRTS_g;

SRTS_g, *PSRTS_g;

typedef const SRTS_g *PCSRTS_g;





typedef struct tagSRTS_g_FB {
@@ -494,8 +494,8 @@ typedef struct tagSRTS_g_FB { 
    WORD        wRTSDuration_aa_f1;

    SRTSData    Data;

}__attribute__ ((__packed__))

SRTS_g_FB, DEF* PSRTS_g_FB;

typedef const SRTS_g_FB DEF*     PCSRTS_g_FB;

SRTS_g_FB, *PSRTS_g_FB;

typedef const SRTS_g_FB *PCSRTS_g_FB;





typedef struct tagSRTS_ab {
@@ -506,8 +506,8 @@ typedef struct tagSRTS_ab { 
    WORD        wReserved;

    SRTSData    Data;

}__attribute__ ((__packed__))

SRTS_ab, DEF* PSRTS_ab;

typedef const SRTS_ab DEF*     PCSRTS_ab;

SRTS_ab, *PSRTS_ab;

typedef const SRTS_ab *PCSRTS_ab;





typedef struct tagSRTS_a_FB {
@@ -520,8 +520,8 @@ typedef struct tagSRTS_a_FB { 
    WORD        wRTSDuration_f1;

    SRTSData    Data;

}__attribute__ ((__packed__))

SRTS_a_FB, DEF* PSRTS_a_FB;

typedef const SRTS_a_FB DEF*     PCSRTS_a_FB;

SRTS_a_FB, *PSRTS_a_FB;

typedef const SRTS_a_FB *PCSRTS_a_FB;





//
@@ -533,7 +533,7 @@ typedef struct tagSCTSData { 
    BYTE    abyRA[U_ETHER_ADDR_LEN];

    WORD    wReserved;

}__attribute__ ((__packed__))

SCTSData, DEF* PSCTSData;

SCTSData, *PSCTSData;



typedef struct tagSCTS {

    BYTE        bySignalField_b;
@@ -543,8 +543,8 @@ typedef struct tagSCTS { 
    WORD        wReserved;

    SCTSData    Data;

}__attribute__ ((__packed__))

SCTS, DEF* PSCTS;

typedef const SCTS DEF*     PCSCTS;

SCTS, *PSCTS;

typedef const SCTS *PCSCTS;



typedef struct tagSCTS_FB {

    BYTE        bySignalField_b;
@@ -556,8 +556,8 @@ typedef struct tagSCTS_FB { 
    WORD        wCTSDuration_ba_f1;

    SCTSData    Data;

}__attribute__ ((__packed__))

SCTS_FB, DEF* PSCTS_FB;

typedef const SCTS_FB DEF*     PCSCTS_FB;

SCTS_FB, *PSCTS_FB;

typedef const SCTS_FB *PCSCTS_FB;





//
@@ -571,15 +571,15 @@ typedef struct tagSTxBufHead { 
    BYTE    byTxPower;

    BYTE    wReserved;

}__attribute__ ((__packed__))

STxBufHead, DEF* PSTxBufHead;

typedef const STxBufHead DEF*   PCSTxBufHead;

STxBufHead, *PSTxBufHead;

typedef const STxBufHead *PCSTxBufHead;



typedef struct tagSTxShortBufHead {

    WORD    wFIFOCtl;

    WORD    wTimeStamp;

}__attribute__ ((__packed__))

STxShortBufHead, DEF* PSTxShortBufHead;

typedef const STxShortBufHead DEF*   PCSTxShortBufHead;

STxShortBufHead, *PSTxShortBufHead;

typedef const STxShortBufHead *PCSTxShortBufHead;



//

// Tx data header
@@ -596,8 +596,8 @@ typedef struct tagSTxDataHead_g { 
    WORD    wTimeStampOff_b;

    WORD    wTimeStampOff_a;

}__attribute__ ((__packed__))

STxDataHead_g, DEF* PSTxDataHead_g;

typedef const STxDataHead_g DEF*  PCSTxDataHead_g;

STxDataHead_g, *PSTxDataHead_g;

typedef const STxDataHead_g *PCSTxDataHead_g;



typedef struct tagSTxDataHead_g_FB {

    BYTE    bySignalField_b;
@@ -613,8 +613,8 @@ typedef struct tagSTxDataHead_g_FB { 
    WORD    wTimeStampOff_b;

    WORD    wTimeStampOff_a;

}__attribute__ ((__packed__))

STxDataHead_g_FB, DEF* PSTxDataHead_g_FB;

typedef const STxDataHead_g_FB DEF*  PCSTxDataHead_g_FB;

STxDataHead_g_FB, *PSTxDataHead_g_FB;

typedef const STxDataHead_g_FB *PCSTxDataHead_g_FB;





typedef struct tagSTxDataHead_ab {
@@ -624,8 +624,8 @@ typedef struct tagSTxDataHead_ab { 
    WORD    wDuration;

    WORD    wTimeStampOff;

}__attribute__ ((__packed__))

STxDataHead_ab, DEF* PSTxDataHead_ab;

typedef const STxDataHead_ab DEF*  PCSTxDataHead_ab;

STxDataHead_ab, *PSTxDataHead_ab;

typedef const STxDataHead_ab *PCSTxDataHead_ab;





typedef struct tagSTxDataHead_a_FB {
@@ -637,8 +637,8 @@ typedef struct tagSTxDataHead_a_FB { 
    WORD    wDuration_f0;

    WORD    wDuration_f1;

}__attribute__ ((__packed__))

STxDataHead_a_FB, DEF* PSTxDataHead_a_FB;

typedef const STxDataHead_a_FB DEF*  PCSTxDataHead_a_FB;

STxDataHead_a_FB, *PSTxDataHead_a_FB;

typedef const STxDataHead_a_FB *PCSTxDataHead_a_FB;



//

// MICHDR data header
@@ -648,8 +648,8 @@ typedef struct tagSMICHDRHead { 
    DWORD   adwHDR1[4];

    DWORD   adwHDR2[4];

}__attribute__ ((__packed__))

SMICHDRHead, DEF* PSMICHDRHead;

typedef const SMICHDRHead DEF*   PCSMICHDRHead;

SMICHDRHead, *PSMICHDRHead;

typedef const SMICHDRHead *PCSMICHDRHead;



typedef struct tagSBEACONCtl {

    DWORD   BufReady : 1;