mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-27 11:19:37 +00:00
Code Issues Releases Wiki Activity

Staging: vt6655: Replace camel case variable names.

Browse source 
Replace camel case variable names with snake case in baseband.h and its
dependencies.

Signed-off-by: Briana Oursler <briana.oursler@gmail.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Link: https://lore.kernel.org/r/20200403171805.466600-1-briana.oursler@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Briana Oursler 2020-04-03 10:18:05 -07:00 committed by Greg Kroah-Hartman
parent 3ea1cb241d
commit af93096eef
7 changed files with 253 additions and 251 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

312
drivers/staging/vt6655/baseband.c
View file

@ -12,10 +12,10 @@
* Date: Aug.22, 2002 * Date: Aug.22, 2002
* *
* Functions: * Functions:
* BBuGetFrameTime - Calculate data frame transmitting time * bb_get_frame_time - Calculate data frame transmitting time
* BBbReadEmbedded - Embedded read baseband register via MAC * bb_read_embedded - Embedded read baseband register via MAC
* BBbWriteEmbedded - Embedded write baseband register via MAC * bb_write_embedded - Embedded write baseband register via MAC
* BBbVT3253Init - VIA VT3253 baseband chip init code * bb_vt3253_init - VIA VT3253 baseband chip init code
* *
* Revision History: * Revision History:
* 06-10-2003 Bryan YC Fan: Re-write codes to support VT3253 spec. * 06-10-2003 Bryan YC Fan: Re-write codes to support VT3253 spec.
@ -1693,53 +1693,53 @@ static const unsigned short awcFrameTime[MAX_RATE] = {
* *
* Parameters: * Parameters:
* In: * In:
* byPreambleType - Preamble Type * by_preamble_type - Preamble Type
* byPktType - PK_TYPE_11A, PK_TYPE_11B, PK_TYPE_11GB, PK_TYPE_11GA * by_pkt_type - PK_TYPE_11A, PK_TYPE_11B, PK_TYPE_11GB, PK_TYPE_11GA
* cbFrameLength - Baseband Type * cb_frame_length - Baseband Type
* wRate - Tx Rate * tx_rate - Tx Rate
* Out: * Out:
* *
* Return Value: FrameTime * Return Value: FrameTime
* *
*/ */
unsigned int BBuGetFrameTime(unsigned char byPreambleType, unsigned int bb_get_frame_time(unsigned char by_preamble_type,
unsigned char byPktType, unsigned char by_pkt_type,
unsigned int cbFrameLength, unsigned short wRate) unsigned int cb_frame_length,
unsigned short tx_rate)
{ {
unsigned int uFrameTime; unsigned int frame_time;
unsigned int uPreamble; unsigned int preamble;
unsigned int uTmp; unsigned int tmp;
unsigned int uRateIdx = (unsigned int)wRate; unsigned int rate_idx = (unsigned int)tx_rate;
unsigned int uRate = 0; unsigned int rate = 0;
if (uRateIdx > RATE_54M) if (rate_idx > RATE_54M)
return 0; return 0;
uRate = (unsigned int)awcFrameTime[uRateIdx]; rate = (unsigned int)awcFrameTime[rate_idx];
if (uRateIdx <= 3) { /* CCK mode */ if (rate_idx <= 3) { /* CCK mode */
if (byPreambleType == 1) /* Short */ if (by_preamble_type == 1) /* Short */
uPreamble = 96; preamble = 96;
else else
uPreamble = 192; preamble = 192;
frame_time = (cb_frame_length * 80) / rate; /* ????? */
tmp = (frame_time * rate) / 80;
if (cb_frame_length != tmp)
frame_time++;
uFrameTime = (cbFrameLength * 80) / uRate; /* ????? */ return preamble + frame_time;
uTmp = (uFrameTime * uRate) / 80;
if (cbFrameLength != uTmp)
uFrameTime++;
return uPreamble + uFrameTime;
} }
uFrameTime = (cbFrameLength * 8 + 22) / uRate; /* ???????? */ frame_time = (cb_frame_length * 8 + 22) / rate; /* ???????? */
uTmp = ((uFrameTime * uRate) - 22) / 8; tmp = ((frame_time * rate) - 22) / 8;
if (cbFrameLength != uTmp) if (cb_frame_length != tmp)
uFrameTime++; frame_time++;
uFrameTime = uFrameTime * 4; /* ??????? */ frame_time = frame_time * 4; /* ??????? */
if (byPktType != PK_TYPE_11A) if (by_pkt_type != PK_TYPE_11A)
uFrameTime += 6; /* ?????? */ frame_time += 6; /* ?????? */
return 20 + uFrameTime; /* ?????? */ return 20 + frame_time; /* ?????? */
} }
/* /*
@ -1897,34 +1897,34 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
* Parameters: * Parameters:
* In: * In:
* iobase - I/O base address * iobase - I/O base address
* byBBAddr - address of register in Baseband * by_bb_addr - address of register in Baseband
* Out: * Out:
* pbyData - data read * pby_data - data read
* *
* Return Value: true if succeeded; false if failed. * Return Value: true if succeeded; false if failed.
* *
*/ */
bool BBbReadEmbedded(struct vnt_private *priv, bool bb_read_embedded(struct vnt_private *priv, unsigned char by_bb_addr,
unsigned char byBBAddr, unsigned char *pbyData) unsigned char *pby_data)
{ {
void __iomem *iobase = priv->PortOffset; void __iomem *iobase = priv->PortOffset;
unsigned short ww; unsigned short ww;
unsigned char byValue; unsigned char by_value;
/* BB reg offset */ /* BB reg offset */
VNSvOutPortB(iobase + MAC_REG_BBREGADR, byBBAddr); VNSvOutPortB(iobase + MAC_REG_BBREGADR, by_bb_addr);
/* turn on REGR */ /* turn on REGR */
MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGR); MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGR);
/* W_MAX_TIMEOUT is the timeout period */ /* W_MAX_TIMEOUT is the timeout period */
for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
VNSvInPortB(iobase + MAC_REG_BBREGCTL, &byValue); VNSvInPortB(iobase + MAC_REG_BBREGCTL, &by_value);
if (byValue & BBREGCTL_DONE) if (by_value & BBREGCTL_DONE)
break; break;
} }
/* get BB data */ /* get BB data */
VNSvInPortB(iobase + MAC_REG_BBREGDATA, pbyData); VNSvInPortB(iobase + MAC_REG_BBREGDATA, pby_data);
if (ww == W_MAX_TIMEOUT) { if (ww == W_MAX_TIMEOUT) {
pr_debug(" DBG_PORT80(0x30)\n"); pr_debug(" DBG_PORT80(0x30)\n");
@ -1939,32 +1939,32 @@ bool BBbReadEmbedded(struct vnt_private *priv,
* Parameters: * Parameters:
* In: * In:
* iobase - I/O base address * iobase - I/O base address
* byBBAddr - address of register in Baseband * by_bb_addr - address of register in Baseband
* byData - data to write * by_data - data to write
* Out: * Out:
* none * none
* *
* Return Value: true if succeeded; false if failed. * Return Value: true if succeeded; false if failed.
* *
*/ */
bool BBbWriteEmbedded(struct vnt_private *priv, bool bb_write_embedded(struct vnt_private *priv, unsigned char by_bb_addr,
unsigned char byBBAddr, unsigned char byData) unsigned char by_data)
{ {
void __iomem *iobase = priv->PortOffset; void __iomem *iobase = priv->PortOffset;
unsigned short ww; unsigned short ww;
unsigned char byValue; unsigned char by_value;
/* BB reg offset */ /* BB reg offset */
VNSvOutPortB(iobase + MAC_REG_BBREGADR, byBBAddr); VNSvOutPortB(iobase + MAC_REG_BBREGADR, by_bb_addr);
/* set BB data */ /* set BB data */
VNSvOutPortB(iobase + MAC_REG_BBREGDATA, byData); VNSvOutPortB(iobase + MAC_REG_BBREGDATA, by_data);
/* turn on BBREGCTL_REGW */ /* turn on BBREGCTL_REGW */
MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGW); MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGW);
/* W_MAX_TIMEOUT is the timeout period */ /* W_MAX_TIMEOUT is the timeout period */
for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
VNSvInPortB(iobase + MAC_REG_BBREGCTL, &byValue); VNSvInPortB(iobase + MAC_REG_BBREGCTL, &by_value);
if (byValue & BBREGCTL_DONE) if (by_value & BBREGCTL_DONE)
break; break;
} }
@ -1990,29 +1990,29 @@ bool BBbWriteEmbedded(struct vnt_private *priv,
* *
*/ */
bool BBbVT3253Init(struct vnt_private *priv) bool bb_vt3253_init(struct vnt_private *priv)
{ {
bool bResult = true; bool result = true;
int ii; int ii;
void __iomem *iobase = priv->PortOffset; void __iomem *iobase = priv->PortOffset;
unsigned char byRFType = priv->byRFType; unsigned char by_rf_type = priv->byRFType;
unsigned char byLocalID = priv->byLocalID; unsigned char by_local_id = priv->byLocalID;
if (byRFType == RF_RFMD2959) { if (by_rf_type == RF_RFMD2959) {
if (byLocalID <= REV_ID_VT3253_A1) { if (by_local_id <= REV_ID_VT3253_A1) {
for (ii = 0; ii < CB_VT3253_INIT_FOR_RFMD; ii++) for (ii = 0; ii < CB_VT3253_INIT_FOR_RFMD; ii++)
bResult &= BBbWriteEmbedded(priv, result &= bb_write_embedded(priv,
byVT3253InitTab_RFMD[ii][0], byVT3253InitTab_RFMD[ii][0],
byVT3253InitTab_RFMD[ii][1]); byVT3253InitTab_RFMD[ii][1]);
} else { } else {
for (ii = 0; ii < CB_VT3253B0_INIT_FOR_RFMD; ii++) for (ii = 0; ii < CB_VT3253B0_INIT_FOR_RFMD; ii++)
bResult &= BBbWriteEmbedded(priv, result &= bb_write_embedded(priv,
byVT3253B0_RFMD[ii][0], byVT3253B0_RFMD[ii][0],
byVT3253B0_RFMD[ii][1]); byVT3253B0_RFMD[ii][1]);
for (ii = 0; ii < CB_VT3253B0_AGC_FOR_RFMD2959; ii++) for (ii = 0; ii < CB_VT3253B0_AGC_FOR_RFMD2959; ii++)
bResult &= BBbWriteEmbedded(priv, result &= bb_write_embedded(priv,
byVT3253B0_AGC4_RFMD2959[ii][0], byVT3253B0_AGC4_RFMD2959[ii][0],
byVT3253B0_AGC4_RFMD2959[ii][1]); byVT3253B0_AGC4_RFMD2959[ii][1]);
@ -2027,14 +2027,14 @@ bool BBbVT3253Init(struct vnt_private *priv)
priv->ldBmThreshold[1] = -50; priv->ldBmThreshold[1] = -50;
priv->ldBmThreshold[2] = 0; priv->ldBmThreshold[2] = 0;
priv->ldBmThreshold[3] = 0; priv->ldBmThreshold[3] = 0;
} else if ((byRFType == RF_AIROHA) || (byRFType == RF_AL2230S)) { } else if ((by_rf_type == RF_AIROHA) || (by_rf_type == RF_AL2230S)) {
for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++) for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++)
bResult &= BBbWriteEmbedded(priv, result &= bb_write_embedded(priv,
byVT3253B0_AIROHA2230[ii][0], byVT3253B0_AIROHA2230[ii][0],
byVT3253B0_AIROHA2230[ii][1]); byVT3253B0_AIROHA2230[ii][1]);
for (ii = 0; ii < CB_VT3253B0_AGC; ii++) for (ii = 0; ii < CB_VT3253B0_AGC; ii++)
bResult &= BBbWriteEmbedded(priv, result &= bb_write_embedded(priv,
byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]); byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]);
priv->abyBBVGA[0] = 0x1C; priv->abyBBVGA[0] = 0x1C;
@ -2045,14 +2045,14 @@ bool BBbVT3253Init(struct vnt_private *priv)
priv->ldBmThreshold[1] = -48; priv->ldBmThreshold[1] = -48;
priv->ldBmThreshold[2] = 0; priv->ldBmThreshold[2] = 0;
priv->ldBmThreshold[3] = 0; priv->ldBmThreshold[3] = 0;
} else if (byRFType == RF_UW2451) { } else if (by_rf_type == RF_UW2451) {
for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++) for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++)
bResult &= BBbWriteEmbedded(priv, result &= bb_write_embedded(priv,
byVT3253B0_UW2451[ii][0], byVT3253B0_UW2451[ii][0],
byVT3253B0_UW2451[ii][1]); byVT3253B0_UW2451[ii][1]);
for (ii = 0; ii < CB_VT3253B0_AGC; ii++) for (ii = 0; ii < CB_VT3253B0_AGC; ii++)
bResult &= BBbWriteEmbedded(priv, result &= bb_write_embedded(priv,
byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][0],
byVT3253B0_AGC[ii][1]); byVT3253B0_AGC[ii][1]);
@ -2067,9 +2067,9 @@ bool BBbVT3253Init(struct vnt_private *priv)
priv->ldBmThreshold[1] = -50; priv->ldBmThreshold[1] = -50;
priv->ldBmThreshold[2] = 0; priv->ldBmThreshold[2] = 0;
priv->ldBmThreshold[3] = 0; priv->ldBmThreshold[3] = 0;
} else if (byRFType == RF_UW2452) { } else if (by_rf_type == RF_UW2452) {
for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++) for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++)
bResult &= BBbWriteEmbedded(priv, result &= bb_write_embedded(priv,
byVT3253B0_UW2451[ii][0], byVT3253B0_UW2451[ii][0],
byVT3253B0_UW2451[ii][1]); byVT3253B0_UW2451[ii][1]);
@ -2078,7 +2078,7 @@ bool BBbVT3253Init(struct vnt_private *priv)
* 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B inverted) * 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B inverted)
*/ */
/*bResult &= BBbWriteEmbedded(iobase,0x09,0x41);*/ /*bResult &= bb_write_embedded(iobase,0x09,0x41);*/
/* Init ANT B select, /* Init ANT B select,
* RX Config CR10 = 0x28->0x2A, * RX Config CR10 = 0x28->0x2A,
@ -2086,23 +2086,23 @@ bool BBbVT3253Init(struct vnt_private *priv)
* make the ANT_A, ANT_B inverted) * make the ANT_A, ANT_B inverted)
*/ */
/*bResult &= BBbWriteEmbedded(iobase,0x0a,0x28);*/ /*bResult &= bb_write_embedded(iobase,0x0a,0x28);*/
/* Select VC1/VC2, CR215 = 0x02->0x06 */ /* Select VC1/VC2, CR215 = 0x02->0x06 */
bResult &= BBbWriteEmbedded(priv, 0xd7, 0x06); result &= bb_write_embedded(priv, 0xd7, 0x06);
/* {{RobertYu:20050125, request by Jack */ /* {{RobertYu:20050125, request by Jack */
bResult &= BBbWriteEmbedded(priv, 0x90, 0x20); result &= bb_write_embedded(priv, 0x90, 0x20);
bResult &= BBbWriteEmbedded(priv, 0x97, 0xeb); result &= bb_write_embedded(priv, 0x97, 0xeb);
/* }} */ /* }} */
/* {{RobertYu:20050221, request by Jack */ /* {{RobertYu:20050221, request by Jack */
bResult &= BBbWriteEmbedded(priv, 0xa6, 0x00); result &= bb_write_embedded(priv, 0xa6, 0x00);
bResult &= BBbWriteEmbedded(priv, 0xa8, 0x30); result &= bb_write_embedded(priv, 0xa8, 0x30);
/* }} */ /* }} */
bResult &= BBbWriteEmbedded(priv, 0xb0, 0x58); result &= bb_write_embedded(priv, 0xb0, 0x58);
for (ii = 0; ii < CB_VT3253B0_AGC; ii++) for (ii = 0; ii < CB_VT3253B0_AGC; ii++)
bResult &= BBbWriteEmbedded(priv, result &= bb_write_embedded(priv,
byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]); byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]);
priv->abyBBVGA[0] = 0x14; priv->abyBBVGA[0] = 0x14;
@ -2115,14 +2115,14 @@ bool BBbVT3253Init(struct vnt_private *priv)
priv->ldBmThreshold[3] = 0; priv->ldBmThreshold[3] = 0;
/* }} RobertYu */ /* }} RobertYu */
} else if (byRFType == RF_VT3226) { } else if (by_rf_type == RF_VT3226) {
for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++) for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++)
bResult &= BBbWriteEmbedded(priv, result &= bb_write_embedded(priv,
byVT3253B0_AIROHA2230[ii][0], byVT3253B0_AIROHA2230[ii][0],
byVT3253B0_AIROHA2230[ii][1]); byVT3253B0_AIROHA2230[ii][1]);
for (ii = 0; ii < CB_VT3253B0_AGC; ii++) for (ii = 0; ii < CB_VT3253B0_AGC; ii++)
bResult &= BBbWriteEmbedded(priv, result &= bb_write_embedded(priv,
byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]); byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]);
priv->abyBBVGA[0] = 0x1C; priv->abyBBVGA[0] = 0x1C;
@ -2136,9 +2136,9 @@ bool BBbVT3253Init(struct vnt_private *priv)
/* Fix VT3226 DFC system timing issue */ /* Fix VT3226 DFC system timing issue */
MACvSetRFLE_LatchBase(iobase); MACvSetRFLE_LatchBase(iobase);
/* {{ RobertYu: 20050104 */ /* {{ RobertYu: 20050104 */
} else if (byRFType == RF_AIROHA7230) { } else if (by_rf_type == RF_AIROHA7230) {
for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++) for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++)
bResult &= BBbWriteEmbedded(priv, result &= bb_write_embedded(priv,
byVT3253B0_AIROHA2230[ii][0], byVT3253B0_AIROHA2230[ii][0],
byVT3253B0_AIROHA2230[ii][1]); byVT3253B0_AIROHA2230[ii][1]);
@ -2146,17 +2146,17 @@ bool BBbVT3253Init(struct vnt_private *priv)
/* Init ANT B select,TX Config CR09 = 0x61->0x45, /* Init ANT B select,TX Config CR09 = 0x61->0x45,
* 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B inverted) * 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B inverted)
*/ */
/*bResult &= BBbWriteEmbedded(iobase,0x09,0x41);*/ /* bResult &= bb_write_embedded(iobase,0x09,0x41);*/
/* Init ANT B select,RX Config CR10 = 0x28->0x2A, /* Init ANT B select,RX Config CR10 = 0x28->0x2A,
* 0x2A->0x28(VC1/VC2 define, make the ANT_A, ANT_B inverted) * 0x2A->0x28(VC1/VC2 define, make the ANT_A, ANT_B inverted)
*/ */
/*bResult &= BBbWriteEmbedded(iobase,0x0a,0x28);*/ /* bResult &= BBbWriteEmbedded(iobase,0x0a,0x28);*/
/* Select VC1/VC2, CR215 = 0x02->0x06 */ /* Select VC1/VC2, CR215 = 0x02->0x06 */
bResult &= BBbWriteEmbedded(priv, 0xd7, 0x06); result &= bb_write_embedded(priv, 0xd7, 0x06);
/* }} */ /* }} */
for (ii = 0; ii < CB_VT3253B0_AGC; ii++) for (ii = 0; ii < CB_VT3253B0_AGC; ii++)
bResult &= BBbWriteEmbedded(priv, result &= bb_write_embedded(priv,
byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]); byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]);
priv->abyBBVGA[0] = 0x1C; priv->abyBBVGA[0] = 0x1C;
@ -2174,12 +2174,12 @@ bool BBbVT3253Init(struct vnt_private *priv)
priv->abyBBVGA[0] = 0x1C; priv->abyBBVGA[0] = 0x1C;
} }
if (byLocalID > REV_ID_VT3253_A1) { if (by_local_id > REV_ID_VT3253_A1) {
BBbWriteEmbedded(priv, 0x04, 0x7F); bb_write_embedded(priv, 0x04, 0x7F);
BBbWriteEmbedded(priv, 0x0D, 0x01); bb_write_embedded(priv, 0x0D, 0x01);
} }
return bResult; return result;
} }
/* /*
@ -2195,42 +2195,42 @@ bool BBbVT3253Init(struct vnt_private *priv)
* *
*/ */
void void
BBvSetShortSlotTime(struct vnt_private *priv) bb_set_short_slot_time(struct vnt_private *priv)
{ {
unsigned char byBBRxConf = 0; unsigned char by_bb_rx_conf = 0;
unsigned char byBBVGA = 0; unsigned char by_bb_vga = 0;
BBbReadEmbedded(priv, 0x0A, &byBBRxConf); /* CR10 */ bb_read_embedded(priv, 0x0A, &by_bb_rx_conf); /* CR10 */
if (priv->bShortSlotTime) if (priv->bShortSlotTime)
byBBRxConf &= 0xDF; /* 1101 1111 */ by_bb_rx_conf &= 0xDF; /* 1101 1111 */
else else
byBBRxConf |= 0x20; /* 0010 0000 */ by_bb_rx_conf |= 0x20; /* 0010 0000 */
/* patch for 3253B0 Baseband with Cardbus module */ /* patch for 3253B0 Baseband with Cardbus module */
BBbReadEmbedded(priv, 0xE7, &byBBVGA); bb_read_embedded(priv, 0xE7, &by_bb_vga);
if (byBBVGA == priv->abyBBVGA[0]) if (by_bb_vga == priv->abyBBVGA[0])
byBBRxConf |= 0x20; /* 0010 0000 */ by_bb_rx_conf |= 0x20; /* 0010 0000 */
BBbWriteEmbedded(priv, 0x0A, byBBRxConf); /* CR10 */ bb_write_embedded(priv, 0x0A, by_bb_rx_conf); /* CR10 */
} }
void BBvSetVGAGainOffset(struct vnt_private *priv, unsigned char byData) void bb_set_vga_gain_offset(struct vnt_private *priv, unsigned char by_data)
{ {
unsigned char byBBRxConf = 0; unsigned char by_bb_rx_conf = 0;
BBbWriteEmbedded(priv, 0xE7, byData); bb_write_embedded(priv, 0xE7, by_data);
BBbReadEmbedded(priv, 0x0A, &byBBRxConf); /* CR10 */ bb_read_embedded(priv, 0x0A, &by_bb_rx_conf); /* CR10 */
/* patch for 3253B0 Baseband with Cardbus module */ /* patch for 3253B0 Baseband with Cardbus module */
if (byData == priv->abyBBVGA[0]) if (by_data == priv->abyBBVGA[0])
byBBRxConf |= 0x20; /* 0010 0000 */ by_bb_rx_conf |= 0x20; /* 0010 0000 */
else if (priv->bShortSlotTime) else if (priv->bShortSlotTime)
byBBRxConf &= 0xDF; /* 1101 1111 */ by_bb_rx_conf &= 0xDF; /* 1101 1111 */
else else
byBBRxConf |= 0x20; /* 0010 0000 */ by_bb_rx_conf |= 0x20; /* 0010 0000 */
priv->byBBVGACurrent = byData; priv->byBBVGACurrent = by_data;
BBbWriteEmbedded(priv, 0x0A, byBBRxConf); /* CR10 */ bb_write_embedded(priv, 0x0A, by_bb_rx_conf); /* CR10 */
} }
/* /*
@ -2246,12 +2246,12 @@ void BBvSetVGAGainOffset(struct vnt_private *priv, unsigned char byData)
* *
*/ */
void void
BBvSoftwareReset(struct vnt_private *priv) bb_software_reset(struct vnt_private *priv)
{ {
BBbWriteEmbedded(priv, 0x50, 0x40); bb_write_embedded(priv, 0x50, 0x40);
BBbWriteEmbedded(priv, 0x50, 0); bb_write_embedded(priv, 0x50, 0);
BBbWriteEmbedded(priv, 0x9C, 0x01); bb_write_embedded(priv, 0x9C, 0x01);
BBbWriteEmbedded(priv, 0x9C, 0); bb_write_embedded(priv, 0x9C, 0);
} }
/* /*
@ -2267,13 +2267,13 @@ BBvSoftwareReset(struct vnt_private *priv)
* *
*/ */
void void
BBvPowerSaveModeON(struct vnt_private *priv) bb_power_save_mode_on(struct vnt_private *priv)
{ {
unsigned char byOrgData; unsigned char by_org_data;
BBbReadEmbedded(priv, 0x0D, &byOrgData); bb_read_embedded(priv, 0x0D, &by_org_data);
byOrgData |= BIT(0); by_org_data |= BIT(0);
BBbWriteEmbedded(priv, 0x0D, byOrgData); bb_write_embedded(priv, 0x0D, by_org_data);
} }
/* /*
@ -2289,13 +2289,13 @@ BBvPowerSaveModeON(struct vnt_private *priv)
* *
*/ */
void void
BBvPowerSaveModeOFF(struct vnt_private *priv) bb_power_save_mode_off(struct vnt_private *priv)
{ {
unsigned char byOrgData; unsigned char by_org_data;
BBbReadEmbedded(priv, 0x0D, &byOrgData); bb_read_embedded(priv, 0x0D, &by_org_data);
byOrgData &= ~(BIT(0)); by_org_data &= ~(BIT(0));
BBbWriteEmbedded(priv, 0x0D, byOrgData); bb_write_embedded(priv, 0x0D, by_org_data);
} }
/* /*
@ -2304,7 +2304,7 @@ BBvPowerSaveModeOFF(struct vnt_private *priv)
* Parameters: * Parameters:
* In: * In:
* priv - Device Structure * priv - Device Structure
* byAntennaMode - Antenna Mode * by_antenna_mode - Antenna Mode
* Out: * Out:
* none * none
* *
@ -2313,22 +2313,22 @@ BBvPowerSaveModeOFF(struct vnt_private *priv)
*/ */
void void
BBvSetTxAntennaMode(struct vnt_private *priv, unsigned char byAntennaMode) bb_set_tx_antenna_mode(struct vnt_private *priv, unsigned char by_antenna_mode)
{ {
unsigned char byBBTxConf; unsigned char by_bb_tx_conf;
BBbReadEmbedded(priv, 0x09, &byBBTxConf); /* CR09 */ bb_read_embedded(priv, 0x09, &by_bb_tx_conf); /* CR09 */
if (byAntennaMode == ANT_DIVERSITY) { if (by_antenna_mode == ANT_DIVERSITY) {
/* bit 1 is diversity */ /* bit 1 is diversity */
byBBTxConf |= 0x02; by_bb_tx_conf |= 0x02;
} else if (byAntennaMode == ANT_A) { } else if (by_antenna_mode == ANT_A) {
/* bit 2 is ANTSEL */ /* bit 2 is ANTSEL */
byBBTxConf &= 0xF9; /* 1111 1001 */ by_bb_tx_conf &= 0xF9; /* 1111 1001 */
} else if (byAntennaMode == ANT_B) { } else if (by_antenna_mode == ANT_B) {
byBBTxConf &= 0xFD; /* 1111 1101 */ by_bb_tx_conf &= 0xFD; /* 1111 1101 */
byBBTxConf |= 0x04; by_bb_tx_conf |= 0x04;
} }
BBbWriteEmbedded(priv, 0x09, byBBTxConf); /* CR09 */ bb_write_embedded(priv, 0x09, by_bb_tx_conf); /* CR09 */
} }
/* /*
@ -2337,7 +2337,7 @@ BBvSetTxAntennaMode(struct vnt_private *priv, unsigned char byAntennaMode)
* Parameters: * Parameters:
* In: * In:
* priv - Device Structure * priv - Device Structure
* byAntennaMode - Antenna Mode * by_antenna_mode - Antenna Mode
* Out: * Out:
* none * none
* *
@ -2346,25 +2346,25 @@ BBvSetTxAntennaMode(struct vnt_private *priv, unsigned char byAntennaMode)
*/ */
void void
BBvSetRxAntennaMode(struct vnt_private *priv, unsigned char byAntennaMode) bb_set_rx_antenna_mode(struct vnt_private *priv, unsigned char by_antenna_mode)
{ {
unsigned char byBBRxConf; unsigned char by_bb_rx_conf;
BBbReadEmbedded(priv, 0x0A, &byBBRxConf); /* CR10 */ bb_read_embedded(priv, 0x0A, &by_bb_rx_conf); /* CR10 */
if (byAntennaMode == ANT_DIVERSITY) { if (by_antenna_mode == ANT_DIVERSITY) {
byBBRxConf |= 0x01; by_bb_rx_conf |= 0x01;
} else if (byAntennaMode == ANT_A) { } else if (by_antenna_mode == ANT_A) {
byBBRxConf &= 0xFC; /* 1111 1100 */ by_bb_rx_conf &= 0xFC; /* 1111 1100 */
} else if (byAntennaMode == ANT_B) { } else if (by_antenna_mode == ANT_B) {
byBBRxConf &= 0xFE; /* 1111 1110 */ by_bb_rx_conf &= 0xFE; /* 1111 1110 */
byBBRxConf |= 0x02; by_bb_rx_conf |= 0x02;
} }
BBbWriteEmbedded(priv, 0x0A, byBBRxConf); /* CR10 */ bb_write_embedded(priv, 0x0A, by_bb_rx_conf); /* CR10 */
} }
/* /*
* Description: BBvSetDeepSleep * Description: bb_set_deep_sleep
* *
* Parameters: * Parameters:
* In: * In:
@ -2376,9 +2376,9 @@ BBvSetRxAntennaMode(struct vnt_private *priv, unsigned char byAntennaMode)
* *
*/ */
void void
BBvSetDeepSleep(struct vnt_private *priv, unsigned char byLocalID) bb_set_deep_sleep(struct vnt_private *priv, unsigned char by_local_id)
{ {
BBbWriteEmbedded(priv, 0x0C, 0x17); /* CR12 */ bb_write_embedded(priv, 0x0C, 0x17); /* CR12 */
BBbWriteEmbedded(priv, 0x0D, 0xB9); /* CR13 */ bb_write_embedded(priv, 0x0D, 0xB9); /* CR13 */
} }

