diff options
Diffstat (limited to 'drivers/staging/vt6655/desc.h')
-rw-r--r-- | drivers/staging/vt6655/desc.h | 194 |
1 files changed, 97 insertions, 97 deletions
diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h index 94ccfce8418..d1fcf46429b 100644 --- a/drivers/staging/vt6655/desc.h +++ b/drivers/staging/vt6655/desc.h @@ -244,10 +244,10 @@ static inline PDEVICE_RD_INFO alloc_rd_info(void) { /* typedef struct tagRDES0 { - WORD wResCount; - WORD wf1Owner ; -// WORD f15Reserved : 15; -// WORD f1Owner : 1; + unsigned short wResCount; + unsigned short wf1Owner ; +// unsigned short f15Reserved : 15; +// unsigned short f1Owner : 1; } __attribute__ ((__packed__)) SRDES0; */ @@ -255,7 +255,7 @@ SRDES0; #ifdef __BIG_ENDIAN typedef struct tagRDES0 { - volatile WORD wResCount; + volatile unsigned short wResCount; union { volatile u16 f15Reserved; struct { @@ -270,9 +270,9 @@ SRDES0, *PSRDES0; #else typedef struct tagRDES0 { - WORD wResCount; - WORD f15Reserved : 15; - WORD f1Owner : 1; + unsigned short wResCount; + unsigned short f15Reserved : 15; + unsigned short f1Owner : 1; } __attribute__ ((__packed__)) SRDES0; @@ -280,8 +280,8 @@ SRDES0; #endif typedef struct tagRDES1 { - WORD wReqCount; - WORD wReserved; + unsigned short wReqCount; + unsigned short wReserved; } __attribute__ ((__packed__)) SRDES1; @@ -306,9 +306,9 @@ typedef const SRxDesc *PCSRxDesc; typedef struct tagTDES0 { volatile BYTE byTSR0; volatile BYTE byTSR1; - volatile WORD wOwner_Txtime; -// volatile WORD f15Txtime : 15; -// volatile WORD f1Owner:1; + volatile unsigned short wOwner_Txtime; +// volatile unsigned short f15Txtime : 15; +// volatile unsigned short f1Owner:1; } __attribute__ ((__packed__)) STDES0; */ @@ -332,8 +332,8 @@ STDES0, PSTDES0; typedef struct tagTDES0 { volatile BYTE byTSR0; volatile BYTE byTSR1; - volatile WORD f15Txtime : 15; - volatile WORD f1Owner:1; + volatile unsigned short f15Txtime : 15; + volatile unsigned short f1Owner:1; } __attribute__ ((__packed__)) STDES0; @@ -341,7 +341,7 @@ STDES0; typedef struct tagTDES1 { - volatile WORD wReqCount; + volatile unsigned short wReqCount; volatile BYTE byTCR; volatile BYTE byReserved; } __attribute__ ((__packed__)) @@ -393,8 +393,8 @@ typedef struct tagSTxSyncDesc { volatile STDES1 m_td1TD1; 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; + volatile unsigned short m_wFIFOCtl; + volatile unsigned short m_wTimeStamp; struct tagSTxSyncDesc* next; //4 bytes volatile PDEVICE_TD_INFO pTDInfo;//4 bytes volatile u32 m_dwReserved2; @@ -407,35 +407,35 @@ typedef const STxSyncDesc *PCSTxSyncDesc; // RsvTime buffer header // typedef struct tagSRrvTime_gRTS { - WORD wRTSTxRrvTime_ba; - WORD wRTSTxRrvTime_aa; - WORD wRTSTxRrvTime_bb; - WORD wReserved; - WORD wTxRrvTime_b; - WORD wTxRrvTime_a; + unsigned short wRTSTxRrvTime_ba; + unsigned short wRTSTxRrvTime_aa; + unsigned short wRTSTxRrvTime_bb; + unsigned short wReserved; + unsigned short wTxRrvTime_b; + unsigned short wTxRrvTime_a; }__attribute__ ((__packed__)) SRrvTime_gRTS, *PSRrvTime_gRTS; typedef const SRrvTime_gRTS *PCSRrvTime_gRTS; typedef struct tagSRrvTime_gCTS { - WORD wCTSTxRrvTime_ba; - WORD wReserved; - WORD wTxRrvTime_b; - WORD wTxRrvTime_a; + unsigned short wCTSTxRrvTime_ba; + unsigned short wReserved; + unsigned short wTxRrvTime_b; + unsigned short wTxRrvTime_a; }__attribute__ ((__packed__)) SRrvTime_gCTS, *PSRrvTime_gCTS; typedef const SRrvTime_gCTS *PCSRrvTime_gCTS; typedef struct tagSRrvTime_ab { - WORD wRTSTxRrvTime; - WORD wTxRrvTime; + unsigned short wRTSTxRrvTime; + unsigned short wTxRrvTime; }__attribute__ ((__packed__)) SRrvTime_ab, *PSRrvTime_ab; typedef const SRrvTime_ab *PCSRrvTime_ab; typedef struct tagSRrvTime_atim { - WORD wCTSTxRrvTime_ba; - WORD wTxRrvTime_a; + unsigned short wCTSTxRrvTime_ba; + unsigned short wTxRrvTime_a; }__attribute__ ((__packed__)) SRrvTime_atim, *PSRrvTime_atim; typedef const SRrvTime_atim *PCSRrvTime_atim; @@ -444,8 +444,8 @@ typedef const SRrvTime_atim *PCSRrvTime_atim; // RTS buffer header // typedef struct tagSRTSData { - WORD wFrameControl; - WORD wDurationID; + unsigned short wFrameControl; + unsigned short wDurationID; BYTE abyRA[ETH_ALEN]; BYTE abyTA[ETH_ALEN]; }__attribute__ ((__packed__)) @@ -455,14 +455,14 @@ typedef const SRTSData *PCSRTSData; typedef struct tagSRTS_g { BYTE bySignalField_b; BYTE byServiceField_b; - WORD wTransmitLength_b; + unsigned short wTransmitLength_b; BYTE bySignalField_a; BYTE byServiceField_a; - WORD wTransmitLength_a; - WORD wDuration_ba; - WORD wDuration_aa; - WORD wDuration_bb; - WORD wReserved; + unsigned short wTransmitLength_a; + unsigned short wDuration_ba; + unsigned short wDuration_aa; + unsigned short wDuration_bb; + unsigned short wReserved; SRTSData Data; }__attribute__ ((__packed__)) SRTS_g, *PSRTS_g; @@ -472,18 +472,18 @@ typedef const SRTS_g *PCSRTS_g; typedef struct tagSRTS_g_FB { BYTE bySignalField_b; BYTE byServiceField_b; - WORD wTransmitLength_b; + unsigned short wTransmitLength_b; BYTE bySignalField_a; BYTE byServiceField_a; - WORD wTransmitLength_a; - WORD wDuration_ba; - WORD wDuration_aa; - WORD wDuration_bb; - WORD wReserved; - WORD wRTSDuration_ba_f0; - WORD wRTSDuration_aa_f0; - WORD wRTSDuration_ba_f1; - WORD wRTSDuration_aa_f1; + unsigned short wTransmitLength_a; + unsigned short wDuration_ba; + unsigned short wDuration_aa; + unsigned short wDuration_bb; + unsigned short wReserved; + unsigned short wRTSDuration_ba_f0; + unsigned short wRTSDuration_aa_f0; + unsigned short wRTSDuration_ba_f1; + unsigned short wRTSDuration_aa_f1; SRTSData Data; }__attribute__ ((__packed__)) SRTS_g_FB, *PSRTS_g_FB; @@ -493,9 +493,9 @@ typedef const SRTS_g_FB *PCSRTS_g_FB; typedef struct tagSRTS_ab { BYTE bySignalField; BYTE byServiceField; - WORD wTransmitLength; - WORD wDuration; - WORD wReserved; + unsigned short wTransmitLength; + unsigned short wDuration; + unsigned short wReserved; SRTSData Data; }__attribute__ ((__packed__)) SRTS_ab, *PSRTS_ab; @@ -505,11 +505,11 @@ typedef const SRTS_ab *PCSRTS_ab; typedef struct tagSRTS_a_FB { BYTE bySignalField; BYTE byServiceField; - WORD wTransmitLength; - WORD wDuration; - WORD wReserved; - WORD wRTSDuration_f0; - WORD wRTSDuration_f1; + unsigned short wTransmitLength; + unsigned short wDuration; + unsigned short wReserved; + unsigned short wRTSDuration_f0; + unsigned short wRTSDuration_f1; SRTSData Data; }__attribute__ ((__packed__)) SRTS_a_FB, *PSRTS_a_FB; @@ -520,19 +520,19 @@ typedef const SRTS_a_FB *PCSRTS_a_FB; // CTS buffer header // typedef struct tagSCTSData { - WORD wFrameControl; - WORD wDurationID; + unsigned short wFrameControl; + unsigned short wDurationID; BYTE abyRA[ETH_ALEN]; - WORD wReserved; + unsigned short wReserved; }__attribute__ ((__packed__)) SCTSData, *PSCTSData; typedef struct tagSCTS { BYTE bySignalField_b; BYTE byServiceField_b; - WORD wTransmitLength_b; - WORD wDuration_ba; - WORD wReserved; + unsigned short wTransmitLength_b; + unsigned short wDuration_ba; + unsigned short wReserved; SCTSData Data; }__attribute__ ((__packed__)) SCTS, *PSCTS; @@ -541,11 +541,11 @@ typedef const SCTS *PCSCTS; typedef struct tagSCTS_FB { BYTE bySignalField_b; BYTE byServiceField_b; - WORD wTransmitLength_b; - WORD wDuration_ba; - WORD wReserved; - WORD wCTSDuration_ba_f0; - WORD wCTSDuration_ba_f1; + unsigned short wTransmitLength_b; + unsigned short wDuration_ba; + unsigned short wReserved; + unsigned short wCTSDuration_ba_f0; + unsigned short wCTSDuration_ba_f1; SCTSData Data; }__attribute__ ((__packed__)) SCTS_FB, *PSCTS_FB; @@ -557,9 +557,9 @@ typedef const SCTS_FB *PCSCTS_FB; // typedef struct tagSTxBufHead { u32 adwTxKey[4]; - WORD wFIFOCtl; - WORD wTimeStamp; - WORD wFragCtl; + unsigned short wFIFOCtl; + unsigned short wTimeStamp; + unsigned short wFragCtl; BYTE byTxPower; BYTE wReserved; }__attribute__ ((__packed__)) @@ -567,8 +567,8 @@ STxBufHead, *PSTxBufHead; typedef const STxBufHead *PCSTxBufHead; typedef struct tagSTxShortBufHead { - WORD wFIFOCtl; - WORD wTimeStamp; + unsigned short wFIFOCtl; + unsigned short wTimeStamp; }__attribute__ ((__packed__)) STxShortBufHead, *PSTxShortBufHead; typedef const STxShortBufHead *PCSTxShortBufHead; @@ -579,14 +579,14 @@ typedef const STxShortBufHead *PCSTxShortBufHead; typedef struct tagSTxDataHead_g { BYTE bySignalField_b; BYTE byServiceField_b; - WORD wTransmitLength_b; + unsigned short wTransmitLength_b; BYTE bySignalField_a; BYTE byServiceField_a; - WORD wTransmitLength_a; - WORD wDuration_b; - WORD wDuration_a; - WORD wTimeStampOff_b; - WORD wTimeStampOff_a; + unsigned short wTransmitLength_a; + unsigned short wDuration_b; + unsigned short wDuration_a; + unsigned short wTimeStampOff_b; + unsigned short wTimeStampOff_a; }__attribute__ ((__packed__)) STxDataHead_g, *PSTxDataHead_g; typedef const STxDataHead_g *PCSTxDataHead_g; @@ -594,16 +594,16 @@ typedef const STxDataHead_g *PCSTxDataHead_g; typedef struct tagSTxDataHead_g_FB { BYTE bySignalField_b; BYTE byServiceField_b; - WORD wTransmitLength_b; + unsigned short wTransmitLength_b; BYTE bySignalField_a; BYTE byServiceField_a; - WORD wTransmitLength_a; - WORD wDuration_b; - WORD wDuration_a; - WORD wDuration_a_f0; - WORD wDuration_a_f1; - WORD wTimeStampOff_b; - WORD wTimeStampOff_a; + unsigned short wTransmitLength_a; + unsigned short wDuration_b; + unsigned short wDuration_a; + unsigned short wDuration_a_f0; + unsigned short wDuration_a_f1; + unsigned short wTimeStampOff_b; + unsigned short wTimeStampOff_a; }__attribute__ ((__packed__)) STxDataHead_g_FB, *PSTxDataHead_g_FB; typedef const STxDataHead_g_FB *PCSTxDataHead_g_FB; @@ -612,9 +612,9 @@ typedef const STxDataHead_g_FB *PCSTxDataHead_g_FB; typedef struct tagSTxDataHead_ab { BYTE bySignalField; BYTE byServiceField; - WORD wTransmitLength; - WORD wDuration; - WORD wTimeStampOff; + unsigned short wTransmitLength; + unsigned short wDuration; + unsigned short wTimeStampOff; }__attribute__ ((__packed__)) STxDataHead_ab, *PSTxDataHead_ab; typedef const STxDataHead_ab *PCSTxDataHead_ab; @@ -623,11 +623,11 @@ typedef const STxDataHead_ab *PCSTxDataHead_ab; typedef struct tagSTxDataHead_a_FB { BYTE bySignalField; BYTE byServiceField; - WORD wTransmitLength; - WORD wDuration; - WORD wTimeStampOff; - WORD wDuration_f0; - WORD wDuration_f1; + unsigned short wTransmitLength; + unsigned short wDuration; + unsigned short wTimeStampOff; + unsigned short wDuration_f0; + unsigned short wDuration_f1; }__attribute__ ((__packed__)) STxDataHead_a_FB, *PSTxDataHead_a_FB; typedef const STxDataHead_a_FB *PCSTxDataHead_a_FB; @@ -660,7 +660,7 @@ SSecretKey; typedef struct tagSKeyEntry { BYTE abyAddrHi[2]; - WORD wKCTL; + unsigned short wKCTL; BYTE abyAddrLo[4]; u32 dwKey0[4]; u32 dwKey1[4]; |