From 412b2d08b93165303d698267d1eeac19e14e67a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charles=20Cl=C3=A9ment?= Date: Tue, 22 Jun 2010 08:54:42 -0700 Subject: Staging: vt6655: remove DWORD_PTR pointer typedef MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use unsigned long instead. Signed-off-by: Charles Clément --- drivers/staging/vt6655/baseband.c | 30 +++++------ drivers/staging/vt6655/baseband.h | 24 ++++----- drivers/staging/vt6655/card.c | 8 +-- drivers/staging/vt6655/card.h | 8 +-- drivers/staging/vt6655/key.c | 18 +++---- drivers/staging/vt6655/key.h | 16 +++--- drivers/staging/vt6655/mac.c | 104 ++++++++++++++++++------------------ drivers/staging/vt6655/mac.h | 108 +++++++++++++++++++------------------- drivers/staging/vt6655/rf.c | 16 +++--- drivers/staging/vt6655/rf.h | 8 +-- drivers/staging/vt6655/srom.c | 24 ++++----- drivers/staging/vt6655/srom.h | 24 ++++----- drivers/staging/vt6655/ttype.h | 2 - 13 files changed, 194 insertions(+), 196 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index 87c66e20d929..ab7d3d89e034 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -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 diff --git a/drivers/staging/vt6655/baseband.h b/drivers/staging/vt6655/baseband.h index eb0368ad850f..075342563c32 100644 --- a/drivers/staging/vt6655/baseband.h +++ b/drivers/staging/vt6655/baseband.h @@ -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 diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 127660c52e0f..747f8d3d1428 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -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); diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h index 40a7d6d5daa1..b63842cd71a3 100644 --- a/drivers/staging/vt6655/card.h +++ b/drivers/staging/vt6655/card.h @@ -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); diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c index 74fe9b5b788e..3fab4d5713fe 100644 --- a/drivers/staging/vt6655/key.c +++ b/drivers/staging/vt6655/key.c @@ -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 ) { diff --git a/drivers/staging/vt6655/key.h b/drivers/staging/vt6655/key.h index e8a74b469efc..c9179e82e085 100644 --- a/drivers/staging/vt6655/key.h +++ b/drivers/staging/vt6655/key.h @@ -101,7 +101,7 @@ typedef struct tagSKeyManagement /*--------------------- Export Functions --------------------------*/ -void KeyvInitTable(PSKeyManagement pTable, DWORD_PTR dwIoBase); +void KeyvInitTable(PSKeyManagement pTable, unsigned long dwIoBase); BOOL KeybGetKey( PSKeyManagement pTable, @@ -118,7 +118,7 @@ BOOL KeybSetKey( PQWORD pKeyRSC, unsigned char *pbyKey, BYTE byKeyDecMode, - DWORD_PTR dwIoBase, + unsigned long dwIoBase, BYTE byLocalID ); @@ -129,7 +129,7 @@ BOOL KeybSetDefaultKey( PQWORD pKeyRSC, unsigned char *pbyKey, BYTE byKeyDecMode, - DWORD_PTR dwIoBase, + unsigned long dwIoBase, BYTE byLocalID ); @@ -137,7 +137,7 @@ BOOL KeybRemoveKey( PSKeyManagement pTable, unsigned char *pbyBSSID, DWORD dwKeyIndex, - DWORD_PTR dwIoBase + unsigned long dwIoBase ); BOOL KeybGetTransmitKey( @@ -155,18 +155,18 @@ BOOL KeybCheckPairewiseKey( BOOL KeybRemoveAllKey( PSKeyManagement pTable, unsigned char *pbyBSSID, - DWORD_PTR dwIoBase + unsigned long dwIoBase ); void KeyvRemoveWEPKey( PSKeyManagement pTable, DWORD dwKeyIndex, - DWORD_PTR dwIoBase + unsigned long dwIoBase ); void KeyvRemoveAllWEPKey( PSKeyManagement pTable, - DWORD_PTR dwIoBase + unsigned long dwIoBase ); BOOL KeybSetAllGroupKey ( @@ -176,7 +176,7 @@ BOOL KeybSetAllGroupKey ( PQWORD pKeyRSC, unsigned char *pbyKey, BYTE byKeyDecMode, - DWORD_PTR dwIoBase, + unsigned long dwIoBase, BYTE byLocalID ); diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 9ec1248bbf98..02616892bda5 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -103,7 +103,7 @@ static int msglevel =MSG_LEVEL_INFO; * Return Value: none * */ -void MACvReadAllRegs (DWORD_PTR dwIoBase, unsigned char *pbyMacRegs) +void MACvReadAllRegs (unsigned long dwIoBase, unsigned char *pbyMacRegs) { int ii; @@ -140,7 +140,7 @@ void MACvReadAllRegs (DWORD_PTR dwIoBase, unsigned char *pbyMacRegs) * Return Value: TRUE if all test bits On; otherwise FALSE * */ -BOOL MACbIsRegBitsOn (DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits) +BOOL MACbIsRegBitsOn (unsigned long dwIoBase, BYTE byRegOfs, BYTE byTestBits) { BYTE byData; @@ -163,7 +163,7 @@ BOOL MACbIsRegBitsOn (DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits) * Return Value: TRUE if all test bits Off; otherwise FALSE * */ -BOOL MACbIsRegBitsOff (DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits) +BOOL MACbIsRegBitsOff (unsigned long dwIoBase, BYTE byRegOfs, BYTE byTestBits) { BYTE byData; @@ -184,7 +184,7 @@ BOOL MACbIsRegBitsOff (DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits) * Return Value: TRUE if interrupt is disable; otherwise FALSE * */ -BOOL MACbIsIntDisable (DWORD_PTR dwIoBase) +BOOL MACbIsIntDisable (unsigned long dwIoBase) { DWORD dwData; @@ -209,7 +209,7 @@ BOOL MACbIsIntDisable (DWORD_PTR dwIoBase) * Return Value: Mask Value read * */ -BYTE MACbyReadMultiAddr (DWORD_PTR dwIoBase, unsigned int uByteIdx) +BYTE MACbyReadMultiAddr (unsigned long dwIoBase, unsigned int uByteIdx) { BYTE byData; @@ -234,7 +234,7 @@ BYTE MACbyReadMultiAddr (DWORD_PTR dwIoBase, unsigned int uByteIdx) * Return Value: none * */ -void MACvWriteMultiAddr (DWORD_PTR dwIoBase, unsigned int uByteIdx, BYTE byData) +void MACvWriteMultiAddr (unsigned long dwIoBase, unsigned int uByteIdx, BYTE byData) { MACvSelectPage1(dwIoBase); VNSvOutPortB(dwIoBase + MAC_REG_MAR0 + uByteIdx, byData); @@ -255,7 +255,7 @@ void MACvWriteMultiAddr (DWORD_PTR dwIoBase, unsigned int uByteIdx, BYTE byData) * Return Value: none * */ -void MACvSetMultiAddrByHash (DWORD_PTR dwIoBase, BYTE byHashIdx) +void MACvSetMultiAddrByHash (unsigned long dwIoBase, BYTE byHashIdx) { unsigned int uByteIdx; BYTE byBitMask; @@ -286,7 +286,7 @@ void MACvSetMultiAddrByHash (DWORD_PTR dwIoBase, BYTE byHashIdx) * Return Value: none * */ -void MACvResetMultiAddrByHash (DWORD_PTR dwIoBase, BYTE byHashIdx) +void MACvResetMultiAddrByHash (unsigned long dwIoBase, BYTE byHashIdx) { unsigned int uByteIdx; BYTE byBitMask; @@ -317,7 +317,7 @@ void MACvResetMultiAddrByHash (DWORD_PTR dwIoBase, BYTE byHashIdx) * Return Value: none * */ -void MACvSetRxThreshold (DWORD_PTR dwIoBase, BYTE byThreshold) +void MACvSetRxThreshold (unsigned long dwIoBase, BYTE byThreshold) { BYTE byOrgValue; @@ -342,7 +342,7 @@ void MACvSetRxThreshold (DWORD_PTR dwIoBase, BYTE byThreshold) * Return Value: none * */ -void MACvGetRxThreshold (DWORD_PTR dwIoBase, unsigned char *pbyThreshold) +void MACvGetRxThreshold (unsigned long dwIoBase, unsigned char *pbyThreshold) { // get FCR0 VNSvInPortB(dwIoBase + MAC_REG_FCR0, pbyThreshold); @@ -363,7 +363,7 @@ void MACvGetRxThreshold (DWORD_PTR dwIoBase, unsigned char *pbyThreshold) * Return Value: none * */ -void MACvSetTxThreshold (DWORD_PTR dwIoBase, BYTE byThreshold) +void MACvSetTxThreshold (unsigned long dwIoBase, BYTE byThreshold) { BYTE byOrgValue; @@ -388,7 +388,7 @@ void MACvSetTxThreshold (DWORD_PTR dwIoBase, BYTE byThreshold) * Return Value: none * */ -void MACvGetTxThreshold (DWORD_PTR dwIoBase, unsigned char *pbyThreshold) +void MACvGetTxThreshold (unsigned long dwIoBase, unsigned char *pbyThreshold) { // get FCR0 VNSvInPortB(dwIoBase + MAC_REG_FCR0, pbyThreshold); @@ -409,7 +409,7 @@ void MACvGetTxThreshold (DWORD_PTR dwIoBase, unsigned char *pbyThreshold) * Return Value: none * */ -void MACvSetDmaLength (DWORD_PTR dwIoBase, BYTE byDmaLength) +void MACvSetDmaLength (unsigned long dwIoBase, BYTE byDmaLength) { BYTE byOrgValue; @@ -434,7 +434,7 @@ void MACvSetDmaLength (DWORD_PTR dwIoBase, BYTE byDmaLength) * Return Value: none * */ -void MACvGetDmaLength (DWORD_PTR dwIoBase, unsigned char *pbyDmaLength) +void MACvGetDmaLength (unsigned long dwIoBase, unsigned char *pbyDmaLength) { // get FCR0 VNSvInPortB(dwIoBase + MAC_REG_FCR0, pbyDmaLength); @@ -455,7 +455,7 @@ void MACvGetDmaLength (DWORD_PTR dwIoBase, unsigned char *pbyDmaLength) * Return Value: none * */ -void MACvSetShortRetryLimit (DWORD_PTR dwIoBase, BYTE byRetryLimit) +void MACvSetShortRetryLimit (unsigned long dwIoBase, BYTE byRetryLimit) { // set SRT VNSvOutPortB(dwIoBase + MAC_REG_SRT, byRetryLimit); @@ -474,7 +474,7 @@ void MACvSetShortRetryLimit (DWORD_PTR dwIoBase, BYTE byRetryLimit) * Return Value: none * */ -void MACvGetShortRetryLimit (DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit) +void MACvGetShortRetryLimit (unsigned long dwIoBase, unsigned char *pbyRetryLimit) { // get SRT VNSvInPortB(dwIoBase + MAC_REG_SRT, pbyRetryLimit); @@ -494,7 +494,7 @@ void MACvGetShortRetryLimit (DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit) * Return Value: none * */ -void MACvSetLongRetryLimit (DWORD_PTR dwIoBase, BYTE byRetryLimit) +void MACvSetLongRetryLimit (unsigned long dwIoBase, BYTE byRetryLimit) { // set LRT VNSvOutPortB(dwIoBase + MAC_REG_LRT, byRetryLimit); @@ -513,7 +513,7 @@ void MACvSetLongRetryLimit (DWORD_PTR dwIoBase, BYTE byRetryLimit) * Return Value: none * */ -void MACvGetLongRetryLimit (DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit) +void MACvGetLongRetryLimit (unsigned long dwIoBase, unsigned char *pbyRetryLimit) { // get LRT VNSvInPortB(dwIoBase + MAC_REG_LRT, pbyRetryLimit); @@ -533,7 +533,7 @@ void MACvGetLongRetryLimit (DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit) * Return Value: none * */ -void MACvSetLoopbackMode (DWORD_PTR dwIoBase, BYTE byLoopbackMode) +void MACvSetLoopbackMode (unsigned long dwIoBase, BYTE byLoopbackMode) { BYTE byOrgValue; @@ -559,7 +559,7 @@ void MACvSetLoopbackMode (DWORD_PTR dwIoBase, BYTE byLoopbackMode) * Return Value: TRUE if in Loopback mode; otherwise FALSE * */ -BOOL MACbIsInLoopbackMode (DWORD_PTR dwIoBase) +BOOL MACbIsInLoopbackMode (unsigned long dwIoBase) { BYTE byOrgValue; @@ -583,7 +583,7 @@ BOOL MACbIsInLoopbackMode (DWORD_PTR dwIoBase) * Return Value: none * */ -void MACvSetPacketFilter (DWORD_PTR dwIoBase, WORD wFilterType) +void MACvSetPacketFilter (unsigned long dwIoBase, WORD wFilterType) { BYTE byOldRCR; BYTE byNewRCR = 0; @@ -643,7 +643,7 @@ void MACvSetPacketFilter (DWORD_PTR dwIoBase, WORD wFilterType) * Return Value: none * */ -void MACvSaveContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf) +void MACvSaveContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf) { int ii; @@ -676,7 +676,7 @@ void MACvSaveContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf) * Return Value: none * */ -void MACvRestoreContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf) +void MACvRestoreContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf) { int ii; @@ -728,7 +728,7 @@ void MACvRestoreContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf) * Return Value: TRUE if all values are the same; otherwise FALSE * */ -BOOL MACbCompareContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf) +BOOL MACbCompareContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf) { DWORD dwData; @@ -773,7 +773,7 @@ BOOL MACbCompareContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf) * Return Value: TRUE if Reset Success; otherwise FALSE * */ -BOOL MACbSoftwareReset (DWORD_PTR dwIoBase) +BOOL MACbSoftwareReset (unsigned long dwIoBase) { BYTE byData; WORD ww; @@ -806,7 +806,7 @@ BOOL MACbSoftwareReset (DWORD_PTR dwIoBase) * Return Value: TRUE if success; otherwise FALSE * */ -BOOL MACbSafeSoftwareReset (DWORD_PTR dwIoBase) +BOOL MACbSafeSoftwareReset (unsigned long dwIoBase) { BYTE abyTmpRegData[MAC_MAX_CONTEXT_SIZE_PAGE0+MAC_MAX_CONTEXT_SIZE_PAGE1]; BOOL bRetVal; @@ -839,7 +839,7 @@ BOOL MACbSafeSoftwareReset (DWORD_PTR dwIoBase) * Return Value: TRUE if success; otherwise FALSE * */ -BOOL MACbSafeRxOff (DWORD_PTR dwIoBase) +BOOL MACbSafeRxOff (unsigned long dwIoBase) { WORD ww; DWORD dwData; @@ -900,7 +900,7 @@ BOOL MACbSafeRxOff (DWORD_PTR dwIoBase) * Return Value: TRUE if success; otherwise FALSE * */ -BOOL MACbSafeTxOff (DWORD_PTR dwIoBase) +BOOL MACbSafeTxOff (unsigned long dwIoBase) { WORD ww; DWORD dwData; @@ -964,7 +964,7 @@ BOOL MACbSafeTxOff (DWORD_PTR dwIoBase) * Return Value: TRUE if success; otherwise FALSE * */ -BOOL MACbSafeStop (DWORD_PTR dwIoBase) +BOOL MACbSafeStop (unsigned long dwIoBase) { MACvRegBitsOff(dwIoBase, MAC_REG_TCR, TCR_AUTOBCNTX); @@ -999,7 +999,7 @@ BOOL MACbSafeStop (DWORD_PTR dwIoBase) * Return Value: TRUE if success; otherwise FALSE * */ -BOOL MACbShutdown (DWORD_PTR dwIoBase) +BOOL MACbShutdown (unsigned long dwIoBase) { // disable MAC IMR MACvIntDisable(dwIoBase); @@ -1026,7 +1026,7 @@ BOOL MACbShutdown (DWORD_PTR dwIoBase) * Return Value: none * */ -void MACvInitialize (DWORD_PTR dwIoBase) +void MACvInitialize (unsigned long dwIoBase) { // clear sticky bits MACvClearStckDS(dwIoBase); @@ -1079,7 +1079,7 @@ void MACvInitialize (DWORD_PTR dwIoBase) * Return Value: none * */ -void MACvSetCurrRx0DescAddr (DWORD_PTR dwIoBase, DWORD dwCurrDescAddr) +void MACvSetCurrRx0DescAddr (unsigned long dwIoBase, DWORD dwCurrDescAddr) { WORD ww; BYTE byData; @@ -1117,7 +1117,7 @@ BYTE byOrgDMACtl; * Return Value: none * */ -void MACvSetCurrRx1DescAddr (DWORD_PTR dwIoBase, DWORD dwCurrDescAddr) +void MACvSetCurrRx1DescAddr (unsigned long dwIoBase, DWORD dwCurrDescAddr) { WORD ww; BYTE byData; @@ -1155,7 +1155,7 @@ BYTE byOrgDMACtl; * Return Value: none * */ -void MACvSetCurrTx0DescAddrEx (DWORD_PTR dwIoBase, DWORD dwCurrDescAddr) +void MACvSetCurrTx0DescAddrEx (unsigned long dwIoBase, DWORD dwCurrDescAddr) { WORD ww; BYTE byData; @@ -1194,7 +1194,7 @@ BYTE byOrgDMACtl; * */ //TxDMA1 = AC0DMA -void MACvSetCurrAC0DescAddrEx (DWORD_PTR dwIoBase, DWORD dwCurrDescAddr) +void MACvSetCurrAC0DescAddrEx (unsigned long dwIoBase, DWORD dwCurrDescAddr) { WORD ww; BYTE byData; @@ -1221,7 +1221,7 @@ BYTE byOrgDMACtl; -void MACvSetCurrTXDescAddr (int iTxType, DWORD_PTR dwIoBase, DWORD dwCurrDescAddr) +void MACvSetCurrTXDescAddr (int iTxType, unsigned long dwIoBase, DWORD dwCurrDescAddr) { if(iTxType == TYPE_AC0DMA){ MACvSetCurrAC0DescAddrEx(dwIoBase, dwCurrDescAddr); @@ -1244,7 +1244,7 @@ void MACvSetCurrTXDescAddr (int iTxType, DWORD_PTR dwIoBase, DWORD dwCurrDescAdd * Return Value: none * */ -void MACvTimer0MicroSDelay (DWORD_PTR dwIoBase, unsigned int uDelay) +void MACvTimer0MicroSDelay (unsigned long dwIoBase, unsigned int uDelay) { BYTE byValue; unsigned int uu,ii; @@ -1280,7 +1280,7 @@ unsigned int uu,ii; * Return Value: none * */ -void MACvOneShotTimer0MicroSec (DWORD_PTR dwIoBase, unsigned int uDelayTime) +void MACvOneShotTimer0MicroSec (unsigned long dwIoBase, unsigned int uDelayTime) { VNSvOutPortB(dwIoBase + MAC_REG_TMCTL0, 0); VNSvOutPortD(dwIoBase + MAC_REG_TMDATA0, uDelayTime); @@ -1301,7 +1301,7 @@ void MACvOneShotTimer0MicroSec (DWORD_PTR dwIoBase, unsigned int uDelayTime) * Return Value: none * */ -void MACvOneShotTimer1MicroSec (DWORD_PTR dwIoBase, unsigned int uDelayTime) +void MACvOneShotTimer1MicroSec (unsigned long dwIoBase, unsigned int uDelayTime) { VNSvOutPortB(dwIoBase + MAC_REG_TMCTL1, 0); VNSvOutPortD(dwIoBase + MAC_REG_TMDATA1, uDelayTime); @@ -1309,7 +1309,7 @@ void MACvOneShotTimer1MicroSec (DWORD_PTR dwIoBase, unsigned int uDelayTime) } -void MACvSetMISCFifo (DWORD_PTR dwIoBase, WORD wOffset, DWORD dwData) +void MACvSetMISCFifo (unsigned long dwIoBase, WORD wOffset, DWORD dwData) { if (wOffset > 273) return; @@ -1319,7 +1319,7 @@ void MACvSetMISCFifo (DWORD_PTR dwIoBase, WORD wOffset, DWORD dwData) } -BOOL MACbTxDMAOff (DWORD_PTR dwIoBase, unsigned int idx) +BOOL MACbTxDMAOff (unsigned long dwIoBase, unsigned int idx) { BYTE byData; unsigned int ww = 0; @@ -1347,7 +1347,7 @@ unsigned int ww = 0; return TRUE; } -void MACvClearBusSusInd (DWORD_PTR dwIoBase) +void MACvClearBusSusInd (unsigned long dwIoBase) { DWORD dwOrgValue; unsigned int ww; @@ -1369,7 +1369,7 @@ void MACvClearBusSusInd (DWORD_PTR dwIoBase) } } -void MACvEnableBusSusEn (DWORD_PTR dwIoBase) +void MACvEnableBusSusEn (unsigned long dwIoBase) { BYTE byOrgValue; DWORD dwOrgValue; @@ -1391,7 +1391,7 @@ void MACvEnableBusSusEn (DWORD_PTR dwIoBase) } } -BOOL MACbFlushSYNCFifo (DWORD_PTR dwIoBase) +BOOL MACbFlushSYNCFifo (unsigned long dwIoBase) { BYTE byOrgValue; unsigned int ww; @@ -1415,7 +1415,7 @@ BOOL MACbFlushSYNCFifo (DWORD_PTR dwIoBase) return TRUE; } -BOOL MACbPSWakeup (DWORD_PTR dwIoBase) +BOOL MACbPSWakeup (unsigned long dwIoBase) { BYTE byOrgValue; unsigned int ww; @@ -1455,7 +1455,7 @@ BOOL MACbPSWakeup (DWORD_PTR dwIoBase) * */ -void MACvSetKeyEntry (DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, +void MACvSetKeyEntry (unsigned long dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, unsigned int uKeyIdx, unsigned char *pbyAddr, unsigned long *pdwKey, BYTE byLocalID) { WORD wOffset; @@ -1522,7 +1522,7 @@ int ii; * Return Value: none * */ -void MACvDisableKeyEntry (DWORD_PTR dwIoBase, unsigned int uEntryIdx) +void MACvDisableKeyEntry (unsigned long dwIoBase, unsigned int uEntryIdx) { WORD wOffset; @@ -1550,7 +1550,7 @@ WORD wOffset; * */ -void MACvSetDefaultKeyEntry (DWORD_PTR dwIoBase, unsigned int uKeyLen, +void MACvSetDefaultKeyEntry (unsigned long dwIoBase, unsigned int uKeyLen, unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID) { WORD wOffset; @@ -1601,7 +1601,7 @@ int ii; * */ /* -void MACvEnableDefaultKey (DWORD_PTR dwIoBase, BYTE byLocalID) +void MACvEnableDefaultKey (unsigned long dwIoBase, BYTE byLocalID) { WORD wOffset; DWORD dwData; @@ -1636,7 +1636,7 @@ DWORD dwData; * Return Value: none * */ -void MACvDisableDefaultKey (DWORD_PTR dwIoBase) +void MACvDisableDefaultKey (unsigned long dwIoBase) { WORD wOffset; DWORD dwData; @@ -1666,7 +1666,7 @@ DWORD dwData; * Return Value: none * */ -void MACvSetDefaultTKIPKeyEntry (DWORD_PTR dwIoBase, unsigned int uKeyLen, +void MACvSetDefaultTKIPKeyEntry (unsigned long dwIoBase, unsigned int uKeyLen, unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID) { WORD wOffset; @@ -1723,7 +1723,7 @@ int ii; * */ -void MACvSetDefaultKeyCtl (DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, BYTE byLocalID) +void MACvSetDefaultKeyCtl (unsigned long dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, BYTE byLocalID) { WORD wOffset; DWORD dwData; diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 0ded9a6d46d0..96653a4d33de 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -1075,80 +1075,80 @@ /*--------------------- Export Functions --------------------------*/ extern WORD TxRate_iwconfig;//2008-5-8 by chester -void MACvReadAllRegs(DWORD_PTR dwIoBase, unsigned char *pbyMacRegs); +void MACvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyMacRegs); -BOOL MACbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits); -BOOL MACbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits); +BOOL MACbIsRegBitsOn(unsigned long dwIoBase, BYTE byRegOfs, BYTE byTestBits); +BOOL MACbIsRegBitsOff(unsigned long dwIoBase, BYTE byRegOfs, BYTE byTestBits); -BOOL MACbIsIntDisable(DWORD_PTR dwIoBase); +BOOL MACbIsIntDisable(unsigned long dwIoBase); -BYTE MACbyReadMultiAddr(DWORD_PTR dwIoBase, unsigned int uByteIdx); -void MACvWriteMultiAddr(DWORD_PTR dwIoBase, unsigned int uByteIdx, BYTE byData); -void MACvSetMultiAddrByHash(DWORD_PTR dwIoBase, BYTE byHashIdx); -void MACvResetMultiAddrByHash(DWORD_PTR dwIoBase, BYTE byHashIdx); +BYTE MACbyReadMultiAddr(unsigned long dwIoBase, unsigned int uByteIdx); +void MACvWriteMultiAddr(unsigned long dwIoBase, unsigned int uByteIdx, BYTE byData); +void MACvSetMultiAddrByHash(unsigned long dwIoBase, BYTE byHashIdx); +void MACvResetMultiAddrByHash(unsigned long dwIoBase, BYTE byHashIdx); -void MACvSetRxThreshold(DWORD_PTR dwIoBase, BYTE byThreshold); -void MACvGetRxThreshold(DWORD_PTR dwIoBase, unsigned char *pbyThreshold); +void MACvSetRxThreshold(unsigned long dwIoBase, BYTE byThreshold); +void MACvGetRxThreshold(unsigned long dwIoBase, unsigned char *pbyThreshold); -void MACvSetTxThreshold(DWORD_PTR dwIoBase, BYTE byThreshold); -void MACvGetTxThreshold(DWORD_PTR dwIoBase, unsigned char *pbyThreshold); +void MACvSetTxThreshold(unsigned long dwIoBase, BYTE byThreshold); +void MACvGetTxThreshold(unsigned long dwIoBase, unsigned char *pbyThreshold); -void MACvSetDmaLength(DWORD_PTR dwIoBase, BYTE byDmaLength); -void MACvGetDmaLength(DWORD_PTR dwIoBase, unsigned char *pbyDmaLength); +void MACvSetDmaLength(unsigned long dwIoBase, BYTE byDmaLength); +void MACvGetDmaLength(unsigned long dwIoBase, unsigned char *pbyDmaLength); -void MACvSetShortRetryLimit(DWORD_PTR dwIoBase, BYTE byRetryLimit); -void MACvGetShortRetryLimit(DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit); +void MACvSetShortRetryLimit(unsigned long dwIoBase, BYTE byRetryLimit); +void MACvGetShortRetryLimit(unsigned long dwIoBase, unsigned char *pbyRetryLimit); -void MACvSetLongRetryLimit(DWORD_PTR dwIoBase, BYTE byRetryLimit); -void MACvGetLongRetryLimit(DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit); +void MACvSetLongRetryLimit(unsigned long dwIoBase, BYTE byRetryLimit); +void MACvGetLongRetryLimit(unsigned long dwIoBase, unsigned char *pbyRetryLimit); -void MACvSetLoopbackMode(DWORD_PTR dwIoBase, BYTE byLoopbackMode); -BOOL MACbIsInLoopbackMode(DWORD_PTR dwIoBase); +void MACvSetLoopbackMode(unsigned long dwIoBase, BYTE byLoopbackMode); +BOOL MACbIsInLoopbackMode(unsigned long dwIoBase); -void MACvSetPacketFilter(DWORD_PTR dwIoBase, WORD wFilterType); +void MACvSetPacketFilter(unsigned long dwIoBase, WORD wFilterType); -void MACvSaveContext(DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf); -void MACvRestoreContext(DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf); -BOOL MACbCompareContext(DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf); +void MACvSaveContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); +void MACvRestoreContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); +BOOL MACbCompareContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); -BOOL MACbSoftwareReset(DWORD_PTR dwIoBase); -BOOL MACbSafeSoftwareReset(DWORD_PTR dwIoBase); -BOOL MACbSafeRxOff(DWORD_PTR dwIoBase); -BOOL MACbSafeTxOff(DWORD_PTR dwIoBase); -BOOL MACbSafeStop(DWORD_PTR dwIoBase); -BOOL MACbShutdown(DWORD_PTR dwIoBase); -void MACvInitialize(DWORD_PTR dwIoBase); -void MACvSetCurrRx0DescAddr(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); -void MACvSetCurrRx1DescAddr(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); -void MACvSetCurrTXDescAddr(int iTxType, DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); -void MACvSetCurrTx0DescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); -void MACvSetCurrAC0DescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); -void MACvSetCurrSyncDescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); -void MACvSetCurrATIMDescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); -void MACvTimer0MicroSDelay(DWORD_PTR dwIoBase, unsigned int uDelay); -void MACvOneShotTimer0MicroSec(DWORD_PTR dwIoBase, unsigned int uDelayTime); -void MACvOneShotTimer1MicroSec(DWORD_PTR dwIoBase, unsigned int uDelayTime); +BOOL MACbSoftwareReset(unsigned long dwIoBase); +BOOL MACbSafeSoftwareReset(unsigned long dwIoBase); +BOOL MACbSafeRxOff(unsigned long dwIoBase); +BOOL MACbSafeTxOff(unsigned long dwIoBase); +BOOL MACbSafeStop(unsigned long dwIoBase); +BOOL MACbShutdown(unsigned long dwIoBase); +void MACvInitialize(unsigned long dwIoBase); +void MACvSetCurrRx0DescAddr(unsigned long dwIoBase, DWORD dwCurrDescAddr); +void MACvSetCurrRx1DescAddr(unsigned long dwIoBase, DWORD dwCurrDescAddr); +void MACvSetCurrTXDescAddr(int iTxType, unsigned long dwIoBase, DWORD dwCurrDescAddr); +void MACvSetCurrTx0DescAddrEx(unsigned long dwIoBase, DWORD dwCurrDescAddr); +void MACvSetCurrAC0DescAddrEx(unsigned long dwIoBase, DWORD dwCurrDescAddr); +void MACvSetCurrSyncDescAddrEx(unsigned long dwIoBase, DWORD dwCurrDescAddr); +void MACvSetCurrATIMDescAddrEx(unsigned long dwIoBase, DWORD dwCurrDescAddr); +void MACvTimer0MicroSDelay(unsigned long dwIoBase, unsigned int uDelay); +void MACvOneShotTimer0MicroSec(unsigned long dwIoBase, unsigned int uDelayTime); +void MACvOneShotTimer1MicroSec(unsigned long dwIoBase, unsigned int uDelayTime); -void MACvSetMISCFifo(DWORD_PTR dwIoBase, WORD wOffset, DWORD dwData); +void MACvSetMISCFifo(unsigned long dwIoBase, WORD wOffset, DWORD dwData); -BOOL MACbTxDMAOff (DWORD_PTR dwIoBase, unsigned int idx); +BOOL MACbTxDMAOff (unsigned long dwIoBase, unsigned int idx); -void MACvClearBusSusInd(DWORD_PTR dwIoBase); -void MACvEnableBusSusEn(DWORD_PTR dwIoBase); +void MACvClearBusSusInd(unsigned long dwIoBase); +void MACvEnableBusSusEn(unsigned long dwIoBase); -BOOL MACbFlushSYNCFifo(DWORD_PTR dwIoBase); -BOOL MACbPSWakeup(DWORD_PTR dwIoBase); +BOOL MACbFlushSYNCFifo(unsigned long dwIoBase); +BOOL MACbPSWakeup(unsigned long dwIoBase); -void MACvSetKeyEntry(DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, +void MACvSetKeyEntry(unsigned long dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, unsigned int uKeyIdx, unsigned char *pbyAddr, unsigned long *pdwKey, BYTE byLocalID); -void MACvDisableKeyEntry(DWORD_PTR dwIoBase, unsigned int uEntryIdx); -void MACvSetDefaultKeyEntry(DWORD_PTR dwIoBase, unsigned int uKeyLen, +void MACvDisableKeyEntry(unsigned long dwIoBase, unsigned int uEntryIdx); +void MACvSetDefaultKeyEntry(unsigned long dwIoBase, unsigned int uKeyLen, unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID); -//void MACvEnableDefaultKey(DWORD_PTR dwIoBase, BYTE byLocalID); -void MACvDisableDefaultKey(DWORD_PTR dwIoBase); -void MACvSetDefaultTKIPKeyEntry(DWORD_PTR dwIoBase, unsigned int uKeyLen, +//void MACvEnableDefaultKey(unsigned long dwIoBase, BYTE byLocalID); +void MACvDisableDefaultKey(unsigned long dwIoBase); +void MACvSetDefaultTKIPKeyEntry(unsigned long dwIoBase, unsigned int uKeyLen, unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID); -void MACvSetDefaultKeyCtl(DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, BYTE byLocalID); +void MACvSetDefaultKeyCtl(unsigned long dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, BYTE byLocalID); #endif // __MAC_H__ diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index c86504dc38b8..63e5e5044e1c 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -474,7 +474,7 @@ const DWORD dwAL7230ChannelTable2[CB_MAX_CHANNEL] = { * Return Value: TRUE if succeeded; FALSE if failed. * */ -BOOL s_bAL7230Init (DWORD_PTR dwIoBase) +BOOL s_bAL7230Init (unsigned long dwIoBase) { int ii; BOOL bResult; @@ -517,7 +517,7 @@ BOOL s_bAL7230Init (DWORD_PTR dwIoBase) } // Need to Pull PLLON low when writing channel registers through 3-wire interface -BOOL s_bAL7230SelectChannel (DWORD_PTR dwIoBase, BYTE byChannel) +BOOL s_bAL7230SelectChannel (unsigned long dwIoBase, BYTE byChannel) { BOOL bResult; @@ -622,7 +622,7 @@ BOOL s_bAL7230SelectChannel (DWORD_PTR dwIoBase, BYTE byChannel) * Return Value: TRUE if succeeded; FALSE if failed. * */ -BOOL IFRFbWriteEmbeded (DWORD_PTR dwIoBase, DWORD dwData) +BOOL IFRFbWriteEmbeded (unsigned long dwIoBase, DWORD dwData) { WORD ww; DWORD dwValue; @@ -684,7 +684,7 @@ BOOL IFRFbWriteEmbeded (DWORD_PTR dwIoBase, DWORD dwData) * Return Value: TRUE if succeeded; FALSE if failed. * */ -BOOL RFbAL2230Init (DWORD_PTR dwIoBase) +BOOL RFbAL2230Init (unsigned long dwIoBase) { int ii; BOOL bResult; @@ -734,7 +734,7 @@ MACvTimer0MicroSDelay(dwIoBase, 30); //delay 30 us return bResult; } -BOOL RFbAL2230SelectChannel (DWORD_PTR dwIoBase, BYTE byChannel) +BOOL RFbAL2230SelectChannel (unsigned long dwIoBase, BYTE byChannel) { BOOL bResult; @@ -875,7 +875,7 @@ BOOL bResult = TRUE; * Return Value: TRUE if succeeded; FALSE if failed. * */ -BOOL RFbSelectChannel (DWORD_PTR dwIoBase, BYTE byRFType, BYTE byChannel) +BOOL RFbSelectChannel (unsigned long dwIoBase, BYTE byRFType, BYTE byChannel) { BOOL bResult = TRUE; switch (byRFType) { @@ -911,7 +911,7 @@ BOOL bResult = TRUE; * Return Value: None. * */ -BOOL RFvWriteWakeProgSyn (DWORD_PTR dwIoBase, BYTE byRFType, unsigned int uChannel) +BOOL RFvWriteWakeProgSyn (unsigned long dwIoBase, BYTE byRFType, unsigned int uChannel) { int ii; BYTE byInitCount = 0; @@ -1232,7 +1232,7 @@ RFvRSSITodBm ( // Post processing for the 11b/g and 11a. // for save time on changing Reg2,3,5,7,10,12,15 -BOOL RFbAL7230SelectChannelPostProcess (DWORD_PTR dwIoBase, BYTE byOldChannel, BYTE byNewChannel) +BOOL RFbAL7230SelectChannelPostProcess (unsigned long dwIoBase, BYTE byOldChannel, BYTE byNewChannel) { BOOL bResult; diff --git a/drivers/staging/vt6655/rf.h b/drivers/staging/vt6655/rf.h index 7571b3d1ca48..b2895733bf67 100644 --- a/drivers/staging/vt6655/rf.h +++ b/drivers/staging/vt6655/rf.h @@ -76,12 +76,12 @@ /*--------------------- Export Functions --------------------------*/ -BOOL IFRFbWriteEmbeded(DWORD_PTR dwIoBase, DWORD dwData); -BOOL RFbSelectChannel(DWORD_PTR dwIoBase, BYTE byRFType, BYTE byChannel); +BOOL IFRFbWriteEmbeded(unsigned long dwIoBase, DWORD dwData); +BOOL RFbSelectChannel(unsigned long dwIoBase, BYTE byRFType, BYTE byChannel); BOOL RFbInit ( PSDevice pDevice ); -BOOL RFvWriteWakeProgSyn(DWORD_PTR dwIoBase, BYTE byRFType, unsigned int uChannel); +BOOL RFvWriteWakeProgSyn(unsigned long dwIoBase, BYTE byRFType, unsigned int uChannel); BOOL RFbSetPower(PSDevice pDevice, unsigned int uRATE, unsigned int uCH); BOOL RFbRawSetPower( PSDevice pDevice, @@ -97,7 +97,7 @@ RFvRSSITodBm( ); //{{ RobertYu: 20050104 -BOOL RFbAL7230SelectChannelPostProcess(DWORD_PTR dwIoBase, BYTE byOldChannel, BYTE byNewChannel); +BOOL RFbAL7230SelectChannelPostProcess(unsigned long dwIoBase, BYTE byOldChannel, BYTE byNewChannel); //}} RobertYu #endif // __RF_H__ diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index 26f7a9ca60aa..500da8cf6874 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c @@ -76,7 +76,7 @@ * Return Value: data read * */ -BYTE SROMbyReadEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset) +BYTE SROMbyReadEmbedded(unsigned long dwIoBase, BYTE byContntOffset) { WORD wDelay, wNoACK; BYTE byWait; @@ -125,7 +125,7 @@ BYTE SROMbyReadEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset) * Return Value: TRUE if succeeded; FALSE if failed. * */ -BOOL SROMbWriteEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byData) +BOOL SROMbWriteEmbedded(unsigned long dwIoBase, BYTE byContntOffset, BYTE byData) { WORD wDelay, wNoACK; BYTE byWait; @@ -178,7 +178,7 @@ BOOL SROMbWriteEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byData) * Return Value: none * */ -void SROMvRegBitsOn(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byBits) +void SROMvRegBitsOn(unsigned long dwIoBase, BYTE byContntOffset, BYTE byBits) { BYTE byOrgData; @@ -199,7 +199,7 @@ void SROMvRegBitsOn(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byBits) * none * */ -void SROMvRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byBits) +void SROMvRegBitsOff(unsigned long dwIoBase, BYTE byContntOffset, BYTE byBits) { BYTE byOrgData; @@ -222,7 +222,7 @@ void SROMvRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byBits) * Return Value: TRUE if all test bits on; otherwise FALSE * */ -BOOL SROMbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits) +BOOL SROMbIsRegBitsOn(unsigned long dwIoBase, BYTE byContntOffset, BYTE byTestBits) { BYTE byOrgData; @@ -245,7 +245,7 @@ BOOL SROMbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits) * Return Value: TRUE if all test bits off; otherwise FALSE * */ -BOOL SROMbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits) +BOOL SROMbIsRegBitsOff(unsigned long dwIoBase, BYTE byContntOffset, BYTE byTestBits) { BYTE byOrgData; @@ -266,7 +266,7 @@ BOOL SROMbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits) * Return Value: none * */ -void SROMvReadAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs) +void SROMvReadAllContents(unsigned long dwIoBase, unsigned char *pbyEepromRegs) { int ii; @@ -291,7 +291,7 @@ void SROMvReadAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs) * Return Value: none * */ -void SROMvWriteAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs) +void SROMvWriteAllContents(unsigned long dwIoBase, unsigned char *pbyEepromRegs) { int ii; @@ -315,7 +315,7 @@ void SROMvWriteAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs) * Return Value: none * */ -void SROMvReadEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress) +void SROMvReadEtherAddress(unsigned long dwIoBase, unsigned char *pbyEtherAddress) { BYTE ii; @@ -340,7 +340,7 @@ void SROMvReadEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress) * Return Value: none * */ -void SROMvWriteEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress) +void SROMvWriteEtherAddress(unsigned long dwIoBase, unsigned char *pbyEtherAddress) { BYTE ii; @@ -364,7 +364,7 @@ void SROMvWriteEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress) * Return Value: none * */ -void SROMvReadSubSysVenId(DWORD_PTR dwIoBase, unsigned long *pdwSubSysVenId) +void SROMvReadSubSysVenId(unsigned long dwIoBase, unsigned long *pdwSubSysVenId) { unsigned char *pbyData; @@ -389,7 +389,7 @@ void SROMvReadSubSysVenId(DWORD_PTR dwIoBase, unsigned long *pdwSubSysVenId) * Return Value: TRUE if success; otherwise FALSE * */ -BOOL SROMbAutoLoad(DWORD_PTR dwIoBase) +BOOL SROMbAutoLoad(unsigned long dwIoBase) { BYTE byWait; int ii; diff --git a/drivers/staging/vt6655/srom.h b/drivers/staging/vt6655/srom.h index 53e3f596a33f..1df61f446c9b 100644 --- a/drivers/staging/vt6655/srom.h +++ b/drivers/staging/vt6655/srom.h @@ -135,23 +135,23 @@ typedef struct tagSSromReg { /*--------------------- Export Functions --------------------------*/ -BYTE SROMbyReadEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset); -BOOL SROMbWriteEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byData); +BYTE SROMbyReadEmbedded(unsigned long dwIoBase, BYTE byContntOffset); +BOOL SROMbWriteEmbedded(unsigned long dwIoBase, BYTE byContntOffset, BYTE byData); -void SROMvRegBitsOn(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byBits); -void SROMvRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byBits); +void SROMvRegBitsOn(unsigned long dwIoBase, BYTE byContntOffset, BYTE byBits); +void SROMvRegBitsOff(unsigned long dwIoBase, BYTE byContntOffset, BYTE byBits); -BOOL SROMbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits); -BOOL SROMbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits); +BOOL SROMbIsRegBitsOn(unsigned long dwIoBase, BYTE byContntOffset, BYTE byTestBits); +BOOL SROMbIsRegBitsOff(unsigned long dwIoBase, BYTE byContntOffset, BYTE byTestBits); -void SROMvReadAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs); -void SROMvWriteAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs); +void SROMvReadAllContents(unsigned long dwIoBase, unsigned char *pbyEepromRegs); +void SROMvWriteAllContents(unsigned long dwIoBase, unsigned char *pbyEepromRegs); -void SROMvReadEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress); -void SROMvWriteEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress); +void SROMvReadEtherAddress(unsigned long dwIoBase, unsigned char *pbyEtherAddress); +void SROMvWriteEtherAddress(unsigned long dwIoBase, unsigned char *pbyEtherAddress); -void SROMvReadSubSysVenId(DWORD_PTR dwIoBase, unsigned long *pdwSubSysVenId); +void SROMvReadSubSysVenId(unsigned long dwIoBase, unsigned long *pdwSubSysVenId); -BOOL SROMbAutoLoad (DWORD_PTR dwIoBase); +BOOL SROMbAutoLoad (unsigned long dwIoBase); #endif // __EEPROM_H__ diff --git a/drivers/staging/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h index c684f1a4c91e..69319a3c94ca 100644 --- a/drivers/staging/vt6655/ttype.h +++ b/drivers/staging/vt6655/ttype.h @@ -86,8 +86,6 @@ typedef UQuadWord QWORD; // 64-bit /****** Common pointer types ***********************************************/ -typedef unsigned long DWORD_PTR; // 32-bit - // boolean pointer typedef unsigned int * PUINT; -- cgit v1.2.3