staging:vt6655:power: Whitespace cleanups

Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Joe Perches 2013-03-18 10:44:58 -07:00 committed by Greg Kroah-Hartman
parent a51ff9058c
commit 474f0f89ef
2 changed files with 226 additions and 226 deletions

View File

@ -54,7 +54,7 @@
/*--------------------- Static Classes ----------------------------*/ /*--------------------- Static Classes ----------------------------*/
/*--------------------- Static Variables --------------------------*/ /*--------------------- Static Variables --------------------------*/
static int msglevel =MSG_LEVEL_INFO; static int msglevel = MSG_LEVEL_INFO;
/*--------------------- Static Functions --------------------------*/ /*--------------------- Static Functions --------------------------*/
@ -71,62 +71,62 @@ static int msglevel =MSG_LEVEL_INFO;
* Return Value: * Return Value:
* None. * None.
* *
-*/ -*/
void void
PSvEnablePowerSaving( PSvEnablePowerSaving(
void *hDeviceContext, void *hDeviceContext,
unsigned short wListenInterval unsigned short wListenInterval
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned short wAID = pMgmt->wCurrAID | BIT14 | BIT15; unsigned short wAID = pMgmt->wCurrAID | BIT14 | BIT15;
// set period of power up before TBTT // set period of power up before TBTT
VNSvOutPortW(pDevice->PortOffset + MAC_REG_PWBT, C_PWBT); VNSvOutPortW(pDevice->PortOffset + MAC_REG_PWBT, C_PWBT);
if (pDevice->eOPMode != OP_MODE_ADHOC) { if (pDevice->eOPMode != OP_MODE_ADHOC) {
// set AID // set AID
VNSvOutPortW(pDevice->PortOffset + MAC_REG_AIDATIM, wAID); VNSvOutPortW(pDevice->PortOffset + MAC_REG_AIDATIM, wAID);
} else { } else {
// set ATIM Window // set ATIM Window
MACvWriteATIMW(pDevice->PortOffset, pMgmt->wCurrATIMWindow); MACvWriteATIMW(pDevice->PortOffset, pMgmt->wCurrATIMWindow);
} }
// Set AutoSleep // Set AutoSleep
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP);
// Set HWUTSF // Set HWUTSF
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); MACvRegBitsOn(pDevice->PortOffset, MAC_REG_TFTCTL, TFTCTL_HWUTSF);
if (wListenInterval >= 2) { if (wListenInterval >= 2) {
// clear always listen beacon // clear always listen beacon
MACvRegBitsOff(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN); MACvRegBitsOff(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN);
//pDevice->wCFG &= ~CFG_ALB; //pDevice->wCFG &= ~CFG_ALB;
// first time set listen next beacon // first time set listen next beacon
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_LNBCN); MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_LNBCN);
pMgmt->wCountToWakeUp = wListenInterval; pMgmt->wCountToWakeUp = wListenInterval;
} }
else { else {
// always listen beacon // always listen beacon
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN); MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN);
//pDevice->wCFG |= CFG_ALB; //pDevice->wCFG |= CFG_ALB;
pMgmt->wCountToWakeUp = 0; pMgmt->wCountToWakeUp = 0;
} }
// enable power saving hw function // enable power saving hw function
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PSEN); MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PSEN);
pDevice->bEnablePSMode = true; pDevice->bEnablePSMode = true;
if (pDevice->eOPMode == OP_MODE_ADHOC) { if (pDevice->eOPMode == OP_MODE_ADHOC) {
// bMgrPrepareBeaconToSend((void *)pDevice, pMgmt); // bMgrPrepareBeaconToSend((void *)pDevice, pMgmt);
} }
// We don't send null pkt in ad hoc mode since beacon will handle this. // We don't send null pkt in ad hoc mode since beacon will handle this.
else if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) { else if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) {
PSbSendNullPacket(pDevice); PSbSendNullPacket(pDevice);
} }
pDevice->bPWBitOn = true; pDevice->bPWBitOn = true;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PS:Power Saving Mode Enable... \n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PS:Power Saving Mode Enable... \n");
return; return;
} }
@ -142,32 +142,32 @@ PSvEnablePowerSaving(
* Return Value: * Return Value:
* None. * None.
* *
-*/ -*/
void void
PSvDisablePowerSaving( PSvDisablePowerSaving(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
// PSMgmtObject pMgmt = pDevice->pMgmt; // PSMgmtObject pMgmt = pDevice->pMgmt;
// disable power saving hw function // disable power saving hw function
MACbPSWakeup(pDevice->PortOffset); MACbPSWakeup(pDevice->PortOffset);
//clear AutoSleep //clear AutoSleep
MACvRegBitsOff(pDevice->PortOffset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); MACvRegBitsOff(pDevice->PortOffset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP);
//clear HWUTSF //clear HWUTSF
MACvRegBitsOff(pDevice->PortOffset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); MACvRegBitsOff(pDevice->PortOffset, MAC_REG_TFTCTL, TFTCTL_HWUTSF);
// set always listen beacon // set always listen beacon
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN); MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN);
pDevice->bEnablePSMode = false; pDevice->bEnablePSMode = false;
if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) { if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) {
PSbSendNullPacket(pDevice); PSbSendNullPacket(pDevice);
} }
pDevice->bPWBitOn = false; pDevice->bPWBitOn = false;
return; return;
} }
@ -179,61 +179,61 @@ PSvDisablePowerSaving(
* Return Value: * Return Value:
* true, if power down success * true, if power down success
* false, if fail * false, if fail
-*/ -*/
bool bool
PSbConsiderPowerDown( PSbConsiderPowerDown(
void *hDeviceContext, void *hDeviceContext,
bool bCheckRxDMA, bool bCheckRxDMA,
bool bCheckCountToWakeUp bool bCheckCountToWakeUp
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned int uIdx; unsigned int uIdx;
// check if already in Doze mode // check if already in Doze mode
if (MACbIsRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PS)) if (MACbIsRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PS))
return true; return true;
if (pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) { if (pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) {
// check if in TIM wake period // check if in TIM wake period
if (pMgmt->bInTIMWake) if (pMgmt->bInTIMWake)
return false; return false;
} }
// check scan state // check scan state
if (pDevice->bCmdRunning) if (pDevice->bCmdRunning)
return false; return false;
// Force PSEN on // Force PSEN on
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PSEN); MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PSEN);
// check if all TD are empty, // check if all TD are empty,
for (uIdx = 0; uIdx < TYPE_MAXTD; uIdx ++) { for (uIdx = 0; uIdx < TYPE_MAXTD; uIdx++) {
if (pDevice->iTDUsed[uIdx] != 0) if (pDevice->iTDUsed[uIdx] != 0)
return false; return false;
} }
// check if rx isr is clear // check if rx isr is clear
if (bCheckRxDMA && if (bCheckRxDMA &&
((pDevice->dwIsr& ISR_RXDMA0) != 0) && ((pDevice->dwIsr & ISR_RXDMA0) != 0) &&
((pDevice->dwIsr & ISR_RXDMA1) != 0)){ ((pDevice->dwIsr & ISR_RXDMA1) != 0)) {
return false; return false;
} }
if (pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) { if (pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) {
if (bCheckCountToWakeUp && if (bCheckCountToWakeUp &&
(pMgmt->wCountToWakeUp == 0 || pMgmt->wCountToWakeUp == 1)) { (pMgmt->wCountToWakeUp == 0 || pMgmt->wCountToWakeUp == 1)) {
return false; return false;
} }
} }
// no Tx, no Rx isr, now go to Doze // no Tx, no Rx isr, now go to Doze
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_GO2DOZE); MACvRegBitsOn(pDevice->PortOffset, 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;
} }
@ -246,43 +246,43 @@ PSbConsiderPowerDown(
* Return Value: * Return Value:
* None. * None.
* *
-*/ -*/
void void
PSvSendPSPOLL( PSvSendPSPOLL(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PSTxMgmtPacket pTxPacket = NULL; PSTxMgmtPacket pTxPacket = NULL;
memset(pMgmt->pbyPSPacketPool, 0, sizeof(STxMgmtPacket) + WLAN_HDR_ADDR2_LEN); memset(pMgmt->pbyPSPacketPool, 0, sizeof(STxMgmtPacket) + WLAN_HDR_ADDR2_LEN);
pTxPacket = (PSTxMgmtPacket)pMgmt->pbyPSPacketPool; pTxPacket = (PSTxMgmtPacket)pMgmt->pbyPSPacketPool;
pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket)); pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
pTxPacket->p80211Header->sA2.wFrameCtl = cpu_to_le16( pTxPacket->p80211Header->sA2.wFrameCtl = cpu_to_le16(
( (
WLAN_SET_FC_FTYPE(WLAN_TYPE_CTL) | WLAN_SET_FC_FTYPE(WLAN_TYPE_CTL) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_PSPOLL) | WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_PSPOLL) |
WLAN_SET_FC_PWRMGT(0) WLAN_SET_FC_PWRMGT(0)
)); ));
pTxPacket->p80211Header->sA2.wDurationID = pMgmt->wCurrAID | BIT14 | BIT15; pTxPacket->p80211Header->sA2.wDurationID = pMgmt->wCurrAID | BIT14 | BIT15;
memcpy(pTxPacket->p80211Header->sA2.abyAddr1, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN); memcpy(pTxPacket->p80211Header->sA2.abyAddr1, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN);
memcpy(pTxPacket->p80211Header->sA2.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN); memcpy(pTxPacket->p80211Header->sA2.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
pTxPacket->cbMPDULen = WLAN_HDR_ADDR2_LEN; pTxPacket->cbMPDULen = WLAN_HDR_ADDR2_LEN;
pTxPacket->cbPayloadLen = 0; pTxPacket->cbPayloadLen = 0;
// send the frame // send the frame
if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) { if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send PS-Poll packet failed..\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send PS-Poll packet failed..\n");
} }
else { else {
// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send PS-Poll packet success..\n"); // DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send PS-Poll packet success..\n");
}; };
return; return;
} }
@ -295,81 +295,81 @@ PSvSendPSPOLL(
* Return Value: * Return Value:
* None. * None.
* *
-*/ -*/
bool bool
PSbSendNullPacket( PSbSendNullPacket(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSTxMgmtPacket pTxPacket = NULL; PSTxMgmtPacket pTxPacket = NULL;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned int uIdx; unsigned int uIdx;
if (pDevice->bLinkPass == false) { if (pDevice->bLinkPass == false) {
return false; return false;
} }
#ifdef TxInSleep #ifdef TxInSleep
if ((pDevice->bEnablePSMode == false) && if ((pDevice->bEnablePSMode == false) &&
(pDevice->fTxDataInSleep == false)){ (pDevice->fTxDataInSleep == false)) {
return false; return false;
} }
#else #else
if (pDevice->bEnablePSMode == false) { if (pDevice->bEnablePSMode == false) {
return false; return false;
} }
#endif #endif
if (pDevice->bEnablePSMode) { if (pDevice->bEnablePSMode) {
for (uIdx = 0; uIdx < TYPE_MAXTD; uIdx ++) { for (uIdx = 0; uIdx < TYPE_MAXTD; uIdx++) {
if (pDevice->iTDUsed[uIdx] != 0) if (pDevice->iTDUsed[uIdx] != 0)
return false; return false;
} }
} }
memset(pMgmt->pbyPSPacketPool, 0, sizeof(STxMgmtPacket) + WLAN_NULLDATA_FR_MAXLEN); memset(pMgmt->pbyPSPacketPool, 0, sizeof(STxMgmtPacket) + WLAN_NULLDATA_FR_MAXLEN);
pTxPacket = (PSTxMgmtPacket)pMgmt->pbyPSPacketPool; pTxPacket = (PSTxMgmtPacket)pMgmt->pbyPSPacketPool;
pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket)); pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
if (pDevice->bEnablePSMode) { if (pDevice->bEnablePSMode) {
pTxPacket->p80211Header->sA3.wFrameCtl = cpu_to_le16( pTxPacket->p80211Header->sA3.wFrameCtl = cpu_to_le16(
( (
WLAN_SET_FC_FTYPE(WLAN_TYPE_DATA) | WLAN_SET_FC_FTYPE(WLAN_TYPE_DATA) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_NULL) | WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_NULL) |
WLAN_SET_FC_PWRMGT(1) WLAN_SET_FC_PWRMGT(1)
)); ));
} }
else { else {
pTxPacket->p80211Header->sA3.wFrameCtl = cpu_to_le16( pTxPacket->p80211Header->sA3.wFrameCtl = cpu_to_le16(
( (
WLAN_SET_FC_FTYPE(WLAN_TYPE_DATA) | WLAN_SET_FC_FTYPE(WLAN_TYPE_DATA) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_NULL) | WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_NULL) |
WLAN_SET_FC_PWRMGT(0) WLAN_SET_FC_PWRMGT(0)
)); ));
} }
if(pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) { if (pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) {
pTxPacket->p80211Header->sA3.wFrameCtl |= cpu_to_le16((unsigned short)WLAN_SET_FC_TODS(1)); pTxPacket->p80211Header->sA3.wFrameCtl |= cpu_to_le16((unsigned short)WLAN_SET_FC_TODS(1));
} }
memcpy(pTxPacket->p80211Header->sA3.abyAddr1, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN); memcpy(pTxPacket->p80211Header->sA3.abyAddr1, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN);
memcpy(pTxPacket->p80211Header->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN); memcpy(pTxPacket->p80211Header->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy(pTxPacket->p80211Header->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN); memcpy(pTxPacket->p80211Header->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
pTxPacket->cbMPDULen = WLAN_HDR_ADDR3_LEN; pTxPacket->cbMPDULen = WLAN_HDR_ADDR3_LEN;
pTxPacket->cbPayloadLen = 0; pTxPacket->cbPayloadLen = 0;
// send the frame // send the frame
if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) { if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet failed !\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet failed !\n");
return false; return false;
} }
else { else {
// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet success....\n"); // DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet success....\n");
} }
return true ; return true;
} }
/*+ /*+
@ -380,33 +380,33 @@ PSbSendNullPacket(
* Return Value: * Return Value:
* None. * None.
* *
-*/ -*/
bool bool
PSbIsNextTBTTWakeUp( PSbIsNextTBTTWakeUp(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
bool bWakeUp = false; bool bWakeUp = false;
if (pMgmt->wListenInterval >= 2) { if (pMgmt->wListenInterval >= 2) {
if (pMgmt->wCountToWakeUp == 0) { if (pMgmt->wCountToWakeUp == 0) {
pMgmt->wCountToWakeUp = pMgmt->wListenInterval; pMgmt->wCountToWakeUp = pMgmt->wListenInterval;
} }
pMgmt->wCountToWakeUp --; pMgmt->wCountToWakeUp--;
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->PortOffset, MAC_REG_PSCTL, PSCTL_LNBCN); MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_LNBCN);
bWakeUp = true; bWakeUp = true;
} }
} }
return bWakeUp; return bWakeUp;
} }

View File

@ -50,35 +50,35 @@
bool bool
PSbConsiderPowerDown( PSbConsiderPowerDown(
void *hDeviceContext, void *hDeviceContext,
bool bCheckRxDMA, bool bCheckRxDMA,
bool bCheckCountToWakeUp bool bCheckCountToWakeUp
); );
void void
PSvDisablePowerSaving( PSvDisablePowerSaving(
void *hDeviceContext void *hDeviceContext
); );
void void
PSvEnablePowerSaving( PSvEnablePowerSaving(
void *hDeviceContext, void *hDeviceContext,
unsigned short wListenInterval unsigned short wListenInterval
); );
void void
PSvSendPSPOLL( PSvSendPSPOLL(
void *hDeviceContext void *hDeviceContext
); );
bool bool
PSbSendNullPacket( PSbSendNullPacket(
void *hDeviceContext void *hDeviceContext
); );
bool bool
PSbIsNextTBTTWakeUp( PSbIsNextTBTTWakeUp(
void *hDeviceContext void *hDeviceContext
); );
#endif //__POWER_H__ #endif //__POWER_H__