36
drivers/staging/vt6655/baseband.h
View file

@ -46,29 +46,31 @@
#define TOP_RATE_2M 0x00200000 #define TOP_RATE_2M 0x00200000
#define TOP_RATE_1M 0x00100000 #define TOP_RATE_1M 0x00100000
unsigned int BBuGetFrameTime(unsigned char byPreambleType, unsigned int bb_get_frame_time(unsigned char by_preamble_type,
unsigned char byPktType, unsigned char by_pkt_type,
unsigned int cbFrameLength, unsigned int cb_frame_length,
unsigned short wRate); unsigned short w_rate);
void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length, void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
u16 tx_rate, u8 pkt_type, struct vnt_phy_field *phy); u16 tx_rate, u8 pkt_type, struct vnt_phy_field *phy);
bool BBbReadEmbedded(struct vnt_private *priv, unsigned char byBBAddr, bool bb_read_embedded(struct vnt_private *priv, unsigned char by_bb_addr,
unsigned char *pbyData); unsigned char *pby_data);
bool BBbWriteEmbedded(struct vnt_private *priv, unsigned char byBBAddr, bool bb_write_embedded(struct vnt_private *priv, unsigned char by_bb_addr,
unsigned char byData); unsigned char by_data);
void BBvSetShortSlotTime(struct vnt_private *priv); void bb_set_short_slot_time(struct vnt_private *priv);
void BBvSetVGAGainOffset(struct vnt_private *priv, unsigned char byData); void bb_set_vga_gain_offset(struct vnt_private *priv, unsigned char by_data);
/* VT3253 Baseband */ /* VT3253 Baseband */
bool BBbVT3253Init(struct vnt_private *priv); bool bb_vt3253_init(struct vnt_private *priv);
void BBvSoftwareReset(struct vnt_private *priv); void bb_software_reset(struct vnt_private *priv);
void BBvPowerSaveModeON(struct vnt_private *priv); void bb_power_save_mode_on(struct vnt_private *priv);
void BBvPowerSaveModeOFF(struct vnt_private *priv); void bb_power_save_mode_off(struct vnt_private *priv);
void BBvSetTxAntennaMode(struct vnt_private *priv, unsigned char byAntennaMode); void bb_set_tx_antenna_mode(struct vnt_private *priv,
void BBvSetRxAntennaMode(struct vnt_private *priv, unsigned char byAntennaMode); unsigned char by_antenna_mode);
void BBvSetDeepSleep(struct vnt_private *priv, unsigned char byLocalID); void bb_set_rx_antenna_mode(struct vnt_private *priv,
unsigned char by_antenna_mode);
void bb_set_deep_sleep(struct vnt_private *priv, unsigned char by_local_id);
#endif /* __BASEBAND_H__ */ #endif /* __BASEBAND_H__ */

