diff options
author | Charles Clément <caratorn@gmail.com> | 2010-06-24 11:02:26 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-24 14:23:17 -0700 |
commit | 2986db5fd31e312206d3ebfa4786aac04bdbe486 (patch) | |
tree | 910e5522ededbdce9e97601fccb79ae94ec51404 /drivers/staging/vt6655/datarate.c | |
parent | 0f4c60d61e9c10a0733eacd650c101189bdf75cd (diff) |
Staging: vt6655: remove WORD typedef
Replace all occurrences with unsigned short type.
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/datarate.c')
-rw-r--r-- | drivers/staging/vt6655/datarate.c | 16 |
1 files changed, 8 insertions, 8 deletions
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; |