Commit f9cfbe94 authored by Philip Worrall's avatar Philip Worrall Committed by Greg Kroah-Hartman
Browse files

Staging: vt6656: Ensure power.c uses proper tabbing. 



Cleanup power.c to use proper tabbing as per coding standards.

Signed-off-by: default avatarPhilip Worrall <philip.worrall@googlemail.com>
Reviewed-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6170f51b

drivers/staging/vt6656/power.c

+201 −215
Original line number Diff line number Diff line
@@ -91,40 +91,43 @@ void PSvEnablePowerSaving(void *hDeviceContext, 
	//Warren:06-18-2004,the sequence must follow PSEN->AUTOSLEEP->GO2DOZE

	// enable power saving hw function

	MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_PSEN);



	// Set AutoSleep

	MACvRegBitsOn(pDevice, MAC_REG_PSCFG, PSCFG_AUTOSLEEP);



	//Warren:MUST turn on this once before turn on AUTOSLEEP ,or the AUTOSLEEP doesn't work

	MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_GO2DOZE);





	if (wListenInterval >= 2) {



		// clear always listen beacon

		MACvRegBitsOff(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);



		// first time set listen next beacon

		MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_LNBCN);



		pMgmt->wCountToWakeUp = wListenInterval;



    }

    else {

	} else {



		// always listen beacon

		MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);

        pMgmt->wCountToWakeUp = 0;



		pMgmt->wCountToWakeUp = 0;

	}



	pDevice->bEnablePSMode = TRUE;



	if (pDevice->eOPMode == OP_MODE_ADHOC) {



	/* bMgrPrepareBeaconToSend((void *) pDevice, pMgmt); */



	}

	// We don't send null pkt in ad hoc mode since beacon will handle this.

	else if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) {

		PSbSendNullPacket(pDevice);

	}



	pDevice->bPWBitOn = TRUE;

	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PS:Power Saving Mode Enable... \n");

	return;
@@ -145,27 +148,21 @@ void PSvDisablePowerSaving(void *hDeviceContext) 
	PSDevice pDevice = (PSDevice)hDeviceContext;

	//PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);





	// disable power saving hw function

    CONTROLnsRequestOut(pDevice,

                        MESSAGE_TYPE_DISABLE_PS,

                        0,

                        0,

                        0,

                        NULL

                        );

	CONTROLnsRequestOut(pDevice, MESSAGE_TYPE_DISABLE_PS, 0,

						0, 0, NULL);



	//clear AutoSleep

	MACvRegBitsOff(pDevice, MAC_REG_PSCFG, PSCFG_AUTOSLEEP);



	// set always listen beacon

	MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);



	pDevice->bEnablePSMode = FALSE;



	if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) {

		PSbSendNullPacket(pDevice);

	}



	pDevice->bPWBitOn = FALSE;

	return;

}
@@ -188,9 +185,10 @@ BOOL PSbConsiderPowerDown(void *hDeviceContext, 
	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	BYTE byData;





	// check if already in Doze mode

    ControlvReadByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PSCTL, &byData);

	ControlvReadByte(pDevice, MESSAGE_REQUEST_MACREG,

					MAC_REG_PSCTL, &byData);



	if ( (byData & PSCTL_PS) != 0 )

		return TRUE;
@@ -212,16 +210,16 @@ BOOL PSbConsiderPowerDown(void *hDeviceContext, 
	MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_PSEN);



	if (pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) {

        if (bCheckCountToWakeUp &&

            (pMgmt->wCountToWakeUp == 0 || pMgmt->wCountToWakeUp == 1)) {

		if (bCheckCountToWakeUp && (pMgmt->wCountToWakeUp == 0

			|| pMgmt->wCountToWakeUp == 1)) {

				return FALSE;

		}

	}



	pDevice->bPSRxBeacon = TRUE;



	// no Tx, no Rx isr, now go to Doze

	MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_GO2DOZE);



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Go to Doze ZZZZZZZZZZZZZZZ\n");

	return TRUE;

}
@@ -242,7 +240,6 @@ void PSvSendPSPOLL(void *hDeviceContext) 
	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	PSTxMgmtPacket pTxPacket = NULL;





	memset(pMgmt->pbyPSPacketPool, 0, sizeof(STxMgmtPacket) + WLAN_HDR_ADDR2_LEN);

	pTxPacket = (PSTxMgmtPacket)pMgmt->pbyPSPacketPool;

	pTxPacket->p80211Header = (PUWLAN_80211HDR)((PBYTE)pTxPacket + sizeof(STxMgmtPacket));
@@ -252,19 +249,19 @@ void PSvSendPSPOLL(void *hDeviceContext) 
			WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_PSPOLL) |

			WLAN_SET_FC_PWRMGT(0)

		));



	pTxPacket->p80211Header->sA2.wDurationID = pMgmt->wCurrAID | BIT14 | BIT15;

	memcpy(pTxPacket->p80211Header->sA2.abyAddr1, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN);

	memcpy(pTxPacket->p80211Header->sA2.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);

	pTxPacket->cbMPDULen = WLAN_HDR_ADDR2_LEN;

	pTxPacket->cbPayloadLen = 0;



	// send the frame

	if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {

		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");

	};



	return;

}
@@ -284,8 +281,6 @@ BOOL PSbSendNullPacket(void *hDeviceContext) 
	PSTxMgmtPacket pTxPacket = NULL;

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);







	if (pDevice->bLinkPass == FALSE) {

		return FALSE;

	}
@@ -300,15 +295,13 @@ BOOL PSbSendNullPacket(void *hDeviceContext) 
	pTxPacket->p80211Header = (PUWLAN_80211HDR)((PBYTE)pTxPacket + sizeof(STxMgmtPacket));



	if (pDevice->bEnablePSMode) {



		pTxPacket->p80211Header->sA3.wFrameCtl = cpu_to_le16(

			(

				WLAN_SET_FC_FTYPE(WLAN_TYPE_DATA) |

				WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_NULL) |

				WLAN_SET_FC_PWRMGT(1)

			));

    }

    else {

	} else {

		pTxPacket->p80211Header->sA3.wFrameCtl = cpu_to_le16(

			(

				WLAN_SET_FC_FTYPE(WLAN_TYPE_DATA) |
@@ -330,12 +323,10 @@ BOOL PSbSendNullPacket(void *hDeviceContext) 
	if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet failed !\n");

		return FALSE;

    }

    else {

	} else {

		// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet success....\n");

	}





	return TRUE ;

}
@@ -351,7 +342,6 @@ BOOL PSbSendNullPacket(void *hDeviceContext) 


BOOL PSbIsNextTBTTWakeUp(void *hDeviceContext)

{



	PSDevice pDevice = (PSDevice)hDeviceContext;

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	BOOL bWakeUp = FALSE;
@@ -364,19 +354,15 @@ BOOL PSbIsNextTBTTWakeUp(void *hDeviceContext) 
		pMgmt->wCountToWakeUp --;



		if (pMgmt->wCountToWakeUp == 1) {



			// Turn on wake up to listen next beacon

			MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_LNBCN);

			pDevice->bPSRxBeacon = FALSE;

			bWakeUp = TRUE;



		} else if ( !pDevice->bPSRxBeacon ) {

			//Listen until RxBeacon

			MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_LNBCN);

		}



	}



	return bWakeUp;

}