diff options
| author | Charles Clément <caratorn@gmail.com> | 2010-06-24 22:02:26 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-25 01:23:17 +0400 |
| commit | 2986db5fd31e312206d3ebfa4786aac04bdbe486 (patch) | |
| tree | 910e5522ededbdce9e97601fccb79ae94ec51404 | |
| parent | 0f4c60d61e9c10a0733eacd650c101189bdf75cd (diff) | |
| download | linux-2986db5fd31e312206d3ebfa4786aac04bdbe486.tar.xz | |
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>
44 files changed, 589 insertions, 590 deletions
diff --git a/drivers/staging/vt6655/80211hdr.h b/drivers/staging/vt6655/80211hdr.h index 5d8e4c64df9a..a063db665897 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 bebb5d6b5936..adae1f32ab30 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 ae5c0e4f13ab..be41ca86f592 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 2909e5b79a57..5671db3b37d5 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 ab7d3d89e034..a0dc3f3630d4 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 075342563c32..0ce947a4e11d 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 3196eb53ab30..7ec088ffbd86 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 af06c941110a..6baa83fc2181 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 3997206668cc..c5da82ad3bcc 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->m_rd1RD1.wReqCount = (WORD)(pDevice->rx_buf_sz); + pDesc->m_rd1RD1.wReqCount = (unsigned short)(pDevice->rx_buf_sz); } // init state, all RD is chip's for (uu = 0; uu < pDevice->sOpts.nRxDescs1; uu++) { pDesc =&(pDevice->aRD1Ring[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->m_rd1RD1.wReqCount = (WORD)(pDevice->rx_buf_sz); + pDesc->m_rd1RD1.wReqCount = (unsigned short)(pDevice->rx_buf_sz); } pDevice->cbDFCB = CB_MAX_RX_FRAG; @@ -1663,18 +1663,18 @@ CARDvSafeResetRx ( * Return Value: response Control frame rate * */ -WORD CARDwGetCCKControlRate(void *pDeviceHandler, WORD wRateIdx) +unsigned short CARDwGetCCKControlRate(void *pDeviceHandler, unsigned short wRateIdx) { PSDevice pDevice = (PSDevice) pDeviceHandler; unsigned int ui = (unsigned int) wRateIdx; while (ui > RATE_1M) { - if (pDevice->wBasicRate & ((WORD)1 << ui)) { - return (WORD)ui; + if (pDevice->wBasicRate & ((unsigned short)1 << ui)) { + return (unsigned short)ui; } ui --; } - return (WORD)RATE_1M; + return (unsigned short)RATE_1M; } /* @@ -1690,7 +1690,7 @@ WORD CARDwGetCCKControlRate(void *pDeviceHandler, WORD wRateIdx) * Return Value: response Control frame rate * */ -WORD CARDwGetOFDMControlRate (void *pDeviceHandler, WORD wRateIdx) +unsigned short CARDwGetOFDMControlRate (void *pDeviceHandler, unsigned short wRateIdx) { PSDevice pDevice = (PSDevice) pDeviceHandler; unsigned int ui = (unsigned int) wRateIdx; @@ -1704,14 +1704,14 @@ WORD CARDwGetOFDMControlRate (void *pDeviceHandler, WORD wRateIdx) return wRateIdx; } while (ui > RATE_11M) { - if (pDevice->wBasicRate & ((WORD)1 << ui)) { + if (pDevice->wBasicRate & ((unsigned short)1 << ui)) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate : %d\n", ui); - return (WORD)ui; + return (unsigned short)ui; } ui --; } DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate: 6M\n"); - return (WORD)RATE_24M; + return (unsigned short)RATE_24M; } @@ -1731,7 +1731,7 @@ void CARDvSetRSPINF (void *pDeviceHandler, CARD_PHY_TYPE ePHYType) { PSDevice pDevice = (PSDevice) pDeviceHandler; BYTE byServ = 0x00, bySignal = 0x00; //For CCK - WORD wLen = 0x0000; + unsigned short wLen = 0x0000; BYTE byTxRate, byRsvTime; //For OFDM //Set to Page1 @@ -1914,7 +1914,7 @@ void CARDvUpdateBasicTopRate (void *pDeviceHandler) //Determines the highest basic rate. for (ii = RATE_54M; ii >= RATE_6M; ii --) { - if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) ) { + if ( (pDevice->wBasicRate) & ((unsigned short)(1<<ii)) ) { byTopOFDM = ii; break; } @@ -1922,7 +1922,7 @@ void CARDvUpdateBasicTopRate (void *pDeviceHandler) pDevice->byTopOFDMBasicRate = byTopOFDM; for (ii = RATE_11M;; ii --) { - if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) ) { + if ( (pDevice->wBasicRate) & ((unsigned short)(1<<ii)) ) { byTopCCK = ii; break; } @@ -1946,10 +1946,10 @@ void CARDvUpdateBasicTopRate (void *pDeviceHandler) * Return Value: TRUE if succeeded; FALSE if failed. * */ -BOOL CARDbAddBasicRate (void *pDeviceHandler, WORD wRateIdx) +BOOL CARDbAddBasicRate (void *pDeviceHandler, unsigned short wRateIdx) { PSDevice pDevice = (PSDevice) pDeviceHandler; - WORD wRate = (WORD)(1<<wRateIdx); + unsigned short wRate = (unsigned short)(1<<wRateIdx); pDevice->wBasicRate |= wRate; @@ -1965,7 +1965,7 @@ BOOL CARDbIsOFDMinBasicRate (void *pDeviceHandler) int ii; for (ii = RATE_54M; ii >= RATE_6M; ii --) { - if ((pDevice->wBasicRate) & ((WORD)(1<<ii))) + if ((pDevice->wBasicRate) & ((unsigned short)(1<<ii))) return TRUE; } return FALSE; @@ -1999,7 +1999,7 @@ BYTE CARDbyGetPktType (void *pDeviceHandler) * Return Value: none * */ -void CARDvSetLoopbackMode (unsigned long dwIoBase, WORD wLoopbackMode) +void CARDvSetLoopbackMode (unsigned long dwIoBase, unsigned short wLoopbackMode) { switch(wLoopbackMode) { case CARD_LB_NONE: @@ -2058,7 +2058,7 @@ BOOL CARDbSoftwareReset (void *pDeviceHandler) QWORD CARDqGetTSFOffset (BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2) { QWORD qwTSFOffset; - WORD wRxBcnTSFOffst= 0;; + unsigned short wRxBcnTSFOffst= 0;; HIDWORD(qwTSFOffset) = 0; LODWORD(qwTSFOffset) = 0; @@ -2094,7 +2094,7 @@ QWORD CARDqGetTSFOffset (BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2) */ BOOL CARDbGetCurrentTSF (unsigned long dwIoBase, PQWORD pqwCurrTSF) { - WORD ww; + unsigned short ww; BYTE byData; MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD); @@ -2126,7 +2126,7 @@ BOOL CARDbGetCurrentTSF (unsigned long dwIoBase, PQWORD pqwCurrTSF) * Return Value: TSF value of next Beacon * */ -QWORD CARDqGetNextTBTT (QWORD qwTSF, WORD wBeaconInterval) +QWORD CARDqGetNextTBTT (QWORD qwTSF, unsigned short wBeaconInterval) { unsigned int uLowNextTBTT; @@ -2170,7 +2170,7 @@ QWORD CARDqGetNextTBTT (QWORD qwTSF, WORD wBeaconInterval) * Return Value: none * */ -void CARDvSetFirstNextTBTT (unsigned long dwIoBase, WORD wBeaconInterval) +void CARDvSetFirstNextTBTT (unsigned long dwIoBase, unsigned short wBeaconInterval) { QWORD qwNextTBTT; @@ -2203,7 +2203,7 @@ void CARDvSetFirstNextTBTT (unsigned long dwIoBase, WORD wBeaconInterval) * Return Value: none * */ -void CARDvUpdateNextTBTT (unsigned long dwIoBase, QWORD qwTSF, WORD wBeaconInterval) +void CARDvUpdateNextTBTT (unsigned long dwIoBase, QWORD qwTSF, unsigned short wBeaconInterval) { qwTSF = CARDqGetNextTBTT(qwTSF, wBeaconInterval); diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h index b63842cd71a3..fbc1f0742902 100644 --- a/drivers/staging/vt6655/card.h +++ b/drivers/staging/vt6655/card.h @@ -89,14 +89,14 @@ typedef enum _CARD_OP_MODE { void CARDvSetRSPINF(void *pDeviceHandler, CARD_PHY_TYPE ePHYType); void vUpdateIFS(void *pDeviceHandler); void CARDvUpdateBasicTopRate(void *pDeviceHandler); -BOOL CARDbAddBasicRate(void *pDeviceHandler, WORD wRateIdx); +BOOL CARDbAddBasicRate(void *pDeviceHandler, unsigned short wRateIdx); BOOL CARDbIsOFDMinBasicRate(void *pDeviceHandler); -void CARDvSetLoopbackMode(unsigned long dwIoBase, WORD wLoopbackMode); +void CARDvSetLoopbackMode(unsigned long dwIoBase, unsigned short wLoopbackMode); BOOL CARDbSoftwareReset(void *pDeviceHandler); -void CARDvSetFirstNextTBTT(unsigned long dwIoBase, WORD wBeaconInterval); -void CARDvUpdateNextTBTT(unsigned long dwIoBase, QWORD qwTSF, WORD wBeaconInterval); +void CARDvSetFirstNextTBTT(unsigned long dwIoBase, unsigned short wBeaconInterval); +void CARDvUpdateNextTBTT(unsigned long dwIoBase, QWORD qwTSF, unsigned short wBeaconInterval); BOOL CARDbGetCurrentTSF(unsigned long dwIoBase, PQWORD pqwCurrTSF); -QWORD CARDqGetNextTBTT(QWORD qwTSF, WORD wBeaconInterval); +QWORD CARDqGetNextTBTT(QWORD qwTSF, unsigned short wBeaconInterval); QWORD CARDqGetTSFOffset(BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2); BOOL CARDbSetTxPower(void *pDeviceHandler, unsigned long ulTxPower); BYTE CARDbyGetPktType(void *pDeviceHandler); @@ -109,11 +109,11 @@ BOOL CARDbRadioPowerOn(void *pDeviceHandler); //BOOL CARDbSendPacket(void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength); BOOL CARDbIsShortPreamble(void *pDeviceHandler); BOOL CARDbIsShorSlotTime(void *pDeviceHandler); -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); BOOL CARDbUpdateTSF(void *pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF); BOOL CARDbStopTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType); BOOL CARDbStartTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType); -BOOL CARDbSetBeaconPeriod(void *pDeviceHandler, WORD wBeaconInterval); +BOOL CARDbSetBeaconPeriod(void *pDeviceHandler, unsigned short wBeaconInterval); BOOL CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE eOPMode); BOOL @@ -123,7 +123,7 @@ CARDbPowerDown( BOOL CARDbSetTxDataRate( void *pDeviceHandler, - WORD wDataRate + unsigned short wDataRate ); @@ -134,7 +134,7 @@ CARDbAdd_PMKID_Candidate ( void *pDeviceHandler, unsigned char *pbyBSSID, BOOL bRSNCapExist, - WORD wRSNCap + unsigned short wRSNCap ); void * @@ -163,8 +163,8 @@ CARDbSetQuiet ( BOOL bResetQuiet, BYTE byQuietCount, BYTE byQuietPeriod, - WORD wQuietDuration, - WORD wQuietOffset + unsigned short wQuietDuration, + unsigned short wQuietOffset ); BOOL diff --git a/drivers/staging/vt6655/datarate.c b/drivers/staging/vt6655/datarate.c index 2a5acbea8fc8..23591a036487 100644 --- a/drivers/staging/vt6655/datarate.c +++ b/drivers/staging/vt6655/datarate.c @@ -51,7 +51,7 @@ /*--------------------- Static Classes ----------------------------*/ - extern WORD TxRate_iwconfig; //2008-5-8 <add> by chester + extern unsigned short TxRate_iwconfig; //2008-5-8 <add> by chester /*--------------------- Static Variables --------------------------*/ //static int msglevel =MSG_LEVEL_DEBUG; static int msglevel =MSG_LEVEL_INFO; @@ -158,12 +158,12 @@ DATARATEbyGetRateIdx ( * Return Value: RateIdx * -*/ -WORD +unsigned short wGetRateIdx( BYTE byRate ) { - WORD ii; + unsigned short ii; //Erase basicRate flag. byRate = byRate & 0x7F;//0111 1111 @@ -211,7 +211,7 @@ PSDevice pDevice = (PSDevice) pDeviceHandler; unsigned int ii; BYTE byHighSuppRate = 0; BYTE byRate = 0; -WORD wOldBasicRate = pDevice->wBasicRate; +unsigned short wOldBasicRate = pDevice->wBasicRate; unsigned int uRateLen; @@ -314,13 +314,13 @@ RATEvTxRateFallBack ( ) { PSDevice pDevice = (PSDevice) pDeviceHandler; -WORD wIdxDownRate = 0; +unsigned short wIdxDownRate = 0; unsigned int ii; //unsigned long dwRateTable[MAX_RATE] = {1, 2, 5, 11, 6, 9, 12, 18, 24, 36, 48, 54}; BOOL bAutoRate[MAX_RATE] = {TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE}; unsigned long dwThroughputTbl[MAX_RATE] = {10, 20, 55, 110, 60, 90, 120, 180, 240, 360, 480, 540}; unsigned long dwThroughput = 0; -WORD wIdxUpRate = 0; + unsigned short wIdxUpRate = 0; unsigned long dwTxDiff = 0; if (pDevice->pMgmt->eScanState != WMAC_NO_SCANNING) { @@ -347,7 +347,7 @@ WORD wIdxUpRate = 0; for(ii=0;ii<MAX_RATE;ii++) { if (psNodeDBTable->wSuppRate & (0x0001<<ii)) { if (bAutoRate[ii] == TRUE) { - wIdxUpRate = (WORD) ii; + wIdxUpRate = (unsigned short) ii; } } else { bAutoRate[ii] = FALSE; @@ -374,7 +374,7 @@ WORD wIdxUpRate = 0; if ( (dwThroughputTbl[ii] > dwThroughput) && (bAutoRate[ii]==TRUE) ) { dwThroughput = dwThroughputTbl[ii]; - wIdxDownRate = (WORD) ii; + wIdxDownRate = (unsigned short) ii; } } psNodeDBTable->wTxDataRate = wIdxDownRate; diff --git a/drivers/staging/vt6655/datarate.h b/drivers/staging/vt6655/datarate.h index dc4baed51d49..fba250c3b986 100644 --- a/drivers/staging/vt6655/datarate.h +++ b/drivers/staging/vt6655/datarate.h @@ -80,7 +80,7 @@ RATEuSetIE( unsigned int uRateLen ); -WORD +unsigned short wGetRateIdx( BYTE byRate ); diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h index 94ccfce84186..d1fcf46429bf 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]; diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 39f67007d3cc..c9599243bb6a 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -282,7 +282,7 @@ typedef struct tagSQuietControl { BOOL bEnable; unsigned long dwStartTime; BYTE byPeriod; - WORD wDuration; + unsigned short wDuration; } SQuietControl, *PSQuietControl; //-- @@ -303,7 +303,7 @@ typedef enum { // The receive duplicate detection cache entry typedef struct tagSCacheEntry{ - WORD wFmSequence; + unsigned short wFmSequence; BYTE abyAddr2[ETH_ALEN]; } SCacheEntry, *PSCacheEntry; @@ -319,8 +319,8 @@ typedef struct tagSCache{ // DeFragment Control Block, used for collecting fragments prior to reassembly typedef struct tagSDeFragControlBlock { - WORD wSequence; - WORD wFragNum; + unsigned short wSequence; + unsigned short wFragNum; BYTE abyAddr2[ETH_ALEN]; unsigned int uLifetime; struct sk_buff* skb; @@ -430,8 +430,8 @@ typedef struct __device_info { u32 io_size; BYTE byRevId; - WORD SubSystemID; - WORD SubVendorID; + unsigned short SubSystemID; + unsigned short SubVendorID; int nTxQueues; volatile int iTDUsed[TYPE_MAXTD]; @@ -525,7 +525,7 @@ typedef struct __device_info { VIA_BB_TYPE byBBType; //0: 11A, 1:11B, 2:11G VIA_PKT_TYPE byPacketType; //0:11a,1:11b,2:11gb(only CCK in BasicRate),3:11ga(OFDM in Basic Rate) - WORD wBasicRate; + unsigned short wBasicRate; BYTE byACKRate; BYTE byTopOFDMBasicRate; BYTE byTopCCKBasicRate; @@ -537,20 +537,20 @@ typedef struct __device_info { BYTE byPreambleType; BYTE byShortPreamble; - WORD wCurrentRate; - WORD wRTSThreshold; - WORD wFragmentationThreshold; + unsigned short wCurrentRate; + unsigned short wRTSThreshold; + unsigned short wFragmentationThreshold; BYTE byShortRetryLimit; BYTE byLongRetryLimit; CARD_OP_MODE eOPMode; BYTE byOpMode; BOOL bBSSIDFilter; - WORD wMaxTransmitMSDULifetime; + unsigned short wMaxTransmitMSDULifetime; BYTE abyBSSID[ETH_ALEN]; BYTE abyDesireBSSID[ETH_ALEN]; - WORD wCTSDuration; // update while speed change - WORD wACKDuration; // update while speed change - WORD wRTSTransmitLen; // update while speed change + unsigned short wCTSDuration; // update while speed change + unsigned short wACKDuration; // update while speed change + unsigned short wRTSTransmitLen; // update while speed change BYTE byRTSServiceField; // update while speed change BYTE byRTSSignalField; // update while speed change @@ -565,12 +565,12 @@ typedef struct __device_info { BOOL bBarkerPreambleMd; BYTE byERPFlag; - WORD wUseProtectCntDown; + unsigned short wUseProtectCntDown; BOOL bRadioControlOff; BOOL bRadioOff; BOOL bEnablePSMode; - WORD wListenInterval; + unsigned short wListenInterval; BOOL bPWBitOn; WMAC_POWER_MODE ePSMode; @@ -583,8 +583,8 @@ typedef struct __device_info { BOOL bGPIOBlockRead; // Beacon releated - WORD wSeqCounter; - WORD wBCNBufLen; + unsigned short wSeqCounter; + unsigned short wBCNBufLen; BOOL bBeaconBufReady; BOOL bBeaconSent; BOOL bIsBeaconBufReadySet; @@ -748,7 +748,7 @@ typedef struct __device_info { unsigned long uNumSQ3[MAX_RATE]; - WORD wAntDiversityMaxRate; + unsigned short wAntDiversityMaxRate; SEthernetHeader sTxEthHeader; @@ -790,7 +790,7 @@ typedef struct __device_info { BOOL bCountryInfo5G; BOOL bCountryInfo24G; - WORD wBeaconInterval; + unsigned short wBeaconInterval; //WPA supplicant deamon struct net_device *wpadev; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 1451bdc08d36..7dd866b326e3 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -775,7 +775,7 @@ else if (pDevice->uConnectionRate == RATE_AUTO) { pDevice->wCurrentRate = RATE_54M; } else { - pDevice->wCurrentRate = (WORD)pDevice->uConnectionRate; + pDevice->wCurrentRate = (unsigned short)pDevice->uConnectionRate; } // default G Mode @@ -1753,7 +1753,7 @@ static int device_tx_srv(PSDevice pDevice, unsigned int uIdx) { if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) && (pTD->pTDInfo->byFlags & TD_FLAGS_NETIF_SKB)) { - WORD wAID; + unsigned short wAID; BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; skb = pTD->pTDInfo->skb; @@ -1798,7 +1798,7 @@ static int device_tx_srv(PSDevice pDevice, unsigned int uIdx) { } -static void device_error(PSDevice pDevice, WORD status) { +static void device_error(PSDevice pDevice, unsigned short status) { if (status & ISR_FETALERR) { DBG_PRT(MSG_LEVEL_ERR, KERN_ERR @@ -2176,13 +2176,13 @@ BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeI if (pDevice->uConnectionRate >= RATE_11M) { pDevice->wCurrentRate = RATE_11M; } else { - pDevice->wCurrentRate = (WORD)pDevice->uConnectionRate; + pDevice->wCurrentRate = (unsigned short)pDevice->uConnectionRate; } } else { if (pDevice->uConnectionRate >= RATE_54M) pDevice->wCurrentRate = RATE_54M; else - pDevice->wCurrentRate = (WORD)pDevice->uConnectionRate; + pDevice->wCurrentRate = (unsigned short)pDevice->uConnectionRate; } } else { @@ -2274,7 +2274,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { PSTxDesc pHeadTD, pLastTD; unsigned int uNodeIndex = 0; BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; - WORD wAID; + unsigned short wAID; unsigned int uMACfragNum = 1; unsigned int cbFrameBodySize; BYTE byPktType; @@ -2457,7 +2457,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { if (pDevice->uConnectionRate >= RATE_11M) { pDevice->wCurrentRate = RATE_11M; } else { - pDevice->wCurrentRate = (WORD)pDevice->uConnectionRate; + pDevice->wCurrentRate = (unsigned short)pDevice->uConnectionRate; } } else { if ((pDevice->eCurrentPHYType == PHY_TYPE_11A) && @@ -2467,7 +2467,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { if (pDevice->uConnectionRate >= RATE_54M) pDevice->wCurrentRate = RATE_54M; else - pDevice->wCurrentRate = (WORD)pDevice->uConnectionRate; + pDevice->wCurrentRate = (unsigned short)pDevice->uConnectionRate; } } @@ -2637,7 +2637,7 @@ pDevice->byTopCCKBasicRate,pDevice->byTopOFDMBasicRate); BYTE Protocol_Version; //802.1x Authentication BYTE Packet_Type; //802.1x Authentication BYTE Descriptor_type; - WORD Key_info; + unsigned short Key_info; BOOL bTxeapol_key = FALSE; Protocol_Version = skb->data[ETH_HLEN]; Packet_Type = skb->data[ETH_HLEN+1]; diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c index e994f0a9dd15..91a52e6dc6d1 100644 --- a/drivers/staging/vt6655/dpc.c +++ b/drivers/staging/vt6655/dpc.c @@ -359,7 +359,7 @@ device_receive_frame ( BOOL bIsWEP = FALSE; unsigned int cbHeaderOffset; unsigned int FrameSize; - WORD wEtherType = 0; + unsigned short wEtherType = 0; int iSANodeIndex = -1; int iDANodeIndex = -1; unsigned int ii; @@ -370,7 +370,7 @@ device_receive_frame ( unsigned char *pbySQ; unsigned int cbHeaderSize; PSKeyItem pKey = NULL; - WORD wRxTSC15_0 = 0; + unsigned short wRxTSC15_0 = 0; unsigned long dwRxTSC47_16 = 0; SKeyItem STempKey; // 802.11h RPI @@ -917,12 +917,12 @@ device_receive_frame ( if ((pKey != NULL) && ((pKey->byCipherSuite == KEY_CTL_TKIP) || (pKey->byCipherSuite == KEY_CTL_CCMP))) { if (bIsWEP) { - WORD wLocalTSC15_0 = 0; + unsigned short wLocalTSC15_0 = 0; unsigned long dwLocalTSC47_16 = 0; unsigned long long RSC = 0; // endian issues RSC = *((unsigned long long *) &(pKey->KeyRSC)); - wLocalTSC15_0 = (WORD) RSC; + wLocalTSC15_0 = (unsigned short) RSC; dwLocalTSC47_16 = (unsigned long) (RSC>>16); RSC = dwRxTSC47_16; @@ -1452,7 +1452,7 @@ static BOOL s_bAPModeRxData ( BOOL bRelayAndForward = FALSE; BOOL bRelayOnly = FALSE; BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; - WORD wAID; + unsigned short wAID; struct sk_buff* skbcpy = NULL; diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c index 1c512cede3d8..07273b959449 100644 --- a/drivers/staging/vt6655/hostap.c +++ b/drivers/staging/vt6655/hostap.c @@ -267,7 +267,7 @@ static int hostap_add_sta(PSDevice pDevice, pMgmt->sNodeDBTable[uNodeIndex].bShortPreamble = WLAN_GET_CAP_INFO_SHORTPREAMBLE(pMgmt->sNodeDBTable[uNodeIndex].wCapInfo); - pMgmt->sNodeDBTable[uNodeIndex].wAID = (WORD)param->u.add_sta.aid; + pMgmt->sNodeDBTable[uNodeIndex].wAID = (unsigned short)param->u.add_sta.aid; pMgmt->sNodeDBTable[uNodeIndex].ulLastRxJiffer = jiffies; @@ -480,7 +480,7 @@ static int hostap_set_encryption(PSDevice pDevice, int iNodeIndex = -1; int ii; BOOL bKeyTableFull = FALSE; - WORD wKeyCtl = 0; + unsigned short wKeyCtl = 0; param->u.crypt.err = 0; diff --git a/drivers/staging/vt6655/ioctl.c b/drivers/staging/vt6655/ioctl.c index 9af6c236c883..229aa150f4d6 100644 --- a/drivers/staging/vt6655/ioctl.c +++ b/drivers/staging/vt6655/ioctl.c @@ -635,9 +635,9 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { pNodeList->sNodeList[jj].wAID = pNode->wAID; memcpy(pNodeList->sNodeList[jj].abyMACAddr, pNode->abyMACAddr, WLAN_ADDR_LEN); pNodeList->sNodeList[jj].wTxDataRate = pNode->wTxDataRate; - pNodeList->sNodeList[jj].wInActiveCount = (WORD)pNode->uInActiveCount; - pNodeList->sNodeList[jj].wEnQueueCnt = (WORD)pNode->wEnQueueCnt; - pNodeList->sNodeList[jj].wFlags = (WORD)pNode->dwFlags; + pNodeList->sNodeList[jj].wInActiveCount = (unsigned short)pNode->uInActiveCount; + pNodeList->sNodeList[jj].wEnQueueCnt = (unsigned short)pNode->wEnQueueCnt; + pNodeList->sNodeList[jj].wFlags = (unsigned short)pNode->dwFlags; pNodeList->sNodeList[jj].bPWBitOn = pNode->bPSEnable; pNodeList->sNodeList[jj].byKeyIndex = pNode->byKeyIndex; pNodeList->sNodeList[jj].wWepKeyLength = pNode->uWepKeyLength; @@ -652,7 +652,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { pNodeList->sNodeList[jj].bIsInFallback = pNode->bIsInFallback; pNodeList->sNodeList[jj].uTxFailures = pNode->uTxFailures; pNodeList->sNodeList[jj].uTxAttempts = pNode->uTxAttempts; - pNodeList->sNodeList[jj].wFailureRatio = (WORD)pNode->uFailureRatio; + pNodeList->sNodeList[jj].wFailureRatio = (unsigned short)pNode->uFailureRatio; jj ++; if (jj >= pNodeList->uItem) break; diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c index 31e9d6feeda6..9583874178f0 100644 --- a/drivers/staging/vt6655/iwctl.c +++ b/drivers/staging/vt6655/iwctl.c @@ -45,7 +45,7 @@ #endif #include <net/iw_handler.h> -extern WORD TxRate_iwconfig;//2008-5-8 <add> by chester +extern unsigned short TxRate_iwconfig;//2008-5-8 <add> by chester /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/key.h b/drivers/staging/vt6655/key.h index 1af72895cd20..f825a3e8a16d 100644 --- a/drivers/staging/vt6655/key.h +++ b/drivers/staging/vt6655/key.h @@ -62,7 +62,7 @@ typedef struct tagSKeyItem BYTE abyKey[MAX_KEY_LEN]; QWORD KeyRSC; unsigned long dwTSC47_16; - WORD wTSC15_0; + unsigned short wTSC15_0; BYTE byCipherSuite; BYTE byReserved0; unsigned long dwKeyIndex; @@ -78,10 +78,10 @@ typedef struct tagSKeyTable unsigned long dwGTKeyIndex; // GroupTransmitKey Index BOOL bInUse; //2006-1116-01,<Modify> by NomadZhao - //WORD wKeyCtl; + //unsigned short wKeyCtl; //BOOL bSoftWEP; BOOL bSoftWEP; - WORD wKeyCtl; // for address of wKeyCtl at align 4 + unsigned short wKeyCtl; // for address of wKeyCtl at align 4 BYTE byReserved1[6]; } SKeyTable, *PSKeyTable; //348 diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 4971a03e74b1..1232bfe6d666 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -72,7 +72,7 @@ #include "tether.h" #include "mac.h" -WORD TxRate_iwconfig;//2008-5-8 <add> by chester +unsigned short TxRate_iwconfig;//2008-5-8 <add> by chester /*--------------------- Static Definitions -------------------------*/ //static int msglevel =MSG_LEVEL_DEBUG; static int msglevel =MSG_LEVEL_INFO; @@ -583,7 +583,7 @@ BOOL MACbIsInLoopbackMode (unsigned long dwIoBase) * Return Value: none * */ -void MACvSetPacketFilter (unsigned long dwIoBase, WORD wFilterType) +void MACvSetPacketFilter (unsigned long dwIoBase, unsigned short wFilterType) { BYTE byOldRCR; BYTE byNewRCR = 0; @@ -776,7 +776,7 @@ BOOL MACbCompareContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf) BOOL MACbSoftwareReset (unsigned long dwIoBase) { BYTE byData; - WORD ww; + unsigned short ww; // turn on HOSTCR_SOFTRST, just write 0x01 to reset //MACvRegBitsOn(dwIoBase, MAC_REG_HOSTCR, HOSTCR_SOFTRST); @@ -841,7 +841,7 @@ BOOL MACbSafeSoftwareReset (unsigned long dwIoBase) */ BOOL MACbSafeRxOff (unsigned long dwIoBase) { - WORD ww; + unsigned short ww; unsigned long dwData; BYTE byData; @@ -902,7 +902,7 @@ BOOL MACbSafeRxOff (unsigned long dwIoBase) */ BOOL MACbSafeTxOff (unsigned long dwIoBase) { - WORD ww; + unsigned short ww; unsigned long dwData; BYTE byData; @@ -1081,7 +1081,7 @@ void MACvInitialize (unsigned long dwIoBase) */ void MACvSetCurrRx0DescAddr (unsigned long dwIoBase, unsigned long dwCurrDescAddr) { -WORD ww; +unsigned short ww; BYTE byData; BYTE byOrgDMACtl; @@ -1119,7 +1119,7 @@ BYTE byOrgDMACtl; */ void MACvSetCurrRx1DescAddr (unsigned long dwIoBase, unsigned long dwCurrDescAddr) { -WORD ww; +unsigned short ww; BYTE byData; BYTE byOrgDMACtl; @@ -1157,7 +1157,7 @@ BYTE byOrgDMACtl; */ void MACvSetCurrTx0DescAddrEx (unsigned long dwIoBase, unsigned long dwCurrDescAddr) { -WORD ww; +unsigned short ww; BYTE byData; BYTE byOrgDMACtl; @@ -1196,7 +1196,7 @@ BYTE byOrgDMACtl; //TxDMA1 = AC0DMA void MACvSetCurrAC0DescAddrEx (unsigned long dwIoBase, unsigned long dwCurrDescAddr) { -WORD ww; +unsigned short ww; BYTE byData; BYTE byOrgDMACtl; @@ -1309,7 +1309,7 @@ void MACvOneShotTimer1MicroSec (unsigned long dwIoBase, unsigned int uDelayTime) } -void MACvSetMISCFifo (unsigned long dwIoBase, WORD wOffset, unsigned long dwData) +void MACvSetMISCFifo (unsigned long dwIoBase, unsigned short wOffset, unsigned long dwData) { if (wOffset > 273) return; @@ -1455,10 +1455,10 @@ BOOL MACbPSWakeup (unsigned long dwIoBase) * */ -void MACvSetKeyEntry (unsigned long dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, +void MACvSetKeyEntry (unsigned long dwIoBase, unsigned short wKeyCtl, unsigned int uEntryIdx, unsigned int uKeyIdx, unsigned char *pbyAddr, unsigned long *pdwKey, BYTE byLocalID) { -WORD wOffset; +unsigned short wOffset; unsigned long dwData; int ii; @@ -1524,7 +1524,7 @@ int ii; */ void MACvDisableKeyEntry (unsigned long dwIoBase, unsigned int uEntryIdx) { -WORD wOffset; +unsigned short wOffset; wOffset = MISCFIFO_KEYETRY0; wOffset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE); @@ -1553,7 +1553,7 @@ WORD wOffset; void MACvSetDefaultKeyEntry (unsigned long dwIoBase, unsigned int uKeyLen, unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID) { -WORD wOffset; +unsigned short wOffset; unsigned long dwData; int ii; @@ -1603,7 +1603,7 @@ int ii; /* void MACvEnableDefaultKey (unsigned long dwIoBase, BYTE byLocalID) { -WORD wOffset; +unsigned short wOffset; unsigned long dwData; @@ -1638,7 +1638,7 @@ unsigned long dwData; */ void MACvDisableDefaultKey (unsigned long dwIoBase) { -WORD wOffset; +unsigned short wOffset; unsigned long dwData; @@ -1669,7 +1669,7 @@ unsigned long dwData; void MACvSetDefaultTKIPKeyEntry (unsigned long dwIoBase, unsigned int uKeyLen, unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID) { -WORD wOffset; +unsigned short wOffset; unsigned long dwData; int ii; @@ -1723,9 +1723,9 @@ int ii; * */ -void MACvSetDefaultKeyCtl (unsigned long dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, BYTE byLocalID) +void MACvSetDefaultKeyCtl (unsigned long dwIoBase, unsigned short wKeyCtl, unsigned int uEntryIdx, BYTE byLocalID) { -WORD wOffset; +unsigned short wOffset; unsigned long dwData; if (byLocalID <= 1) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 3573b23b9f4b..c83b8f81a8b2 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -670,7 +670,7 @@ #define MACvWordRegBitsOn(dwIoBase, byRegOfs, wBits) \ { \ - WORD wData; \ + unsigned short wData; \ VNSvInPortW(dwIoBase + byRegOfs, &wData); \ VNSvOutPortW(dwIoBase + byRegOfs, wData | (wBits)); \ } @@ -699,7 +699,7 @@ #define MACvWordRegBitsOff(dwIoBase, byRegOfs, wBits) \ { \ - WORD wData; \ + unsigned short wData; \ VNSvInPortW(dwIoBase + byRegOfs, &wData); \ VNSvOutPortW(dwIoBase + byRegOfs, wData & ~(wBits)); \ } @@ -1074,7 +1074,7 @@ /*--------------------- Export Functions --------------------------*/ -extern WORD TxRate_iwconfig;//2008-5-8 <add> by chester +extern unsigned short TxRate_iwconfig;//2008-5-8 <add> by chester void MACvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyMacRegs); BOOL MACbIsRegBitsOn(unsigned long dwIoBase, BYTE byRegOfs, BYTE byTestBits); @@ -1105,7 +1105,7 @@ void MACvGetLongRetryLimit(unsigned long dwIoBase, unsigned char *pbyRetryLimit) void MACvSetLoopbackMode(unsigned long dwIoBase, BYTE byLoopbackMode); BOOL MACbIsInLoopbackMode(unsigned long dwIoBase); -void MACvSetPacketFilter(unsigned long dwIoBase, WORD wFilterType); +void MACvSetPacketFilter(unsigned long dwIoBase, unsigned short wFilterType); void MACvSaveContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); void MACvRestoreContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); @@ -1129,7 +1129,7 @@ void MACvTimer0MicroSDelay(unsigned long dwIoBase, unsigned int uDelay); void MACvOneShotTimer0MicroSec(unsigned long dwIoBase, unsigned int uDelayTime); void MACvOneShotTimer1MicroSec(unsigned long dwIoBase, unsigned int uDelayTime); -void MACvSetMISCFifo(unsigned long dwIoBase, WORD wOffset, unsigned long dwData); +void MACvSetMISCFifo(unsigned long dwIoBase, unsigned short wOffset, unsigned long dwData); BOOL MACbTxDMAOff (unsigned long dwIoBase, unsigned int idx); @@ -1139,7 +1139,7 @@ void MACvEnableBusSusEn(unsigned long dwIoBase); BOOL MACbFlushSYNCFifo(unsigned long dwIoBase); BOOL MACbPSWakeup(unsigned long dwIoBase); -void MACvSetKeyEntry(unsigned long dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, +void MACvSetKeyEntry(unsigned long dwIoBase, unsigned short wKeyCtl, unsigned int uEntryIdx, unsigned int uKeyIdx, unsigned char *pbyAddr, unsigned long *pdwKey, BYTE byLocalID); void MACvDisableKeyEntry(unsigned long dwIoBase, unsigned int uEntryIdx); void MACvSetDefaultKeyEntry(unsigned long dwIoBase, unsigned int uKeyLen, @@ -1148,7 +1148,7 @@ void MACvSetDefaultKeyEntry(unsigned long dwIoBase, unsigned int uKeyLen, void MACvDisableDefaultKey(unsigned long dwIoBase); void MACvSetDefaultTKIPKeyEntry(unsigned long dwIoBase, unsigned int uKeyLen, unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID); -void MACvSetDefaultKeyCtl(unsigned long dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, BYTE byLocalID); +void MACvSetDefaultKeyCtl(unsigned long dwIoBase, unsigned short wKeyCtl, unsigned int uEntryIdx, BYTE byLocalID); #endif // __MAC_H__ diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c index a2491d3d0a8a..3debc8986cd0 100644 --- a/drivers/staging/vt6655/power.c +++ b/drivers/staging/vt6655/power.c @@ -77,12 +77,12 @@ static int msglevel =MSG_LEVEL_INFO; void PSvEnablePowerSaving( void *hDeviceContext, - WORD wListenInterval + unsigned short wListenInterval ) { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = pDevice->pMgmt; - WORD wAID = pMgmt->wCurrAID | BIT14 | BIT15; + unsigned short wAID = pMgmt->wCurrAID | BIT14 | BIT15; // set period of power up before TBTT VNSvOutPortW(pDevice->PortOffset + MAC_REG_PWBT, C_PWBT); @@ -350,7 +350,7 @@ PSbSendNullPacket( } if(pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) { - pTxPacket->p80211Header->sA3.wFrameCtl |= cpu_to_le16((WORD)WLAN_SET_FC_TODS(1)); + pTxPacket->p80211Header->sA3.wFrameCtl |= cpu_to_le16((unsigned short)WLAN_SET_FC_TODS(1)); } memcpy(pTxPacket->p80211Header->sA3.abyAddr1, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN); diff --git a/drivers/staging/vt6655/power.h b/drivers/staging/vt6655/power.h index c0dbe216e977..61196bc6f9c5 100644 --- a/drivers/staging/vt6655/power.h +++ b/drivers/staging/vt6655/power.h @@ -63,7 +63,7 @@ PSvDisablePowerSaving( void PSvEnablePowerSaving( void *hDeviceContext, - WORD wListenInterval + unsigned short wListenInterval ); void diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index c126e26e0b5a..9122bb1069d1 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -624,7 +624,7 @@ BOOL s_bAL7230SelectChannel (unsigned long dwIoBase, BYTE byChannel) */ BOOL IFRFbWriteEmbeded (unsigned long dwIoBase, unsigned long dwData) { - WORD ww; + unsigned short ww; unsigned long dwValue; VNSvOutPortD(dwIoBase + MAC_REG_IFREGCTL, dwData); @@ -932,11 +932,11 @@ BOOL RFvWriteWakeProgSyn (unsigned long dwIoBase, BYTE byRFType, unsigned int uC } for (ii = 0; ii < CB_AL2230_INIT_SEQ; ii++ ) { - MACvSetMISCFifo(dwIoBase, (WORD)(MISCFIFO_SYNDATA_IDX + ii), dwAL2230InitTable[ii]); + MACvSetMISCFifo(dwIoBase, (unsigned short)(MISCFIFO_SYNDATA_IDX + ii), dwAL2230InitTable[ii]); } - MACvSetMISCFifo(dwIoBase, (WORD)(MISCFIFO_SYNDATA_IDX + ii), dwAL2230ChannelTable0[uChannel-1]); + MACvSetMISCFifo(dwIoBase, (unsigned short)(MISCFIFO_SYNDATA_IDX + ii), dwAL2230ChannelTable0[uChannel-1]); ii ++; - MACvSetMISCFifo(dwIoBase, (WORD)(MISCFIFO_SYNDATA_IDX + ii), dwAL2230ChannelTable1[uChannel-1]); + MACvSetMISCFifo(dwIoBase, (unsigned short)(MISCFIFO_SYNDATA_IDX + ii), dwAL2230ChannelTable1[uChannel-1]); break; //{{ RobertYu: 20050104 @@ -951,21 +951,21 @@ BOOL RFvWriteWakeProgSyn (unsigned long dwIoBase, BYTE byRFType, unsigned int uC if (uChannel <= CB_MAX_CHANNEL_24G) { for (ii = 0; ii < CB_AL7230_INIT_SEQ; ii++ ) { - MACvSetMISCFifo(dwIoBase, (WORD)(MISCFIFO_SYNDATA_IDX + ii), dwAL7230InitTable[ii]); + MACvSetMISCFifo(dwIoBase, (unsigned short)(MISCFIFO_SYNDATA_IDX + ii), dwAL7230InitTable[ii]); } } else { for (ii = 0; ii < CB_AL7230_INIT_SEQ; ii++ ) { - MACvSetMISCFifo(dwIoBase, (WORD)(MISCFIFO_SYNDATA_IDX + ii), dwAL7230InitTableAMode[ii]); + MACvSetMISCFifo(dwIoBase, (unsigned short)(MISCFIFO_SYNDATA_IDX + ii), dwAL7230InitTableAMode[ii]); } } - MACvSetMISCFifo(dwIoBase, (WORD)(MISCFIFO_SYNDATA_IDX + ii), dwAL7230ChannelTable0[uChannel-1]); + MACvSetMISCFifo(dwIoBase, (unsigned short)(MISCFIFO_SYNDATA_IDX + ii), dwAL7230ChannelTable0[uChannel-1]); ii ++; - MACvSetMISCFifo(dwIoBase, (WORD)(MISCFIFO_SYNDATA_IDX + ii), dwAL7230ChannelTable1[uChannel-1]); + MACvSetMISCFifo(dwIoBase, (unsigned short)(MISCFIFO_SYNDATA_IDX + ii), dwAL7230ChannelTable1[uChannel-1]); ii ++; - MACvSetMISCFifo(dwIoBase, (WORD)(MISCFIFO_SYNDATA_IDX + ii), dwAL7230ChannelTable2[uChannel-1]); + MACvSetMISCFifo(dwIoBase, (unsigned short)(MISCFIFO_SYNDATA_IDX + ii), dwAL7230ChannelTable2[uChannel-1]); break; //}} RobertYu diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 6664d78e8db6..8e5e88833729 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -80,16 +80,16 @@ static int msglevel =MSG_LEVEL_INFO; #define CRITICAL_PACKET_LEN 256 // if packet size < 256 -> in-direct send // packet size >= 256 -> direct send -const WORD wTimeStampOff[2][MAX_RATE] = { +const unsigned short wTimeStampOff[2][MAX_RATE] = { {384, 288, 226, 209, 54, 43, 37, 31, 28, 25, 24, 23}, // Long Preamble {384, 192, 130, 113, 54, 43, 37, 31, 28, 25, 24, 23}, // Short Preamble }; -const WORD wFB_Opt0[2][5] = { +const unsigned short wFB_Opt0[2][5] = { {RATE_12M, RATE_18M, RATE_24M, RATE_36M, RATE_48M}, // fallback_rate0 {RATE_12M, RATE_12M, RATE_18M, RATE_24M, RATE_36M}, // fallback_rate1 }; -const WORD wFB_Opt1[2][5] = { +const unsigned short wFB_Opt1[2][5] = { {RATE_12M, RATE_18M, RATE_24M, RATE_24M, RATE_36M}, // fallback_rate0 {RATE_6M , RATE_6M, RATE_12M, RATE_12M, RATE_18M}, // fallback_rate1 }; @@ -122,7 +122,7 @@ s_vFillTxKey( unsigned char *pbyIVHead, PSKeyItem pTransmitKey, unsigned char *pbyHdrBuf, - WORD wPayloadLen, + unsigned short wPayloadLen, unsigned char *pMICHDR ); @@ -138,7 +138,7 @@ s_vFillRTSHead( BOOL bNeedAck, BOOL bDisCRC, PSEthernetHeader psEthHeader, - WORD wCurrentRate, + unsigned short wCurrentRate, BYTE byFBOption ); @@ -155,7 +155,7 @@ s_vGenerateTxParameter( BOOL bNeedACK, unsigned int uDMAIdx, PSEthernetHeader psEthHeader, - WORD wCurrentRate + unsigned short wCurrentRate ); @@ -165,7 +165,7 @@ static void s_vFillFragParameter( unsigned char *pbyBuffer, unsigned int uTxType, void * pvtdCurr, - WORD wFragType, + unsigned short wFragType, unsigned int cbReqCount ); @@ -201,7 +201,7 @@ s_uFillDataHead ( unsigned int cbLastFragmentSize, unsigned int uMACfragNum, BYTE byFBOption, - WORD wCurrentRate + unsigned short wCurrentRate ); @@ -217,13 +217,13 @@ s_vFillTxKey ( unsigned char *pbyIVHead, PSKeyItem pTransmitKey, unsigned char *pbyHdrBuf, - WORD wPayloadLen, + unsigned short wPayloadLen, unsigned char *pMICHDR ) { unsigned long *pdwIV = (unsigned long *) pbyIVHead; unsigned long *pdwExtIV = (unsigned long *) ((unsigned char *)pbyIVHead+4); - WORD wValue; + unsigned short wValue; PS802_11Header pMACHeader = (PS802_11Header)pbyHdrBuf; unsigned long dwRevIVCounter; BYTE byKeyIndex = 0; @@ -285,7 +285,7 @@ s_vFillTxKey ( // Make IV *pdwIV = 0; *(pbyIVHead+3) = (BYTE)(((byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV - *pdwIV |= cpu_to_le16((WORD)(pTransmitKey->wTSC15_0)); + *pdwIV |= cpu_to_le16((unsigned short)(pTransmitKey->wTSC15_0)); //Append IV&ExtIV after Mac Header *pdwExtIV = cpu_to_le32(pTransmitKey->dwTSC47_16); @@ -333,7 +333,7 @@ s_vSWencryption ( PSDevice pDevice, PSKeyItem pTransmitKey, unsigned char *pbyPayloadHead, - WORD wPayloadSize + unsigned short wPayloadSize ) { unsigned int cbICVlen = 4; @@ -382,7 +382,7 @@ s_uGetTxRsvTime ( PSDevice pDevice, BYTE byPktType, unsigned int cbFrameLength, - WORD wRate, + unsigned short wRate, BOOL bNeedAck ) { @@ -393,9 +393,9 @@ s_uGetTxRsvTime ( //printk("s_uGetTxRsvTime is %d\n",uDataTime); #endif if (byPktType == PK_TYPE_11B) {//llb,CCK mode - uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, (WORD)pDevice->byTopCCKBasicRate); + uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopCCKBasicRate); } else {//11g 2.4G OFDM mode & 11a 5G OFDM mode - uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, (WORD)pDevice->byTopOFDMBasicRate); + uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopOFDMBasicRate); } if (bNeedAck) { @@ -414,7 +414,7 @@ s_uGetRTSCTSRsvTime ( BYTE byRTSRsvType, BYTE byPktType, unsigned int cbFrameLength, - WORD wCurrentRate + unsigned short wCurrentRate ) { unsigned int uRrvTime , uRTSTime, uCTSTime, uAckTime, uDataTime; @@ -456,7 +456,7 @@ s_uGetDataDuration ( BYTE byDurType, unsigned int cbFrameLength, BYTE byPktType, - WORD wRate, + unsigned short wRate, BOOL bNeedAck, unsigned int uFragIdx, unsigned int cbLastFragmentSize, @@ -627,7 +627,7 @@ s_uGetRTSCTSDuration ( BYTE byDurType, unsigned int cbFrameLength, BYTE byPktType, - WORD wRate, + unsigned short wRate, BOOL bNeedAck, BYTE byFBOption ) @@ -731,10 +731,10 @@ s_uFillDataHead ( unsigned int cbLastFragmentSize, unsigned int uMACfragNum, BYTE byFBOption, - WORD wCurrentRate + unsigned short wCurrentRate ) { - WORD wLen = 0x0000; + unsigned short wLen = 0x0000; if (pTxDataHead == NULL) { return 0; @@ -753,11 +753,11 @@ s_uFillDataHead ( ); pBuf->wTransmitLength_b = cpu_to_le16(wLen); //Get Duration and TimeStamp - pBuf->wDuration_a = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, + pBuf->wDuration_a = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz - pBuf->wDuration_b = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, + pBuf->wDuration_b = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4 @@ -779,13 +779,13 @@ s_uFillDataHead ( ); pBuf->wTransmitLength_b = cpu_to_le16(wLen); //Get Duration and TimeStamp - pBuf->wDuration_a = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, + pBuf->wDuration_a = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz - pBuf->wDuration_b = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, PK_TYPE_11B, + pBuf->wDuration_b = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz - pBuf->wDuration_a_f0 = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A_F0, cbFrameLength, byPktType, + pBuf->wDuration_a_f0 = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz - pBuf->wDuration_a_f1 = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A_F1, cbFrameLength, byPktType, + pBuf->wDuration_a_f1 = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz pBuf->wTimeStampOff_a = cpu_to_le16(wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE]); @@ -805,11 +805,11 @@ s_uFillDataHead ( pBuf->wTransmitLength = cpu_to_le16(wLen); //Get Duration and TimeStampOff - pBuf->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, + pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //0: 5GHz - pBuf->wDuration_f0 = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A_F0, cbFrameLength, byPktType, + pBuf->wDuration_f0 = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //0: 5GHz - pBuf->wDuration_f1 = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A_F1, cbFrameLength, byPktType, + pBuf->wDuration_f1 = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //0: 5GHz pBuf->wTimeStampOff = cpu_to_le16(wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE]); return (pBuf->wDuration); @@ -822,7 +822,7 @@ s_uFillDataHead ( pBuf->wTransmitLength = cpu_to_le16(wLen); //Get Duration and TimeStampOff - pBuf->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, + pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); @@ -839,7 +839,7 @@ s_uFillDataHead ( ); pBuf->wTransmitLength = cpu_to_le16(wLen); //Get Duration and TimeStampOff - pBuf->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, byPktType, + pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, byPktType, wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); @@ -860,12 +860,12 @@ s_vFillRTSHead ( BOOL bNeedAck, BOOL bDisCRC, PSEthernetHeader psEthHeader, - WORD wCurrentRate, + unsigned short wCurrentRate, BYTE byFBOption ) { unsigned int uRTSFrameLen = 20; - WORD wLen = 0x0000; + unsigned short wLen = 0x0000; if (pvRTS == NULL) return; @@ -891,9 +891,9 @@ s_vFillRTSHead ( ); pBuf->wTransmitLength_a = cpu_to_le16(wLen); //Get Duration - pBuf->wDuration_bb = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData - pBuf->wDuration_aa = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3: 2.4G OFDMData - pBuf->wDuration_ba = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //1:RTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data + pBuf->wDuration_bb = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData + pBuf->wDuration_aa = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3: 2.4G OFDMData + pBuf->wDuration_ba = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //1:RTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data pBuf->Data.wDurationID = pBuf->wDuration_aa; //Get RTS Frame body @@ -925,13 +925,13 @@ s_vFillRTSHead ( pBuf->wTransmitLength_a = cpu_to_le16(wLen); //Get Duration - pBuf->wDuration_bb = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData - pBuf->wDuration_aa = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3:2.4G OFDMData - pBuf->wDuration_ba = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //1:RTSDuration_ba, 1:2.4G, 2,3:2.4G OFDMData - pBuf->wRTSDuration_ba_f0 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //4:wRTSDuration_ba_f0, 1:2.4G, 1:CCKData - pBuf->wRTSDuration_aa_f0 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //5:wRTSDuration_aa_f0, 1:2.4G, 1:CCKData - pBuf->wRTSDuration_ba_f1 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //6:wRTSDuration_ba_f1, 1:2.4G, 1:CCKData - pBuf->wRTSDuration_aa_f1 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //7:wRTSDuration_aa_f1, 1:2.4G, 1:CCKData + pBuf->wDuration_bb = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData + pBuf->wDuration_aa = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3:2.4G OFDMData + pBuf->wDuration_ba = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //1:RTSDuration_ba, 1:2.4G, 2,3:2.4G OFDMData + pBuf->wRTSDuration_ba_f0 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //4:wRTSDuration_ba_f0, 1:2.4G, 1:CCKData + pBuf->wRTSDuration_aa_f0 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //5:wRTSDuration_aa_f0, 1:2.4G, 1:CCKData + pBuf->wRTSDuration_ba_f1 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //6:wRTSDuration_ba_f1, 1:2.4G, 1:CCKData + pBuf->wRTSDuration_aa_f1 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //7:wRTSDuration_aa_f1, 1:2.4G, 1:CCKData pBuf->Data.wDurationID = pBuf->wDuration_aa; //Get RTS Frame body pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 @@ -962,7 +962,7 @@ s_vFillRTSHead ( ); pBuf->wTransmitLength = cpu_to_le16(wLen); //Get Duration - pBuf->wDuration = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData + pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData pBuf->Data.wDurationID = pBuf->wDuration; //Get RTS Frame body pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 @@ -991,9 +991,9 @@ s_vFillRTSHead ( ); pBuf->wTransmitLength = cpu_to_le16(wLen); //Get Duration - pBuf->wDuration = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData - pBuf->wRTSDuration_f0 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //5:RTSDuration_aa_f0, 0:5G, 0: 5G OFDMData - pBuf->wRTSDuration_f1 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //7:RTSDuration_aa_f1, 0:5G, 0: + pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData + pBuf->wRTSDuration_f0 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //5:RTSDuration_aa_f0, 0:5G, 0: 5G OFDMData + pBuf->wRTSDuration_f1 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //7:RTSDuration_aa_f1, 0:5G, 0: pBuf->Data.wDurationID = pBuf->wDuration; //Get RTS Frame body pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 @@ -1021,7 +1021,7 @@ s_vFillRTSHead ( ); pBuf->wTransmitLength = cpu_to_le16(wLen); //Get Duration - pBuf->wDuration = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData + pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData pBuf->Data.wDurationID = pBuf->wDuration; //Get RTS Frame body pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 @@ -1054,12 +1054,12 @@ s_vFillCTSHead ( unsigned int cbFrameLength, BOOL bNeedAck, BOOL bDisCRC, - WORD wCurrentRate, + unsigned short wCurrentRate, BYTE byFBOption ) { unsigned int uCTSFrameLen = 14; - WORD wLen = 0x0000; + unsigned short wLen = 0x0000; if (pvCTS == NULL) { return; @@ -1083,15 +1083,15 @@ s_vFillCTSHead ( pBuf->wTransmitLength_b = cpu_to_le16(wLen); - pBuf->wDuration_ba = (WORD)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data + pBuf->wDuration_ba = (unsigned short)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data pBuf->wDuration_ba += pDevice->wCTSDuration; pBuf->wDuration_ba = cpu_to_le16(pBuf->wDuration_ba); //Get CTSDuration_ba_f0 - pBuf->wCTSDuration_ba_f0 = (WORD)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //8:CTSDuration_ba_f0, 1:2.4G, 2,3:2.4G OFDM Data + pBuf->wCTSDuration_ba_f0 = (unsigned short)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //8:CTSDuration_ba_f0, 1:2.4G, 2,3:2.4G OFDM Data pBuf->wCTSDuration_ba_f0 += pDevice->wCTSDuration; pBuf->wCTSDuration_ba_f0 = cpu_to_le16(pBuf->wCTSDuration_ba_f0); //Get CTSDuration_ba_f1 - pBuf->wCTSDuration_ba_f1 = (WORD)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //9:CTSDuration_ba_f1, 1:2.4G, 2,3:2.4G OFDM Data + pBuf->wCTSDuration_ba_f1 = (unsigned short)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //9:CTSDuration_ba_f1, 1:2.4G, 2,3:2.4G OFDM Data pBuf->wCTSDuration_ba_f1 += pDevice->wCTSDuration; pBuf->wCTSDuration_ba_f1 = cpu_to_le16(pBuf->wCTSDuration_ba_f1); //Get CTS Frame body @@ -1108,7 +1108,7 @@ s_vFillCTSHead ( ); pBuf->wTransmitLength_b = cpu_to_le16(wLen); //Get CTSDuration_ba - pBuf->wDuration_ba = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data + pBuf->wDuration_ba = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data pBuf->wDuration_ba += pDevice->wCTSDuration; pBuf->wDuration_ba = cpu_to_le16(pBuf->wDuration_ba); @@ -1162,14 +1162,14 @@ s_vGenerateTxParameter ( BOOL bNeedACK, unsigned int uDMAIdx, PSEthernetHeader psEthHeader, - WORD wCurrentRate + unsigned short wCurrentRate ) { unsigned int cbMACHdLen = WLAN_HDR_ADDR3_LEN; //24 - WORD wFifoCtl; + unsigned short wFifoCtl; BOOL bDisCRC = FALSE; BYTE byFBOption = AUTO_FB_NONE; -// WORD wCurrentRate = pDevice->wCurrentRate; +// unsigned short wCurrentRate = pDevice->wCurrentRate; //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vGenerateTxParameter...\n"); PSTxBufHead pFifoHead = (PSTxBufHead)pTxBufHead; @@ -1196,11 +1196,11 @@ s_vGenerateTxParameter ( //Fill RsvTime if (pvRrvTime) { PSRrvTime_gRTS pBuf = (PSRrvTime_gRTS)pvRrvTime; - pBuf->wRTSTxRrvTime_aa = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 2, byPktType, cbFrameSize, wCurrentRate));//2:RTSTxRrvTime_aa, 1:2.4GHz - pBuf->wRTSTxRrvTime_ba = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 1, byPktType, cbFrameSize, wCurrentRate));//1:RTSTxRrvTime_ba, 1:2.4GHz - pBuf->wRTSTxRrvTime_bb = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 0, byPktType, cbFrameSize, wCurrentRate));//0:RTSTxRrvTime_bb, 1:2.4GHz - pBuf->wTxRrvTime_a = cpu_to_le16((WORD) s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//2.4G OFDM - pBuf->wTxRrvTime_b = cpu_to_le16((WORD) s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK));//1:CCK + pBuf->wRTSTxRrvTime_aa = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 2, byPktType, cbFrameSize, wCurrentRate));//2:RTSTxRrvTime_aa, 1:2.4GHz + pBuf->wRTSTxRrvTime_ba = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 1, byPktType, cbFrameSize, wCurrentRate));//1:RTSTxRrvTime_ba, 1:2.4GHz + pBuf->wRTSTxRrvTime_bb = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 0, byPktType, cbFrameSize, wCurrentRate));//0:RTSTxRrvTime_bb, 1:2.4GHz + pBuf->wTxRrvTime_a = cpu_to_le16((unsigned short) s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//2.4G OFDM + pBuf->wTxRrvTime_b = cpu_to_le16((unsigned short) s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK));//1:CCK } //Fill RTS s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); @@ -1210,9 +1210,9 @@ s_vGenerateTxParameter ( //Fill RsvTime if (pvRrvTime) { PSRrvTime_gCTS pBuf = (PSRrvTime_gCTS)pvRrvTime; - pBuf->wTxRrvTime_a = cpu_to_le16((WORD)s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//2.4G OFDM - pBuf->wTxRrvTime_b = cpu_to_le16((WORD)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK));//1:CCK - pBuf->wCTSTxRrvTime_ba = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 3, byPktType, cbFrameSize, wCurrentRate));//3:CTSTxRrvTime_Ba, 1:2.4GHz + pBuf->wTxRrvTime_a = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//2.4G OFDM + pBuf->wTxRrvTime_b = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK));//1:CCK + pBuf->wCTSTxRrvTime_ba = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 3, byPktType, cbFrameSize, wCurrentRate));//3:CTSTxRrvTime_Ba, 1:2.4GHz } @@ -1226,8 +1226,8 @@ s_vGenerateTxParameter ( //Fill RsvTime if (pvRrvTime) { PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime; - pBuf->wRTSTxRrvTime = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 2, byPktType, cbFrameSize, wCurrentRate));//2:RTSTxRrvTime_aa, 0:5GHz - pBuf->wTxRrvTime = cpu_to_le16((WORD)s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//0:OFDM + pBuf->wRTSTxRrvTime = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 2, byPktType, cbFrameSize, wCurrentRate));//2:RTSTxRrvTime_aa, 0:5GHz + pBuf->wTxRrvTime = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//0:OFDM } //Fill RTS s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); @@ -1236,7 +1236,7 @@ s_vGenerateTxParameter ( //Fill RsvTime if (pvRrvTime) { PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime; - pBuf->wTxRrvTime = cpu_to_le16((WORD)s_uGetTxRsvTime(pDevice, PK_TYPE_11A, cbFrameSize, wCurrentRate, bNeedACK)); //0:OFDM + pBuf->wTxRrvTime = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, PK_TYPE_11A, cbFrameSize, wCurrentRate, bNeedACK)); //0:OFDM } } } @@ -1246,8 +1246,8 @@ s_vGenerateTxParameter ( //Fill RsvTime if (pvRrvTime) { PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime; - pBuf->wRTSTxRrvTime = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 0, byPktType, cbFrameSize, wCurrentRate));//0:RTSTxRrvTime_bb, 1:2.4GHz - pBuf->wTxRrvTime = cpu_to_le16((WORD)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK));//1:CCK + pBuf->wRTSTxRrvTime = cpu_to_le16((unsigned short)s_uGetRTSCTSRsvTime(pDevice, 0, byPktType, cbFrameSize, wCurrentRate));//0:RTSTxRrvTime_bb, 1:2.4GHz + pBuf->wTxRrvTime = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK));//1:CCK } //Fill RTS s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); @@ -1256,7 +1256,7 @@ s_vGenerateTxParameter ( //Fill RsvTime if (pvRrvTime) { PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime; - pBuf->wTxRrvTime = cpu_to_le16((WORD)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK)); //1:CCK + pBuf->wTxRrvTime = cpu_to_le16((unsigned short)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK)); //1:CCK } } } @@ -1264,7 +1264,7 @@ s_vGenerateTxParameter ( } /* unsigned char *pbyBuffer,//point to pTxBufHead - WORD wFragType,//00:Non-Frag, 01:Start, 02:Mid, 03:Last + unsigned short wFragType,//00:Non-Frag, 01:Start, 02:Mid, 03:Last unsigned int cbFragmentSize,//Hdr+payoad+FCS */ static @@ -1274,7 +1274,7 @@ s_vFillFragParameter( unsigned char *pbyBuffer, unsigned int uTxType, void * pvtdCurr, - WORD wFragType, + unsigned short wFragType, unsigned int cbReqCount ) { @@ -1289,7 +1289,7 @@ s_vFillFragParameter( ptdCurr->m_wFIFOCtl = pTxBufHead->wFIFOCtl; ptdCurr->m_wTimeStamp = pTxBufHead->wTimeStamp; //Set TSR1 & ReqCount in TxDescHead - ptdCurr->m_td1TD1.wReqCount = cpu_to_le16((WORD)(cbReqCount)); + ptdCurr->m_td1TD1.wReqCount = cpu_to_le16((unsigned short)(cbReqCount)); if (wFragType == FRAGCTL_ENDFRAG) { //Last Fragmentation ptdCurr->m_td1TD1.byTCR |= (TCR_STP | TCR_EDP | EDMSDU); } @@ -1301,7 +1301,7 @@ s_vFillFragParameter( //PSTxDesc ptdCurr = (PSTxDesc)s_pvGetTxDescHead(pDevice, uTxType, uCurIdx); PSTxDesc ptdCurr = (PSTxDesc)pvtdCurr; //Set TSR1 & ReqCount in TxDescHead - ptdCurr->m_td1TD1.wReqCount = cpu_to_le16((WORD)(cbReqCount)); + ptdCurr->m_td1TD1.wReqCount = cpu_to_le16((unsigned short)(cbReqCount)); if (wFragType == FRAGCTL_ENDFRAG) { //Last Fragmentation ptdCurr->m_td1TD1.byTCR |= (TCR_STP | TCR_EDP | EDMSDU); } @@ -1310,7 +1310,7 @@ s_vFillFragParameter( } } - pTxBufHead->wFragCtl |= (WORD)wFragType;//0x0001; //0000 0000 0000 0001 + pTxBufHead->wFragCtl |= (unsigned short)wFragType;//0x0001; //0000 0000 0000 0001 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vFillFragParameter END\n"); } @@ -1342,7 +1342,7 @@ s_cbFillTxBufHead ( unsigned char *pbyPayloadHead; unsigned char *pbyIVHead; unsigned char *pbyMacHdr; - WORD wFragType; //00:Non-Frag, 01:Start, 10:Mid, 11:Last + unsigned short wFragType; //00:Non-Frag, 01:Start, 10:Mid, 11:Last unsigned int uDuration; unsigned char *pbyBuffer; // unsigned int uKeyEntryIdx = NUM_KEY_ENTRY+1; @@ -1381,7 +1381,7 @@ s_cbFillTxBufHead ( void * pvRTS; void * pvCTS; void * pvTxDataHd; - WORD wTxBufSize; // FFinfo size + unsigned short wTxBufSize; // FFinfo size unsigned int uTotalCopyLength = 0; BYTE byFBOption = AUTO_FB_NONE; BOOL bIsWEP256 = FALSE; @@ -1580,7 +1580,7 @@ s_cbFillTxBufHead ( cbFragmentSize = pDevice->wFragmentationThreshold; cbFragPayloadSize = cbFragmentSize - cbMACHdLen - cbIVlen - cbICVlen - cbFCSlen; //FragNum = (FrameSize-(Hdr+FCS))/(Fragment Size -(Hrd+FCS))) - uMACfragNum = (WORD) ((cbFrameBodySize + cbMIClen) / cbFragPayloadSize); + uMACfragNum = (unsigned short) ((cbFrameBodySize + cbMIClen) / cbFragPayloadSize); cbLastFragPayloadSize = (cbFrameBodySize + cbMIClen) % cbFragPayloadSize; if (cbLastFragPayloadSize == 0) { cbLastFragPayloadSize = cbFragPayloadSize; @@ -1606,13 +1606,13 @@ s_cbFillTxBufHead ( uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFragmentSize, uDMAIdx, bNeedACK, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate); // Generate TX MAC Header - vGenerateMACHeader(pDevice, pbyMacHdr, (WORD)uDuration, psEthHeader, bNeedEncrypt, + vGenerateMACHeader(pDevice, pbyMacHdr, (unsigned short)uDuration, psEthHeader, bNeedEncrypt, wFragType, uDMAIdx, uFragIdx); if (bNeedEncrypt == TRUE) { //Fill TXKEY s_vFillTxKey(pDevice, (unsigned char *)(psTxBufHd->adwTxKey), pbyIVHead, pTransmitKey, - pbyMacHdr, (WORD)cbFragPayloadSize, (unsigned char *)pMICHDR); + pbyMacHdr, (unsigned short)cbFragPayloadSize, (unsigned char *)pMICHDR); //Fill IV(ExtIV,RSNHDR) if (pDevice->bEnableHostWEP) { pMgmt->sNodeDBTable[uNodeIndex].dwTSC47_16 = pTransmitKey->dwTSC47_16; @@ -1631,7 +1631,7 @@ s_cbFillTxBufHead ( memcpy((unsigned char *) (pbyPayloadHead), &pDevice->abySNAP_RFC1042[0], 6); } pbyType = (unsigned char *) (pbyPayloadHead + 6); - memcpy(pbyType, &(psEthHeader->wType), sizeof(WORD)); + memcpy(pbyType, &(psEthHeader->wType), sizeof(unsigned short)); cb802_1_H_len = 8; } @@ -1641,10 +1641,10 @@ s_cbFillTxBufHead ( //--------------------------- //Fill MICHDR //if (pDevice->bAES) { - // s_vFillMICHDR(pDevice, (unsigned char *)pMICHDR, pbyMacHdr, (WORD)cbFragPayloadSize); + // s_vFillMICHDR(pDevice, (unsigned char *)pMICHDR, pbyMacHdr, (unsigned short)cbFragPayloadSize); //} //cbReqCount += s_uDoEncryption(pDevice, psEthHeader, (void *)psTxBufHd, byKeySel, - // pbyPayloadHead, (WORD)cbFragPayloadSize, uDMAIdx); + // pbyPayloadHead, (unsigned short)cbFragPayloadSize, uDMAIdx); @@ -1672,7 +1672,7 @@ s_cbFillTxBufHead ( //--------------------------- if ((pDevice->byLocalID <= REV_ID_VT3253_A1)) { if (bNeedEncrypt) { - s_vSWencryption(pDevice, pTransmitKey, (pbyBuffer + uLength - cb802_1_H_len), (WORD)cbFragPayloadSize); + s_vSWencryption(pDevice, pTransmitKey, (pbyBuffer + uLength - cb802_1_H_len), (unsigned short)cbFragPayloadSize); cbReqCount += cbICVlen; } } @@ -1711,13 +1711,13 @@ s_cbFillTxBufHead ( uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate); // Generate TX MAC Header - vGenerateMACHeader(pDevice, pbyMacHdr, (WORD)uDuration, psEthHeader, bNeedEncrypt, + vGenerateMACHeader(pDevice, pbyMacHdr, (unsigned short)uDuration, psEthHeader, bNeedEncrypt, wFragType, uDMAIdx, uFragIdx); if (bNeedEncrypt == TRUE) { //Fill TXKEY s_vFillTxKey(pDevice, (unsigned char *)(psTxBufHd->adwTxKey), pbyIVHead, pTransmitKey, - pbyMacHdr, (WORD)cbLastFragPayloadSize, (unsigned char *)pMICHDR); + pbyMacHdr, (unsigned short)cbLastFragPayloadSize, (unsigned char *)pMICHDR); if (pDevice->bEnableHostWEP) { pMgmt->sNodeDBTable[uNodeIndex].dwTSC47_16 = pTransmitKey->dwTSC47_16; @@ -1798,7 +1798,7 @@ s_cbFillTxBufHead ( //--------------------------- if ((pDevice->byLocalID <= REV_ID_VT3253_A1)) { if (bNeedEncrypt) { - s_vSWencryption(pDevice, pTransmitKey, (pbyBuffer + uLength), (WORD)cbLastFragPayloadSize); + s_vSWencryption(pDevice, pTransmitKey, (pbyBuffer + uLength), (unsigned short)cbLastFragPayloadSize); cbReqCount += cbICVlen; } } @@ -1841,14 +1841,14 @@ s_cbFillTxBufHead ( uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate); // Generate TX MAC Header - vGenerateMACHeader(pDevice, pbyMacHdr, (WORD)uDuration, psEthHeader, bNeedEncrypt, + vGenerateMACHeader(pDevice, pbyMacHdr, (unsigned short)uDuration, psEthHeader, bNeedEncrypt, wFragType, uDMAIdx, uFragIdx); if (bNeedEncrypt == TRUE) { //Fill TXKEY s_vFillTxKey(pDevice, (unsigned char *)(psTxBufHd->adwTxKey), pbyIVHead, pTransmitKey, - pbyMacHdr, (WORD)cbFragPayloadSize, (unsigned char *)pMICHDR); + pbyMacHdr, (unsigned short)cbFragPayloadSize, (unsigned char *)pMICHDR); if (pDevice->bEnableHostWEP) { pMgmt->sNodeDBTable[uNodeIndex].dwTSC47_16 = pTransmitKey->dwTSC47_16; @@ -1862,10 +1862,10 @@ s_cbFillTxBufHead ( //--------------------------- //Fill MICHDR //if (pDevice->bAES) { - // s_vFillMICHDR(pDevice, (unsigned char *)pMICHDR, pbyMacHdr, (WORD)cbFragPayloadSize); + // s_vFillMICHDR(pDevice, (unsigned char *)pMICHDR, pbyMacHdr, (unsigned short)cbFragPayloadSize); //} //cbReqCount += s_uDoEncryption(pDevice, psEthHeader, (void *)psTxBufHd, byKeySel, - // pbyPayloadHead, (WORD)cbFragPayloadSize, uDMAIdx); + // pbyPayloadHead, (unsigned short)cbFragPayloadSize, uDMAIdx); pbyBuffer = (unsigned char *)pHeadTD->pTDInfo->buf; @@ -1926,7 +1926,7 @@ s_cbFillTxBufHead ( if ((pDevice->byLocalID <= REV_ID_VT3253_A1)) { if (bNeedEncrypt) { - s_vSWencryption(pDevice, pTransmitKey, (pbyBuffer + uLength), (WORD)cbFragPayloadSize); + s_vSWencryption(pDevice, pTransmitKey, (pbyBuffer + uLength), (unsigned short)cbFragPayloadSize); cbReqCount += cbICVlen; } } @@ -1961,7 +1961,7 @@ s_cbFillTxBufHead ( wFragType = FRAGCTL_NONFRAG; //Set FragCtl in TxBufferHead - psTxBufHd->wFragCtl |= (WORD)wFragType; + psTxBufHd->wFragCtl |= (unsigned short)wFragType; //Fill FIFO,RrvTime,RTS,and CTS s_vGenerateTxParameter(pDevice, byPktType, (void *)psTxBufHd, pvRrvTime, pvRTS, pvCTS, @@ -1971,13 +1971,13 @@ s_cbFillTxBufHead ( 0, 0, uMACfragNum, byFBOption, pDevice->wCurrentRate); // Generate TX MAC Header - vGenerateMACHeader(pDevice, pbyMacHdr, (WORD)uDuration, psEthHeader, bNeedEncrypt, + vGenerateMACHeader(pDevice, pbyMacHdr, (unsigned short)uDuration, psEthHeader, bNeedEncrypt, wFragType, uDMAIdx, 0); if (bNeedEncrypt == TRUE) { //Fill TXKEY s_vFillTxKey(pDevice, (unsigned char *)(psTxBufHd->adwTxKey), pbyIVHead, pTransmitKey, - pbyMacHdr, (WORD)cbFrameBodySize, (unsigned char *)pMICHDR); + pbyMacHdr, (unsigned short)cbFrameBodySize, (unsigned char *)pMICHDR); if (pDevice->bEnableHostWEP) { pMgmt->sNodeDBTable[uNodeIndex].dwTSC47_16 = pTransmitKey->dwTSC47_16; @@ -1995,7 +1995,7 @@ s_cbFillTxBufHead ( memcpy((unsigned char *) (pbyPayloadHead), &pDevice->abySNAP_RFC1042[0], 6); } pbyType = (unsigned char *) (pbyPayloadHead + 6); - memcpy(pbyType, &(psEthHeader->wType), sizeof(WORD)); + memcpy(pbyType, &(psEthHeader->wType), sizeof(unsigned short)); cb802_1_H_len = 8; } @@ -2006,7 +2006,7 @@ s_cbFillTxBufHead ( //Fill MICHDR //if (pDevice->bAES) { // DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Fill MICHDR...\n"); - // s_vFillMICHDR(pDevice, (unsigned char *)pMICHDR, pbyMacHdr, (WORD)cbFrameBodySize); + // s_vFillMICHDR(pDevice, (unsigned char *)pMICHDR, pbyMacHdr, (unsigned short)cbFrameBodySize); //} pbyBuffer = (unsigned char *)pHeadTD->pTDInfo->buf; @@ -2064,7 +2064,7 @@ s_cbFillTxBufHead ( if ((pDevice->byLocalID <= REV_ID_VT3253_A1)){ if (bNeedEncrypt) { s_vSWencryption(pDevice, pTransmitKey, (pbyBuffer + uLength - cb802_1_H_len), - (WORD)(cbFrameBodySize + cbMIClen)); + (unsigned short)(cbFrameBodySize + cbMIClen)); cbReqCount += cbICVlen; } } @@ -2078,7 +2078,7 @@ s_cbFillTxBufHead ( ptdCurr->buff_addr = cpu_to_le32(ptdCurr->pTDInfo->skb_dma); //Set TSR1 & ReqCount in TxDescHead ptdCurr->m_td1TD1.byTCR |= (TCR_STP | TCR_EDP | EDMSDU); - ptdCurr->m_td1TD1.wReqCount = cpu_to_le16((WORD)(cbReqCount)); + ptdCurr->m_td1TD1.wReqCount = cpu_to_le16((unsigned short)(cbReqCount)); pDevice->iTDUsed[uDMAIdx]++; @@ -2113,7 +2113,7 @@ vGenerateFIFOHeader ( unsigned int wTxBufSize; // FFinfo size BOOL bNeedACK; BOOL bIsAdhoc; - WORD cbMacHdLen; + unsigned short cbMacHdLen; PSTxBufHead pTxBufHead = (PSTxBufHead) pbyTxBufferAddr; wTxBufSize = sizeof(STxBufHead); @@ -2165,7 +2165,7 @@ vGenerateFIFOHeader ( } else { cbMacHdLen = WLAN_HDR_ADDR3_LEN; } - pTxBufHead->wFragCtl |= cpu_to_le16((WORD)(cbMacHdLen << 10)); + pTxBufHead->wFragCtl |= cpu_to_le16((unsigned short)(cbMacHdLen << 10)); //Set packet type if (byPktType == PK_TYPE_11A) {//0000 0000 0000 0000 @@ -2268,10 +2268,10 @@ void vGenerateMACHeader ( PSDevice pDevice, unsigned char *pbyBufferAddr, - WORD wDuration, + unsigned short wDuration, PSEthernetHeader psEthHeader, BOOL bNeedEncrypt, - WORD wFragType, + unsigned short wFragType, unsigned int uDMAIdx, unsigned int uFragIdx ) @@ -2307,7 +2307,7 @@ vGenerateMACHeader ( } if (bNeedEncrypt) - pMACHeader->wFrameCtl |= cpu_to_le16((WORD)WLAN_SET_FC_ISWEP(1)); + pMACHeader->wFrameCtl |= cpu_to_le16((unsigned short)WLAN_SET_FC_ISWEP(1)); pMACHeader->wDurationID = cpu_to_le16(wDuration); @@ -2319,7 +2319,7 @@ vGenerateMACHeader ( pMACHeader->wSeqCtl = cpu_to_le16(pDevice->wSeqCounter << 4); //Set FragNumber in Sequence Control - pMACHeader->wSeqCtl |= cpu_to_le16((WORD)uFragIdx); + pMACHeader->wSeqCtl |= cpu_to_le16((unsigned short)uFragIdx); if ((wFragType == FRAGCTL_ENDFRAG) || (wFragType == FRAGCTL_NONFRAG)) { pDevice->wSeqCounter++; @@ -2359,13 +2359,13 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { unsigned int cbMIClen = 0; unsigned int cbFCSlen = 4; unsigned int uPadding = 0; - WORD wTxBufSize; + unsigned short wTxBufSize; unsigned int cbMacHdLen; SEthernetHeader sEthHeader; void * pvRrvTime; void * pMICHDR; PSMgmtObject pMgmt = pDevice->pMgmt; - WORD wCurrentRate = RATE_1M; + unsigned short wCurrentRate = RATE_1M; if (AVAIL_TD(pDevice, TYPE_TXDMA0) <= 0) { @@ -2456,7 +2456,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { } //Set FRAGCTL_MACHDCNT - pTxBufHead->wFragCtl |= cpu_to_le16((WORD)(cbMacHdLen << 10)); + pTxBufHead->wFragCtl |= cpu_to_le16((unsigned short)(cbMacHdLen << 10)); // Notes: // Although spec says MMPDU can be fragmented; In most case, @@ -2523,7 +2523,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { //========================= // No Fragmentation //========================= - pTxBufHead->wFragCtl |= (WORD)FRAGCTL_NONFRAG; + pTxBufHead->wFragCtl |= (unsigned short)FRAGCTL_NONFRAG; //Fill FIFO,RrvTime,RTS,and CTS @@ -2558,7 +2558,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { //--------------------------- //Fill MICHDR //if (pDevice->bAES) { - // s_vFillMICHDR(pDevice, (unsigned char *)pMICHDR, (unsigned char *)pMACHeader, (WORD)cbFrameBodySize); + // s_vFillMICHDR(pDevice, (unsigned char *)pMICHDR, (unsigned char *)pMACHeader, (unsigned short)cbFrameBodySize); //} do { if ((pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) && @@ -2587,7 +2587,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { } while(FALSE); //Fill TXKEY s_vFillTxKey(pDevice, (unsigned char *)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey, - (unsigned char *)pMACHeader, (WORD)cbFrameBodySize, NULL); + (unsigned char *)pMACHeader, (unsigned short)cbFrameBodySize, NULL); memcpy(pMACHeader, pPacket->p80211Header, cbMacHdLen); memcpy(pbyPayloadHead, ((unsigned char *)(pPacket->p80211Header) + cbMacHdLen), @@ -2622,7 +2622,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { //Set TSR1 & ReqCount in TxDescHead pFrstTD->m_td1TD1.byTCR = (TCR_STP | TCR_EDP | EDMSDU); pFrstTD->pTDInfo->skb_dma = pFrstTD->pTDInfo->buf_dma; - pFrstTD->m_td1TD1.wReqCount = cpu_to_le16((WORD)(cbReqCount)); + pFrstTD->m_td1TD1.wReqCount = cpu_to_le16((unsigned short)(cbReqCount)); pFrstTD->buff_addr = cpu_to_le32(pFrstTD->pTDInfo->skb_dma); pFrstTD->pTDInfo->byFlags = 0; @@ -2665,12 +2665,12 @@ CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { unsigned char *pbyBuffer = (unsigned char *)pDevice->tx_beacon_bufs; unsigned int cbFrameSize = pPacket->cbMPDULen + WLAN_FCS_LEN; unsigned int cbHeaderSize = 0; - WORD wTxBufSize = sizeof(STxShortBufHead); + unsigned short wTxBufSize = sizeof(STxShortBufHead); PSTxShortBufHead pTxBufHead = (PSTxShortBufHead) pbyBuffer; PSTxDataHead_ab pTxDataHead = (PSTxDataHead_ab) (pbyBuffer + wTxBufSize); PS802_11Header pMACHeader; - WORD wCurrentRate; - WORD wLen = 0x0000; + unsigned short wCurrentRate; + unsigned short wLen = 0x0000; memset(pTxBufHead, 0, wTxBufSize); @@ -2693,12 +2693,12 @@ CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { //Set packet type & Get Duration if (byPktType == PK_TYPE_11A) {//0000 0000 0000 0000 - pTxDataHead->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameSize, byPktType, + pTxDataHead->wDuration = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameSize, byPktType, wCurrentRate, FALSE, 0, 0, 1, AUTO_FB_NONE)); } else if (byPktType == PK_TYPE_11B) {//0000 0001 0000 0000 pTxBufHead->wFIFOCtl |= FIFOCTL_11B; - pTxDataHead->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameSize, byPktType, + pTxDataHead->wDuration = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameSize, byPktType, wCurrentRate, FALSE, 0, 0, 1, AUTO_FB_NONE)); } @@ -2813,7 +2813,7 @@ cbGetFragCount ( // Fragmentation cbFragmentSize = pDevice->wFragmentationThreshold; cbFragPayloadSize = cbFragmentSize - cbMACHdLen - cbIVlen - cbICVlen - cbFCSlen; - uMACfragNum = (WORD) ((cbFrameBodySize + cbMIClen) / cbFragPayloadSize); + uMACfragNum = (unsigned short) ((cbFrameBodySize + cbMIClen) / cbFragPayloadSize); cbLastFragPayloadSize = (cbFrameBodySize + cbMIClen) % cbFragPayloadSize; if (cbLastFragPayloadSize == 0) { cbLastFragPayloadSize = cbFragPayloadSize; @@ -2854,13 +2854,13 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un unsigned long dwMIC_Priority; unsigned long *pdwMIC_L; unsigned long *pdwMIC_R; - WORD wTxBufSize; + unsigned short wTxBufSize; unsigned int cbMacHdLen; SEthernetHeader sEthHeader; void * pvRrvTime; void * pMICHDR; PSMgmtObject pMgmt = pDevice->pMgmt; - WORD wCurrentRate = RATE_1M; + unsigned short wCurrentRate = RATE_1M; PUWLAN_80211HDR p80211Header; unsigned int uNodeIndex = 0; BOOL bNodeExist = FALSE; @@ -2996,7 +2996,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un //Set FRAGCTL_MACHDCNT - pTxBufHead->wFragCtl |= cpu_to_le16((WORD)cbMacHdLen << 10); + pTxBufHead->wFragCtl |= cpu_to_le16((unsigned short)cbMacHdLen << 10); // Notes: // Although spec says MMPDU can be fragmented; In most case, @@ -3067,7 +3067,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un //========================= // No Fragmentation //========================= - pTxBufHead->wFragCtl |= (WORD)FRAGCTL_NONFRAG; + pTxBufHead->wFragCtl |= (unsigned short)FRAGCTL_NONFRAG; //Fill FIFO,RrvTime,RTS,and CTS @@ -3161,7 +3161,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un s_vFillTxKey(pDevice, (unsigned char *)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey, - pbyMacHdr, (WORD)cbFrameBodySize, (unsigned char *)pMICHDR); + pbyMacHdr, (unsigned short)cbFrameBodySize, (unsigned char *)pMICHDR); if (pDevice->bEnableHostWEP) { pMgmt->sNodeDBTable[uNodeIndex].dwTSC47_16 = pTransmitKey->dwTSC47_16; @@ -3169,7 +3169,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un } if ((pDevice->byLocalID <= REV_ID_VT3253_A1)) { - s_vSWencryption(pDevice, pTransmitKey, pbyPayloadHead, (WORD)(cbFrameBodySize + cbMIClen)); + s_vSWencryption(pDevice, pTransmitKey, pbyPayloadHead, (unsigned short)(cbFrameBodySize + cbMIClen)); } } diff --git a/drivers/staging/vt6655/rxtx.h b/drivers/staging/vt6655/rxtx.h index 64d30b5c18b6..655488dd6b07 100644 --- a/drivers/staging/vt6655/rxtx.h +++ b/drivers/staging/vt6655/rxtx.h @@ -64,10 +64,10 @@ void vGenerateMACHeader ( PSDevice pDevice, unsigned char *pbyBufferAddr, - WORD wDuration, + unsigned short wDuration, PSEthernetHeader psEthHeader, BOOL bNeedEncrypt, - WORD wFragType, + unsigned short wFragType, unsigned int uDMAIdx, unsigned int uFragIdx ); diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index 500da8cf6874..221fb0b0e0b9 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c @@ -78,7 +78,7 @@ */ BYTE SROMbyReadEmbedded(unsigned long dwIoBase, BYTE byContntOffset) { - WORD wDelay, wNoACK; + unsigned short wDelay, wNoACK; BYTE byWait; BYTE byData; BYTE byOrg; @@ -127,7 +127,7 @@ BYTE SROMbyReadEmbedded(unsigned long dwIoBase, BYTE byContntOffset) */ BOOL SROMbWriteEmbedded(unsigned long dwIoBase, BYTE byContntOffset, BYTE byData) { - WORD wDelay, wNoACK; + unsigned short wDelay, wNoACK; BYTE byWait; BYTE byOrg; diff --git a/drivers/staging/vt6655/srom.h b/drivers/staging/vt6655/srom.h index 1df61f446c9b..e735563319cb 100644 --- a/drivers/staging/vt6655/srom.h +++ b/drivers/staging/vt6655/srom.h @@ -97,34 +97,34 @@ // 2048 bits = 256 bytes = 128 words // typedef struct tagSSromReg { - BYTE abyPAR[6]; // 0x00 (WORD) + BYTE abyPAR[6]; // 0x00 (unsigned short) - WORD wSUB_VID; // 0x03 (WORD) - WORD wSUB_SID; + unsigned short wSUB_VID; // 0x03 (unsigned short) + unsigned short wSUB_SID; - BYTE byBCFG0; // 0x05 (WORD) + BYTE byBCFG0; // 0x05 (unsigned short) BYTE byBCFG1; - BYTE byFCR0; // 0x06 (WORD) + BYTE byFCR0; // 0x06 (unsigned short) BYTE byFCR1; - BYTE byPMC0; // 0x07 (WORD) + BYTE byPMC0; // 0x07 (unsigned short) BYTE byPMC1; - BYTE byMAXLAT; // 0x08 (WORD) + BYTE byMAXLAT; // 0x08 (unsigned short) BYTE byMINGNT; - BYTE byCFG0; // 0x09 (WORD) + BYTE byCFG0; // 0x09 (unsigned short) BYTE byCFG1; - WORD wCISPTR; // 0x0A (WORD) - WORD wRsv0; // 0x0B (WORD) - WORD wRsv1; // 0x0C (WORD) - BYTE byBBPAIR; // 0x0D (WORD) + unsigned short wCISPTR; // 0x0A (unsigned short) + unsigned short wRsv0; // 0x0B (unsigned short) + unsigned short wRsv1; // 0x0C (unsigned short) + BYTE byBBPAIR; // 0x0D (unsigned short) BYTE byRFTYPE; - BYTE byMinChannel; // 0x0E (WORD) + BYTE byMinChannel; // 0x0E (unsigned short) BYTE byMaxChannel; - BYTE bySignature; // 0x0F (WORD) + BYTE bySignature; // 0x0F (unsigned short) BYTE byCheckSum; - BYTE abyReserved0[96]; // 0x10 (WORD) - BYTE abyCIS[128]; // 0x80 (WORD) + BYTE abyReserved0[96]; // 0x10 (unsigned short) + BYTE abyCIS[128]; // 0x80 (unsigned short) } SSromReg, *PSSromReg; /*--------------------- Export Macros ------------------------------*/ diff --git a/drivers/staging/vt6655/tether.h b/drivers/staging/vt6655/tether.h index 5d90cd8da8af..ad749e48a1db 100644 --- a/drivers/staging/vt6655/tether.h +++ b/drivers/staging/vt6655/tether.h @@ -156,7 +156,7 @@ typedef struct tagSEthernetHeader { BYTE abyDstAddr[ETH_ALEN]; BYTE abySrcAddr[ETH_ALEN]; - WORD wType; + unsigned short wType; }__attribute__ ((__packed__)) SEthernetHeader, *PSEthernetHeader; @@ -167,7 +167,7 @@ SEthernetHeader, *PSEthernetHeader; typedef struct tagS802_3Header { BYTE abyDstAddr[ETH_ALEN]; BYTE abySrcAddr[ETH_ALEN]; - WORD wLen; + unsigned short wLen; }__attribute__ ((__packed__)) S802_3Header, *PS802_3Header; @@ -175,12 +175,12 @@ S802_3Header, *PS802_3Header; // 802_11 packet // typedef struct tagS802_11Header { - WORD wFrameCtl; - WORD wDurationID; + unsigned short wFrameCtl; + unsigned short wDurationID; BYTE abyAddr1[ETH_ALEN]; BYTE abyAddr2[ETH_ALEN]; BYTE abyAddr3[ETH_ALEN]; - WORD wSeqCtl; + unsigned short wSeqCtl; BYTE abyAddr4[ETH_ALEN]; }__attribute__ ((__packed__)) S802_11Header, *PS802_11Header; diff --git a/drivers/staging/vt6655/tkip.c b/drivers/staging/vt6655/tkip.c index a215866100f6..4d97c517907f 100644 --- a/drivers/staging/vt6655/tkip.c +++ b/drivers/staging/vt6655/tkip.c @@ -186,7 +186,7 @@ unsigned int rotr1(unsigned int a) void TKIPvMixKey( unsigned char *pbyTKey, unsigned char *pbyTA, - WORD wTSC15_0, + unsigned short wTSC15_0, unsigned long dwTSC47_16, unsigned char *pbyRC4Key ) diff --git a/drivers/staging/vt6655/tkip.h b/drivers/staging/vt6655/tkip.h index 30c25d0676f7..eb5951d726e0 100644 --- a/drivers/staging/vt6655/tkip.h +++ b/drivers/staging/vt6655/tkip.h @@ -49,7 +49,7 @@ void TKIPvMixKey( unsigned char *pbyTKey, unsigned char *pbyTA, - WORD wTSC15_0, + unsigned short wTSC15_0, unsigned long dwTSC47_16, unsigned char *pbyRC4Key ); diff --git a/drivers/staging/vt6655/tmacro.h b/drivers/staging/vt6655/tmacro.h index 99c86fef5e70..0c49430de8b6 100644 --- a/drivers/staging/vt6655/tmacro.h +++ b/drivers/staging/vt6655/tmacro.h @@ -37,24 +37,24 @@ #define LOBYTE(w) ((BYTE)(w)) #endif #if !defined(HIBYTE) -#define HIBYTE(w) ((BYTE)(((WORD)(w) >> 8) & 0xFF)) +#define HIBYTE(w) ((BYTE)(((unsigned short)(w) >> 8) & 0xFF)) #endif #if !defined(LOWORD) -#define LOWORD(d) ((WORD)(d)) +#define LOWORD(d) ((unsigned short)(d)) #endif #if !defined(HIWORD) -#define HIWORD(d) ((WORD)((((unsigned long)(d)) >> 16) & 0xFFFF)) +#define HIWORD(d) ((unsigned short)((((unsigned long)(d)) >> 16) & 0xFFFF)) #endif #define LODWORD(q) ((q).u.dwLowDword) #define HIDWORD(q) ((q).u.dwHighDword) #if !defined(MAKEWORD) -#define MAKEWORD(lb, hb) ((WORD)(((BYTE)(lb)) | (((WORD)((BYTE)(hb))) << 8))) +#define MAKEWORD(lb, hb) ((unsigned short)(((BYTE)(lb)) | (((unsigned short)((BYTE)(hb))) << 8))) #endif #if !defined(MAKEDWORD) -#define MAKEDWORD(lw, hw) ((unsigned long)(((WORD)(lw)) | (((unsigned long)((WORD)(hw))) << 16))) +#define MAKEDWORD(lw, hw) ((unsigned long)(((unsigned short)(lw)) | (((unsigned long)((unsigned short)(hw))) << 16))) #endif #endif // __TMACRO_H__ diff --git a/drivers/staging/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h index 11493e1be904..6f2e1be97f62 100644 --- a/drivers/staging/vt6655/ttype.h +++ b/drivers/staging/vt6655/ttype.h @@ -69,7 +69,6 @@ typedef int BOOL; */ typedef unsigned char BYTE; // 8-bit -typedef unsigned short WORD; // 16-bit // QWORD is for those situation that we want // an 8-byte-aligned 8 byte long structure diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index fc97a30f3409..633449f20973 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -82,7 +82,7 @@ #define VNSvInPortW(dwIOAddress, pwData) { \ - volatile WORD* pwAddr = ((unsigned short *)(dwIOAddress)); \ + volatile unsigned short *pwAddr = ((unsigned short *)(dwIOAddress)); \ *(pwData) = readw(pwAddr); \ } @@ -99,8 +99,8 @@ #define VNSvOutPortW(dwIOAddress, wData) { \ - volatile WORD* pwAddr = ((unsigned short *)(dwIOAddress)); \ - writew((WORD)wData, pwAddr); \ + volatile unsigned short *pwAddr = ((unsigned short *)(dwIOAddress)); \ + writew((unsigned short)wData, pwAddr); \ } #define VNSvOutPortD(dwIOAddress, dwData) { \ diff --git a/drivers/staging/vt6655/vntwifi.c b/drivers/staging/vt6655/vntwifi.c index ce60f7c7f8b4..23af1b585c89 100644 --- a/drivers/staging/vt6655/vntwifi.c +++ b/drivers/staging/vt6655/vntwifi.c @@ -101,8 +101,8 @@ VNTWIFIvSetOPMode ( void VNTWIFIvSetIBSSParameter ( void *pMgmtHandle, - WORD wBeaconPeriod, - WORD wATIMWindow, + unsigned short wBeaconPeriod, + unsigned short wATIMWindow, unsigned int uChannel ) { @@ -176,7 +176,7 @@ VNTWIFIpGetCurrentChannel ( * Return Value: current Assoc ID * -*/ -WORD +unsigned short VNTWIFIwGetAssocID ( void *pMgmtHandle ) @@ -499,7 +499,7 @@ VNTWIFIvUpdateNodeTxCounter( void *pMgmtHandle, unsigned char *pbyDestAddress, BOOL bTxOk, - WORD wRate, + unsigned short wRate, unsigned char *pbyTxFailCount ) { @@ -541,7 +541,7 @@ VNTWIFIvGetTxRate( { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; unsigned int uNodeIndex = 0; - WORD wTxDataRate = RATE_1M; + unsigned short wTxDataRate = RATE_1M; BYTE byACKRate = RATE_1M; BYTE byCCKBasicRate = RATE_1M; BYTE byOFDMBasicRate = RATE_24M; @@ -681,12 +681,12 @@ VNTWIFIbSetPMKIDCache ( -WORD +unsigned short VNTWIFIwGetMaxSupportRate( void *pMgmtObject ) { - WORD wRate = RATE_54M; + unsigned short wRate = RATE_54M; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; for(wRate = RATE_54M; wRate > RATE_1M; wRate--) { diff --git a/drivers/staging/vt6655/vntwifi.h b/drivers/staging/vt6655/vntwifi.h index 724cd4c9b6bc..67f7ac8720e2 100644 --- a/drivers/staging/vt6655/vntwifi.h +++ b/drivers/staging/vt6655/vntwifi.h @@ -143,8 +143,8 @@ typedef enum tagWMAC_POWER_MODE { void VNTWIFIvSetIBSSParameter ( void *pMgmtHandle, - WORD wBeaconPeriod, - WORD wATIMWindow, + unsigned short wBeaconPeriod, + unsigned short wATIMWindow, unsigned int uChannel ); @@ -164,7 +164,7 @@ VNTWIFIpGetCurrentChannel( void *pMgmtHandle ); -WORD +unsigned short VNTWIFIwGetAssocID ( void *pMgmtHandle ); @@ -231,7 +231,7 @@ VNTWIFIvUpdateNodeTxCounter( void *pMgmtHandle, unsigned char *pbyDestAddress, BOOL bTxOk, - WORD wRate, + unsigned short wRate, unsigned char *pbyTxFailCount ); @@ -274,7 +274,7 @@ VNTWIFIbCommandRunning ( void *pMgmtObject ); -WORD +unsigned short VNTWIFIwGetMaxSupportRate( void *pMgmtObject ); diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c index 72912d792370..5d2ee26562d6 100644 --- a/drivers/staging/vt6655/wcmd.c +++ b/drivers/staging/vt6655/wcmd.c @@ -904,7 +904,7 @@ s_bCommandComplete ( { PWLAN_IE_SSID pSSID; BOOL bRadioCmd = FALSE; - //WORD wDeAuthenReason = 0; + //unsigned short wDeAuthenReason = 0; BOOL bForceSCAN = TRUE; PSMgmtObject pMgmt = pDevice->pMgmt; diff --git a/drivers/staging/vt6655/wcmd.h b/drivers/staging/vt6655/wcmd.h index 3eb5d75c6b55..a67c7fd6dfde 100644 --- a/drivers/staging/vt6655/wcmd.h +++ b/drivers/staging/vt6655/wcmd.h @@ -77,7 +77,7 @@ typedef struct tagCMD_ITEM { CMD_CODE eCmd; BYTE abyCmdDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; BOOL bNeedRadioOFF; - WORD wDeAuthenReason; + unsigned short wDeAuthenReason; BOOL bRadioCmd; BOOL bForceSCAN; } CMD_ITEM, *PCMD_ITEM; diff --git a/drivers/staging/vt6655/wmgr.c b/drivers/staging/vt6655/wmgr.c index d657beb02789..d3a516ae3016 100644 --- a/drivers/staging/vt6655/wmgr.c +++ b/drivers/staging/vt6655/wmgr.c @@ -106,8 +106,8 @@ s_MgrMakeAssocRequest( PSDevice pDevice, PSMgmtObject pMgmt, unsigned char *pDAddr, - WORD wCurrCapInfo, - WORD wListenInterval, + unsigned short wCurrCapInfo, + unsigned short wListenInterval, PWLAN_IE_SSID pCurrSSID, PWLAN_IE_SUPP_RATES pCurrRates, PWLAN_IE_SUPP_RATES pCurrExtSuppRates @@ -128,8 +128,8 @@ s_MgrMakeReAssocRequest( PSDevice pDevice, PSMgmtObject pMgmt, unsigned char *pDAddr, - WORD wCurrCapInfo, - WORD wListenInterval, + unsigned short wCurrCapInfo, + unsigned short wListenInterval, PWLAN_IE_SSID pCurrSSID, PWLAN_IE_SUPP_RATES pCurrRates, PWLAN_IE_SUPP_RATES pCurrExtSuppRates @@ -241,10 +241,10 @@ PSTxMgmtPacket s_MgrMakeBeacon( PSDevice pDevice, PSMgmtObject pMgmt, - WORD wCurrCapInfo, - WORD wCurrBeaconPeriod, + unsigned short wCurrCapInfo, + unsigned short wCurrBeaconPeriod, unsigned int uCurrChannel, - WORD wCurrATIMWinodw, + unsigned short wCurrATIMWinodw, PWLAN_IE_SSID pCurrSSID, unsigned char *pCurrBSSID, PWLAN_IE_SUPP_RATES pCurrSuppRates, @@ -258,9 +258,9 @@ PSTxMgmtPacket s_MgrMakeAssocResponse( PSDevice pDevice, PSMgmtObject pMgmt, - WORD wCurrCapInfo, - WORD wAssocStatus, - WORD wAssocAID, + unsigned short wCurrCapInfo, + unsigned short wAssocStatus, + unsigned short wAssocAID, unsigned char *pDstAddr, PWLAN_IE_SUPP_RATES pCurrSuppRates, PWLAN_IE_SUPP_RATES pCurrExtSuppRates @@ -272,9 +272,9 @@ PSTxMgmtPacket s_MgrMakeReAssocResponse( PSDevice pDevice, PSMgmtObject pMgmt, - WORD wCurrCapInfo, - WORD wAssocStatus, - WORD wAssocAID, + unsigned short wCurrCapInfo, + unsigned short wAssocStatus, + unsigned short wAssocAID, unsigned char *pDstAddr, PWLAN_IE_SUPP_RATES pCurrSuppRates, PWLAN_IE_SUPP_RATES pCurrExtSuppRates @@ -286,10 +286,10 @@ PSTxMgmtPacket s_MgrMakeProbeResponse( PSDevice pDevice, PSMgmtObject pMgmt, - WORD wCurrCapInfo, - WORD wCurrBeaconPeriod, + unsigned short wCurrCapInfo, + unsigned short wCurrBeaconPeriod, unsigned int uCurrChannel, - WORD wCurrATIMWinodw, + unsigned short wCurrATIMWinodw, unsigned char *pDstAddr, PWLAN_IE_SSID pCurrSSID, unsigned char *pCurrBSSID, @@ -303,7 +303,7 @@ static void s_vMgrLogStatus( PSMgmtObject pMgmt, - WORD wStatus + unsigned short wStatus ); @@ -621,7 +621,7 @@ vMgrDisassocBeginSta( void *hDeviceContext, PSMgmtObject pMgmt, unsigned char *abyDestAddress, - WORD wReason, + unsigned short wReason, PCMD_STATUS pStatus ) { @@ -690,8 +690,8 @@ s_vMgrRxAssocRequest( WLAN_FR_ASSOCREQ sFrame; CMD_STATUS Status; PSTxMgmtPacket pTxPacket; - WORD wAssocStatus = 0; - WORD wAssocAID = 0; + unsigned short wAssocStatus = 0; + unsigned short wAssocAID = 0; unsigned int uRateLen = WLAN_RATES_MAXLEN; BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; @@ -759,9 +759,9 @@ s_vMgrRxAssocRequest( WLAN_GET_CAP_INFO_SHORTPREAMBLE(*sFrame.pwCapInfo); pMgmt->sNodeDBTable[uNodeIndex].bShortSlotTime = WLAN_GET_CAP_INFO_SHORTSLOTTIME(*sFrame.pwCapInfo); - pMgmt->sNodeDBTable[uNodeIndex].wAID = (WORD)uNodeIndex; + pMgmt->sNodeDBTable[uNodeIndex].wAID = (unsigned short)uNodeIndex; wAssocStatus = WLAN_MGMT_STATUS_SUCCESS; - wAssocAID = (WORD)uNodeIndex; + wAssocAID = (unsigned short)uNodeIndex; // check if ERP support if(pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate > RATE_11M) pMgmt->sNodeDBTable[uNodeIndex].bERPExist = TRUE; @@ -852,8 +852,8 @@ s_vMgrRxReAssocRequest( WLAN_FR_REASSOCREQ sFrame; CMD_STATUS Status; PSTxMgmtPacket pTxPacket; - WORD wAssocStatus = 0; - WORD wAssocAID = 0; + unsigned short wAssocStatus = 0; + unsigned short wAssocAID = 0; unsigned int uRateLen = WLAN_RATES_MAXLEN; BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; @@ -918,9 +918,9 @@ s_vMgrRxReAssocRequest( WLAN_GET_CAP_INFO_SHORTPREAMBLE(*sFrame.pwCapInfo); pMgmt->sNodeDBTable[uNodeIndex].bShortSlotTime = WLAN_GET_CAP_INFO_SHORTSLOTTIME(*sFrame.pwCapInfo); - pMgmt->sNodeDBTable[uNodeIndex].wAID = (WORD)uNodeIndex; + pMgmt->sNodeDBTable[uNodeIndex].wAID = (unsigned short)uNodeIndex; wAssocStatus = WLAN_MGMT_STATUS_SUCCESS; - wAssocAID = (WORD)uNodeIndex; + wAssocAID = (unsigned short)uNodeIndex; // if suppurt ERP if(pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate > RATE_11M) @@ -1214,7 +1214,7 @@ vMgrDeAuthenBeginSta( void *hDeviceContext, PSMgmtObject pMgmt, unsigned char *abyDestAddress, - WORD wReason, + unsigned short wReason, PCMD_STATUS pStatus ) { @@ -1885,12 +1885,12 @@ s_vMgrRxBeacon( BOOL bIsChannelEqual = FALSE; unsigned int uLocateByteIndex; BYTE byTIMBitOn = 0; - WORD wAIDNumber = 0; + unsigned short wAIDNumber = 0; unsigned int uNodeIndex; QWORD qwTimestamp, qwLocalTSF; QWORD qwCurrTSF; - WORD wStartIndex = 0; - WORD wAIDIndex = 0; + unsigned short wStartIndex = 0; + unsigned short wAIDIndex = 0; BYTE byCurrChannel = pRxPacket->byRxChannel; ERPObject sERP; unsigned int uRateLen = WLAN_RATES_MAXLEN; @@ -2393,8 +2393,8 @@ vMgrCreateOwnIBSS( { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = pDevice->pMgmt; - WORD wMaxBasicRate; - WORD wMaxSuppRate; + unsigned short wMaxBasicRate; + unsigned short wMaxSuppRate; BYTE byTopCCKBasicRate; BYTE byTopOFDMBasicRate; QWORD qwCurrTSF; @@ -2402,7 +2402,7 @@ vMgrCreateOwnIBSS( BYTE abyRATE[] = {0x82, 0x84, 0x8B, 0x96, 0x24, 0x30, 0x48, 0x6C, 0x0C, 0x12, 0x18, 0x60}; BYTE abyCCK_RATE[] = {0x82, 0x84, 0x8B, 0x96}; BYTE abyOFDM_RATE[] = {0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C}; - WORD wSuppRate; + unsigned short wSuppRate; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Create Basic Service Set .......\n"); @@ -2667,9 +2667,9 @@ vMgrJoinBSSBegin( PWLAN_IE_SUPP_RATES pItemExtRates = NULL; PWLAN_IE_SSID pItemSSID; unsigned int uRateLen = WLAN_RATES_MAXLEN; - WORD wMaxBasicRate = RATE_1M; - WORD wMaxSuppRate = RATE_1M; - WORD wSuppRate; + unsigned short wMaxBasicRate = RATE_1M; + unsigned short wMaxSuppRate = RATE_1M; + unsigned short wSuppRate; BYTE byTopCCKBasicRate = RATE_1M; BYTE byTopOFDMBasicRate = RATE_1M; @@ -3157,8 +3157,8 @@ s_vMgrFormatTIM( unsigned int ii, jj; BOOL bStartFound = FALSE; BOOL bMulticast = FALSE; - WORD wStartIndex = 0; - WORD wEndIndex = 0; + unsigned short wStartIndex = 0; + unsigned short wEndIndex = 0; // Find size of partial virtual bitmap @@ -3225,10 +3225,10 @@ PSTxMgmtPacket s_MgrMakeBeacon( PSDevice pDevice, PSMgmtObject pMgmt, - WORD wCurrCapInfo, - WORD wCurrBeaconPeriod, + unsigned short wCurrCapInfo, + unsigned short wCurrBeaconPeriod, unsigned int uCurrChannel, - WORD wCurrATIMWinodw, + unsigned short wCurrATIMWinodw, PWLAN_IE_SSID pCurrSSID, unsigned char *pCurrBSSID, PWLAN_IE_SUPP_RATES pCurrSuppRates, @@ -3259,7 +3259,7 @@ s_MgrMakeBeacon( )); if (pDevice->bEnablePSMode) { - sFrame.pHdr->sA3.wFrameCtl |= cpu_to_le16((WORD)WLAN_SET_FC_PWRMGT(1)); + sFrame.pHdr->sA3.wFrameCtl |= cpu_to_le16((unsigned short)WLAN_SET_FC_PWRMGT(1)); } memcpy( sFrame.pHdr->sA3.abyAddr1, abyBroadcastAddr, WLAN_ADDR_LEN); @@ -3454,10 +3454,10 @@ PSTxMgmtPacket s_MgrMakeProbeResponse( PSDevice pDevice, PSMgmtObject pMgmt, - WORD wCurrCapInfo, - WORD wCurrBeaconPeriod, + unsigned short wCurrCapInfo, + unsigned short wCurrBeaconPeriod, unsigned int uCurrChannel, - WORD wCurrATIMWinodw, + unsigned short wCurrATIMWinodw, unsigned char *pDstAddr, PWLAN_IE_SSID pCurrSSID, unsigned char *pCurrBSSID, @@ -3494,7 +3494,7 @@ s_MgrMakeProbeResponse( *sFrame.pwCapInfo = cpu_to_le16(wCurrCapInfo); if (byPHYType == BB_TYPE_11B) { - *sFrame.pwCapInfo &= cpu_to_le16((WORD)~(WLAN_SET_CAP_INFO_SHORTSLOTTIME(1))); + *sFrame.pwCapInfo &= cpu_to_le16((unsigned short)~(WLAN_SET_CAP_INFO_SHORTSLOTTIME(1))); } // Copy SSID @@ -3644,8 +3644,8 @@ s_MgrMakeAssocRequest( PSDevice pDevice, PSMgmtObject pMgmt, unsigned char *pDAddr, - WORD wCurrCapInfo, - WORD wListenInterval, + unsigned short wCurrCapInfo, + unsigned short wListenInterval, PWLAN_IE_SSID pCurrSSID, PWLAN_IE_SUPP_RATES pCurrRates, PWLAN_IE_SUPP_RATES pCurrExtSuppRates @@ -3919,8 +3919,8 @@ s_MgrMakeReAssocRequest( PSDevice pDevice, PSMgmtObject pMgmt, unsigned char *pDAddr, - WORD wCurrCapInfo, - WORD wListenInterval, + unsigned short wCurrCapInfo, + unsigned short wListenInterval, PWLAN_IE_SSID pCurrSSID, PWLAN_IE_SUPP_RATES pCurrRates, PWLAN_IE_SUPP_RATES pCurrExtSuppRates @@ -4170,9 +4170,9 @@ PSTxMgmtPacket s_MgrMakeAssocResponse( PSDevice pDevice, PSMgmtObject pMgmt, - WORD wCurrCapInfo, - WORD wAssocStatus, - WORD wAssocAID, + unsigned short wCurrCapInfo, + unsigned short wAssocStatus, + unsigned short wAssocAID, unsigned char *pDstAddr, PWLAN_IE_SUPP_RATES pCurrSuppRates, PWLAN_IE_SUPP_RATES pCurrExtSuppRates @@ -4201,7 +4201,7 @@ s_MgrMakeAssocResponse( *sFrame.pwCapInfo = cpu_to_le16(wCurrCapInfo); *sFrame.pwStatus = cpu_to_le16(wAssocStatus); - *sFrame.pwAid = cpu_to_le16((WORD)(wAssocAID | BIT14 | BIT15)); + *sFrame.pwAid = cpu_to_le16((unsigned short)(wAssocAID | BIT14 | BIT15)); // Copy the rate set sFrame.pSuppRates = (PWLAN_IE_SUPP_RATES)(sFrame.pBuf + sFrame.len); @@ -4244,9 +4244,9 @@ PSTxMgmtPacket s_MgrMakeReAssocResponse( PSDevice pDevice, PSMgmtObject pMgmt, - WORD wCurrCapInfo, - WORD wAssocStatus, - WORD wAssocAID, + unsigned short wCurrCapInfo, + unsigned short wAssocStatus, + unsigned short wAssocAID, unsigned char *pDstAddr, PWLAN_IE_SUPP_RATES pCurrSuppRates, PWLAN_IE_SUPP_RATES pCurrExtSuppRates @@ -4275,7 +4275,7 @@ s_MgrMakeReAssocResponse( *sFrame.pwCapInfo = cpu_to_le16(wCurrCapInfo); *sFrame.pwStatus = cpu_to_le16(wAssocStatus); - *sFrame.pwAid = cpu_to_le16((WORD)(wAssocAID | BIT14 | BIT15)); + *sFrame.pwAid = cpu_to_le16((unsigned short)(wAssocAID | BIT14 | BIT15)); // Copy the rate set sFrame.pSuppRates = (PWLAN_IE_SUPP_RATES)(sFrame.pBuf + sFrame.len); @@ -4742,7 +4742,7 @@ static void s_vMgrLogStatus( PSMgmtObject pMgmt, - WORD wStatus + unsigned short wStatus ) { switch( wStatus ){ diff --git a/drivers/staging/vt6655/wmgr.h b/drivers/staging/vt6655/wmgr.h index 748706fcaef7..badf69df6724 100644 --- a/drivers/staging/vt6655/wmgr.h +++ b/drivers/staging/vt6655/wmgr.h @@ -276,10 +276,10 @@ typedef struct tagSMgmtObject BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE abyCurrSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; BYTE abyCurrBSSID[WLAN_BSSID_LEN]; - WORD wCurrCapInfo; - WORD wCurrAID; - WORD wCurrATIMWindow; - WORD wCurrBeaconPeriod; + unsigned short wCurrCapInfo; + unsigned short wCurrAID; + unsigned short wCurrATIMWindow; + unsigned short wCurrBeaconPeriod; BOOL bIsDS; BYTE byERPContext; @@ -292,13 +292,13 @@ typedef struct tagSMgmtObject // Adhoc or AP configuration vars //BYTE abyAdHocSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; - WORD wIBSSBeaconPeriod; - WORD wIBSSATIMWindow; + unsigned short wIBSSBeaconPeriod; + unsigned short wIBSSATIMWindow; unsigned int uIBSSChannel; BYTE abyIBSSSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE byAPBBType; BYTE abyWPAIE[MAX_WPA_IE_LEN]; - WORD wWPAIELen; + unsigned short wWPAIELen; unsigned int uAssocCount; BOOL bMoreData; @@ -308,7 +308,7 @@ typedef struct tagSMgmtObject WMAC_SCAN_TYPE eScanType; unsigned int uScanStartCh; unsigned int uScanEndCh; - WORD wScanSteps; + unsigned short wScanSteps; unsigned int uScanBSSType; // Desire scannig vars BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; @@ -329,8 +329,8 @@ typedef struct tagSMgmtObject // Power saving state vars WMAC_POWER_MODE ePSMode; - WORD wListenInterval; - WORD wCountToWakeUp; + unsigned short wListenInterval; + unsigned short wCountToWakeUp; BOOL bInTIMWake; unsigned char *pbyPSPacketPool; BYTE byPSPacketPool[sizeof(STxMgmtPacket) + WLAN_NULLDATA_FR_MAXLEN]; @@ -433,7 +433,7 @@ vMgrDisassocBeginSta( void *hDeviceContext, PSMgmtObject pMgmt, unsigned char *abyDestAddress, - WORD wReason, + unsigned short wReason, PCMD_STATUS pStatus ); @@ -476,7 +476,7 @@ vMgrDeAuthenBeginSta( void *hDeviceContext, PSMgmtObject pMgmt, unsigned char *abyDestAddress, - WORD wReason, + unsigned short wReason, PCMD_STATUS pStatus ); diff --git a/drivers/staging/vt6655/wpa.c b/drivers/staging/vt6655/wpa.c index 4f81364dffea..64a4f5f9aaf2 100644 --- a/drivers/staging/vt6655/wpa.c +++ b/drivers/staging/vt6655/wpa.c @@ -166,7 +166,7 @@ WPA_ParseRSN ( break; //DBG_PRN_GRP14(("abyPKType[%d]: %X\n", j-1, pBSSList->abyPKType[j-1])); } //for - pBSSList->wPKCount = (WORD)j; + pBSSList->wPKCount = (unsigned short)j; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wPKCount: %d\n", pBSSList->wPKCount); } @@ -195,7 +195,7 @@ WPA_ParseRSN ( //DBG_PRN_GRP14(("abyAuthType[%d]: %X\n", j-1, pBSSList->abyAuthType[j-1])); } if(j > 0) - pBSSList->wAuthCount = (WORD)j; + pBSSList->wAuthCount = (unsigned short)j; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAuthCount: %d\n", pBSSList->wAuthCount); } diff --git a/drivers/staging/vt6655/wpa2.c b/drivers/staging/vt6655/wpa2.c index c4387de67c4d..b97094173fa6 100644 --- a/drivers/staging/vt6655/wpa2.c +++ b/drivers/staging/vt6655/wpa2.c @@ -114,7 +114,7 @@ WPA2vParseRSN ( ) { int i, j; - WORD m = 0, n = 0; + unsigned short m = 0, n = 0; unsigned char *pbyOUI; BOOL bUseGK = FALSE; @@ -209,7 +209,7 @@ WPA2vParseRSN ( // invalid CSS, No valid PK. return; } - pBSSNode->wCSSPKCount = (WORD)j; + pBSSNode->wCSSPKCount = (unsigned short)j; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wCSSPKCount: %d\n", pBSSNode->wCSSPKCount); } @@ -232,7 +232,7 @@ WPA2vParseRSN ( } else break; } - pBSSNode->wAKMSSAuthCount = (WORD)j; + pBSSNode->wAKMSSAuthCount = (unsigned short)j; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAKMSSAuthCount: %d\n", pBSSNode->wAKMSSAuthCount); n = *((unsigned short *) &(pRSN->abyRSN[6+4*m]));; diff --git a/drivers/staging/vt6655/wroute.c b/drivers/staging/vt6655/wroute.c index 6d02cea7b41d..9af4aebf8d0b 100644 --- a/drivers/staging/vt6655/wroute.c +++ b/drivers/staging/vt6655/wroute.c @@ -139,7 +139,7 @@ BOOL ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat if (pDevice->uConnectionRate >= RATE_11M) { pDevice->wCurrentRate = RATE_11M; } else { - pDevice->wCurrentRate = (WORD)pDevice->uConnectionRate; + pDevice->wCurrentRate = (unsigned short)pDevice->uConnectionRate; } } else { if ((pDevice->eCurrentPHYType == PHY_TYPE_11A) && @@ -149,7 +149,7 @@ BOOL ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat if (pDevice->uConnectionRate >= RATE_54M) pDevice->wCurrentRate = RATE_54M; else - pDevice->wCurrentRate = (WORD)pDevice->uConnectionRate; + pDevice->wCurrentRate = (unsigned short)pDevice->uConnectionRate; } } } |