mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity

staging: vt6656: rename MACvRegBitsOff to vnt_mac_reg_bits_off

Browse source 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-05-31 11:50:42 +01:00 committed by Greg Kroah-Hartman
parent a9bed1df5b
commit 369575377e
8 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/vt6656/baseband.c
View file

@ -994,7 +994,7 @@ int BBbVT3184Init(struct vnt_private *priv)
priv->ldBmThreshold[2] = 0; priv->ldBmThreshold[2] = 0;
priv->ldBmThreshold[3] = 0; priv->ldBmThreshold[3] = 0;
/* Fix VT3226 DFC system timing issue */ /* Fix VT3226 DFC system timing issue */
MACvRegBitsOn(priv, MAC_REG_SOFTPWRCTL2, SOFTPWRCTL_RFLEOPT); vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL2, SOFTPWRCTL_RFLEOPT);
} else if ((priv->byRFType == RF_VT3342A0)) { } else if ((priv->byRFType == RF_VT3342A0)) {
priv->byBBRxConf = abyVT3184_VT3226D0[10]; priv->byBBRxConf = abyVT3184_VT3226D0[10];
length = sizeof(abyVT3184_VT3226D0); length = sizeof(abyVT3184_VT3226D0);
@ -1011,7 +1011,7 @@ int BBbVT3184Init(struct vnt_private *priv)
priv->ldBmThreshold[2] = 0; priv->ldBmThreshold[2] = 0;
priv->ldBmThreshold[3] = 0; priv->ldBmThreshold[3] = 0;
/* Fix VT3226 DFC system timing issue */ /* Fix VT3226 DFC system timing issue */
MACvRegBitsOn(priv, MAC_REG_SOFTPWRCTL2, SOFTPWRCTL_RFLEOPT); vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL2, SOFTPWRCTL_RFLEOPT);
} else { } else {
return true; return true;
} }
@ -1030,11 +1030,11 @@ int BBbVT3184Init(struct vnt_private *priv)
(priv->byRFType == RF_VT3342A0)) { (priv->byRFType == RF_VT3342A0)) {
vnt_control_out_u8(priv, MESSAGE_REQUEST_MACREG, vnt_control_out_u8(priv, MESSAGE_REQUEST_MACREG,
MAC_REG_ITRTMSET, 0x23); MAC_REG_ITRTMSET, 0x23);
MACvRegBitsOn(priv, MAC_REG_PAPEDELAY, 0x01); vnt_mac_reg_bits_on(priv, MAC_REG_PAPEDELAY, 0x01);
} else if (priv->byRFType == RF_VT3226D0) { } else if (priv->byRFType == RF_VT3226D0) {
vnt_control_out_u8(priv, MESSAGE_REQUEST_MACREG, vnt_control_out_u8(priv, MESSAGE_REQUEST_MACREG,
MAC_REG_ITRTMSET, 0x11); MAC_REG_ITRTMSET, 0x11);
MACvRegBitsOn(priv, MAC_REG_PAPEDELAY, 0x01); vnt_mac_reg_bits_on(priv, MAC_REG_PAPEDELAY, 0x01);
} }
vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG, 0x04, 0x7f); vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG, 0x04, 0x7f);

8
drivers/staging/vt6656/card.c
View file

