staging: vt6655: channel.c replace pDevice with priv
PATCH 1/8 staging: vt6655: channel.c replace pDevice with priv
Removing camel case.
--- drivers/staging/vt6655/channel.c | 58 ++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-)
drivers/staging/vt6655/channel.c +29 -29
@@ -176,62 +176,62 @@ void vnt_init_bands(struct vnt_private *priv)*/ bool set_channel (void *pDeviceHandler,struct ieee80211_channel *ch) { -struct vnt_private *pDevice = pDeviceHandler; +struct vnt_private *priv = pDeviceHandler;bool bResult = true; -if (pDevice->byCurrentCh == ch->hw_value) +if (priv->byCurrentCh == ch->hw_value)return bResult;/* Set VGA to max sensitivity */ -if (pDevice->bUpdateBBVGA && - pDevice->byBBVGACurrent != pDevice->abyBBVGA[0 ]) { - pDevice->byBBVGACurrent = pDevice->abyBBVGA[0 ]; +if (priv->bUpdateBBVGA && + priv->byBBVGACurrent != priv->abyBBVGA[0 ]) { + priv->byBBVGACurrent = priv->abyBBVGA[0 ]; -BBvSetVGAGainOffset (pDevice, pDevice->byBBVGACurrent); +BBvSetVGAGainOffset (priv, priv->byBBVGACurrent); }/* clear NAV */ -MACvRegBitsOn (pDevice->PortOffset,MAC_REG_MACCR ,MACCR_CLRNAV ); +MACvRegBitsOn (priv->PortOffset,MAC_REG_MACCR ,MACCR_CLRNAV );/* TX_PE will reserve 3 us for MAX2829 A mode only, it is for better TX throughput */ -if (pDevice->byRFType ==RF_AIROHA7230 ) -RFbAL7230SelectChannelPostProcess (pDevice, pDevice->byCurrentCh, +if (priv->byRFType ==RF_AIROHA7230 ) +RFbAL7230SelectChannelPostProcess (priv, priv->byCurrentCh, ch->hw_value); - pDevice->byCurrentCh = ch->hw_value; - bResult &=RFbSelectChannel (pDevice, pDevice->byRFType, + priv->byCurrentCh = ch->hw_value; + bResult &=RFbSelectChannel (priv, priv->byRFType, ch->hw_value);/* Init Synthesizer Table */ -if (pDevice->bEnablePSMode) -RFvWriteWakeProgSyn (pDevice, pDevice->byRFType, ch->hw_value); +if (priv->bEnablePSMode) +RFvWriteWakeProgSyn (priv, priv->byRFType, ch->hw_value); -BBvSoftwareReset (pDevice); +BBvSoftwareReset (priv); -if (pDevice->byLocalID >REV_ID_VT3253_B1 ) { +if (priv->byLocalID >REV_ID_VT3253_B1 ) {unsigned long flags; -spin_lock_irqsave (&pDevice->lock, flags); +spin_lock_irqsave (&priv->lock, flags);/* set HW default power register */ -MACvSelectPage1 (pDevice->PortOffset); -RFbSetPower (pDevice,RATE_1M , pDevice->byCurrentCh); -VNSvOutPortB (pDevice->PortOffset +MAC_REG_PWRCCK , - pDevice->byCurPwr); -RFbSetPower (pDevice,RATE_6M , pDevice->byCurrentCh); -VNSvOutPortB (pDevice->PortOffset +MAC_REG_PWROFDM , - pDevice->byCurPwr); -MACvSelectPage0 (pDevice->PortOffset); - -spin_unlock_irqrestore (&pDevice->lock, flags); +MACvSelectPage1 (priv->PortOffset); +RFbSetPower (priv,RATE_1M , priv->byCurrentCh); +VNSvOutPortB (priv->PortOffset +MAC_REG_PWRCCK , + priv->byCurPwr); +RFbSetPower (priv,RATE_6M , priv->byCurrentCh); +VNSvOutPortB (priv->PortOffset +MAC_REG_PWROFDM , + priv->byCurPwr); +MACvSelectPage0 (priv->PortOffset); + +spin_unlock_irqrestore (&priv->lock, flags); } -if (pDevice->byBBType ==BB_TYPE_11B ) -RFbSetPower (pDevice,RATE_1M , pDevice->byCurrentCh); +if (priv->byBBType ==BB_TYPE_11B ) +RFbSetPower (priv,RATE_1M , priv->byCurrentCh);else -RFbSetPower (pDevice,RATE_6M , pDevice->byCurrentCh); +RFbSetPower (priv,RATE_6M , priv->byCurrentCh);return bResult; }
Signature · 1 line
2.6.2
PATCH 2/8 staging: vt6655: set_channel replace void handler.
Replace with struct vnt_private.
--- drivers/staging/vt6655/channel.c | 3 +-- drivers/staging/vt6655/channel.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/staging/vt6655/channel.c +1 -2
@@ -174,9 +174,8 @@ void vnt_init_bands(struct vnt_private *priv)* Return Value: true if succeeded; false if failed. * */ -bool set_channel (void *pDeviceHandler,struct ieee80211_channel *ch) +bool set_channel (struct vnt_private *priv,struct ieee80211_channel *ch) { -struct vnt_private *priv = pDeviceHandler;bool bResult = true;if (priv->byCurrentCh == ch->hw_value)
drivers/staging/vt6655/channel.h +1 -1
@@ -27,6 +27,6 @@void vnt_init_bands (struct vnt_private *); -bool set_channel (void *pDeviceHandler,struct ieee80211_channel *); +bool set_channel (struct vnt_private *,struct ieee80211_channel *);#endif /* _CHANNEL_H_ */
Signature · 1 line
2.6.2
PATCH 3/8 staging: vt6655: set_channel replace bResult with ret
In reply to Malcolm PriestleyRemoving camel case.
--- drivers/staging/vt6655/channel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/vt6655/channel.c +5 -5
@@ -176,10 +176,10 @@ void vnt_init_bands(struct vnt_private *priv)*/ bool set_channel (struct vnt_private *priv,struct ieee80211_channel *ch) { -bool bResult = true; +bool ret = true;if (priv->byCurrentCh == ch->hw_value) -return bResult; +return ret;/* Set VGA to max sensitivity */ if (priv->bUpdateBBVGA &&
@@ -200,8 +200,8 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) ch->hw_value); priv->byCurrentCh = ch->hw_value; - bResult &=RFbSelectChannel (priv, priv->byRFType, - ch->hw_value); + ret &=RFbSelectChannel (priv, priv->byRFType, + ch->hw_value);/* Init Synthesizer Table */ if (priv->bEnablePSMode)
@@ -232,5 +232,5 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)else RFbSetPower (priv,RATE_6M , priv->byCurrentCh); -return bResult; +return ret; }
Signature · 1 line
2.6.2
Re: [PATCH 3/8] staging: vt6655: set_channel replace bResult with ret
Hi Malcolm,
Quoted 12 lines · Malcolm Priestley
Removing camel case.
Signed-off-by Malcolm Priestley <[email protected]>--- drivers/staging/vt6655/channel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/staging/vt6655/channel.c +0
-0
drivers/staging/vt6655/channel.c void vnt_init_bands(struct vnt_private *priv) · line 182
Quoted 9 lines
drivers/staging/vt6655/channel.c +2
-2@@ -176,10 +176,10 @@ void vnt_init_bands(struct vnt_private *priv)*/ bool set_channel (struct vnt_private *priv,struct ieee80211_channel *ch) { -bool bResult = true; +bool ret = true;if (priv->byCurrentCh == ch->hw_value) -return bResult; +return ret;
ret is always true here, right?
drivers/staging/vt6655/channel.c bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) · line 204
Quoted 11 lines
drivers/staging/vt6655/channel.c +2
-2/* Set VGA to max sensitivity */ if (priv->bUpdateBBVGA &&@@ -200,8 +200,8 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) ch->hw_value); priv->byCurrentCh = ch->hw_value; - bResult &=RFbSelectChannel (priv, priv->byRFType, - ch->hw_value); + ret &=RFbSelectChannel (priv, priv->byRFType, + ch->hw_value);
Isn't a &= b equivalent to a = a & b which is inappropriate for boolean variables?
Also, wouldn't ret be true here, so the & is unnecessary?
Thanks,
Signature · 4 lines
Julian Calaby Email: [email protected] Profile: http://www.google.com/profiles/julian.calaby/
PATCH 4/8 staging: vt6655: rf.c rename bResult ret.
In reply to Malcolm PriestleyRemoving camel case and reflecting return value.
--- drivers/staging/vt6655/rf.c | 138 ++++++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 69 deletions(-)
drivers/staging/vt6655/rf.c +69 -69
@@ -420,9 +420,9 @@ static bool s_bAL7230Init(struct vnt_private *priv) {void __iomem *dwIoBase = priv->PortOffset;int ii; -bool bResult; +bool ret; - bResult = true; + ret = true;/* 3-wire control for normal mode */ VNSvOutPortB (dwIoBase +MAC_REG_SOFTPWRCTL ,0 );
@@ -432,7 +432,7 @@ static bool s_bAL7230Init(struct vnt_private *priv)BBvPowerSaveModeOFF (priv);/* RobertYu:20050106, have DC value for Calibration */ for (ii =0 ; ii <CB_AL7230_INIT_SEQ ; ii++) - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[ii]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[ii]);/* PLL On */ MACvWordRegBitsOn (dwIoBase,MAC_REG_SOFTPWRCTL ,SOFTPWRCTL_SWPE3 );
@@ -440,13 +440,13 @@ static bool s_bAL7230Init(struct vnt_private *priv)/* Calibration */ MACvTimer0MicroSDelay (dwIoBase,150 );/* 150us */ /* TXDCOC:active, RCK:disable */ - bResult &=IFRFbWriteEmbedded (priv, (0x9ABA8F00 +(BY_AL7230_REG_LEN <<3 )+IFREGCTL_REGW )); + ret &=IFRFbWriteEmbedded (priv, (0x9ABA8F00 +(BY_AL7230_REG_LEN <<3 )+IFREGCTL_REGW ));MACvTimer0MicroSDelay (dwIoBase,30 );/* 30us */ /* TXDCOC:disable, RCK:active */ - bResult &=IFRFbWriteEmbedded (priv, (0x3ABA8F00 +(BY_AL7230_REG_LEN <<3 )+IFREGCTL_REGW )); + ret &=IFRFbWriteEmbedded (priv, (0x3ABA8F00 +(BY_AL7230_REG_LEN <<3 )+IFREGCTL_REGW ));MACvTimer0MicroSDelay (dwIoBase,30 );/* 30us */ /* TXDCOC:disable, RCK:disable */ - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[CB_AL7230_INIT_SEQ -1 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[CB_AL7230_INIT_SEQ -1 ]); MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3 | SOFTPWRCTL_SWPE2 |
@@ -459,7 +459,7 @@ static bool s_bAL7230Init(struct vnt_private *priv)/* 3-wire control for power saving mode */ VNSvOutPortB (dwIoBase +MAC_REG_PSPWRSIG , (PSSIG_WPE3 |PSSIG_WPE2 ));/* 1100 0000 */ -return bResult; +return ret; }/* Need to Pull PLLON low when writing channel registers through
@@ -467,16 +467,16 @@ static bool s_bAL7230Init(struct vnt_private *priv)static bool s_bAL7230SelectChannel (struct vnt_private *priv,unsigned char byChannel) {void __iomem *dwIoBase = priv->PortOffset; -bool bResult; +bool ret; - bResult = true; + ret = true;/* PLLON Off */ MACvWordRegBitsOff (dwIoBase,MAC_REG_SOFTPWRCTL ,SOFTPWRCTL_SWPE3 ); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230ChannelTable0[byChannel -1 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230ChannelTable1[byChannel -1 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230ChannelTable2[byChannel -1 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230ChannelTable0[byChannel -1 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230ChannelTable1[byChannel -1 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230ChannelTable2[byChannel -1 ]);/* PLLOn On */ MACvWordRegBitsOn (dwIoBase,MAC_REG_SOFTPWRCTL ,SOFTPWRCTL_SWPE3 );
@@ -487,7 +487,7 @@ static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned char byCha/* Set Channel[7] = 1 to tell H/W channel change is done. */ VNSvOutPortB (dwIoBase +MAC_REG_CHANNEL , (byChannel |0x80 )); -return bResult; +return ret; }/*
@@ -540,9 +540,9 @@ static bool RFbAL2230Init(struct vnt_private *priv) {void __iomem *dwIoBase = priv->PortOffset;int ii; -bool bResult; +bool ret; - bResult = true; + ret = true;/* 3-wire control for normal mode */ VNSvOutPortB (dwIoBase +MAC_REG_SOFTPWRCTL ,0 );
@@ -556,18 +556,18 @@ static bool RFbAL2230Init(struct vnt_private *priv)IFRFbWriteEmbedded (priv, (0x07168700 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW ));for (ii =0 ; ii <CB_AL2230_INIT_SEQ ; ii++) - bResult &=IFRFbWriteEmbedded (priv, dwAL2230InitTable[ii]); + ret &=IFRFbWriteEmbedded (priv, dwAL2230InitTable[ii]);MACvTimer0MicroSDelay (dwIoBase,30 );/* delay 30 us */ /* PLL On */ MACvWordRegBitsOn (dwIoBase,MAC_REG_SOFTPWRCTL ,SOFTPWRCTL_SWPE3 );MACvTimer0MicroSDelay (dwIoBase,150 );/* 150us */ - bResult &=IFRFbWriteEmbedded (priv, (0x00d80f00 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW )); + ret &=IFRFbWriteEmbedded (priv, (0x00d80f00 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW ));MACvTimer0MicroSDelay (dwIoBase,30 );/* 30us */ - bResult &=IFRFbWriteEmbedded (priv, (0x00780f00 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW )); + ret &=IFRFbWriteEmbedded (priv, (0x00780f00 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW ));MACvTimer0MicroSDelay (dwIoBase,30 );/* 30us */ - bResult &=IFRFbWriteEmbedded (priv, dwAL2230InitTable[CB_AL2230_INIT_SEQ -1 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL2230InitTable[CB_AL2230_INIT_SEQ -1 ]); MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3 | SOFTPWRCTL_SWPE2 |
@@ -577,18 +577,18 @@ static bool RFbAL2230Init(struct vnt_private *priv)/* 3-wire control for power saving mode */ VNSvOutPortB (dwIoBase +MAC_REG_PSPWRSIG , (PSSIG_WPE3 |PSSIG_WPE2 ));/* 1100 0000 */ -return bResult; +return ret; }static bool RFbAL2230SelectChannel (struct vnt_private *priv,unsigned char byChannel) {void __iomem *dwIoBase = priv->PortOffset; -bool bResult; +bool ret; - bResult = true; + ret = true; - bResult &=IFRFbWriteEmbedded (priv, dwAL2230ChannelTable0[byChannel -1 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL2230ChannelTable1[byChannel -1 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL2230ChannelTable0[byChannel -1 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL2230ChannelTable1[byChannel -1 ]);/* Set Channel[7] = 0 to tell H/W channel is changing now. */ VNSvOutPortB (dwIoBase +MAC_REG_CHANNEL , (byChannel &0x7F ));
@@ -596,7 +596,7 @@ static bool RFbAL2230SelectChannel(struct vnt_private *priv, unsigned char byCha/* Set Channel[7] = 1 to tell H/W channel change is done. */ VNSvOutPortB (dwIoBase +MAC_REG_CHANNEL , (byChannel |0x80 )); -return bResult; +return ret; }/*
@@ -616,26 +616,26 @@ bool RFbInit(struct vnt_private *priv ) { -bool bResult = true; +bool ret = true;switch (priv->byRFType) {case RF_AIROHA :case RF_AL2230S : priv->byMaxPwrLevel =AL2230_PWR_IDX_LEN ; - bResult =RFbAL2230Init (priv); + ret =RFbAL2230Init (priv);break ;case RF_AIROHA7230 : priv->byMaxPwrLevel =AL7230_PWR_IDX_LEN ; - bResult =s_bAL7230Init (priv); + ret =s_bAL7230Init (priv);break ;case RF_NOTHING : - bResult = true; + ret = true;break ;default : - bResult = false; + ret = false;break ; } -return bResult; +return ret; }/*
@@ -654,26 +654,26 @@ bool RFbInit(bool RFbSelectChannel (struct vnt_private *priv,unsigned char byRFType,u16 byChannel) { -bool bResult = true; +bool ret = true;switch (byRFType) {case RF_AIROHA :case RF_AL2230S : - bResult =RFbAL2230SelectChannel (priv, byChannel); + ret =RFbAL2230SelectChannel (priv, byChannel);break ;/*{{ RobertYu: 20050104 */ case RF_AIROHA7230 : - bResult =s_bAL7230SelectChannel (priv, byChannel); + ret =s_bAL7230SelectChannel (priv, byChannel);break ;/*}} RobertYu */ case RF_NOTHING : - bResult = true; + ret = true;break ;default : - bResult = false; + ret = false;break ; } -return bResult; +return ret; }/*
@@ -772,7 +772,7 @@ bool RFbSetPower(u16 uCH ) { -bool bResult = true; +bool ret = true;unsigned char byPwr =0 ;unsigned char byDec =0 ;
@@ -818,11 +818,11 @@ bool RFbSetPower(if (priv->byCurPwr == byPwr)return true; - bResult =RFbRawSetPower (priv, byPwr, rate); -if (bResult) + ret =RFbRawSetPower (priv, byPwr, rate); +if (ret) priv->byCurPwr = byPwr; -return bResult; +return ret; }/*
@@ -845,7 +845,7 @@ bool RFbRawSetPower(unsigned int rate ) { -bool bResult = true; +bool ret = true;unsigned long dwMax7230Pwr =0 ;if (byPwr >= priv->byMaxPwrLevel)
@@ -853,22 +853,22 @@ bool RFbRawSetPower(switch (priv->byRFType) {case RF_AIROHA : - bResult &=IFRFbWriteEmbedded (priv, dwAL2230PowerTable[byPwr]); + ret &=IFRFbWriteEmbedded (priv, dwAL2230PowerTable[byPwr]);if (rate <=RATE_11M ) - bResult &=IFRFbWriteEmbedded (priv,0x0001B400 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW ); + ret &=IFRFbWriteEmbedded (priv,0x0001B400 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW );else - bResult &=IFRFbWriteEmbedded (priv,0x0005A400 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW ); + ret &=IFRFbWriteEmbedded (priv,0x0005A400 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW );break ;case RF_AL2230S : - bResult &=IFRFbWriteEmbedded (priv, dwAL2230PowerTable[byPwr]); + ret &=IFRFbWriteEmbedded (priv, dwAL2230PowerTable[byPwr]);if (rate <=RATE_11M ) { - bResult &=IFRFbWriteEmbedded (priv,0x040C1400 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW ); - bResult &=IFRFbWriteEmbedded (priv,0x00299B00 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW ); + ret &=IFRFbWriteEmbedded (priv,0x040C1400 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW ); + ret &=IFRFbWriteEmbedded (priv,0x00299B00 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW ); }else { - bResult &=IFRFbWriteEmbedded (priv,0x0005A400 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW ); - bResult &=IFRFbWriteEmbedded (priv,0x00099B00 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW ); + ret &=IFRFbWriteEmbedded (priv,0x0005A400 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW ); + ret &=IFRFbWriteEmbedded (priv,0x00099B00 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW ); }break ;
@@ -879,13 +879,13 @@ bool RFbRawSetPower( dwMax7230Pwr =0x080C0B00 | ((byPwr) <<12 ) | (BY_AL7230_REG_LEN <<3 ) |IFREGCTL_REGW ; - bResult &=IFRFbWriteEmbedded (priv, dwMax7230Pwr); + ret &=IFRFbWriteEmbedded (priv, dwMax7230Pwr);break ;default :break ; } -return bResult; +return ret; }/*+
@@ -934,32 +934,32 @@ bool RFbAL7230SelectChannelPostProcess(struct vnt_private *priv,u16 byOldChannel, u16 byNewChannel) { - bool bResult; + bool ret; - bResult = true; + ret = true;/* if change between 11 b/g and 11a need to update the following * register * Channel Index 1~14 */ if ((byOldChannel <=CB_MAX_CHANNEL_24G ) && (byNewChannel >CB_MAX_CHANNEL_24G )) {/* Change from 2.4G to 5G [Reg] */ - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTableAMode[2 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTableAMode[3 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTableAMode[5 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTableAMode[7 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTableAMode[10 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTableAMode[12 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTableAMode[15 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTableAMode[2 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTableAMode[3 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTableAMode[5 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTableAMode[7 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTableAMode[10 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTableAMode[12 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTableAMode[15 ]); }else if ((byOldChannel >CB_MAX_CHANNEL_24G ) && (byNewChannel <=CB_MAX_CHANNEL_24G )) {/* Change from 5G to 2.4G [Reg] */ - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[2 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[3 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[5 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[7 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[10 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[12 ]); - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[15 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[2 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[3 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[5 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[7 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[10 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[12 ]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[15 ]); } -return bResult; +return ret; }
Signature · 1 line
2.6.2
Re: [PATCH 4/8] staging: vt6655: rf.c rename bResult ret.
Hi Malcolm,
A couple of these comments apply to a few of the patches.
Quoted 12 lines · Malcolm Priestley
Removing camel case and reflecting return value.
Signed-off-by Malcolm Priestley <[email protected]>--- drivers/staging/vt6655/rf.c | 138 ++++++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 69 deletions(-)drivers/staging/vt6655/rf.c +0
-0
drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 425
Quoted 8 lines
drivers/staging/vt6655/rf.c +2
-2@@ -420,9 +420,9 @@ static bool s_bAL7230Init(struct vnt_private *priv) {void __iomem *dwIoBase = priv->PortOffset;int ii; -bool bResult; +bool ret; - bResult = true; + ret = true;
These two lines could be combined into one.
drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 435
Quoted 8 lines
drivers/staging/vt6655/rf.c +1
-1/* 3-wire control for normal mode */ VNSvOutPortB (dwIoBase +MAC_REG_SOFTPWRCTL ,0 );@@ -432,7 +432,7 @@ static bool s_bAL7230Init(struct vnt_private *priv)BBvPowerSaveModeOFF (priv);/* RobertYu:20050106, have DC value for Calibration */ for (ii =0 ; ii <CB_AL7230_INIT_SEQ ; ii++) - bResult &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[ii]); + ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[ii]);
Now that I understand why it's always ret &= ..., I'm truly horrified by the error handling in this driver. =)
Quoted 48 lines
drivers/staging/vt6655/rf.c +8
-8/* PLL On */ MACvWordRegBitsOn (dwIoBase,MAC_REG_SOFTPWRCTL ,SOFTPWRCTL_SWPE3 );@@ -616,26 +616,26 @@ bool RFbInit(struct vnt_private *priv ) { -bool bResult = true; +bool ret = true;switch (priv->byRFType) {case RF_AIROHA :case RF_AL2230S : priv->byMaxPwrLevel =AL2230_PWR_IDX_LEN ; - bResult =RFbAL2230Init (priv); + ret =RFbAL2230Init (priv);break ;case RF_AIROHA7230 : priv->byMaxPwrLevel =AL7230_PWR_IDX_LEN ; - bResult =s_bAL7230Init (priv); + ret =s_bAL7230Init (priv);break ;case RF_NOTHING : - bResult = true; + ret = true;break ;default : - bResult = false; + ret = false;break ; } -return bResult; +return ret; }/* @@ -654,26 +654,26 @@ bool RFbInit(bool RFbSelectChannel (struct vnt_private *priv,unsigned char byRFType,u16 byChannel) { -bool bResult = true; +bool ret = true;switch (byRFType) {case RF_AIROHA :case RF_AL2230S : - bResult =RFbAL2230SelectChannel (priv, byChannel); + ret =RFbAL2230SelectChannel (priv, byChannel);
drivers/staging/vt6655/rf.c bool RFbInit( · line 670
Quoted 10 lines
drivers/staging/vt6655/rf.c +2
-2break ;/*{{ RobertYu: 20050104 */ case RF_AIROHA7230 : - bResult =s_bAL7230SelectChannel (priv, byChannel); + ret =s_bAL7230SelectChannel (priv, byChannel);break ;/*}} RobertYu */ case RF_NOTHING : - bResult = true; + ret = true;
Isn't this line unnecessary?
Quoted 13 lines
drivers/staging/vt6655/rf.c +2
-2break ;default : - bResult = false; + ret = false;break ; } -return bResult; +return ret; }/*
drivers/staging/vt6655/rf.c bool RFbRawSetPower( · line 886
Quoted 9 lines
drivers/staging/vt6655/rf.c +1
-1@@ -879,13 +879,13 @@ bool RFbRawSetPower( dwMax7230Pwr =0x080C0B00 | ((byPwr) <<12 ) | (BY_AL7230_REG_LEN <<3 ) |IFREGCTL_REGW ; - bResult &=IFRFbWriteEmbedded (priv, dwMax7230Pwr); + ret &=IFRFbWriteEmbedded (priv, dwMax7230Pwr);break ;default :break ;
You could remove this default case in another round of cleanups.
Thanks,
Signature · 4 lines
Julian Calaby Email: [email protected] Profile: http://www.google.com/profiles/julian.calaby/
PATCH 5/8 staging: vt6655: power.c replace pDevice with priv
In reply to Malcolm PriestleyRemoving camel case.
--- drivers/staging/vt6655/power.c | 56 +++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-)
drivers/staging/vt6655/power.c +28 -28
@@ -68,40 +68,40 @@ PSvEnablePowerSaving(unsigned short wListenInterval ) { -struct vnt_private *pDevice = hDeviceContext; -u16 wAID = pDevice->current_aid |BIT (14 ) |BIT (15 ); +struct vnt_private *priv = hDeviceContext; +u16 wAID = priv->current_aid |BIT (14 ) |BIT (15 );/* set period of power up before TBTT */ -VNSvOutPortW (pDevice->PortOffset +MAC_REG_PWBT ,C_PWBT ); -if (pDevice->op_mode !=NL80211_IFTYPE_ADHOC ) { +VNSvOutPortW (priv->PortOffset +MAC_REG_PWBT ,C_PWBT ); +if (priv->op_mode !=NL80211_IFTYPE_ADHOC ) {/* set AID */ -VNSvOutPortW (pDevice->PortOffset +MAC_REG_AIDATIM , wAID); +VNSvOutPortW (priv->PortOffset +MAC_REG_AIDATIM , wAID); }else {/* set ATIM Window */ #if 0 /* TODO atim window */ -MACvWriteATIMW (pDevice->PortOffset, pMgmt->wCurrATIMWindow); +MACvWriteATIMW (priv->PortOffset, pMgmt->wCurrATIMWindow);#endif }/* Set AutoSleep */ -MACvRegBitsOn (pDevice->PortOffset,MAC_REG_PSCFG ,PSCFG_AUTOSLEEP ); +MACvRegBitsOn (priv->PortOffset,MAC_REG_PSCFG ,PSCFG_AUTOSLEEP );/* Set HWUTSF */ -MACvRegBitsOn (pDevice->PortOffset,MAC_REG_TFTCTL ,TFTCTL_HWUTSF ); +MACvRegBitsOn (priv->PortOffset,MAC_REG_TFTCTL ,TFTCTL_HWUTSF );if (wListenInterval >=2 ) {/* clear always listen beacon */ -MACvRegBitsOff (pDevice->PortOffset,MAC_REG_PSCTL ,PSCTL_ALBCN ); +MACvRegBitsOff (priv->PortOffset,MAC_REG_PSCTL ,PSCTL_ALBCN );/* first time set listen next beacon */ -MACvRegBitsOn (pDevice->PortOffset,MAC_REG_PSCTL ,PSCTL_LNBCN ); +MACvRegBitsOn (priv->PortOffset,MAC_REG_PSCTL ,PSCTL_LNBCN ); }else {/* always listen beacon */ -MACvRegBitsOn (pDevice->PortOffset,MAC_REG_PSCTL ,PSCTL_ALBCN ); +MACvRegBitsOn (priv->PortOffset,MAC_REG_PSCTL ,PSCTL_ALBCN ); }/* enable power saving hw function */ -MACvRegBitsOn (pDevice->PortOffset,MAC_REG_PSCTL ,PSCTL_PSEN ); - pDevice->bEnablePSMode = true; +MACvRegBitsOn (priv->PortOffset,MAC_REG_PSCTL ,PSCTL_PSEN ); + priv->bEnablePSMode = true; - pDevice->bPWBitOn = true; + priv->bPWBitOn = true;pr_debug ("PS:Power Saving Mode Enable...\n" ); }
@@ -120,20 +120,20 @@ PSvDisablePowerSaving(void *hDeviceContext ) { -struct vnt_private *pDevice = hDeviceContext; +struct vnt_private *priv = hDeviceContext;/* disable power saving hw function */ -MACbPSWakeup (pDevice->PortOffset); +MACbPSWakeup (priv->PortOffset);/* clear AutoSleep */ -MACvRegBitsOff (pDevice->PortOffset,MAC_REG_PSCFG ,PSCFG_AUTOSLEEP ); +MACvRegBitsOff (priv->PortOffset,MAC_REG_PSCFG ,PSCFG_AUTOSLEEP );/* clear HWUTSF */ -MACvRegBitsOff (pDevice->PortOffset,MAC_REG_TFTCTL ,TFTCTL_HWUTSF ); +MACvRegBitsOff (priv->PortOffset,MAC_REG_TFTCTL ,TFTCTL_HWUTSF );/* set always listen beacon */ -MACvRegBitsOn (pDevice->PortOffset,MAC_REG_PSCTL ,PSCTL_ALBCN ); +MACvRegBitsOn (priv->PortOffset,MAC_REG_PSCTL ,PSCTL_ALBCN ); - pDevice->bEnablePSMode = false; + priv->bEnablePSMode = false; - pDevice->bPWBitOn = false; + priv->bPWBitOn = false; }
@@ -152,20 +152,20 @@ PSbIsNextTBTTWakeUp(void *hDeviceContext ) { -struct vnt_private *pDevice = hDeviceContext; -struct ieee80211_hw *hw = pDevice->hw; +struct vnt_private *priv = hDeviceContext; +struct ieee80211_hw *hw = priv->hw;struct ieee80211_conf *conf = &hw->conf;bool bWakeUp = false;if (conf->listen_interval >1 ) { -if (!pDevice->wake_up_count) - pDevice->wake_up_count = conf->listen_interval; +if (!priv->wake_up_count) + priv->wake_up_count = conf->listen_interval; - --pDevice->wake_up_count; + --priv->wake_up_count; -if (pDevice->wake_up_count ==1 ) { +if (priv->wake_up_count ==1 ) {/* Turn on wake up to listen next beacon */ -MACvRegBitsOn (pDevice->PortOffset, +MACvRegBitsOn (priv->PortOffset,MAC_REG_PSCTL ,PSCTL_LNBCN ); bWakeUp = true; }
Signature · 1 line
2.6.2
PATCH 6/8 staging: vt6655: rf.c/h Replace DeviceContext with vnt_private
In reply to Malcolm PriestleyRemoving void and including device.h for power.h
--- drivers/staging/vt6655/power.c | 10 +++------- drivers/staging/vt6655/power.h | 8 +++++--- 2 files changed, 8 insertions(+), 10 deletions(-)
drivers/staging/vt6655/power.c +3 -7
@@ -64,11 +64,10 @@void PSvEnablePowerSaving ( -void *hDeviceContext, +struct vnt_private *priv,unsigned short wListenInterval ) { -struct vnt_private *priv = hDeviceContext;u16 wAID = priv->current_aid |BIT (14 ) |BIT (15 );/* set period of power up before TBTT */
@@ -117,11 +116,9 @@ PSvEnablePowerSaving(void PSvDisablePowerSaving ( -void *hDeviceContext +struct vnt_private *priv ) { -struct vnt_private *priv = hDeviceContext; -/* disable power saving hw function */ MACbPSWakeup (priv->PortOffset);/* clear AutoSleep */
@@ -149,10 +146,9 @@ PSvDisablePowerSaving(bool PSbIsNextTBTTWakeUp ( -void *hDeviceContext +struct vnt_private *priv ) { -struct vnt_private *priv = hDeviceContext;struct ieee80211_hw *hw = priv->hw;struct ieee80211_conf *conf = &hw->conf;bool bWakeUp = false;
drivers/staging/vt6655/power.h +5 -3
@@ -29,25 +29,27 @@#ifndef __POWER_H__#define __POWER_H__ +#include "device.h" +#define C_PWBT 1000/* micro sec. power up before TBTT */ #define PS_FAST_INTERVAL 1/* Fast power saving listen interval */ #define PS_MAX_INTERVAL 4/* MAX power saving listen interval */ void PSvDisablePowerSaving ( -void *hDeviceContext +struct vnt_private * );void PSvEnablePowerSaving ( -void *hDeviceContext, +struct vnt_private *,unsigned short wListenInterval );bool PSbIsNextTBTTWakeUp ( -void *hDeviceContext +struct vnt_private * );#endif /* __POWER_H__ */
Signature · 1 line
2.6.2
PATCH 7/8 staging: vt6655: PSbIsNextTBTTWakeUp Rename bWakeUp wake_up
In reply to Malcolm PriestleyRemoving camel case.
--- drivers/staging/vt6655/power.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/vt6655/power.c +3 -3
@@ -151,7 +151,7 @@ PSbIsNextTBTTWakeUp( {struct ieee80211_hw *hw = priv->hw;struct ieee80211_conf *conf = &hw->conf; -bool bWakeUp = false; +bool wake_up = false;if (conf->listen_interval >1 ) {if (!priv->wake_up_count)
@@ -163,9 +163,9 @@ PSbIsNextTBTTWakeUp(/* Turn on wake up to listen next beacon */ MACvRegBitsOn (priv->PortOffset,MAC_REG_PSCTL ,PSCTL_LNBCN ); - bWakeUp = true; + wake_up = true; } } -return bWakeUp; +return wake_up; }
Signature · 1 line
2.6.2
PATCH 8/8 staging: vt6655: mac.c replace void __iomem * with struct vnt_private
In reply to Malcolm PriestleyMoving void __iomem down one level in the following functions MACbIsRegBitsOn
MACbIsRegBitsOff
MACbIsIntDisable
MACvSetShortRetryLimit
MACvSetLongRetryLimit
MACvGetLongRetryLimit
MACvSetLoopbackMode
MACvSaveContext
MACvRestoreContext
MACbSoftwareReset
MACbSafeSoftwareReset
MACbSafeRxOff
MACbSafeTxOff
MACbSafeStop
MACbShutdown
MACvInitialize
MACvSetCurrRx0DescAddr
MACvSetCurrRx1DescAddr
MACvSetCurrTXDescAddr
MACvSetCurrTx0DescAddrEx
MACvSetCurrAC0DescAddrEx
MACvSetCurrSyncDescAddrEx
MACvSetCurrATIMDescAddrEx
MACvTimer0MicroSDelay
MACvOneShotTimer1MicroSec
MACvSetMISCFifo
MACbPSWakeup
MACvSetKeyEntry
MACvDisableKeyEntry
--- drivers/staging/vt6655/card.c | 18 ++---- drivers/staging/vt6655/device_main.c | 24 ++++---- drivers/staging/vt6655/key.c | 8 +-- drivers/staging/vt6655/mac.c | 108 ++++++++++++++++++++++------------- drivers/staging/vt6655/mac.h | 58 +++++++++---------- drivers/staging/vt6655/power.c | 2 +- drivers/staging/vt6655/rf.c | 36 ++++++------ 7 files changed, 137 insertions(+), 117 deletions(-)
drivers/staging/vt6655/card.c +6 -12
@@ -535,11 +535,9 @@ CARDvSafeResetTx( }/* set MAC TD pointer */ -MACvSetCurrTXDescAddr (TYPE_TXDMA0 , priv->PortOffset, - (priv->td0_pool_dma)); +MACvSetCurrTXDescAddr (TYPE_TXDMA0 , priv, priv->td0_pool_dma); -MACvSetCurrTXDescAddr (TYPE_AC0DMA , priv->PortOffset, - (priv->td1_pool_dma)); +MACvSetCurrTXDescAddr (TYPE_AC0DMA , priv, priv->td1_pool_dma);/* set MAC Beacon TX pointer */ MACvSetCurrBCNTxDescAddr(priv->PortOffset,
@@ -590,11 +588,9 @@ CARDvSafeResetRx(MACvRx0PerPktMode (priv->PortOffset);MACvRx1PerPktMode (priv->PortOffset);/* set MAC RD pointer */ -MACvSetCurrRx0DescAddr (priv->PortOffset, - priv->rd0_pool_dma); +MACvSetCurrRx0DescAddr (priv, priv->rd0_pool_dma); -MACvSetCurrRx1DescAddr (priv->PortOffset, - priv->rd1_pool_dma); +MACvSetCurrRx1DescAddr (priv, priv->rd1_pool_dma); }/*
@@ -839,8 +835,6 @@ unsigned char CARDbyGetPktType(struct vnt_private *priv)*/ void CARDvSetLoopbackMode (struct vnt_private *priv,unsigned short wLoopbackMode) { -void __iomem *dwIoBase = priv->PortOffset; -switch (wLoopbackMode) {case CARD_LB_NONE :case CARD_LB_MAC :
@@ -850,7 +844,7 @@ void CARDvSetLoopbackMode(struct vnt_private *priv, unsigned short wLoopbackModebreak ; }/* set MAC loopback */ -MACvSetLoopbackMode (dwIoBase,LOBYTE (wLoopbackMode)); +MACvSetLoopbackMode (priv,LOBYTE (wLoopbackMode));/* set Baseband loopback */ }
@@ -869,7 +863,7 @@ bool CARDbSoftwareReset(struct vnt_private *priv) {/* reset MAC */ -if (!MACbSafeSoftwareReset (priv->PortOffset)) +if (!MACbSafeSoftwareReset (priv))return false;return true;
drivers/staging/vt6655/device_main.c +12 -12
@@ -211,11 +211,11 @@ static void device_init_registers(struct vnt_private *priv)unsigned char byCCKPwrdBm =0 ;unsigned char byOFDMPwrdBm =0 ; -MACbShutdown (priv->PortOffset); +MACbShutdown (priv);BBvSoftwareReset (priv);/* Do MACbSoftwareReset in MACvInitialize */ -MACbSoftwareReset (priv->PortOffset); +MACbSoftwareReset (priv); priv->bAES = false;
@@ -229,7 +229,7 @@ static void device_init_registers(struct vnt_private *priv) priv->byTopCCKBasicRate =RATE_1M ;/* init MAC */ -MACvInitialize (priv->PortOffset); +MACvInitialize (priv);/* Get Local ID */ VNSvInPortB (priv->PortOffset +MAC_REG_LOCALID , &priv->byLocalID);
@@ -357,8 +357,8 @@ static void device_init_registers(struct vnt_private *priv) MAC_REG_CFG, (CFG_TKIPOPT | CFG_NOTXTIMEOUT));/* set performance parameter by registry */ -MACvSetShortRetryLimit (priv->PortOffset, priv->byShortRetryLimit); -MACvSetLongRetryLimit (priv->PortOffset, priv->byLongRetryLimit); +MACvSetShortRetryLimit (priv, priv->byShortRetryLimit); +MACvSetLongRetryLimit (priv, priv->byLongRetryLimit);/* reset TSF counter */ VNSvOutPortB (priv->PortOffset +MAC_REG_TFTCTL ,TFTCTL_TSFCNTRST );
@@ -884,7 +884,7 @@ static void device_error(struct vnt_private *priv, unsigned short status)if (status &ISR_FETALERR ) {dev_err (&priv->pcid->dev,"Hardware fatal error\n" ); -MACbShutdown (priv->PortOffset); +MACbShutdown (priv);return ; } }
@@ -1012,7 +1012,7 @@ static void vnt_interrupt_process(struct vnt_private *priv)if ((priv->op_mode ==NL80211_IFTYPE_AP || priv->op_mode ==NL80211_IFTYPE_ADHOC ) && priv->vif->bss_conf.enable_beacon) { -MACvOneShotTimer1MicroSec (priv->PortOffset, +MACvOneShotTimer1MicroSec (priv, (priv->vif->bss_conf.beacon_int -MAKE_BEACON_RESERVED ) <<10 ); }
@@ -1197,8 +1197,8 @@ static void vnt_stop(struct ieee80211_hw *hw)cancel_work_sync (&priv->interrupt_work); -MACbShutdown (priv->PortOffset); -MACbSoftwareReset (priv->PortOffset); +MACbShutdown (priv); +MACbSoftwareReset (priv);CARDbRadioPowerOff (priv);device_free_td0_ring (priv);
@@ -1636,13 +1636,13 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent)INIT_WORK (&priv->interrupt_work, vnt_interrupt_work);/* do reset */ -if (!MACbSoftwareReset (priv->PortOffset)) { +if (!MACbSoftwareReset (priv)) {dev_err (&pcid->dev,": Failed to access MAC hardware..\n" );device_free_info (priv);return -ENODEV ; }/* initial to reload eeprom */ -MACvInitialize (priv->PortOffset); +MACvInitialize (priv);MACvReadEtherAddress (priv->PortOffset, priv->abyCurrentNetAddr);/* Get RFType */
@@ -1690,7 +1690,7 @@ static int vt6655_suspend(struct pci_dev *pcid, pm_message_t state)pci_save_state (pcid); -MACbShutdown (priv->PortOffset); +MACbShutdown (priv);pci_disable_device (pcid);pci_set_power_state (pcid,pci_choose_state (pcid, state));
drivers/staging/vt6655/key.c +4 -4
@@ -36,7 +36,7 @@ int vnt_key_init_table(struct vnt_private *priv)u32 i;for (i =0 ; i <MAX_KEY_TABLE ; i++) -MACvDisableKeyEntry (priv->PortOffset, i); +MACvDisableKeyEntry (priv, i);return 0 ; }
@@ -104,7 +104,7 @@ static int vnt_set_keymode(struct ieee80211_hw *hw, u8 *mac_addr, key->key[15 ] |=0x80 ; } -MACvSetKeyEntry (priv->PortOffset, key_mode, entry, key_inx, +MACvSetKeyEntry (priv, key_mode, entry, key_inx, bssid, (u32 *)key->key, priv->byLocalID);return 0 ;
@@ -126,13 +126,13 @@ int vnt_set_keys(struct ieee80211_hw *hw, struct ieee80211_sta *sta,switch (key->cipher) {case 0 :for (u =0 ; u <MAX_KEY_TABLE ; u++) -MACvDisableKeyEntry (priv->PortOffset, u); +MACvDisableKeyEntry (priv, u);return ret;case WLAN_CIPHER_SUITE_WEP40 :case WLAN_CIPHER_SUITE_WEP104 :for (u =0 ; u <MAX_KEY_TABLE ; u++) -MACvDisableKeyEntry (priv->PortOffset, u); +MACvDisableKeyEntry (priv, u);vnt_set_keymode (hw, mac_addr, key,VNT_KEY_DEFAULTKEY ,KEY_CTL_WEP , true);
drivers/staging/vt6655/mac.c +67 -41
327 lines not on this page · raw message
drivers/staging/vt6655/mac.h +29 -29
86 lines not on this page · raw message
drivers/staging/vt6655/power.c +1 -1
@@ -120,7 +120,7 @@ PSvDisablePowerSaving( ) {/* disable power saving hw function */ -MACbPSWakeup (priv->PortOffset); +MACbPSWakeup (priv);/* clear AutoSleep */ MACvRegBitsOff (priv->PortOffset,MAC_REG_PSCFG ,PSCFG_AUTOSLEEP );/* clear HWUTSF */
drivers/staging/vt6655/rf.c +18 -18
@@ -438,13 +438,13 @@ static bool s_bAL7230Init(struct vnt_private *priv)MACvWordRegBitsOn (dwIoBase,MAC_REG_SOFTPWRCTL ,SOFTPWRCTL_SWPE3 );/* Calibration */ -MACvTimer0MicroSDelay (dwIoBase,150 );/* 150us */ +MACvTimer0MicroSDelay (priv,150 );/* 150us */ /* TXDCOC:active, RCK:disable */ ret &=IFRFbWriteEmbedded (priv, (0x9ABA8F00 +(BY_AL7230_REG_LEN <<3 )+IFREGCTL_REGW )); -MACvTimer0MicroSDelay (dwIoBase,30 );/* 30us */ +MACvTimer0MicroSDelay (priv,30 );/* 30us */ /* TXDCOC:disable, RCK:active */ ret &=IFRFbWriteEmbedded (priv, (0x3ABA8F00 +(BY_AL7230_REG_LEN <<3 )+IFREGCTL_REGW )); -MACvTimer0MicroSDelay (dwIoBase,30 );/* 30us */ +MACvTimer0MicroSDelay (priv,30 );/* 30us */ /* TXDCOC:disable, RCK:disable */ ret &=IFRFbWriteEmbedded (priv, dwAL7230InitTable[CB_AL7230_INIT_SEQ -1 ]);
@@ -483,7 +483,7 @@ static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned char byCha/* Set Channel[7] = 0 to tell H/W channel is changing now. */ VNSvOutPortB (dwIoBase +MAC_REG_CHANNEL , (byChannel &0x7F )); -MACvTimer0MicroSDelay (dwIoBase,SWITCH_CHANNEL_DELAY_AL7230 ); +MACvTimer0MicroSDelay (priv,SWITCH_CHANNEL_DELAY_AL7230 );/* Set Channel[7] = 1 to tell H/W channel change is done. */ VNSvOutPortB (dwIoBase +MAC_REG_CHANNEL , (byChannel |0x80 ));
@@ -557,16 +557,16 @@ static bool RFbAL2230Init(struct vnt_private *priv)for (ii =0 ; ii <CB_AL2230_INIT_SEQ ; ii++) ret &=IFRFbWriteEmbedded (priv, dwAL2230InitTable[ii]); -MACvTimer0MicroSDelay (dwIoBase,30 );/* delay 30 us */ +MACvTimer0MicroSDelay (priv,30 );/* delay 30 us */ /* PLL On */ MACvWordRegBitsOn (dwIoBase,MAC_REG_SOFTPWRCTL ,SOFTPWRCTL_SWPE3 ); -MACvTimer0MicroSDelay (dwIoBase,150 );/* 150us */ +MACvTimer0MicroSDelay (priv,150 );/* 150us */ ret &=IFRFbWriteEmbedded (priv, (0x00d80f00 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW )); -MACvTimer0MicroSDelay (dwIoBase,30 );/* 30us */ +MACvTimer0MicroSDelay (priv,30 );/* 30us */ ret &=IFRFbWriteEmbedded (priv, (0x00780f00 +(BY_AL2230_REG_LEN <<3 )+IFREGCTL_REGW )); -MACvTimer0MicroSDelay (dwIoBase,30 );/* 30us */ +MACvTimer0MicroSDelay (priv,30 );/* 30us */ ret &=IFRFbWriteEmbedded (priv, dwAL2230InitTable[CB_AL2230_INIT_SEQ -1 ]); MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3 |
@@ -592,7 +592,7 @@ static bool RFbAL2230SelectChannel(struct vnt_private *priv, unsigned char byCha/* Set Channel[7] = 0 to tell H/W channel is changing now. */ VNSvOutPortB (dwIoBase +MAC_REG_CHANNEL , (byChannel &0x7F )); -MACvTimer0MicroSDelay (dwIoBase,SWITCH_CHANNEL_DELAY_AL2230 ); +MACvTimer0MicroSDelay (priv,SWITCH_CHANNEL_DELAY_AL2230 );/* Set Channel[7] = 1 to tell H/W channel change is done. */ VNSvOutPortB (dwIoBase +MAC_REG_CHANNEL , (byChannel |0x80 ));
@@ -711,11 +711,11 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType,return false;for (ii =0 ; ii <CB_AL2230_INIT_SEQ ; ii++) -MACvSetMISCFifo (dwIoBase, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL2230InitTable[ii]); +MACvSetMISCFifo (priv, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL2230InitTable[ii]); -MACvSetMISCFifo (dwIoBase, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL2230ChannelTable0[uChannel-1 ]); +MACvSetMISCFifo (priv, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL2230ChannelTable0[uChannel-1 ]); ii++; -MACvSetMISCFifo (dwIoBase, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL2230ChannelTable1[uChannel-1 ]); +MACvSetMISCFifo (priv, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL2230ChannelTable1[uChannel-1 ]);break ;/* Need to check, PLLON need to be low for channel setting */
@@ -728,17 +728,17 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType,if (uChannel <=CB_MAX_CHANNEL_24G ) {for (ii =0 ; ii <CB_AL7230_INIT_SEQ ; ii++) -MACvSetMISCFifo (dwIoBase, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL7230InitTable[ii]); +MACvSetMISCFifo (priv, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL7230InitTable[ii]); }else {for (ii =0 ; ii <CB_AL7230_INIT_SEQ ; ii++) -MACvSetMISCFifo (dwIoBase, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL7230InitTableAMode[ii]); +MACvSetMISCFifo (priv, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL7230InitTableAMode[ii]); } -MACvSetMISCFifo (dwIoBase, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL7230ChannelTable0[uChannel-1 ]); +MACvSetMISCFifo (priv, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL7230ChannelTable0[uChannel-1 ]); ii++; -MACvSetMISCFifo (dwIoBase, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL7230ChannelTable1[uChannel-1 ]); +MACvSetMISCFifo (priv, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL7230ChannelTable1[uChannel-1 ]); ii++; -MACvSetMISCFifo (dwIoBase, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL7230ChannelTable2[uChannel-1 ]); +MACvSetMISCFifo (priv, (unsigned short )(MISCFIFO_SYNDATA_IDX + ii), dwAL7230ChannelTable2[uChannel-1 ]);break ;case RF_NOTHING :
@@ -748,7 +748,7 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType,return false; } -MACvSetMISCFifo (dwIoBase,MISCFIFO_SYNINFO_IDX , (unsigned long )MAKEWORD (bySleepCount, byInitCount)); +MACvSetMISCFifo (priv,MISCFIFO_SYNINFO_IDX , (unsigned long )MAKEWORD (bySleepCount, byInitCount));return true; }
Signature · 1 line
2.6.2