Commit 030ede1e authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: BBuGetFrameTime remove camel case.

Camel case changes.
byPreambleType, byPktType, cbFrameLength, uFrameTime, uPreamble, uTmp, uRate
->
preamble_type, pkt_type, frame_length, frame_time, preamble, tmp, rate
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b5a89ca
...@@ -654,54 +654,54 @@ s_vClearSQ3Value(PSDevice pDevice); ...@@ -654,54 +654,54 @@ s_vClearSQ3Value(PSDevice pDevice);
* *
* Parameters: * Parameters:
* In: * In:
* byPreambleType - Preamble Type * preamble_type - Preamble Type
* byPktType - PK_TYPE_11A, PK_TYPE_11B, PK_TYPE_11GB, PK_TYPE_11GA * pkt_type - PK_TYPE_11A, PK_TYPE_11B, PK_TYPE_11GB, PK_TYPE_11GA
* cbFrameLength - Baseband Type * frame_length - Baseband Type
* tx_rate - Tx Rate * tx_rate - Tx Rate
* Out: * Out:
* *
* Return Value: FrameTime * Return Value: FrameTime
* *
*/ */
unsigned int BBuGetFrameTime(u8 byPreambleType, u8 byPktType, unsigned int BBuGetFrameTime(u8 preamble_type, u8 pkt_type,
unsigned int cbFrameLength, u16 tx_rate) unsigned int frame_length, u16 tx_rate)
{ {
unsigned int uFrameTime; unsigned int frame_time;
unsigned int uPreamble; unsigned int preamble;
unsigned int uTmp; unsigned int tmp;
unsigned int uRate = 0; unsigned int rate = 0;
if (tx_rate > RATE_54M) if (tx_rate > RATE_54M)
return 0; return 0;
uRate = (unsigned int)awcFrameTime[tx_rate]; rate = (unsigned int)awcFrameTime[tx_rate];
if (tx_rate <= 3) { if (tx_rate <= 3) {
if (byPreambleType == 1) if (preamble_type == 1)
uPreamble = 96; preamble = 96;
else else
uPreamble = 192; preamble = 192;
uFrameTime = (cbFrameLength * 80) / uRate; frame_time = (frame_length * 80) / rate;
uTmp = (uFrameTime * uRate) / 80; tmp = (frame_time * rate) / 80;
if (cbFrameLength != uTmp) if (frame_length != tmp)
uFrameTime++; frame_time++;
return uPreamble + uFrameTime; return preamble + frame_time;
} else { } else {
uFrameTime = (cbFrameLength * 8 + 22) / uRate; frame_time = (frame_length * 8 + 22) / rate;
uTmp = ((uFrameTime * uRate) - 22) / 8; tmp = ((frame_time * rate) - 22) / 8;
if (cbFrameLength != uTmp) if (frame_length != tmp)
uFrameTime++; frame_time++;
uFrameTime = uFrameTime * 4; frame_time = frame_time * 4;
if (byPktType != PK_TYPE_11A) if (pkt_type != PK_TYPE_11A)
uFrameTime += 6; frame_time += 6;
return 20 + uFrameTime; return 20 + frame_time;
} }
} }
......
...@@ -88,8 +88,8 @@ struct vnt_phy_field { ...@@ -88,8 +88,8 @@ struct vnt_phy_field {
__le16 len; __le16 len;
} __packed; } __packed;
unsigned int BBuGetFrameTime(u8 byPreambleType, u8 byPktType, unsigned int BBuGetFrameTime(u8 preamble_type, u8 pkt_type,
unsigned int cbFrameLength, u16 tx_rate); unsigned int frame_length, u16 tx_rate);
void BBvCalculateParameter(struct vnt_private *, u32 cbFrameLength, void BBvCalculateParameter(struct vnt_private *, u32 cbFrameLength,
u16 wRate, u8 byPacketType, struct vnt_phy_field *); u16 wRate, u8 byPacketType, struct vnt_phy_field *);
......
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