@ -89,7 +89,7 @@ void vnt_set_channel(struct vnt_private *priv, u32 connection_channel)
} }
/* clear NAV */ /* clear NAV */
MACvRegBitsOn(priv, MAC_REG_MACCR, MACCR_CLRNAV); vnt_mac_reg_bits_on(priv, MAC_REG_MACCR, MACCR_CLRNAV);
/* Set Channel[7] = 0 to tell H/W channel is changing now. */ /* Set Channel[7] = 0 to tell H/W channel is changing now. */
vnt_mac_reg_bits_off(priv, MAC_REG_CHANNEL, 0xb0); vnt_mac_reg_bits_off(priv, MAC_REG_CHANNEL, 0xb0);
@ -636,7 +636,7 @@ bool vnt_get_current_tsf(struct vnt_private *priv, u64 *current_tsf)
bool vnt_clear_current_tsf(struct vnt_private *priv) bool vnt_clear_current_tsf(struct vnt_private *priv)
{ {
MACvRegBitsOn(priv, MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); vnt_mac_reg_bits_on(priv, MAC_REG_TFTCTL, TFTCTL_TSFCNTRST);
priv->qwCurrTSF = 0; priv->qwCurrTSF = 0;
@ -812,7 +812,7 @@ int vnt_radio_power_on(struct vnt_private *priv)
BBvExitDeepSleep(priv); BBvExitDeepSleep(priv);
MACvRegBitsOn(priv, MAC_REG_HOSTCR, HOSTCR_RXON); vnt_mac_reg_bits_on(priv, MAC_REG_HOSTCR, HOSTCR_RXON);
switch (priv->byRFType) { switch (priv->byRFType) {
case RF_AL2230: case RF_AL2230:
@ -821,7 +821,7 @@ int vnt_radio_power_on(struct vnt_private *priv)
case RF_VT3226: case RF_VT3226:
case RF_VT3226D0: case RF_VT3226D0:
case RF_VT3342A0: case RF_VT3342A0:
MACvRegBitsOn(priv, MAC_REG_SOFTPWRCTL, vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL,
(SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3)); (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3));
break; break;
} }

2
drivers/staging/vt6656/mac.c
View file

@ -158,7 +158,7 @@ void vnt_mac_reg_bits_off(struct vnt_private *priv, u8 reg_ofs, u8 bits)
reg_ofs, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data); reg_ofs, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
} }
void MACvRegBitsOn(struct vnt_private *priv, u8 reg_ofs, u8 bits) void vnt_mac_reg_bits_on(struct vnt_private *priv, u8 reg_ofs, u8 bits)
{ {
u8 data[2]; u8 data[2];

2
drivers/staging/vt6656/mac.h
View file

@ -420,7 +420,7 @@ void vnt_mac_set_bb_type(struct vnt_private *, u8);
void vnt_mac_disable_keyentry(struct vnt_private *, u8); void vnt_mac_disable_keyentry(struct vnt_private *, u8);
void vnt_mac_set_keyentry(struct vnt_private *, u16, u32, u32, u8 *, u8 *); void vnt_mac_set_keyentry(struct vnt_private *, u16, u32, u32, u8 *, u8 *);
void vnt_mac_reg_bits_off(struct vnt_private *, u8, u8); void vnt_mac_reg_bits_off(struct vnt_private *, u8, u8);
void MACvRegBitsOn(struct vnt_private *, u8, u8); void vnt_mac_reg_bits_on(struct vnt_private *, u8, u8);
void MACvWriteWord(struct vnt_private *, u8, u16); void MACvWriteWord(struct vnt_private *, u8, u16);
void MACvWriteBSSIDAddress(struct vnt_private *, u8 *); void MACvWriteBSSIDAddress(struct vnt_private *, u8 *);
void MACvEnableProtectMD(struct vnt_private *); void MACvEnableProtectMD(struct vnt_private *);

5
drivers/staging/vt6656/main_usb.c
View file

@ -544,7 +544,8 @@ static int device_init_registers(struct vnt_private *pDevice)
if ((byTmp & GPIO3_DATA) == 0) { if ((byTmp & GPIO3_DATA) == 0) {
pDevice->bHWRadioOff = true; pDevice->bHWRadioOff = true;
MACvRegBitsOn(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD); vnt_mac_reg_bits_on(pDevice, MAC_REG_GPIOCTL1,
GPIO3_INTMD);
} else { } else {
vnt_mac_reg_bits_off(pDevice, MAC_REG_GPIOCTL1, vnt_mac_reg_bits_off(pDevice, MAC_REG_GPIOCTL1,
GPIO3_INTMD); GPIO3_INTMD);
@ -557,7 +558,7 @@ static int device_init_registers(struct vnt_private *pDevice)
vnt_mac_set_led(pDevice, LEDSTS_STS, LEDSTS_SLOW); vnt_mac_set_led(pDevice, LEDSTS_STS, LEDSTS_SLOW);
MACvRegBitsOn(pDevice, MAC_REG_GPIOCTL0, 0x01); vnt_mac_reg_bits_on(pDevice, MAC_REG_GPIOCTL0, 0x01);
if ((pDevice->bHWRadioOff == true) || if ((pDevice->bHWRadioOff == true) ||
(pDevice->bRadioControlOff == true)) { (pDevice->bRadioControlOff == true)) {

20
drivers/staging/vt6656/power.c
View file

@ -75,15 +75,15 @@ void PSvEnablePowerSaving(struct vnt_private *pDevice, u16 wListenInterval)
* PSEN->AUTOSLEEP->GO2DOZE * PSEN->AUTOSLEEP->GO2DOZE
*/ */
/* enable power saving hw function */ /* enable power saving hw function */
MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_PSEN); vnt_mac_reg_bits_on(pDevice, MAC_REG_PSCTL, PSCTL_PSEN);
/* Set AutoSleep */ /* Set AutoSleep */
MACvRegBitsOn(pDevice, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); vnt_mac_reg_bits_on(pDevice, MAC_REG_PSCFG, PSCFG_AUTOSLEEP);
/* Warren:MUST turn on this once before turn on AUTOSLEEP ,or the /* Warren:MUST turn on this once before turn on AUTOSLEEP ,or the
* AUTOSLEEP doesn't work * AUTOSLEEP doesn't work
*/ */
MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_GO2DOZE); vnt_mac_reg_bits_on(pDevice, MAC_REG_PSCTL, PSCTL_GO2DOZE);
if (wListenInterval >= 2) { if (wListenInterval >= 2) {
@ -91,14 +91,14 @@ void PSvEnablePowerSaving(struct vnt_private *pDevice, u16 wListenInterval)
vnt_mac_reg_bits_off(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN); vnt_mac_reg_bits_off(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);
/* first time set listen next beacon */ /* first time set listen next beacon */
MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_LNBCN); vnt_mac_reg_bits_on(pDevice, MAC_REG_PSCTL, PSCTL_LNBCN);
pMgmt->wCountToWakeUp = wListenInterval; pMgmt->wCountToWakeUp = wListenInterval;
} else { } else {
/* always listen beacon */ /* always listen beacon */
MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN); vnt_mac_reg_bits_on(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);
pMgmt->wCountToWakeUp = 0; pMgmt->wCountToWakeUp = 0;
} }
@ -136,7 +136,7 @@ void PSvDisablePowerSaving(struct vnt_private *pDevice)
vnt_mac_reg_bits_off(pDevice, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); vnt_mac_reg_bits_off(pDevice, MAC_REG_PSCFG, PSCFG_AUTOSLEEP);
/* set always listen beacon */ /* set always listen beacon */
MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN); vnt_mac_reg_bits_on(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);
pDevice->bEnablePSMode = false; pDevice->bEnablePSMode = false;
if (pDevice->op_mode == NL80211_IFTYPE_STATION) if (pDevice->op_mode == NL80211_IFTYPE_STATION)
@ -183,7 +183,7 @@ int PSbConsiderPowerDown(struct vnt_private *pDevice, int bCheckRxDMA,
return false; return false;
/* Froce PSEN on */ /* Froce PSEN on */
MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_PSEN); vnt_mac_reg_bits_on(pDevice, MAC_REG_PSCTL, PSCTL_PSEN);
if (pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) { if (pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) {
if (bCheckCountToWakeUp && (pMgmt->wCountToWakeUp == 0 if (bCheckCountToWakeUp && (pMgmt->wCountToWakeUp == 0
@ -195,7 +195,7 @@ int PSbConsiderPowerDown(struct vnt_private *pDevice, int bCheckRxDMA,
pDevice->bPSRxBeacon = true; pDevice->bPSRxBeacon = true;
/* no Tx, no Rx isr, now go to Doze */ /* no Tx, no Rx isr, now go to Doze */
MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_GO2DOZE); vnt_mac_reg_bits_on(pDevice, MAC_REG_PSCTL, PSCTL_GO2DOZE);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Go to Doze ZZZZZZZZZZZZZZZ\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Go to Doze ZZZZZZZZZZZZZZZ\n");
return true; return true;
} }
@ -325,12 +325,12 @@ int PSbIsNextTBTTWakeUp(struct vnt_private *pDevice)
if (pMgmt->wCountToWakeUp == 1) { if (pMgmt->wCountToWakeUp == 1) {
/* Turn on wake up to listen next beacon */ /* Turn on wake up to listen next beacon */
MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_LNBCN); vnt_mac_reg_bits_on(pDevice, MAC_REG_PSCTL, PSCTL_LNBCN);
pDevice->bPSRxBeacon = false; pDevice->bPSRxBeacon = false;
bWakeUp = true; bWakeUp = true;
} else if (!pDevice->bPSRxBeacon) { } else if (!pDevice->bPSRxBeacon) {
/* Listen until RxBeacon */ /* Listen until RxBeacon */
MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_LNBCN); vnt_mac_reg_bits_on(pDevice, MAC_REG_PSCTL, PSCTL_LNBCN);
} }
} }
return bWakeUp; return bWakeUp;

6
drivers/staging/vt6656/wcmd.c
View file

@ -142,7 +142,7 @@ static void vAdHocBeaconRestart(struct vnt_private *pDevice)
if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
(pMgmt->eCurrState >= WMAC_STATE_STARTED)) { (pMgmt->eCurrState >= WMAC_STATE_STARTED)) {
//PMESG(("RESTART_BEACON\n")); //PMESG(("RESTART_BEACON\n"));
MACvRegBitsOn(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX); vnt_mac_reg_bits_on(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
} }
} }
@ -390,7 +390,7 @@ void vRunCommand(struct work_struct *work)
vnt_set_channel(pDevice, pMgmt->uCurrChannel); vnt_set_channel(pDevice, pMgmt->uCurrChannel);
// Set Filter // Set Filter
if (pMgmt->bCurrBSSIDFilterOn) { if (pMgmt->bCurrBSSIDFilterOn) {
MACvRegBitsOn(pDevice, MAC_REG_RCR, RCR_BSSID); vnt_mac_reg_bits_on(pDevice, MAC_REG_RCR, RCR_BSSID);
pDevice->byRxMode |= RCR_BSSID; pDevice->byRxMode |= RCR_BSSID;
} }
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning, set back to channel: [%d]\n", pMgmt->uCurrChannel); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning, set back to channel: [%d]\n", pMgmt->uCurrChannel);
@ -799,7 +799,7 @@ void vRunCommand(struct work_struct *work)
netif_stop_queue(pDevice->dev); netif_stop_queue(pDevice->dev);
vnt_radio_power_off(pDevice); vnt_radio_power_off(pDevice);
MACvRegBitsOn(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD); vnt_mac_reg_bits_on(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);
vnt_mac_set_led(pDevice, LEDSTS_STS, LEDSTS_OFF); vnt_mac_set_led(pDevice, LEDSTS_STS, LEDSTS_OFF);