40
drivers/staging/vt6655/card.c
View file

@ -195,22 +195,22 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
priv->abyBBVGA[0] = 0x20; priv->abyBBVGA[0] = 0x20;
priv->abyBBVGA[2] = 0x10; priv->abyBBVGA[2] = 0x10;
priv->abyBBVGA[3] = 0x10; priv->abyBBVGA[3] = 0x10;
BBbReadEmbedded(priv, 0xE7, &byData); bb_read_embedded(priv, 0xE7, &byData);
if (byData == 0x1C) if (byData == 0x1C)
BBbWriteEmbedded(priv, 0xE7, priv->abyBBVGA[0]); bb_write_embedded(priv, 0xE7, priv->abyBBVGA[0]);
} else if (priv->byRFType == RF_UW2452) { } else if (priv->byRFType == RF_UW2452) {
MACvSetBBType(priv->PortOffset, BB_TYPE_11A); MACvSetBBType(priv->PortOffset, BB_TYPE_11A);
priv->abyBBVGA[0] = 0x18; priv->abyBBVGA[0] = 0x18;
BBbReadEmbedded(priv, 0xE7, &byData); bb_read_embedded(priv, 0xE7, &byData);
if (byData == 0x14) { if (byData == 0x14) {
BBbWriteEmbedded(priv, 0xE7, priv->abyBBVGA[0]); bb_write_embedded(priv, 0xE7, priv->abyBBVGA[0]);
BBbWriteEmbedded(priv, 0xE1, 0x57); bb_write_embedded(priv, 0xE1, 0x57);
} }
} else { } else {
MACvSetBBType(priv->PortOffset, BB_TYPE_11A); MACvSetBBType(priv->PortOffset, BB_TYPE_11A);
} }
BBbWriteEmbedded(priv, 0x88, 0x03); bb_write_embedded(priv, 0x88, 0x03);
bySlot = C_SLOT_SHORT; bySlot = C_SLOT_SHORT;
bySIFS = C_SIFS_A; bySIFS = C_SIFS_A;
byDIFS = C_SIFS_A + 2 * C_SLOT_SHORT; byDIFS = C_SIFS_A + 2 * C_SLOT_SHORT;
@ -221,19 +221,19 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
priv->abyBBVGA[0] = 0x1C; priv->abyBBVGA[0] = 0x1C;
priv->abyBBVGA[2] = 0x00; priv->abyBBVGA[2] = 0x00;
priv->abyBBVGA[3] = 0x00; priv->abyBBVGA[3] = 0x00;
BBbReadEmbedded(priv, 0xE7, &byData); bb_read_embedded(priv, 0xE7, &byData);
if (byData == 0x20) if (byData == 0x20)
BBbWriteEmbedded(priv, 0xE7, priv->abyBBVGA[0]); bb_write_embedded(priv, 0xE7, priv->abyBBVGA[0]);
} else if (priv->byRFType == RF_UW2452) { } else if (priv->byRFType == RF_UW2452) {
priv->abyBBVGA[0] = 0x14; priv->abyBBVGA[0] = 0x14;
BBbReadEmbedded(priv, 0xE7, &byData); bb_read_embedded(priv, 0xE7, &byData);
if (byData == 0x18) { if (byData == 0x18) {
BBbWriteEmbedded(priv, 0xE7, priv->abyBBVGA[0]); bb_write_embedded(priv, 0xE7, priv->abyBBVGA[0]);
BBbWriteEmbedded(priv, 0xE1, 0xD3); bb_write_embedded(priv, 0xE1, 0xD3);
} }
} }
BBbWriteEmbedded(priv, 0x88, 0x02); bb_write_embedded(priv, 0x88, 0x02);
bySlot = C_SLOT_LONG; bySlot = C_SLOT_LONG;
bySIFS = C_SIFS_BG; bySIFS = C_SIFS_BG;
byDIFS = C_SIFS_BG + 2 * C_SLOT_LONG; byDIFS = C_SIFS_BG + 2 * C_SLOT_LONG;
@ -244,19 +244,19 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
priv->abyBBVGA[0] = 0x1C; priv->abyBBVGA[0] = 0x1C;
priv->abyBBVGA[2] = 0x00; priv->abyBBVGA[2] = 0x00;
priv->abyBBVGA[3] = 0x00; priv->abyBBVGA[3] = 0x00;
BBbReadEmbedded(priv, 0xE7, &byData); bb_read_embedded(priv, 0xE7, &byData);
if (byData == 0x20) if (byData == 0x20)
BBbWriteEmbedded(priv, 0xE7, priv->abyBBVGA[0]); bb_write_embedded(priv, 0xE7, priv->abyBBVGA[0]);
} else if (priv->byRFType == RF_UW2452) { } else if (priv->byRFType == RF_UW2452) {
priv->abyBBVGA[0] = 0x14; priv->abyBBVGA[0] = 0x14;
BBbReadEmbedded(priv, 0xE7, &byData); bb_read_embedded(priv, 0xE7, &byData);
if (byData == 0x18) { if (byData == 0x18) {
BBbWriteEmbedded(priv, 0xE7, priv->abyBBVGA[0]); bb_write_embedded(priv, 0xE7, priv->abyBBVGA[0]);
BBbWriteEmbedded(priv, 0xE1, 0xD3); bb_write_embedded(priv, 0xE1, 0xD3);
} }
} }
BBbWriteEmbedded(priv, 0x88, 0x08); bb_write_embedded(priv, 0x88, 0x08);
bySIFS = C_SIFS_BG; bySIFS = C_SIFS_BG;
if (priv->bShortSlotTime) { if (priv->bShortSlotTime) {
@ -307,7 +307,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
priv->bySlot = bySlot; priv->bySlot = bySlot;
VNSvOutPortB(priv->PortOffset + MAC_REG_SLOT, priv->bySlot); VNSvOutPortB(priv->PortOffset + MAC_REG_SLOT, priv->bySlot);
BBvSetShortSlotTime(priv); bb_set_short_slot_time(priv);
} }
if (priv->byCWMaxMin != byCWMaxMin) { if (priv->byCWMaxMin != byCWMaxMin) {
priv->byCWMaxMin = byCWMaxMin; priv->byCWMaxMin = byCWMaxMin;
@ -428,7 +428,7 @@ void CARDbRadioPowerOff(struct vnt_private *priv)
MACvRegBitsOff(priv->PortOffset, MAC_REG_HOSTCR, HOSTCR_RXON); MACvRegBitsOff(priv->PortOffset, MAC_REG_HOSTCR, HOSTCR_RXON);
BBvSetDeepSleep(priv, priv->byLocalID); bb_set_deep_sleep(priv, priv->byLocalID);
priv->bRadioOff = true; priv->bRadioOff = true;
pr_debug("chester power off\n"); pr_debug("chester power off\n");

4
drivers/staging/vt6655/channel.c
View file

@ -173,7 +173,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)
priv->byBBVGACurrent != priv->abyBBVGA[0]) { priv->byBBVGACurrent != priv->abyBBVGA[0]) {
priv->byBBVGACurrent = priv->abyBBVGA[0]; priv->byBBVGACurrent = priv->abyBBVGA[0];
BBvSetVGAGainOffset(priv, priv->byBBVGACurrent); bb_set_vga_gain_offset(priv, priv->byBBVGACurrent);
} }
/* clear NAV */ /* clear NAV */
@ -195,7 +195,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)
if (priv->bEnablePSMode) if (priv->bEnablePSMode)
RFvWriteWakeProgSyn(priv, priv->byRFType, ch->hw_value); RFvWriteWakeProgSyn(priv, priv->byRFType, ch->hw_value);
BBvSoftwareReset(priv); bb_software_reset(priv);
if (priv->byLocalID > REV_ID_VT3253_B1) { if (priv->byLocalID > REV_ID_VT3253_B1) {
unsigned long flags; unsigned long flags;

36
drivers/staging/vt6655/device_main.c
View file

@ -21,14 +21,14 @@
* device_alloc_rx_buf - rx buffer pre-allocated function * device_alloc_rx_buf - rx buffer pre-allocated function
* device_free_rx_buf - free rx buffer function * device_free_rx_buf - free rx buffer function
* device_free_tx_buf - free tx buffer function * device_free_tx_buf - free tx buffer function
* device_init_rd0_ring- initial rd dma0 ring * device_init_rd0_ring - initial rd dma0 ring
* device_init_rd1_ring- initial rd dma1 ring * device_init_rd1_ring - initial rd dma1 ring
* device_init_td0_ring- initial tx dma0 ring buffer * device_init_td0_ring - initial tx dma0 ring buffer
* device_init_td1_ring- initial tx dma1 ring buffer * device_init_td1_ring - initial tx dma1 ring buffer
* device_init_registers- initial MAC & BBP & RF internal registers. * device_init_registers - initial MAC & BBP & RF internal registers.
* device_init_rings- initial tx/rx ring buffer * device_init_rings - initial tx/rx ring buffer
* device_free_rings- free all allocated ring buffer * device_free_rings - free all allocated ring buffer
* device_tx_srv- tx interrupt service function * device_tx_srv - tx interrupt service function
* *
* Revision History: * Revision History:
*/ */
@ -202,7 +202,7 @@ static void device_init_registers(struct vnt_private *priv)
unsigned char byOFDMPwrdBm = 0; unsigned char byOFDMPwrdBm = 0;
MACbShutdown(priv); MACbShutdown(priv);
BBvSoftwareReset(priv); bb_software_reset(priv);
/* Do MACbSoftwareReset in MACvInitialize */ /* Do MACbSoftwareReset in MACvInitialize */
MACbSoftwareReset(priv); MACbSoftwareReset(priv);
@ -279,8 +279,8 @@ static void device_init_registers(struct vnt_private *priv)
} }
/* Set initial antenna mode */ /* Set initial antenna mode */
BBvSetTxAntennaMode(priv, priv->byTxAntennaMode); bb_set_tx_antenna_mode(priv, priv->byTxAntennaMode);
BBvSetRxAntennaMode(priv, priv->byRxAntennaMode); bb_set_rx_antenna_mode(priv, priv->byRxAntennaMode);
/* zonetype initial */ /* zonetype initial */
priv->byOriginalZonetype = priv->abyEEPROM[EEP_OFS_ZONETYPE]; priv->byOriginalZonetype = priv->abyEEPROM[EEP_OFS_ZONETYPE];
@ -357,16 +357,16 @@ static void device_init_registers(struct vnt_private *priv)
VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN);
/* initialize BBP registers */ /* initialize BBP registers */
BBbVT3253Init(priv); bb_vt3253_init(priv);
if (priv->bUpdateBBVGA) { if (priv->bUpdateBBVGA) {
priv->byBBVGACurrent = priv->abyBBVGA[0]; priv->byBBVGACurrent = priv->abyBBVGA[0];
priv->byBBVGANew = priv->byBBVGACurrent; priv->byBBVGANew = priv->byBBVGACurrent;
BBvSetVGAGainOffset(priv, priv->abyBBVGA[0]); bb_set_vga_gain_offset(priv, priv->abyBBVGA[0]);
} }
BBvSetRxAntennaMode(priv, priv->byRxAntennaMode); bb_set_rx_antenna_mode(priv, priv->byRxAntennaMode);
BBvSetTxAntennaMode(priv, priv->byTxAntennaMode); bb_set_tx_antenna_mode(priv, priv->byTxAntennaMode);
/* Set BB and packet type at the same time. */ /* Set BB and packet type at the same time. */
/* Set Short Slot Time, xIFS, and RSPINF. */ /* Set Short Slot Time, xIFS, and RSPINF. */
@ -1001,7 +1001,7 @@ static void vnt_check_bb_vga(struct vnt_private *priv)
if (priv->uBBVGADiffCount == 1) { if (priv->uBBVGADiffCount == 1) {
/* first VGA diff gain */ /* first VGA diff gain */
BBvSetVGAGainOffset(priv, priv->byBBVGANew); bb_set_vga_gain_offset(priv, priv->byBBVGANew);
dev_dbg(&priv->pcid->dev, dev_dbg(&priv->pcid->dev,
"First RSSI[%d] NewGain[%d] OldGain[%d] Count[%d]\n", "First RSSI[%d] NewGain[%d] OldGain[%d] Count[%d]\n",
@ -1017,7 +1017,7 @@ static void vnt_check_bb_vga(struct vnt_private *priv)
priv->byBBVGACurrent, priv->byBBVGACurrent,
(int)priv->uBBVGADiffCount); (int)priv->uBBVGADiffCount);
BBvSetVGAGainOffset(priv, priv->byBBVGANew); bb_set_vga_gain_offset(priv, priv->byBBVGANew);
} }
} }
@ -1445,7 +1445,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
priv->bShortSlotTime = false; priv->bShortSlotTime = false;
CARDbSetPhyParameter(priv, priv->byBBType); CARDbSetPhyParameter(priv, priv->byBBType);
BBvSetVGAGainOffset(priv, priv->abyBBVGA[0]); bb_set_vga_gain_offset(priv, priv->abyBBVGA[0]);
} }
if (changed & BSS_CHANGED_TXPOWER) if (changed & BSS_CHANGED_TXPOWER)

