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

Staging: vt6655: remove WORD typedef 



Replace all occurrences with unsigned short type.

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

drivers/staging/vt6655/80211hdr.h

+47 −47
Original line number Diff line number Diff line
@@ -161,21 +161,21 @@ 
#ifdef __BIG_ENDIAN



/* GET & SET Frame Control bit */

#define WLAN_GET_FC_PRVER(n)    ((((WORD)(n) >> 8) & (BIT0 | BIT1))

#define WLAN_GET_FC_FTYPE(n)    ((((WORD)(n) >> 8) & (BIT2 | BIT3)) >> 2)

#define WLAN_GET_FC_FSTYPE(n)   ((((WORD)(n) >> 8) & (BIT4|BIT5|BIT6|BIT7)) >> 4)

#define WLAN_GET_FC_TODS(n)     ((((WORD)(n) << 8) & (BIT8)) >> 8)

#define WLAN_GET_FC_FROMDS(n)   ((((WORD)(n) << 8) & (BIT9)) >> 9)

#define WLAN_GET_FC_MOREFRAG(n) ((((WORD)(n) << 8) & (BIT10)) >> 10)

#define WLAN_GET_FC_RETRY(n)    ((((WORD)(n) << 8) & (BIT11)) >> 11)

#define WLAN_GET_FC_PWRMGT(n)   ((((WORD)(n) << 8) & (BIT12)) >> 12)

#define WLAN_GET_FC_MOREDATA(n) ((((WORD)(n) << 8) & (BIT13)) >> 13)

#define WLAN_GET_FC_ISWEP(n)    ((((WORD)(n) << 8) & (BIT14)) >> 14)

#define WLAN_GET_FC_ORDER(n)    ((((WORD)(n) << 8) & (BIT15)) >> 15)

#define WLAN_GET_FC_PRVER(n)    ((((unsigned short)(n) >> 8) & (BIT0 | BIT1))

#define WLAN_GET_FC_FTYPE(n)    ((((unsigned short)(n) >> 8) & (BIT2 | BIT3)) >> 2)

#define WLAN_GET_FC_FSTYPE(n)   ((((unsigned short)(n) >> 8) & (BIT4|BIT5|BIT6|BIT7)) >> 4)

#define WLAN_GET_FC_TODS(n)     ((((unsigned short)(n) << 8) & (BIT8)) >> 8)

#define WLAN_GET_FC_FROMDS(n)   ((((unsigned short)(n) << 8) & (BIT9)) >> 9)

#define WLAN_GET_FC_MOREFRAG(n) ((((unsigned short)(n) << 8) & (BIT10)) >> 10)

#define WLAN_GET_FC_RETRY(n)    ((((unsigned short)(n) << 8) & (BIT11)) >> 11)

#define WLAN_GET_FC_PWRMGT(n)   ((((unsigned short)(n) << 8) & (BIT12)) >> 12)

#define WLAN_GET_FC_MOREDATA(n) ((((unsigned short)(n) << 8) & (BIT13)) >> 13)

#define WLAN_GET_FC_ISWEP(n)    ((((unsigned short)(n) << 8) & (BIT14)) >> 14)

#define WLAN_GET_FC_ORDER(n)    ((((unsigned short)(n) << 8) & (BIT15)) >> 15)



/* Sequence Field bit */

#define WLAN_GET_SEQ_FRGNUM(n) (((WORD)(n) >> 8) & (BIT0|BIT1|BIT2|BIT3))

#define WLAN_GET_SEQ_SEQNUM(n) ((((WORD)(n) >> 8) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4)

#define WLAN_GET_SEQ_FRGNUM(n) (((unsigned short)(n) >> 8) & (BIT0|BIT1|BIT2|BIT3))

#define WLAN_GET_SEQ_SEQNUM(n) ((((unsigned short)(n) >> 8) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4)





/* Capability Field bit */
@@ -196,22 +196,22 @@ 
#else



/* GET & SET Frame Control bit */

#define WLAN_GET_FC_PRVER(n)    (((WORD)(n)) & (BIT0 | BIT1))

#define WLAN_GET_FC_FTYPE(n)    ((((WORD)(n)) & (BIT2 | BIT3)) >> 2)

#define WLAN_GET_FC_FSTYPE(n)   ((((WORD)(n)) & (BIT4|BIT5|BIT6|BIT7)) >> 4)

#define WLAN_GET_FC_TODS(n)     ((((WORD)(n)) & (BIT8)) >> 8)