16
drivers/staging/vt6656/wmgr.c
View file

@ -2048,7 +2048,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus)
vnt_clear_current_tsf(pDevice); vnt_clear_current_tsf(pDevice);
// enable TSF counter // enable TSF counter
MACvRegBitsOn(pDevice,MAC_REG_TFTCTL,TFTCTL_TSFCNTREN); vnt_mac_reg_bits_on(pDevice, MAC_REG_TFTCTL, TFTCTL_TSFCNTREN);
// set Next TBTT // set Next TBTT
vnt_reset_next_tbtt(pDevice, pMgmt->wIBSSBeaconPeriod); vnt_reset_next_tbtt(pDevice, pMgmt->wIBSSBeaconPeriod);
@ -2083,12 +2083,12 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus)
vnt_set_bss_mode(pDevice); vnt_set_bss_mode(pDevice);
if (pMgmt->eConfigMode == WMAC_CONFIG_AP) { if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {
MACvRegBitsOn(pDevice, MAC_REG_HOSTCR, HOSTCR_AP); vnt_mac_reg_bits_on(pDevice, MAC_REG_HOSTCR, HOSTCR_AP);
pMgmt->eCurrMode = WMAC_MODE_ESS_AP; pMgmt->eCurrMode = WMAC_MODE_ESS_AP;
} }
if (pMgmt->eConfigMode == WMAC_CONFIG_IBSS_STA) { if (pMgmt->eConfigMode == WMAC_CONFIG_IBSS_STA) {
MACvRegBitsOn(pDevice, MAC_REG_HOSTCR, HOSTCR_ADHOC); vnt_mac_reg_bits_on(pDevice, MAC_REG_HOSTCR, HOSTCR_ADHOC);
pMgmt->eCurrMode = WMAC_MODE_IBSS_STA; pMgmt->eCurrMode = WMAC_MODE_IBSS_STA;
} }
@ -2142,7 +2142,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus)
MACvWriteBSSIDAddress(pDevice, pMgmt->abyCurrBSSID); MACvWriteBSSIDAddress(pDevice, pMgmt->abyCurrBSSID);
memcpy(pDevice->abyBSSID, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN); memcpy(pDevice->abyBSSID, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN);
MACvRegBitsOn(pDevice, MAC_REG_RCR, RCR_BSSID); vnt_mac_reg_bits_on(pDevice, MAC_REG_RCR, RCR_BSSID);
pDevice->byRxMode |= RCR_BSSID; pDevice->byRxMode |= RCR_BSSID;
pMgmt->bCurrBSSIDFilterOn = true; pMgmt->bCurrBSSIDFilterOn = true;
@ -2636,7 +2636,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
if (uBSSMode == WMAC_MODE_ESS_STA) { if (uBSSMode == WMAC_MODE_ESS_STA) {
vnt_mac_reg_bits_off(pDevice, MAC_REG_HOSTCR, HOSTCR_ADHOC); vnt_mac_reg_bits_off(pDevice, MAC_REG_HOSTCR, HOSTCR_ADHOC);
MACvRegBitsOn(pDevice, MAC_REG_RCR, RCR_BSSID); vnt_mac_reg_bits_on(pDevice, MAC_REG_RCR, RCR_BSSID);
pDevice->byRxMode |= RCR_BSSID; pDevice->byRxMode |= RCR_BSSID;
pMgmt->bCurrBSSIDFilterOn = true; pMgmt->bCurrBSSIDFilterOn = true;
} }
@ -2658,8 +2658,8 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
// 2. In Infra mode : Supposed we already synchronized with AP right now. // 2. In Infra mode : Supposed we already synchronized with AP right now.
if (uBSSMode == WMAC_MODE_IBSS_STA) { if (uBSSMode == WMAC_MODE_IBSS_STA) {
MACvRegBitsOn(pDevice, MAC_REG_HOSTCR, HOSTCR_ADHOC); vnt_mac_reg_bits_on(pDevice, MAC_REG_HOSTCR, HOSTCR_ADHOC);
MACvRegBitsOn(pDevice, MAC_REG_RCR, RCR_BSSID); vnt_mac_reg_bits_on(pDevice, MAC_REG_RCR, RCR_BSSID);
pDevice->byRxMode |= RCR_BSSID; pDevice->byRxMode |= RCR_BSSID;
pMgmt->bCurrBSSIDFilterOn = true; pMgmt->bCurrBSSIDFilterOn = true;
} }
@ -4059,7 +4059,7 @@ int bMgrPrepareBeaconToSend(struct vnt_private *pDevice,
spin_unlock_irqrestore(&pDevice->lock, flags); spin_unlock_irqrestore(&pDevice->lock, flags);
MACvRegBitsOn(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX); vnt_mac_reg_bits_on(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
return true; return true;
} }