4
drivers/staging/vt6655/rf.c
View file

@ -419,7 +419,7 @@ static bool s_bAL7230Init(struct vnt_private *priv)
MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI | MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI |
SOFTPWRCTL_TXPEINV)); SOFTPWRCTL_TXPEINV));
BBvPowerSaveModeOFF(priv); /* RobertYu:20050106, have DC value for Calibration */ bb_power_save_mode_off(priv); /* RobertYu:20050106, have DC value for Calibration */
for (ii = 0; ii < CB_AL7230_INIT_SEQ; ii++) for (ii = 0; ii < CB_AL7230_INIT_SEQ; ii++)
ret &= IFRFbWriteEmbedded(priv, dwAL7230InitTable[ii]); ret &= IFRFbWriteEmbedded(priv, dwAL7230InitTable[ii]);
@ -443,7 +443,7 @@ static bool s_bAL7230Init(struct vnt_private *priv)
SOFTPWRCTL_SWPECTI | SOFTPWRCTL_SWPECTI |
SOFTPWRCTL_TXPEINV)); SOFTPWRCTL_TXPEINV));
BBvPowerSaveModeON(priv); /* RobertYu:20050106 */ bb_power_save_mode_on(priv); /* RobertYu:20050106 */
/* PE1: TX_ON, PE2: RX_ON, PE3: PLLON */ /* PE1: TX_ON, PE2: RX_ON, PE3: PLLON */
/* 3-wire control for power saving mode */ /* 3-wire control for power saving mode */