#define WLAN_GET_FC_FROMDS(n)   ((((WORD)(n)) & (BIT9)) >> 9)

#define WLAN_GET_FC_MOREFRAG(n) ((((WORD)(n)) & (BIT10)) >> 10)

#define WLAN_GET_FC_RETRY(n)    ((((WORD)(n)) & (BIT11)) >> 11)

#define WLAN_GET_FC_PWRMGT(n)   ((((WORD)(n)) & (BIT12)) >> 12)

#define WLAN_GET_FC_MOREDATA(n) ((((WORD)(n)) & (BIT13)) >> 13)

#define WLAN_GET_FC_ISWEP(n)    ((((WORD)(n)) & (BIT14)) >> 14)

#define WLAN_GET_FC_ORDER(n)    ((((WORD)(n)) & (BIT15)) >> 15)

#define WLAN_GET_FC_PRVER(n)    (((unsigned short)(n)) & (BIT0 | BIT1))

#define WLAN_GET_FC_FTYPE(n)    ((((unsigned short)(n)) & (BIT2 | BIT3)) >> 2)

#define WLAN_GET_FC_FSTYPE(n)   ((((unsigned short)(n)) & (BIT4|BIT5|BIT6|BIT7)) >> 4)

#define WLAN_GET_FC_TODS(n)     ((((unsigned short)(n)) & (BIT8)) >> 8)

#define WLAN_GET_FC_FROMDS(n)   ((((unsigned short)(n)) & (BIT9)) >> 9)

#define WLAN_GET_FC_MOREFRAG(n) ((((unsigned short)(n)) & (BIT10)) >> 10)

#define WLAN_GET_FC_RETRY(n)    ((((unsigned short)(n)) & (BIT11)) >> 11)

#define WLAN_GET_FC_PWRMGT(n)   ((((unsigned short)(n)) & (BIT12)) >> 12)

#define WLAN_GET_FC_MOREDATA(n) ((((unsigned short)(n)) & (BIT13)) >> 13)

#define WLAN_GET_FC_ISWEP(n)    ((((unsigned short)(n)) & (BIT14)) >> 14)

#define WLAN_GET_FC_ORDER(n)    ((((unsigned short)(n)) & (BIT15)) >> 15)





/* Sequence Field bit */

#define WLAN_GET_SEQ_FRGNUM(n) (((WORD)(n)) & (BIT0|BIT1|BIT2|BIT3))

#define WLAN_GET_SEQ_SEQNUM(n) ((((WORD)(n)) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4)

#define WLAN_GET_SEQ_FRGNUM(n) (((unsigned short)(n)) & (BIT0|BIT1|BIT2|BIT3))

#define WLAN_GET_SEQ_SEQNUM(n) ((((unsigned short)(n)) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4)





/* Capability Field bit */
@@ -246,20 +246,20 @@ 
#define WLAN_SET_CAP_INFO_GRPACK(n)        ((n) << 14)





#define WLAN_SET_FC_PRVER(n)    ((WORD)(n))

#define WLAN_SET_FC_FTYPE(n)    (((WORD)(n)) << 2)

#define WLAN_SET_FC_FSTYPE(n)   (((WORD)(n)) << 4)

#define WLAN_SET_FC_TODS(n)     (((WORD)(n)) << 8)

#define WLAN_SET_FC_FROMDS(n)   (((WORD)(n)) << 9)

#define WLAN_SET_FC_MOREFRAG(n) (((WORD)(n)) << 10)

#define WLAN_SET_FC_RETRY(n)    (((WORD)(n)) << 11)

#define WLAN_SET_FC_PWRMGT(n)   (((WORD)(n)) << 12)

#define WLAN_SET_FC_MOREDATA(n) (((WORD)(n)) << 13)

#define WLAN_SET_FC_ISWEP(n)    (((WORD)(n)) << 14)

#define WLAN_SET_FC_ORDER(n)    (((WORD)(n)) << 15)

#define WLAN_SET_FC_PRVER(n)    ((unsigned short)(n))

#define WLAN_SET_FC_FTYPE(n)    (((unsigned short)(n)) << 2)

#define WLAN_SET_FC_FSTYPE(n)   (((unsigned short)(n)) << 4)

#define WLAN_SET_FC_TODS(n)     (((unsigned short)(n)) << 8)

#define WLAN_SET_FC_FROMDS(n)   (((unsigned short)(n)) << 9)

