Skip to content

L
linux
Commit fc20463e authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files
Options

staging: vt6656: rf.c: RFbRawSetPower Remove camel case and cleanup. 

White space clean up.

Camel case changes;
pDevice -> priv
uRATE -> rate
bResult -> ret
byPwr -> power

Functional change merged as one variable.
dwMax7230Pwr -> power_setting
dwVT3226Pwr -> power_setting
dwVT3342Pwr -> power_setting

Author changes moved to Revision history.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a628747f
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 105 deletions
drivers/staging/vt6656/rf.c
View file @ fc20463e
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
* IFRFbWriteEmbedded - Embedded write RF register via MAC * IFRFbWriteEmbedded - Embedded write RF register via MAC
* *
* Revision History: * Revision History:
* RF_VT3226: RobertYu:20051111, VT3226C0 and before
* RF_VT3226D0: RobertYu:20051228
* *
*/ */
...@@ -783,136 +785,146 @@ int RFbSetPower(struct vnt_private *priv, u32 rate, u32 channel) ...@@ -783,136 +785,146 @@ int RFbSetPower(struct vnt_private *priv, u32 rate, u32 channel)
* *
*/ */
int RFbRawSetPower(struct vnt_private *pDevice, u8 byPwr, u32 uRATE) int RFbRawSetPower(struct vnt_private *priv, u8 power, u32 rate)
{ {
int bResult = true; u32 power_setting = 0;
int ret = true;
if (pDevice->byCurPwr == byPwr) if (priv->byCurPwr == power)
return true; return true;
pDevice->byCurPwr = byPwr; priv->byCurPwr = power;
switch (pDevice->byRFType) {
case RF_AL2230 : switch (priv->byRFType) {
if (pDevice->byCurPwr >= AL2230_PWR_IDX_LEN) case RF_AL2230:
if (priv->byCurPwr >= AL2230_PWR_IDX_LEN)
return false; return false;
bResult &= IFRFbWriteEmbedded(pDevice, dwAL2230PowerTable[pDevice->byCurPwr]);
if (uRATE <= RATE_11M) ret &= IFRFbWriteEmbedded(priv,
bResult &= IFRFbWriteEmbedded(pDevice, 0x0001B400+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW); dwAL2230PowerTable[priv->byCurPwr]);
if (rate <= RATE_11M)
ret &= IFRFbWriteEmbedded(priv, 0x0001b400 +
(BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW);
else else
bResult &= IFRFbWriteEmbedded(pDevice, 0x0005A400+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW); ret &= IFRFbWriteEmbedded(priv, 0x0005a400 +
(BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW);
break; break;
case RF_AL2230S:
case RF_AL2230S : if (priv->byCurPwr >= AL2230_PWR_IDX_LEN)
if (pDevice->byCurPwr >= AL2230_PWR_IDX_LEN)
return false; return false;
bResult &= IFRFbWriteEmbedded(pDevice, dwAL2230PowerTable[pDevice->byCurPwr]);
if (uRATE <= RATE_11M) { ret &= IFRFbWriteEmbedded(priv,
bResult &= IFRFbWriteEmbedded(pDevice, 0x040C1400+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW); dwAL2230PowerTable[priv->byCurPwr]);
bResult &= IFRFbWriteEmbedded(pDevice, 0x00299B00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW);
}else { if (rate <= RATE_11M) {
bResult &= IFRFbWriteEmbedded(pDevice, 0x0005A400+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW); ret &= IFRFbWriteEmbedded(priv, 0x040c1400 +
bResult &= IFRFbWriteEmbedded(pDevice, 0x00099B00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW); (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW);
ret &= IFRFbWriteEmbedded(priv, 0x00299b00 +
(BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW);
} else {
ret &= IFRFbWriteEmbedded(priv, 0x0005a400 +
(BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW);
ret &= IFRFbWriteEmbedded(priv, 0x00099b00 +
(BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW);
} }
break; break;
case RF_AIROHA7230: case RF_AIROHA7230:
{ if (rate <= RATE_11M)
u32 dwMax7230Pwr; ret &= IFRFbWriteEmbedded(priv, 0x111bb900 +
(BY_AL7230_REG_LEN << 3)+IFREGCTL_REGW);
else
ret &= IFRFbWriteEmbedded(priv, 0x221bb900 +
(BY_AL7230_REG_LEN << 3)+IFREGCTL_REGW);
if (uRATE <= RATE_11M) { //RobertYu:20060426, for better 11b mask if (priv->byCurPwr > AL7230_PWR_IDX_LEN)
bResult &= IFRFbWriteEmbedded(pDevice, 0x111BB900+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW); return false;
}
else {
bResult &= IFRFbWriteEmbedded(pDevice, 0x221BB900+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW);
}
if (pDevice->byCurPwr > AL7230_PWR_IDX_LEN) return false; /*
* 0x080F1B00 for 3 wire control TxGain(D10)
* and 0x31 as TX Gain value
*/
power_setting = 0x080c0b00 | ((priv->byCurPwr) << 12) |
(BY_AL7230_REG_LEN << 3) | IFREGCTL_REGW;
// 0x080F1B00 for 3 wire control TxGain(D10) and 0x31 as TX Gain value ret &= IFRFbWriteEmbedded(priv, power_setting);
dwMax7230Pwr = 0x080C0B00 | ( (pDevice->byCurPwr) << 12 ) |
(BY_AL7230_REG_LEN << 3 ) | IFREGCTL_REGW;
bResult &= IFRFbWriteEmbedded(pDevice, dwMax7230Pwr);
break;
}
break; break;
case RF_VT3226: //RobertYu:20051111, VT3226C0 and before case RF_VT3226:
{ if (priv->byCurPwr >= VT3226_PWR_IDX_LEN)
u32 dwVT3226Pwr;
if (pDevice->byCurPwr >= VT3226_PWR_IDX_LEN)
return false; return false;
dwVT3226Pwr = ((0x3F-pDevice->byCurPwr) << 20 ) | ( 0x17 << 8 ) /* Reg7 */ | power_setting = ((0x3f - priv->byCurPwr) << 20) | (0x17 << 8) |
(BY_VT3226_REG_LEN << 3 ) | IFREGCTL_REGW; (BY_VT3226_REG_LEN << 3) | IFREGCTL_REGW;
bResult &= IFRFbWriteEmbedded(pDevice, dwVT3226Pwr);
break;
}
case RF_VT3226D0: //RobertYu:20051228 ret &= IFRFbWriteEmbedded(priv, power_setting);
{
u32 dwVT3226Pwr;
if (pDevice->byCurPwr >= VT3226_PWR_IDX_LEN) break;
case RF_VT3226D0:
if (priv->byCurPwr >= VT3226_PWR_IDX_LEN)
return false; return false;
if (uRATE <= RATE_11M) { if (rate <= RATE_11M) {
power_setting = ((0x3f-priv->byCurPwr) << 20) |
(0xe07 << 8) | (BY_VT3226_REG_LEN << 3) |
IFREGCTL_REGW;
dwVT3226Pwr = ((0x3F-pDevice->byCurPwr) << 20 ) | ( 0xE07 << 8 ) /* Reg7 */ | //RobertYu:20060420, TWIF 1.10 ret &= IFRFbWriteEmbedded(priv, power_setting);
(BY_VT3226_REG_LEN << 3 ) | IFREGCTL_REGW; ret &= IFRFbWriteEmbedded(priv, 0x03c6a200 +
bResult &= IFRFbWriteEmbedded(pDevice, dwVT3226Pwr); (BY_VT3226_REG_LEN<<3)+IFREGCTL_REGW);
bResult &= IFRFbWriteEmbedded(pDevice, 0x03C6A200+(BY_VT3226_REG_LEN<<3)+IFREGCTL_REGW); if (priv->vnt_mgmt.eScanState != WMAC_NO_SCANNING) {
if (pDevice->vnt_mgmt.eScanState != WMAC_NO_SCANNING) {
/* scanning, channel number is pDevice->uScanChannel */
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
"RFbRawSetPower> 11B mode uCurrChannel[%d]\n", "RFbRawSetPower> 11B mode uCurrChannel[%d]\n",
pDevice->vnt_mgmt.uScanChannel); priv->vnt_mgmt.uScanChannel);
bResult &= IFRFbWriteEmbedded(pDevice, ret &= IFRFbWriteEmbedded(priv,
dwVT3226D0LoCurrentTable[pDevice-> dwVT3226D0LoCurrentTable[priv->
vnt_mgmt.uScanChannel - 1]); vnt_mgmt.uScanChannel - 1]);
} else { } else {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
"RFbRawSetPower> 11B mode uCurrChannel[%d]\n", "RFbRawSetPower> 11B mode uCurrChannel[%d]\n",
pDevice->vnt_mgmt.uCurrChannel); priv->vnt_mgmt.uCurrChannel);
bResult &= IFRFbWriteEmbedded(pDevice, ret &= IFRFbWriteEmbedded(priv,
dwVT3226D0LoCurrentTable[pDevice-> dwVT3226D0LoCurrentTable[priv->
vnt_mgmt.uCurrChannel - 1]); vnt_mgmt.uCurrChannel - 1]);
} }
bResult &= IFRFbWriteEmbedded(pDevice, 0x015C0800+(BY_VT3226_REG_LEN<<3)+IFREGCTL_REGW); //RobertYu:20060420, ok now, new switching power (mini-pci can have bigger power consumption) ret &= IFRFbWriteEmbedded(priv, 0x015C0800 +
(BY_VT3226_REG_LEN<<3)+IFREGCTL_REGW);
} else { } else {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"@@@@ RFbRawSetPower> 11G mode\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
dwVT3226Pwr = ((0x3F-pDevice->byCurPwr) << 20 ) | ( 0x7 << 8 ) /* Reg7 */ | //RobertYu:20060420, TWIF 1.10 "@@@@ RFbRawSetPower> 11G mode\n");
(BY_VT3226_REG_LEN << 3 ) | IFREGCTL_REGW;
bResult &= IFRFbWriteEmbedded(pDevice, dwVT3226Pwr); power_setting = ((0x3f-priv->byCurPwr) << 20) |
bResult &= IFRFbWriteEmbedded(pDevice, 0x00C6A200+(BY_VT3226_REG_LEN<<3)+IFREGCTL_REGW); //RobertYu:20060327 (0x7 << 8) | (BY_VT3226_REG_LEN << 3) |
bResult &= IFRFbWriteEmbedded(pDevice, 0x016BC600+(BY_VT3226_REG_LEN<<3)+IFREGCTL_REGW); //RobertYu:20060111 IFREGCTL_REGW;
bResult &= IFRFbWriteEmbedded(pDevice, 0x00900800+(BY_VT3226_REG_LEN<<3)+IFREGCTL_REGW); //RobertYu:20060111
ret &= IFRFbWriteEmbedded(priv, power_setting);
ret &= IFRFbWriteEmbedded(priv, 0x00C6A200 +
(BY_VT3226_REG_LEN << 3) + IFREGCTL_REGW);
ret &= IFRFbWriteEmbedded(priv, 0x016BC600 +
(BY_VT3226_REG_LEN<<3)+IFREGCTL_REGW);
ret &= IFRFbWriteEmbedded(priv, 0x00900800 +
(BY_VT3226_REG_LEN<<3)+IFREGCTL_REGW);
} }
break; break;
}
//{{RobertYu:20060609
case RF_VT3342A0: case RF_VT3342A0:
{ if (priv->byCurPwr >= VT3342_PWR_IDX_LEN)
u32 dwVT3342Pwr;
if (pDevice->byCurPwr >= VT3342_PWR_IDX_LEN)
return false; return false;
dwVT3342Pwr = ((0x3F-pDevice->byCurPwr) << 20 ) | ( 0x27 << 8 ) /* Reg7 */ | power_setting = ((0x3F-priv->byCurPwr) << 20) |
(BY_VT3342_REG_LEN << 3 ) | IFREGCTL_REGW; (0x27 << 8) | (BY_VT3342_REG_LEN << 3) |
bResult &= IFRFbWriteEmbedded(pDevice, dwVT3342Pwr); IFREGCTL_REGW;
break;
}
default : ret &= IFRFbWriteEmbedded(priv, power_setting);
break;
default:
break; break;
} }
return bResult; return ret;
} }
/*+ /*+
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7