leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: vt6656: cleared C99 // comments in datarate.c

Browse Source 
Cleared 'do not use C99 // comments' checkpatch error, several warnings
about code indentation and camel casing were not resolved.

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andres More 2013-01-31 15:20:42 -05:00 committed by Greg Kroah-Hartman
parent c16fdffc2d
commit 84cf5fcbb5
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/staging/vt6656/datarate.c
View File

@ -54,7 +54,8 @@
/*--------------------- Static Variables --------------------------*/ /*--------------------- Static Variables --------------------------*/
//static int msglevel =MSG_LEVEL_DEBUG;
/* static int msglevel = MSG_LEVEL_DEBUG; */
static int msglevel =MSG_LEVEL_INFO; static int msglevel =MSG_LEVEL_INFO;
const BYTE acbyIERate[MAX_RATE] = const BYTE acbyIERate[MAX_RATE] =
{0x02, 0x04, 0x0B, 0x16, 0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C}; {0x02, 0x04, 0x0B, 0x16, 0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C};
@ -71,7 +72,7 @@ void s_vResetCounter(PKnownNodeDB psNodeDBTable)
{ {
BYTE ii; BYTE ii;
// clear statistic counter for auto_rate /* clear statistics counter for auto_rate */
for (ii = 0; ii <= MAX_RATE; ii++) { for (ii = 0; ii <= MAX_RATE; ii++) {
psNodeDBTable->uTxOk[ii] = 0; psNodeDBTable->uTxOk[ii] = 0;
psNodeDBTable->uTxFail[ii] = 0; psNodeDBTable->uTxFail[ii] = 0;
@ -105,8 +106,8 @@ DATARATEbyGetRateIdx (
{ {
BYTE ii; BYTE ii;
//Erase basicRate flag. /* erase BasicRate flag */
byRate = byRate & 0x7F;//0111 1111 byRate = byRate & 0x7F;
for (ii = 0; ii < MAX_RATE; ii ++) { for (ii = 0; ii < MAX_RATE; ii ++) {
if (acbyIERate[ii] == byRate) if (acbyIERate[ii] == byRate)
@ -159,8 +160,8 @@ RATEwGetRateIdx(
{ {
WORD ii; WORD ii;
//Erase basicRate flag. /* erase BasicRate flag */
byRate = byRate & 0x7F;//0111 1111 byRate = byRate & 0x7F;
for (ii = 0; ii < MAX_RATE; ii ++) { for (ii = 0; ii < MAX_RATE; ii ++) {
if (acbyIERate[ii] == byRate) if (acbyIERate[ii] == byRate)
@ -218,7 +219,10 @@ void RATEvParseMaxRate(struct vnt_private *pDevice,
byRate = (BYTE)(pItemRates->abyRates[ii]); byRate = (BYTE)(pItemRates->abyRates[ii]);
if (WLAN_MGMT_IS_BASICRATE(byRate) && if (WLAN_MGMT_IS_BASICRATE(byRate) &&
(bUpdateBasicRate == TRUE)) { (bUpdateBasicRate == TRUE)) {
// Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate /*
* add to basic rate set, update pDevice->byTopCCKBasicRate and
* pDevice->byTopOFDMBasicRate
*/
CARDbAddBasicRate((void *)pDevice, RATEwGetRateIdx(byRate)); CARDbAddBasicRate((void *)pDevice, RATEwGetRateIdx(byRate));
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", RATEwGetRateIdx(byRate)); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", RATEwGetRateIdx(byRate));
} }
@ -239,9 +243,12 @@ void RATEvParseMaxRate(struct vnt_private *pDevice,
for (ii = 0; ii < uExtRateLen ; ii++) { for (ii = 0; ii < uExtRateLen ; ii++) {
byRate = (BYTE)(pItemExtRates->abyRates[ii]); byRate = (BYTE)(pItemExtRates->abyRates[ii]);
// select highest basic rate /* select highest basic rate */
if (WLAN_MGMT_IS_BASICRATE(pItemExtRates->abyRates[ii])) { if (WLAN_MGMT_IS_BASICRATE(pItemExtRates->abyRates[ii])) {
// Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate /*
* add to basic rate set, update pDevice->byTopCCKBasicRate and
* pDevice->byTopOFDMBasicRate
*/
CARDbAddBasicRate((void *)pDevice, RATEwGetRateIdx(byRate)); CARDbAddBasicRate((void *)pDevice, RATEwGetRateIdx(byRate));
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", RATEwGetRateIdx(byRate)); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", RATEwGetRateIdx(byRate));
} }
@ -251,9 +258,11 @@ void RATEvParseMaxRate(struct vnt_private *pDevice,
if (byRate > byHighSuppRate) if (byRate > byHighSuppRate)
byHighSuppRate = byRate; byHighSuppRate = byRate;
*pwSuppRate |= (1<<RATEwGetRateIdx(byRate)); *pwSuppRate |= (1<<RATEwGetRateIdx(byRate));
//DBG_PRN_GRP09(("ParseMaxRate : HighSuppRate: %d, %X\n", RATEwGetRateIdx(byRate), byRate));
/* DBG_PRN_GRP09(("ParseMaxRate : HighSuppRate: %d, %X\n",
RATEwGetRateIdx(byRate), byRate)); */
} }
} //if(pItemExtRates != NULL) }
if ((pDevice->byPacketType == PK_TYPE_11GB) if ((pDevice->byPacketType == PK_TYPE_11GB)
&& CARDbIsOFDMinBasicRate((void *)pDevice)) { && CARDbIsOFDMinBasicRate((void *)pDevice)) {
@ -363,7 +372,7 @@ void RATEvTxRateFallBack(struct vnt_private *pDevice,
(psNodeDBTable->uTxFail[MAX_RATE] * 4) ) { (psNodeDBTable->uTxFail[MAX_RATE] * 4) ) {
psNodeDBTable->wTxDataRate = wIdxUpRate; psNodeDBTable->wTxDataRate = wIdxUpRate;
} }
}else { // adhoc, if uTxOk(total) =0 & uTxFail(total) = 0 } else { /* adhoc, if uTxOk(total) == 0 & uTxFail(total) == 0 */
if (psNodeDBTable->uTxFail[MAX_RATE] == 0) if (psNodeDBTable->uTxFail[MAX_RATE] == 0)
psNodeDBTable->wTxDataRate = wIdxUpRate; psNodeDBTable->wTxDataRate = wIdxUpRate;
} }