#define WLAN_SET_FC_MOREFRAG(n) (((unsigned short)(n)) << 10)

#define WLAN_SET_FC_RETRY(n)    (((unsigned short)(n)) << 11)

#define WLAN_SET_FC_PWRMGT(n)   (((unsigned short)(n)) << 12)

#define WLAN_SET_FC_MOREDATA(n) (((unsigned short)(n)) << 13)

#define WLAN_SET_FC_ISWEP(n)    (((unsigned short)(n)) << 14)

#define WLAN_SET_FC_ORDER(n)    (((unsigned short)(n)) << 15)



#define WLAN_SET_SEQ_FRGNUM(n) ((WORD)(n))

#define WLAN_SET_SEQ_SEQNUM(n) (((WORD)(n)) << 4)

#define WLAN_SET_SEQ_FRGNUM(n) ((unsigned short)(n))

#define WLAN_SET_SEQ_SEQNUM(n) (((unsigned short)(n)) << 4)



/* ERP Field bit */
@@ -297,8 +297,8 @@ typedef struct { 


typedef struct tagWLAN_80211HDR_A2 {



    WORD    wFrameCtl;

    WORD    wDurationID;

    unsigned short wFrameCtl;

    unsigned short wDurationID;

    BYTE    abyAddr1[WLAN_ADDR_LEN];

    BYTE    abyAddr2[WLAN_ADDR_LEN];
@@ -307,24 +307,24 @@ WLAN_80211HDR_A2, *PWLAN_80211HDR_A2; 


typedef struct tagWLAN_80211HDR_A3 {



    WORD    wFrameCtl;

    WORD    wDurationID;

    unsigned short wFrameCtl;

    unsigned short wDurationID;

    BYTE    abyAddr1[WLAN_ADDR_LEN];

    BYTE    abyAddr2[WLAN_ADDR_LEN];

    BYTE    abyAddr3[WLAN_ADDR_LEN];

    WORD    wSeqCtl;

    unsigned short wSeqCtl;



}__attribute__ ((__packed__))

WLAN_80211HDR_A3, *PWLAN_80211HDR_A3;



typedef struct tagWLAN_80211HDR_A4 {



    WORD    wFrameCtl;

    WORD    wDurationID;

    unsigned short wFrameCtl;

    unsigned short wDurationID;

    BYTE    abyAddr1[WLAN_ADDR_LEN];

    BYTE    abyAddr2[WLAN_ADDR_LEN];

    BYTE    abyAddr3[WLAN_ADDR_LEN];

    WORD    wSeqCtl;

    unsigned short wSeqCtl;

    BYTE    abyAddr4[WLAN_ADDR_LEN];



} __attribute__ ((__packed__))

drivers/staging/vt6655/80211mgr.h

+8 −8
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ WLAN_IE_SUPP_RATES, *PWLAN_IE_SUPP_RATES; 
typedef struct _WLAN_IE_FH_PARMS {

    BYTE    byElementID;

    BYTE    len;

    WORD    wDwellTime;

    unsigned short wDwellTime;

    BYTE    byHopSet;

    BYTE    byHopPattern;

    BYTE    byHopIndex;
@@ -285,8 +285,8 @@ typedef struct tagWLAN_IE_CF_PARMS { 
    BYTE   len;

    BYTE   byCFPCount;

    BYTE   byCFPPeriod;

    WORD   wCFPMaxDuration;

    WORD   wCFPDurRemaining;

    unsigned short wCFPMaxDuration;

    unsigned short wCFPDurRemaining;

}__attribute__ ((__packed__))

WLAN_IE_CF_PARMS,  *PWLAN_IE_CF_PARMS;
@@ -309,7 +309,7 @@ WLAN_IE_TIM, *PWLAN_IE_TIM; 
typedef struct tagWLAN_IE_IBSS_PARMS {

    BYTE   byElementID;

    BYTE   len;

    WORD   wATIMWindow;

    unsigned short wATIMWindow;

}__attribute__ ((__packed__))

WLAN_IE_IBSS_PARMS, *PWLAN_IE_IBSS_PARMS;
@@ -329,9 +329,9 @@ typedef struct tagWLAN_IE_RSN_EXT { 
    BYTE byElementID;

    BYTE len;

    BYTE abyOUI[4];

    WORD wVersion;

    unsigned short wVersion;

    BYTE abyMulticast[4];

    WORD wPKCount;

    unsigned short wPKCount;

    struct {

        BYTE abyOUI[4];

    } PKSList[1]; // the rest is variable so need to
@@ -340,7 +340,7 @@ typedef struct tagWLAN_IE_RSN_EXT { 


#pragma pack(1)

typedef struct tagWLAN_IE_RSN_AUTH {

    WORD wAuthCount;

    unsigned short wAuthCount;

    struct {

        BYTE abyOUI[4];

    } AuthKSList[1];
@@ -351,7 +351,7 @@ typedef struct tagWLAN_IE_RSN_AUTH { 
typedef struct tagWLAN_IE_RSN {

    BYTE   byElementID;

    BYTE   len;

    WORD   wVersion;

    unsigned short wVersion;

    BYTE   abyRSN[WLAN_MIN_ARRAY];

} WLAN_IE_RSN, *PWLAN_IE_RSN;

drivers/staging/vt6655/aes_ccmp.c

+4 −4
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ BYTE abyRoundKey[16]; 
 * Return Value: MIC compare result

 *

 */

BOOL AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, WORD wFrameSize)

BOOL AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize)

{

BYTE            abyNonce[13];

BYTE            MIC_IV[16];
@@ -258,11 +258,11 @@ BYTE abyLastCipher[16]; 
PS802_11Header  pMACHeader = (PS802_11Header) pbyFrame;

unsigned char *pbyIV;

unsigned char *pbyPayload;

WORD            wHLen = 22;

WORD            wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;//8 is IV, 8 is MIC, 4 is CRC

unsigned short wHLen = 22;

unsigned short wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;//8 is IV, 8 is MIC, 4 is CRC

BOOL            bA4 = FALSE;

BYTE            byTmp;

WORD            wCnt;

unsigned short wCnt;

int             ii,jj,kk;

drivers/staging/vt6655/aes_ccmp.h

+1 −1
Original line number Diff line number Diff line
@@ -41,6 +41,6 @@ 
/*---------------------  Export Variables  --------------------------*/



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

BOOL AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, WORD wFrameSize);

BOOL AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize);



#endif //__AES_H__

drivers/staging/vt6655/baseband.c

+7 −7
Original line number Diff line number Diff line
@@ -1712,7 +1712,7 @@ BYTE byVT3253B0_AGC[CB_VT3253B0_AGC][2] = { 
    {0xF0, 0x00},

};



const WORD awcFrameTime[MAX_RATE] =

const unsigned short awcFrameTime[MAX_RATE] =

{10, 20, 55, 110, 24, 36, 48, 72, 96, 144, 192, 216};
@@ -1781,7 +1781,7 @@ BBuGetFrameTime ( 
    BYTE byPreambleType,

    BYTE byPktType,

    unsigned int cbFrameLength,

    WORD wRate

    unsigned short wRate

    )

{

    unsigned int uFrameTime;
@@ -1847,7 +1847,7 @@ void 
BBvCaculateParameter (

    PSDevice pDevice,

    unsigned int cbFrameLength,

    WORD wRate,

    unsigned short wRate,

    BYTE byPacketType,

    unsigned short *pwPhyLen,

    unsigned char *pbyPhySrv,
@@ -1994,11 +1994,11 @@ BBvCaculateParameter ( 
        *pbyPhySrv = 0x00;

        if (bExtBit)

            *pbyPhySrv = *pbyPhySrv | 0x80;

        *pwPhyLen = (WORD)cbUsCount;

        *pwPhyLen = (unsigned short)cbUsCount;

    }

    else {

        *pbyPhySrv = 0x00;

        *pwPhyLen = (WORD)cbFrameLength;

        *pwPhyLen = (unsigned short)cbFrameLength;

    }

}
@@ -2017,7 +2017,7 @@ BBvCaculateParameter ( 
 */

BOOL BBbReadEmbeded (unsigned long dwIoBase, BYTE byBBAddr, unsigned char *pbyData)

{

    WORD    ww;

    unsigned short ww;

    BYTE    byValue;



    // BB reg offset
@@ -2060,7 +2060,7 @@ BOOL BBbReadEmbeded (unsigned long dwIoBase, BYTE byBBAddr, unsigned char *pbyDa 
 */

BOOL BBbWriteEmbeded (unsigned long dwIoBase, BYTE byBBAddr, BYTE byData)

{

    WORD    ww;

    unsigned short ww;

    BYTE    byValue;



    // BB reg offset