staging: vt6656: BBuGetFrameTime remove uRateIdx

Remove uRateIdx and rename wRate tx_rate

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley
2014-05-19 20:32:59 +01:00
committed by Greg Kroah-Hartman
parent 4d99952df1
commit 3b5a89ca3d
2 changed files with 8 additions and 14 deletions

View File

@@ -657,27 +657,26 @@ s_vClearSQ3Value(PSDevice pDevice);
* byPreambleType - Preamble Type
* byPktType - PK_TYPE_11A, PK_TYPE_11B, PK_TYPE_11GB, PK_TYPE_11GA
* cbFrameLength - Baseband Type
* wRate - Tx Rate
* tx_rate - Tx Rate
* Out:
*
* Return Value: FrameTime
*
*/
unsigned int BBuGetFrameTime(u8 byPreambleType, u8 byPktType,
unsigned int cbFrameLength, u16 wRate)
unsigned int BBuGetFrameTime(u8 byPreambleType, u8 byPktType,
unsigned int cbFrameLength, u16 tx_rate)
{
unsigned int uFrameTime;
unsigned int uPreamble;
unsigned int uTmp;
unsigned int uRateIdx = (unsigned int)wRate;
unsigned int uRate = 0;
if (uRateIdx > RATE_54M)
if (tx_rate > RATE_54M)
return 0;
uRate = (unsigned int)awcFrameTime[uRateIdx];
uRate = (unsigned int)awcFrameTime[tx_rate];
if (uRateIdx <= 3) {
if (tx_rate <= 3) {
if (byPreambleType == 1)
uPreamble = 96;
else

View File

@@ -88,13 +88,8 @@ struct vnt_phy_field {
__le16 len;
} __packed;
unsigned int
BBuGetFrameTime(
u8 byPreambleType,
u8 byFreqType,
unsigned int cbFrameLength,
u16 wRate
);
unsigned int BBuGetFrameTime(u8 byPreambleType, u8 byPktType,
unsigned int cbFrameLength, u16 tx_rate);
void BBvCalculateParameter(struct vnt_private *, u32 cbFrameLength,
u16 wRate, u8 byPacketType, struct vnt_phy_field *);