diff options
| author | Charles Clément <caratorn@gmail.com> | 2010-06-24 11:02:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-24 14:23:17 -0700 |
| commit | 2986db5fd31e312206d3ebfa4786aac04bdbe486 (patch) | |
| tree | 910e5522ededbdce9e97601fccb79ae94ec51404 /drivers/staging/vt6655 | |
| parent | 0f4c60d61e9c10a0733eacd650c101189bdf75cd (diff) | |
Staging: vt6655: remove WORD typedef
Replace all occurrences with unsigned short type.
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655')
44 files changed, 589 insertions, 590 deletions
diff --git a/drivers/staging/vt6655/80211hdr.h b/drivers/staging/vt6655/80211hdr.h index 5d8e4c64df9..a063db66589 100644 --- a/drivers/staging/vt6655/80211hdr.h +++ b/drivers/staging/vt6655/80211hdr.h @@ -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__)) diff --git a/drivers/staging/vt6655/80211mgr.h b/drivers/staging/vt6655/80211mgr.h index bebb5d6b593..adae1f32ab3 100644 --- a/drivers/staging/vt6655/80211mgr.h +++ b/drivers/staging/vt6655/80211mgr.h @@ -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; diff --git a/drivers/staging/vt6655/aes_ccmp.c b/drivers/staging/vt6655/aes_ccmp.c index ae5c0e4f13a..be41ca86f59 100644 --- a/drivers/staging/vt6655/aes_ccmp.c +++ b/drivers/staging/vt6655/aes_ccmp.c @@ -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; diff --git a/drivers/staging/vt6655/aes_ccmp.h b/drivers/staging/vt6655/aes_ccmp.h index 2909e5b79a5..5671db3b37d 100644 --- a/drivers/staging/vt6655/aes_ccmp.h +++ b/drivers/staging/vt6655/aes_ccmp.h @@ -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__ diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index ab7d3d89e03..a0dc3f3630d 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -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 diff --git a/drivers/staging/vt6655/baseband.h b/drivers/staging/vt6655/baseband.h index 075342563c3..0ce947a4e11 100644 --- a/drivers/staging/vt6655/baseband.h +++ b/drivers/staging/vt6655/baseband.h @@ -123,14 +123,14 @@ BBuGetFrameTime( BYTE byPreambleType, BYTE byPktType, unsigned int cbFrameLength, - WORD wRate + unsigned short wRate ); void BBvCaculateParameter ( PSDevice pDevice, unsigned int cbFrameLength, - WORD wRate, + unsigned short wRate, BYTE byPacketType, unsigned short *pwPhyLen, unsigned char *pbyPhySrv, diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c index 3196eb53ab3..7ec088ffbd8 100644 --- a/drivers/staging/vt6655/bssdb.c +++ b/drivers/staging/vt6655/bssdb.c @@ -72,14 +72,14 @@ static int msglevel =MSG_LEVEL_INFO; -const WORD awHWRetry0[5][5] = { +const unsigned short awHWRetry0[5][5] = { {RATE_18M, RATE_18M, RATE_12M, RATE_12M, RATE_12M}, {RATE_24M, RATE_24M, RATE_18M, RATE_12M, RATE_12M}, {RATE_36M, RATE_36M, RATE_24M, RATE_18M, RATE_18M}, {RATE_48M, RATE_48M, RATE_36M, RATE_24M, RATE_24M}, {RATE_54M, RATE_54M, RATE_48M, RATE_36M, RATE_36M} }; -const WORD awHWRetry1[5][5] = { +const unsigned short awHWRetry1[5][5] = { {RATE_18M, RATE_18M, RATE_12M, RATE_6M, RATE_6M}, {RATE_24M, RATE_24M, RATE_18M, RATE_6M, RATE_6M}, {RATE_36M, RATE_36M, RATE_24M, RATE_12M, RATE_12M}, @@ -372,8 +372,8 @@ BSSbInsertToBSSList ( void *hDeviceContext, unsigned char *abyBSSIDAddr, QWORD qwTimestamp, - WORD wBeaconInterval, - WORD wCapInfo, + unsigned short wBeaconInterval, + unsigned short wCapInfo, BYTE byCurrChannel, PWLAN_IE_SSID pSSID, PWLAN_IE_SUPP_RATES pSuppRates, @@ -587,8 +587,8 @@ BOOL BSSbUpdateToBSSList ( void *hDeviceContext, QWORD qwTimestamp, - WORD wBeaconInterval, - WORD wCapInfo, + unsigned short wBeaconInterval, + unsigned short wCapInfo, BYTE byCurrChannel, BOOL bChannelHit, PWLAN_IE_SSID pSSID, @@ -1402,8 +1402,8 @@ BSSvUpdateNodeTxCounter( BYTE byTxRetry = (byTsr0 & TSR0_NCR); PSTxBufHead pTxBufHead; PS802_11Header pMACHeader; - WORD wRate; - WORD wFallBackRate = RATE_1M; + unsigned short wRate; + unsigned short wFallBackRate = RATE_1M; BYTE byFallBack; unsigned int ii; // unsigned int txRetryTemp; diff --git a/drivers/staging/vt6655/bssdb.h b/drivers/staging/vt6655/bssdb.h index af06c941110..6baa83fc218 100644 --- a/drivers/staging/vt6655/bssdb.h +++ b/drivers/staging/vt6655/bssdb.h @@ -97,7 +97,7 @@ typedef struct tagSERPObject { typedef struct tagSRSNCapObject { BOOL bRSNCapExist; - WORD wRSNCap; + unsigned short wRSNCap; }SRSNCapObject, *PSRSNCapObject; // BSS info(AP) @@ -111,12 +111,12 @@ typedef struct tagKnownBSS { BYTE abyExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; unsigned int uRSSI; BYTE bySQ; - WORD wBeaconInterval; - WORD wCapInfo; + unsigned short wBeaconInterval; + unsigned short wCapInfo; BYTE abySSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; BYTE byRxRate; -// WORD wATIMWindow; +// unsigned short wATIMWindow; BYTE byRSSIStatCnt; long ldBmMAX; long ldBmAverage[RSSI_STAT_COUNT]; @@ -128,9 +128,9 @@ typedef struct tagKnownBSS { BOOL bWPAValid; BYTE byGKType; BYTE abyPKType[4]; - WORD wPKCount; + unsigned short wPKCount; BYTE abyAuthType[4]; - WORD wAuthCount; + unsigned short wAuthCount; BYTE byDefaultK_as_PK; BYTE byReplayIdx; //-- @@ -138,16 +138,16 @@ typedef struct tagKnownBSS { //++ WPA2 informations BOOL bWPA2Valid; BYTE byCSSGK; - WORD wCSSPKCount; + unsigned short wCSSPKCount; BYTE abyCSSPK[4]; - WORD wAKMSSAuthCount; + unsigned short wAKMSSAuthCount; BYTE abyAKMSSAuthType[4]; //++ wpactl BYTE byWPAIE[MAX_WPA_IE_LEN]; BYTE byRSNIE[MAX_WPA_IE_LEN]; - WORD wWPALen; - WORD wRSNLen; + unsigned short wWPALen; + unsigned short wRSNLen; // Clear count unsigned int uClearCount; @@ -185,22 +185,22 @@ typedef struct tagKnownNodeDB { BYTE abyMACAddr[WLAN_ADDR_LEN]; BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; - WORD wTxDataRate; + unsigned short wTxDataRate; BOOL bShortPreamble; BOOL bERPExist; BOOL bShortSlotTime; unsigned int uInActiveCount; - WORD wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp. - WORD wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon. - WORD wSuppRate; + unsigned short wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp. + unsigned short wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon. + unsigned short wSuppRate; BYTE byTopOFDMBasicRate;//Records the highest basic rate in OFDM mode BYTE byTopCCKBasicRate; //Records the highest basic rate in CCK mode // For AP mode struct sk_buff_head sTxPSQueue; - WORD wCapInfo; - WORD wListenInterval; - WORD wAID; + unsigned short wCapInfo; + unsigned short wListenInterval; + unsigned short wAID; NODE_STATE eNodeState; BOOL bPSEnable; BOOL bRxPSPoll; @@ -208,7 +208,7 @@ typedef struct tagKnownNodeDB { unsigned long ulLastRxJiffer; BYTE bySuppRate; unsigned long dwFlags; - WORD wEnQueueCnt; + unsigned short wEnQueueCnt; BOOL bOnFly; unsigned long long KeyRSC; @@ -216,7 +216,7 @@ typedef struct tagKnownNodeDB { unsigned long dwKeyIndex; BYTE byCipherSuite; unsigned long dwTSC47_16; - WORD wTSC15_0; + unsigned short wTSC15_0; unsigned int uWepKeyLength; BYTE abyWepKey[WLAN_WEPMAX_KEYLEN]; // @@ -268,8 +268,8 @@ BSSbInsertToBSSList( void *hDeviceContext, unsigned char *abyBSSIDAddr, QWORD qwTimestamp, - WORD wBeaconInterval, - WORD wCapInfo, + unsigned short wBeaconInterval, + unsigned short wCapInfo, BYTE byCurrChannel, PWLAN_IE_SSID pSSID, PWLAN_IE_SUPP_RATES pSuppRates, @@ -289,8 +289,8 @@ BOOL BSSbUpdateToBSSList( void *hDeviceContext, QWORD qwTimestamp, - WORD wBeaconInterval, - WORD wCapInfo, + unsigned short wBeaconInterval, + unsigned short wCapInfo, BYTE byCurrChannel, BOOL bChannelHit, PWLAN_IE_SSID pSSID, diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 3997206668c..c5da82ad3bc 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -92,7 +92,7 @@ static BYTE abyDefaultSuppRatesB[] = {WLAN_EID_SUPP_RATES, 4, 0x02, 0x04, 0x0B, /*--------------------- Static Variables --------------------------*/ -const WORD cwRXBCNTSFOff[MAX_RATE] = +const unsigned short cwRXBCNTSFOff[MAX_RATE] = {17, 17, 17, 17, 34, 23, 17, 11, 8, 5, 4, 3}; @@ -244,7 +244,7 @@ void s_vSetRSPINF (PSDevice pDevice, CARD_PHY_TYPE ePHYType, void *pvSupportRateIEs, void *pvExtSupportRateIEs) { BYTE byServ = 0, bySignal = 0; // For CCK - WORD wLen = 0; + unsigned short wLen = 0; BYTE byTxRate = 0, byRsvTime = 0; // For OFDM //Set to Page1 @@ -437,7 +437,7 @@ BOOL CARDbIsShorSlotTime (void *pDeviceHandler) * Return Value: None. * */ -BOOL CARDbSetPhyParameter (void *pDeviceHandler, CARD_PHY_TYPE ePHYType, WORD wCapInfo, BYTE byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs) +BOOL CARDbSetPhyParameter (void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned short wCapInfo, BYTE byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs) { PSDevice pDevice = (PSDevice) pDeviceHandler; BYTE byCWMaxMin = 0; @@ -659,7 +659,7 @@ BOOL CARDbUpdateTSF (void *pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp, * Return Value: TRUE if succeed; otherwise FALSE * */ -BOOL CARDbSetBeaconPeriod (void *pDeviceHandler, WORD wBeaconInterval) +BOOL CARDbSetBeaconPeriod (void *pDeviceHandler, unsigned short wBeaconInterval) { PSDevice pDevice = (PSDevice) pDeviceHandler; unsigned int uBeaconInterval = 0; @@ -884,7 +884,7 @@ BOOL CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE e */ BOOL CARDbSetTxDataRate( void *pDeviceHandler, - WORD wDataRate + unsigned short wDataRate ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -1069,7 +1069,7 @@ CARDbAdd_PMKID_Candidate ( void *pDeviceHandler, unsigned char *pbyBSSID, BOOL bRSNCapExist, - WORD wRSNCap + unsigned short wRSNCap ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -1151,7 +1151,7 @@ CARDbStartMeasure ( QWORD qwCurrTSF; QWORD qwStartTSF; BOOL bExpired = TRUE; - WORD wDuration = 0; + unsigned short wDuration = 0; if ((pEID == NULL) || (uNumOfMeasureEIDs == 0)) { @@ -1315,8 +1315,8 @@ CARDbSetQuiet ( BOOL bResetQuiet, BYTE byQuietCount, BYTE byQuietPeriod, - WORD wQuietDuration, - WORD wQuietOffset + unsigned short wQuietDuration, + unsigned short wQuietOffset ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -1396,8 +1396,8 @@ CARDbStartQuiet ( dwNextTime = pDevice->sQuiet[uCurrentQuietIndex].dwStartTime; dwNextTime %= pDevice->wBeaconInterval; MACvSelectPage1(pDevice->PortOffset); - VNSvOutPortW(pDevice->PortOffset + MAC_REG_QUIETINIT, (WORD) dwNextTime); - VNSvOutPortW(pDevice->PortOffset + MAC_REG_QUIETDUR, (WORD) pDevice->sQuiet[uCurrentQuietIndex].wDuration); + VNSvOutPortW(pDevice->PortOffset + MAC_REG_QUIETINIT, (unsigned short) dwNextTime); + VNSvOutPortW(pDevice->PortOffset + MAC_REG_QUIETDUR, (unsigned short) pDevice->sQuiet[uCurrentQuietIndex].wDuration); if (pDevice->byQuietStartCount == 0) { pDevice->bEnableFirstQuiet = FALSE; MACvRegBitsOn(pDevice->PortOffset, MAC_REG_MSRCTL, (MSRCTL_QUIETTXCHK | MSRCTL_QUIETEN)); @@ -1421,8 +1421,8 @@ CARDbStartQuiet ( } // set GAP and Next duration MACvSelectPage1(pDevice->PortOffset); - VNSvOutPortW(pDevice->PortOffset + MAC_REG_QUIETGAP, (WORD) dwGap); - VNSvOutPortW(pDevice->PortOffset + MAC_REG_QUIETDUR, (WORD) dwDuration); + VNSvOutPortW(pDevice->PortOffset + MAC_REG_QUIETGAP, (unsigned short) dwGap); + VNSvOutPortW(pDevice->PortOffset + MAC_REG_QUIETDUR, (unsigned short) dwDuration); MACvRegBitsOn(pDevice->PortOffset, MAC_REG_MSRCTL, MSRCTL_QUIETRPT); MACvSelectPage0(pDevice->PortOffset); } @@ -1620,17 +1620,17 @@ CARDvSafeResetRx ( // init state, all RD is chip's for (uu = 0; uu < pDevice->sOpts.nRxDescs0; uu++) { pDesc =&(pDevice->aRD0Ring[uu]); - pDesc->m_rd0RD0.wResCount = (WORD)(pDevice->rx_buf_sz); + pDesc->m_rd0RD0.wResCount = (unsigned short)(pDevice->rx_buf_sz); pDesc->m_rd0RD0.f1Owner=OWNED_BY_NIC; - pDesc-& |