Staging: vt6655: remove DWORD_PTR pointer typedef (412b2d08) · Commits · jan.koester / Linux

drivers/staging/vt6655/baseband.c

+15 −15

Original line number	Diff line number	Diff line
		@@ -2015,7 +2015,7 @@ BBvCaculateParameter (
		* Return Value: TRUE if succeeded; FALSE if failed.
		*
		*/
		BOOL BBbReadEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, unsigned char *pbyData)
		BOOL BBbReadEmbeded (unsigned long dwIoBase, BYTE byBBAddr, unsigned char *pbyData)
		{
		WORD ww;
		BYTE byValue;
		@@ -2058,7 +2058,7 @@ BOOL BBbReadEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, unsigned char *pbyData)
		* Return Value: TRUE if succeeded; FALSE if failed.
		*
		*/
		BOOL BBbWriteEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byData)
		BOOL BBbWriteEmbeded (unsigned long dwIoBase, BYTE byBBAddr, BYTE byData)
		{
		WORD ww;
		BYTE byValue;
		@@ -2100,7 +2100,7 @@ BOOL BBbWriteEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byData)
		* Return Value: TRUE if all TestBits are set; FALSE otherwise.
		*
		*/
		BOOL BBbIsRegBitsOn (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits)
		BOOL BBbIsRegBitsOn (unsigned long dwIoBase, BYTE byBBAddr, BYTE byTestBits)
		{
		BYTE byOrgData;

		@@ -2123,7 +2123,7 @@ BOOL BBbIsRegBitsOn (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits)
		* Return Value: TRUE if all TestBits are clear; FALSE otherwise.
		*
		*/
		BOOL BBbIsRegBitsOff (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits)
		BOOL BBbIsRegBitsOff (unsigned long dwIoBase, BYTE byBBAddr, BYTE byTestBits)
		{
		BYTE byOrgData;

		@@ -2150,7 +2150,7 @@ BOOL BBbVT3253Init (PSDevice pDevice)
		{
		BOOL bResult = TRUE;
		int ii;
		DWORD_PTR dwIoBase = pDevice->PortOffset;
		unsigned long dwIoBase = pDevice->PortOffset;
		BYTE byRFType = pDevice->byRFType;
		BYTE byLocalID = pDevice->byLocalID;

		@@ -2321,7 +2321,7 @@ BOOL BBbVT3253Init (PSDevice pDevice)
		* Return Value: none
		*
		*/
		void BBvReadAllRegs (DWORD_PTR dwIoBase, unsigned char *pbyBBRegs)
		void BBvReadAllRegs (unsigned long dwIoBase, unsigned char *pbyBBRegs)
		{
		int ii;
		BYTE byBase = 1;
		@@ -2349,7 +2349,7 @@ void BBvReadAllRegs (DWORD_PTR dwIoBase, unsigned char *pbyBBRegs)
		void BBvLoopbackOn (PSDevice pDevice)
		{
		BYTE byData;
		DWORD_PTR dwIoBase = pDevice->PortOffset;
		unsigned long dwIoBase = pDevice->PortOffset;

		//CR C9 = 0x00
		BBbReadEmbeded(dwIoBase, 0xC9, &pDevice->byBBCRc9);//CR201
		@@ -2403,7 +2403,7 @@ void BBvLoopbackOn (PSDevice pDevice)
		void BBvLoopbackOff (PSDevice pDevice)
		{
		BYTE byData;
		DWORD_PTR dwIoBase = pDevice->PortOffset;
		unsigned long dwIoBase = pDevice->PortOffset;

		BBbWriteEmbeded(dwIoBase, 0xC9, pDevice->byBBCRc9);//CR201
		BBbWriteEmbeded(dwIoBase, 0x88, pDevice->byBBCR88);//CR136
		@@ -2495,7 +2495,7 @@ void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData)
		*
		*/
		void
		BBvSoftwareReset (DWORD_PTR dwIoBase)
		BBvSoftwareReset (unsigned long dwIoBase)
		{
		BBbWriteEmbeded(dwIoBase, 0x50, 0x40);
		BBbWriteEmbeded(dwIoBase, 0x50, 0);
		@@ -2516,7 +2516,7 @@ BBvSoftwareReset (DWORD_PTR dwIoBase)
		*
		*/
		void
		BBvPowerSaveModeON (DWORD_PTR dwIoBase)
		BBvPowerSaveModeON (unsigned long dwIoBase)
		{
		BYTE byOrgData;

		@@ -2538,7 +2538,7 @@ BBvPowerSaveModeON (DWORD_PTR dwIoBase)
		*
		*/
		void
		BBvPowerSaveModeOFF (DWORD_PTR dwIoBase)
		BBvPowerSaveModeOFF (unsigned long dwIoBase)
		{
		BYTE byOrgData;

		@@ -2562,7 +2562,7 @@ BBvPowerSaveModeOFF (DWORD_PTR dwIoBase)
		*/

		void
		BBvSetTxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode)
		BBvSetTxAntennaMode (unsigned long dwIoBase, BYTE byAntennaMode)
		{
		BYTE byBBTxConf;

		@@ -2604,7 +2604,7 @@ BBvSetTxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode)
		*/

		void
		BBvSetRxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode)
		BBvSetRxAntennaMode (unsigned long dwIoBase, BYTE byAntennaMode)
		{
		BYTE byBBRxConf;

		@@ -2635,14 +2635,14 @@ BBvSetRxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode)
		*
		*/
		void
		BBvSetDeepSleep (DWORD_PTR dwIoBase, BYTE byLocalID)
		BBvSetDeepSleep (unsigned long dwIoBase, BYTE byLocalID)
		{
		BBbWriteEmbeded(dwIoBase, 0x0C, 0x17);//CR12
		BBbWriteEmbeded(dwIoBase, 0x0D, 0xB9);//CR13
		}

		void
		BBvExitDeepSleep (DWORD_PTR dwIoBase, BYTE byLocalID)
		BBvExitDeepSleep (unsigned long dwIoBase, BYTE byLocalID)
		{
		BBbWriteEmbeded(dwIoBase, 0x0C, 0x00);//CR12
		BBbWriteEmbeded(dwIoBase, 0x0D, 0x01);//CR13

drivers/staging/vt6655/baseband.h

+12 −12

Original line number	Diff line number	Diff line
		@@ -137,26 +137,26 @@ BBvCaculateParameter (
		unsigned char *pbyPhySgn
		);

		BOOL BBbReadEmbeded(DWORD_PTR dwIoBase, BYTE byBBAddr, unsigned char *pbyData);
		BOOL BBbWriteEmbeded(DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byData);
		BOOL BBbReadEmbeded(unsigned long dwIoBase, BYTE byBBAddr, unsigned char *pbyData);
		BOOL BBbWriteEmbeded(unsigned long dwIoBase, BYTE byBBAddr, BYTE byData);

		void BBvReadAllRegs(DWORD_PTR dwIoBase, unsigned char *pbyBBRegs);
		void BBvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyBBRegs);
		void BBvLoopbackOn(PSDevice pDevice);
		void BBvLoopbackOff(PSDevice pDevice);
		void BBvSetShortSlotTime(PSDevice pDevice);
		BOOL BBbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits);
		BOOL BBbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits);
		BOOL BBbIsRegBitsOn(unsigned long dwIoBase, BYTE byBBAddr, BYTE byTestBits);
		BOOL BBbIsRegBitsOff(unsigned long dwIoBase, BYTE byBBAddr, BYTE byTestBits);
		void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData);

		// VT3253 Baseband
		BOOL BBbVT3253Init(PSDevice pDevice);
		void BBvSoftwareReset(DWORD_PTR dwIoBase);
		void BBvPowerSaveModeON(DWORD_PTR dwIoBase);
		void BBvPowerSaveModeOFF(DWORD_PTR dwIoBase);
		void BBvSetTxAntennaMode(DWORD_PTR dwIoBase, BYTE byAntennaMode);
		void BBvSetRxAntennaMode(DWORD_PTR dwIoBase, BYTE byAntennaMode);
		void BBvSetDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID);
		void BBvExitDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID);
		void BBvSoftwareReset(unsigned long dwIoBase);
		void BBvPowerSaveModeON(unsigned long dwIoBase);
		void BBvPowerSaveModeOFF(unsigned long dwIoBase);
		void BBvSetTxAntennaMode(unsigned long dwIoBase, BYTE byAntennaMode);
		void BBvSetRxAntennaMode(unsigned long dwIoBase, BYTE byAntennaMode);
		void BBvSetDeepSleep(unsigned long dwIoBase, BYTE byLocalID);
		void BBvExitDeepSleep(unsigned long dwIoBase, BYTE byLocalID);

		// timer for antenna diversity

drivers/staging/vt6655/card.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1999,7 +1999,7 @@ BYTE CARDbyGetPktType (void *pDeviceHandler)
		* Return Value: none
		*
		*/
		void CARDvSetLoopbackMode (DWORD_PTR dwIoBase, WORD wLoopbackMode)
		void CARDvSetLoopbackMode (unsigned long dwIoBase, WORD wLoopbackMode)
		{
		switch(wLoopbackMode) {
		case CARD_LB_NONE:
		@@ -2092,7 +2092,7 @@ QWORD CARDqGetTSFOffset (BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2)
		* Return Value: TRUE if success; otherwise FALSE
		*
		*/
		BOOL CARDbGetCurrentTSF (DWORD_PTR dwIoBase, PQWORD pqwCurrTSF)
		BOOL CARDbGetCurrentTSF (unsigned long dwIoBase, PQWORD pqwCurrTSF)
		{
		WORD ww;
		BYTE byData;
		@@ -2170,7 +2170,7 @@ QWORD CARDqGetNextTBTT (QWORD qwTSF, WORD wBeaconInterval)
		* Return Value: none
		*
		*/
		void CARDvSetFirstNextTBTT (DWORD_PTR dwIoBase, WORD wBeaconInterval)
		void CARDvSetFirstNextTBTT (unsigned long dwIoBase, WORD wBeaconInterval)
		{

		QWORD qwNextTBTT;
		@@ -2203,7 +2203,7 @@ void CARDvSetFirstNextTBTT (DWORD_PTR dwIoBase, WORD wBeaconInterval)
		* Return Value: none
		*
		*/
		void CARDvUpdateNextTBTT (DWORD_PTR dwIoBase, QWORD qwTSF, WORD wBeaconInterval)
		void CARDvUpdateNextTBTT (unsigned long dwIoBase, QWORD qwTSF, WORD wBeaconInterval)
		{

		qwTSF = CARDqGetNextTBTT(qwTSF, wBeaconInterval);

drivers/staging/vt6655/card.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -91,11 +91,11 @@ void vUpdateIFS(void *pDeviceHandler);
		void CARDvUpdateBasicTopRate(void *pDeviceHandler);
		BOOL CARDbAddBasicRate(void *pDeviceHandler, WORD wRateIdx);
		BOOL CARDbIsOFDMinBasicRate(void *pDeviceHandler);
		void CARDvSetLoopbackMode(DWORD_PTR dwIoBase, WORD wLoopbackMode);
		void CARDvSetLoopbackMode(unsigned long dwIoBase, WORD wLoopbackMode);
		BOOL CARDbSoftwareReset(void *pDeviceHandler);
		void CARDvSetFirstNextTBTT(DWORD_PTR dwIoBase, WORD wBeaconInterval);
		void CARDvUpdateNextTBTT(DWORD_PTR dwIoBase, QWORD qwTSF, WORD wBeaconInterval);
		BOOL CARDbGetCurrentTSF(DWORD_PTR dwIoBase, PQWORD pqwCurrTSF);
		void CARDvSetFirstNextTBTT(unsigned long dwIoBase, WORD wBeaconInterval);
		void CARDvUpdateNextTBTT(unsigned long dwIoBase, QWORD qwTSF, WORD wBeaconInterval);
		BOOL CARDbGetCurrentTSF(unsigned long dwIoBase, PQWORD pqwCurrTSF);
		QWORD CARDqGetNextTBTT(QWORD qwTSF, WORD wBeaconInterval);
		QWORD CARDqGetTSFOffset(BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2);
		BOOL CARDbSetTxPower(void *pDeviceHandler, unsigned long ulTxPower);

drivers/staging/vt6655/key.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ static int msglevel =MSG_LEVEL_INFO;

		/--------------------- Static Functions --------------------------/
		static void
		s_vCheckKeyTableValid (PSKeyManagement pTable, DWORD_PTR dwIoBase)
		s_vCheckKeyTableValid (PSKeyManagement pTable, unsigned long dwIoBase)
		{
		int i;

		@@ -96,7 +96,7 @@ s_vCheckKeyTableValid (PSKeyManagement pTable, DWORD_PTR dwIoBase)
		* Return Value: none
		*
		*/
		void KeyvInitTable (PSKeyManagement pTable, DWORD_PTR dwIoBase)
		void KeyvInitTable (PSKeyManagement pTable, unsigned long dwIoBase)
		{
		int i;
		int jj;
		@@ -197,7 +197,7 @@ BOOL KeybSetKey (
		PQWORD pKeyRSC,
		unsigned char *pbyKey,
		BYTE byKeyDecMode,
		DWORD_PTR dwIoBase,
		unsigned long dwIoBase,
		BYTE byLocalID
		)
		{
		@@ -366,7 +366,7 @@ BOOL KeybRemoveKey (
		PSKeyManagement pTable,
		unsigned char *pbyBSSID,
		DWORD dwKeyIndex,
		DWORD_PTR dwIoBase
		unsigned long dwIoBase
		)
		{
		int i;
		@@ -438,7 +438,7 @@ BOOL KeybRemoveKey (
		BOOL KeybRemoveAllKey (
		PSKeyManagement pTable,
		unsigned char *pbyBSSID,
		DWORD_PTR dwIoBase
		unsigned long dwIoBase
		)
		{
		int i,u;
		@@ -473,7 +473,7 @@ BOOL KeybRemoveAllKey (
		void KeyvRemoveWEPKey (
		PSKeyManagement pTable,
		DWORD dwKeyIndex,
		DWORD_PTR dwIoBase
		unsigned long dwIoBase
		)
		{

		@@ -494,7 +494,7 @@ void KeyvRemoveWEPKey (

		void KeyvRemoveAllWEPKey (
		PSKeyManagement pTable,
		DWORD_PTR dwIoBase
		unsigned long dwIoBase
		)
		{
		int i;
		@@ -638,7 +638,7 @@ BOOL KeybSetDefaultKey (
		PQWORD pKeyRSC,
		unsigned char *pbyKey,
		BYTE byKeyDecMode,
		DWORD_PTR dwIoBase,
		unsigned long dwIoBase,
		BYTE byLocalID
		)
		{
		@@ -745,7 +745,7 @@ BOOL KeybSetAllGroupKey (
		PQWORD pKeyRSC,
		unsigned char *pbyKey,
		BYTE byKeyDecMode,
		DWORD_PTR dwIoBase,
		unsigned long dwIoBase,
		BYTE byLocalID
		)
		{