Commit 8543bb9c authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: rf.c/h rename RFbRawSetPower to vnt_rf_set_txpower

Remove raw and use txpower.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4f5290ea
...@@ -99,15 +99,15 @@ void CARDbSetMediaChannel(struct vnt_private *priv, u32 connection_channel) ...@@ -99,15 +99,15 @@ void CARDbSetMediaChannel(struct vnt_private *priv, u32 connection_channel)
if (priv->byBBType == BB_TYPE_11A) { if (priv->byBBType == BB_TYPE_11A) {
priv->byCurPwr = 0xff; priv->byCurPwr = 0xff;
RFbRawSetPower(priv, vnt_rf_set_txpower(priv,
priv->abyOFDMAPwrTbl[connection_channel-15], RATE_54M); priv->abyOFDMAPwrTbl[connection_channel-15], RATE_54M);
} else if (priv->byBBType == BB_TYPE_11G) { } else if (priv->byBBType == BB_TYPE_11G) {
priv->byCurPwr = 0xff; priv->byCurPwr = 0xff;
RFbRawSetPower(priv, vnt_rf_set_txpower(priv,
priv->abyOFDMPwrTbl[connection_channel-1], RATE_54M); priv->abyOFDMPwrTbl[connection_channel-1], RATE_54M);
} else { } else {
priv->byCurPwr = 0xff; priv->byCurPwr = 0xff;
RFbRawSetPower(priv, vnt_rf_set_txpower(priv,
priv->abyCCKPwrTbl[connection_channel-1], RATE_1M); priv->abyCCKPwrTbl[connection_channel-1], RATE_1M);
} }
......
...@@ -763,7 +763,7 @@ int vnt_rf_setpower(struct vnt_private *priv, u32 rate, u32 channel) ...@@ -763,7 +763,7 @@ int vnt_rf_setpower(struct vnt_private *priv, u32 rate, u32 channel)
break; break;
} }
ret = RFbRawSetPower(priv, power, rate); ret = vnt_rf_set_txpower(priv, power, rate);
return ret; return ret;
} }
...@@ -808,7 +808,7 @@ static u8 vnt_rf_addpower(struct vnt_private *priv) ...@@ -808,7 +808,7 @@ static u8 vnt_rf_addpower(struct vnt_private *priv)
* *
*/ */
int RFbRawSetPower(struct vnt_private *priv, u8 power, u32 rate) int vnt_rf_set_txpower(struct vnt_private *priv, u8 power, u32 rate)
{ {
u32 power_setting = 0; u32 power_setting = 0;
int ret = true; int ret = true;
...@@ -903,14 +903,14 @@ int RFbRawSetPower(struct vnt_private *priv, u8 power, u32 rate) ...@@ -903,14 +903,14 @@ int RFbRawSetPower(struct vnt_private *priv, u8 power, u32 rate)
if (priv->vnt_mgmt.eScanState != WMAC_NO_SCANNING) { if (priv->vnt_mgmt.eScanState != WMAC_NO_SCANNING) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
"RFbRawSetPower> 11B mode uCurrChannel[%d]\n", "vnt_rf_set_txpower> 11B mode uCurrChannel[%d]\n",
priv->vnt_mgmt.uScanChannel); priv->vnt_mgmt.uScanChannel);
ret &= vnt_rf_write_embedded(priv, ret &= vnt_rf_write_embedded(priv,
vt3226d0_lo_current_table[priv-> vt3226d0_lo_current_table[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", "vnt_rf_set_txpower> 11B mode uCurrChannel[%d]\n",
priv->vnt_mgmt.uCurrChannel); priv->vnt_mgmt.uCurrChannel);
ret &= vnt_rf_write_embedded(priv, ret &= vnt_rf_write_embedded(priv,
vt3226d0_lo_current_table[priv-> vt3226d0_lo_current_table[priv->
...@@ -921,7 +921,7 @@ int RFbRawSetPower(struct vnt_private *priv, u8 power, u32 rate) ...@@ -921,7 +921,7 @@ int RFbRawSetPower(struct vnt_private *priv, u8 power, u32 rate)
(BY_VT3226_REG_LEN<<3)+IFREGCTL_REGW); (BY_VT3226_REG_LEN<<3)+IFREGCTL_REGW);
} else { } else {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
"@@@@ RFbRawSetPower> 11G mode\n"); "@@@@ vnt_rf_set_txpower> 11G mode\n");
power_setting = ((0x3f-priv->byCurPwr) << 20) | power_setting = ((0x3f-priv->byCurPwr) << 20) |
(0x7 << 8) | (BY_VT3226_REG_LEN << 3) | (0x7 << 8) | (BY_VT3226_REG_LEN << 3) |
......
...@@ -59,7 +59,7 @@ extern const u8 RFaby11aChannelIndex[200]; ...@@ -59,7 +59,7 @@ extern const u8 RFaby11aChannelIndex[200];
int vnt_rf_write_embedded(struct vnt_private *, u32); int vnt_rf_write_embedded(struct vnt_private *, u32);
int vnt_rf_setpower(struct vnt_private *, u32, u32); int vnt_rf_setpower(struct vnt_private *, u32, u32);
int RFbRawSetPower(struct vnt_private *, u8 byPwr, u32 uRATE); int vnt_rf_set_txpower(struct vnt_private *, u8, u32);
void RFvRSSITodBm(struct vnt_private *, u8 byCurrRSSI, long *pldBm); void RFvRSSITodBm(struct vnt_private *, u8 byCurrRSSI, long *pldBm);
void RFbRFTableDownload(struct vnt_private *pDevice); void RFbRFTableDownload(struct vnt_private *pDevice);
......
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