72
drivers/staging/vt6655/rxtx.c
View file

@ -165,11 +165,11 @@ s_uGetTxRsvTime(
{ {
unsigned int uDataTime, uAckTime; unsigned int uDataTime, uAckTime;
uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, cbFrameLength, wRate); uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, cbFrameLength, wRate);
if (byPktType == PK_TYPE_11B) /* llb,CCK mode */ if (byPktType == PK_TYPE_11B) /* llb,CCK mode */
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopCCKBasicRate); uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopCCKBasicRate);
else /* 11g 2.4G OFDM mode & 11a 5G OFDM mode */ else /* 11g 2.4G OFDM mode & 11a 5G OFDM mode */
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopOFDMBasicRate); uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopOFDMBasicRate);
if (bNeedAck) if (bNeedAck)
return uDataTime + pDevice->uSIFS + uAckTime; return uDataTime + pDevice->uSIFS + uAckTime;
@ -201,22 +201,22 @@ s_uGetRTSCTSRsvTime(
unsigned int uAckTime = 0; unsigned int uAckTime = 0;
unsigned int uDataTime = 0; unsigned int uDataTime = 0;
uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, cbFrameLength, wCurrentRate); uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, cbFrameLength, wCurrentRate);
if (byRTSRsvType == 0) { /* RTSTxRrvTime_bb */ if (byRTSRsvType == 0) { /* RTSTxRrvTime_bb */
uRTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 20, pDevice->byTopCCKBasicRate); uRTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 20, pDevice->byTopCCKBasicRate);
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate); uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
uCTSTime = uAckTime; uCTSTime = uAckTime;
} else if (byRTSRsvType == 1) { /* RTSTxRrvTime_ba, only in 2.4GHZ */ } else if (byRTSRsvType == 1) { /* RTSTxRrvTime_ba, only in 2.4GHZ */
uRTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 20, pDevice->byTopCCKBasicRate); uRTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 20, pDevice->byTopCCKBasicRate);
uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate); uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
} else if (byRTSRsvType == 2) { /* RTSTxRrvTime_aa */ } else if (byRTSRsvType == 2) { /* RTSTxRrvTime_aa */
uRTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 20, pDevice->byTopOFDMBasicRate); uRTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 20, pDevice->byTopOFDMBasicRate);
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
uCTSTime = uAckTime; uCTSTime = uAckTime;
} else if (byRTSRsvType == 3) { /* CTSTxRrvTime_ba, only in 2.4GHZ */ } else if (byRTSRsvType == 3) { /* CTSTxRrvTime_ba, only in 2.4GHZ */
uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate); uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
uRrvTime = uCTSTime + uAckTime + uDataTime + 2 * pDevice->uSIFS; uRrvTime = uCTSTime + uAckTime + uDataTime + 2 * pDevice->uSIFS;
return cpu_to_le16((u16)uRrvTime); return cpu_to_le16((u16)uRrvTime);
} }
@ -257,7 +257,7 @@ s_uGetDataDuration(
case DATADUR_B: /* DATADUR_B */ case DATADUR_B: /* DATADUR_B */
if (((uMACfragNum == 1)) || bLastFrag) {/* Non Frag or Last Frag */ if (((uMACfragNum == 1)) || bLastFrag) {/* Non Frag or Last Frag */
if (bNeedAck) { if (bNeedAck) {
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate); uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
return pDevice->uSIFS + uAckTime; return pDevice->uSIFS + uAckTime;
} else { } else {
return 0; return 0;
@ -266,9 +266,9 @@ s_uGetDataDuration(
uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wRate, bNeedAck); uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wRate, bNeedAck);
if (bNeedAck) { if (bNeedAck) {
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, uAckTime = bb_get_frame_time(pDevice->byPreambleType,
byPktType, 14, byPktType, 14,
pDevice->byTopCCKBasicRate); pDevice->byTopCCKBasicRate);
} }
return pDevice->uSIFS + uAckTime + uNextPktTime; return pDevice->uSIFS + uAckTime + uNextPktTime;
} }
@ -277,7 +277,7 @@ s_uGetDataDuration(
case DATADUR_A: /* DATADUR_A */ case DATADUR_A: /* DATADUR_A */
if (((uMACfragNum == 1)) || bLastFrag) {/* Non Frag or Last Frag */ if (((uMACfragNum == 1)) || bLastFrag) {/* Non Frag or Last Frag */
if (bNeedAck) { if (bNeedAck) {
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
return pDevice->uSIFS + uAckTime; return pDevice->uSIFS + uAckTime;
} else { } else {
return 0; return 0;
@ -287,9 +287,9 @@ s_uGetDataDuration(
wRate, bNeedAck); wRate, bNeedAck);
if (bNeedAck) { if (bNeedAck) {
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, uAckTime = bb_get_frame_time(pDevice->byPreambleType,
byPktType, 14, byPktType, 14,
pDevice->byTopOFDMBasicRate); pDevice->byTopOFDMBasicRate);
} }
return pDevice->uSIFS + uAckTime + uNextPktTime; return pDevice->uSIFS + uAckTime + uNextPktTime;
} }
@ -298,7 +298,7 @@ s_uGetDataDuration(
case DATADUR_A_F0: /* DATADUR_A_F0 */ case DATADUR_A_F0: /* DATADUR_A_F0 */
if (((uMACfragNum == 1)) || bLastFrag) {/* Non Frag or Last Frag */ if (((uMACfragNum == 1)) || bLastFrag) {/* Non Frag or Last Frag */
if (bNeedAck) { if (bNeedAck) {
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
return pDevice->uSIFS + uAckTime; return pDevice->uSIFS + uAckTime;
} else { } else {
return 0; return 0;
@ -322,9 +322,9 @@ s_uGetDataDuration(
} }
if (bNeedAck) { if (bNeedAck) {
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, uAckTime = bb_get_frame_time(pDevice->byPreambleType,
byPktType, 14, byPktType, 14,
pDevice->byTopOFDMBasicRate); pDevice->byTopOFDMBasicRate);
} }
return pDevice->uSIFS + uAckTime + uNextPktTime; return pDevice->uSIFS + uAckTime + uNextPktTime;
} }
@ -333,7 +333,7 @@ s_uGetDataDuration(
case DATADUR_A_F1: /* DATADUR_A_F1 */ case DATADUR_A_F1: /* DATADUR_A_F1 */
if (((uMACfragNum == 1)) || bLastFrag) { /* Non Frag or Last Frag */ if (((uMACfragNum == 1)) || bLastFrag) { /* Non Frag or Last Frag */
if (bNeedAck) { if (bNeedAck) {
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
return pDevice->uSIFS + uAckTime; return pDevice->uSIFS + uAckTime;
} else { } else {
return 0; return 0;
@ -357,9 +357,9 @@ s_uGetDataDuration(
} }
if (bNeedAck) { if (bNeedAck) {
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, uAckTime = bb_get_frame_time(pDevice->byPreambleType,
byPktType, 14, byPktType, 14,
pDevice->byTopOFDMBasicRate); pDevice->byTopOFDMBasicRate);
} }
return pDevice->uSIFS + uAckTime + uNextPktTime; return pDevice->uSIFS + uAckTime + uNextPktTime;
} }
@ -389,17 +389,17 @@ s_uGetRTSCTSDuration(
switch (byDurType) { switch (byDurType) {
case RTSDUR_BB: /* RTSDuration_bb */ case RTSDUR_BB: /* RTSDuration_bb */
uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate); uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck); uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
break; break;
case RTSDUR_BA: /* RTSDuration_ba */ case RTSDUR_BA: /* RTSDuration_ba */
uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate); uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck); uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
break; break;
case RTSDUR_AA: /* RTSDuration_aa */ case RTSDUR_AA: /* RTSDuration_aa */
uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck); uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
break; break;
@ -408,7 +408,7 @@ s_uGetRTSCTSDuration(
break; break;
case RTSDUR_BA_F0: /* RTSDuration_ba_f0 */ case RTSDUR_BA_F0: /* RTSDuration_ba_f0 */
uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate); uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M)) if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0][wRate-RATE_18M], bNeedAck); uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0][wRate-RATE_18M], bNeedAck);
else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M)) else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
@ -417,7 +417,7 @@ s_uGetRTSCTSDuration(
break; break;
case RTSDUR_AA_F0: /* RTSDuration_aa_f0 */ case RTSDUR_AA_F0: /* RTSDuration_aa_f0 */
uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M)) if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0][wRate-RATE_18M], bNeedAck); uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0][wRate-RATE_18M], bNeedAck);
else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M)) else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
@ -426,7 +426,7 @@ s_uGetRTSCTSDuration(
break; break;
case RTSDUR_BA_F1: /* RTSDuration_ba_f1 */ case RTSDUR_BA_F1: /* RTSDuration_ba_f1 */
uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate); uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M)) if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
uDurTime = uCTSTime + 2*pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1][wRate-RATE_18M], bNeedAck); uDurTime = uCTSTime + 2*pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1][wRate-RATE_18M], bNeedAck);
else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M)) else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
@ -435,7 +435,7 @@ s_uGetRTSCTSDuration(
break; break;
case RTSDUR_AA_F1: /* RTSDuration_aa_f1 */ case RTSDUR_AA_F1: /* RTSDuration_aa_f1 */
uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M)) if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1][wRate-RATE_18M], bNeedAck); uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1][wRate-RATE_18M], bNeedAck);
else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M)) else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M))