aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655
diff options
context:
space:
mode:
authorCharles Clément <caratorn@gmail.com>2010-06-22 11:54:42 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-06-22 18:43:08 -0400
commit412b2d08b93165303d698267d1eeac19e14e67a4 (patch)
tree6ae14956f49e0fa242cc3238a7436383b8bd351a /drivers/staging/vt6655
parentdec572cbe67598080f7beb00279db1a5590cec35 (diff)
Staging: vt6655: remove DWORD_PTR pointer typedef
Use unsigned long instead. Signed-off-by: Charles Clément <caratorn@gmail.com>
Diffstat (limited to 'drivers/staging/vt6655')
-rw-r--r--drivers/staging/vt6655/baseband.c30
-rw-r--r--drivers/staging/vt6655/baseband.h24
-rw-r--r--drivers/staging/vt6655/card.c8
-rw-r--r--drivers/staging/vt6655/card.h8
-rw-r--r--drivers/staging/vt6655/key.c18
-rw-r--r--drivers/staging/vt6655/key.h16
-rw-r--r--drivers/staging/vt6655/mac.c104
-rw-r--r--drivers/staging/vt6655/mac.h108
-rw-r--r--drivers/staging/vt6655/rf.c16
-rw-r--r--drivers/staging/vt6655/rf.h8
-rw-r--r--drivers/staging/vt6655/srom.c24
-rw-r--r--drivers/staging/vt6655/srom.h24
-rw-r--r--drivers/staging/vt6655/ttype.h2
13 files changed, 194 insertions, 196 deletions
diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c
index 87c66e20d92..ab7d3d89e03 100644
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -2015,7 +2015,7 @@ BBvCaculateParameter (
2015 * Return Value: TRUE if succeeded; FALSE if failed. 2015 * Return Value: TRUE if succeeded; FALSE if failed.
2016 * 2016 *
2017 */ 2017 */
2018BOOL BBbReadEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, unsigned char *pbyData) 2018BOOL BBbReadEmbeded (unsigned long dwIoBase, BYTE byBBAddr, unsigned char *pbyData)
2019{ 2019{
2020 WORD ww; 2020 WORD ww;
2021 BYTE byValue; 2021 BYTE byValue;
@@ -2058,7 +2058,7 @@ BOOL BBbReadEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, unsigned char *pbyData)
2058 * Return Value: TRUE if succeeded; FALSE if failed. 2058 * Return Value: TRUE if succeeded; FALSE if failed.
2059 * 2059 *
2060 */ 2060 */
2061BOOL BBbWriteEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byData) 2061BOOL BBbWriteEmbeded (unsigned long dwIoBase, BYTE byBBAddr, BYTE byData)
2062{ 2062{
2063 WORD ww; 2063 WORD ww;
2064 BYTE byValue; 2064 BYTE byValue;
@@ -2100,7 +2100,7 @@ BOOL BBbWriteEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byData)
2100 * Return Value: TRUE if all TestBits are set; FALSE otherwise. 2100 * Return Value: TRUE if all TestBits are set; FALSE otherwise.
2101 * 2101 *
2102 */ 2102 */
2103BOOL BBbIsRegBitsOn (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits) 2103BOOL BBbIsRegBitsOn (unsigned long dwIoBase, BYTE byBBAddr, BYTE byTestBits)
2104{ 2104{
2105 BYTE byOrgData; 2105 BYTE byOrgData;
2106 2106
@@ -2123,7 +2123,7 @@ BOOL BBbIsRegBitsOn (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits)
2123 * Return Value: TRUE if all TestBits are clear; FALSE otherwise. 2123 * Return Value: TRUE if all TestBits are clear; FALSE otherwise.
2124 * 2124 *
2125 */ 2125 */
2126BOOL BBbIsRegBitsOff (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits) 2126BOOL BBbIsRegBitsOff (unsigned long dwIoBase, BYTE byBBAddr, BYTE byTestBits)
2127{ 2127{
2128 BYTE byOrgData; 2128 BYTE byOrgData;
2129 2129
@@ -2150,7 +2150,7 @@ BOOL BBbVT3253Init (PSDevice pDevice)
2150{ 2150{
2151 BOOL bResult = TRUE; 2151 BOOL bResult = TRUE;
2152 int ii; 2152 int ii;
2153 DWORD_PTR dwIoBase = pDevice->PortOffset; 2153 unsigned long dwIoBase = pDevice->PortOffset;
2154 BYTE byRFType = pDevice->byRFType; 2154 BYTE byRFType = pDevice->byRFType;
2155 BYTE byLocalID = pDevice->byLocalID; 2155 BYTE byLocalID = pDevice->byLocalID;
2156 2156
@@ -2321,7 +2321,7 @@ BOOL BBbVT3253Init (PSDevice pDevice)
2321 * Return Value: none 2321 * Return Value: none
2322 * 2322 *
2323 */ 2323 */
2324void BBvReadAllRegs (DWORD_PTR dwIoBase, unsigned char *pbyBBRegs) 2324void BBvReadAllRegs (unsigned long dwIoBase, unsigned char *pbyBBRegs)
2325{ 2325{
2326 int ii; 2326 int ii;
2327 BYTE byBase = 1; 2327 BYTE byBase = 1;
@@ -2349,7 +2349,7 @@ void BBvReadAllRegs (DWORD_PTR dwIoBase, unsigned char *pbyBBRegs)
2349void BBvLoopbackOn (PSDevice pDevice) 2349void BBvLoopbackOn (PSDevice pDevice)
2350{ 2350{
2351 BYTE byData; 2351 BYTE byData;
2352 DWORD_PTR dwIoBase = pDevice->PortOffset; 2352 unsigned long dwIoBase = pDevice->PortOffset;
2353 2353
2354 //CR C9 = 0x00 2354 //CR C9 = 0x00
2355 BBbReadEmbeded(dwIoBase, 0xC9, &pDevice->byBBCRc9);//CR201 2355 BBbReadEmbeded(dwIoBase, 0xC9, &pDevice->byBBCRc9);//CR201
@@ -2403,7 +2403,7 @@ void BBvLoopbackOn (PSDevice pDevice)
2403void BBvLoopbackOff (PSDevice pDevice) 2403void BBvLoopbackOff (PSDevice pDevice)
2404{ 2404{
2405 BYTE byData; 2405 BYTE byData;
2406 DWORD_PTR dwIoBase = pDevice->PortOffset; 2406 unsigned long dwIoBase = pDevice->PortOffset;
2407 2407
2408 BBbWriteEmbeded(dwIoBase, 0xC9, pDevice->byBBCRc9);//CR201 2408 BBbWriteEmbeded(dwIoBase, 0xC9, pDevice->byBBCRc9);//CR201
2409 BBbWriteEmbeded(dwIoBase, 0x88, pDevice->byBBCR88);//CR136 2409 BBbWriteEmbeded(dwIoBase, 0x88, pDevice->byBBCR88);//CR136
@@ -2495,7 +2495,7 @@ void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData)
2495 * 2495 *
2496 */ 2496 */
2497void 2497void
2498BBvSoftwareReset (DWORD_PTR dwIoBase) 2498BBvSoftwareReset (unsigned long dwIoBase)
2499{ 2499{
2500 BBbWriteEmbeded(dwIoBase, 0x50, 0x40); 2500 BBbWriteEmbeded(dwIoBase, 0x50, 0x40);
2501 BBbWriteEmbeded(dwIoBase, 0x50, 0); 2501 BBbWriteEmbeded(dwIoBase, 0x50, 0);
@@ -2516,7 +2516,7 @@ BBvSoftwareReset (DWORD_PTR dwIoBase)
2516 * 2516 *
2517 */ 2517 */
2518void 2518void
2519BBvPowerSaveModeON (DWORD_PTR dwIoBase) 2519BBvPowerSaveModeON (unsigned long dwIoBase)
2520{ 2520{
2521 BYTE byOrgData; 2521 BYTE byOrgData;
2522 2522
@@ -2538,7 +2538,7 @@ BBvPowerSaveModeON (DWORD_PTR dwIoBase)
2538 * 2538 *
2539 */ 2539 */
2540void 2540void
2541BBvPowerSaveModeOFF (DWORD_PTR dwIoBase) 2541BBvPowerSaveModeOFF (unsigned long dwIoBase)
2542{ 2542{
2543 BYTE byOrgData; 2543 BYTE byOrgData;
2544 2544
@@ -2562,7 +2562,7 @@ BBvPowerSaveModeOFF (DWORD_PTR dwIoBase)
2562 */ 2562 */
2563 2563
2564void 2564void
2565BBvSetTxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode) 2565BBvSetTxAntennaMode (unsigned long dwIoBase, BYTE byAntennaMode)
2566{ 2566{
2567 BYTE byBBTxConf; 2567 BYTE byBBTxConf;
2568 2568
@@ -2604,7 +2604,7 @@ BBvSetTxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode)
2604 */ 2604 */
2605 2605
2606void 2606void
2607BBvSetRxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode) 2607BBvSetRxAntennaMode (unsigned long dwIoBase, BYTE byAntennaMode)
2608{ 2608{
2609 BYTE byBBRxConf; 2609 BYTE byBBRxConf;
2610 2610
@@ -2635,14 +2635,14 @@ BBvSetRxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode)
2635 * 2635 *
2636 */ 2636 */
2637void 2637void
2638BBvSetDeepSleep (DWORD_PTR dwIoBase, BYTE byLocalID) 2638BBvSetDeepSleep (unsigned long dwIoBase, BYTE byLocalID)
2639{ 2639{
2640 BBbWriteEmbeded(dwIoBase, 0x0C, 0x17);//CR12 2640 BBbWriteEmbeded(dwIoBase, 0x0C, 0x17);//CR12
2641 BBbWriteEmbeded(dwIoBase, 0x0D, 0xB9);//CR13 2641 BBbWriteEmbeded(dwIoBase, 0x0D, 0xB9);//CR13
2642} 2642}
2643 2643
2644void 2644void
2645BBvExitDeepSleep (DWORD_PTR dwIoBase, BYTE byLocalID) 2645BBvExitDeepSleep (unsigned long dwIoBase, BYTE byLocalID)
2646{ 2646{
2647 BBbWriteEmbeded(dwIoBase, 0x0C, 0x00);//CR12 2647 BBbWriteEmbeded(dwIoBase, 0x0C, 0x00);//CR12
2648 BBbWriteEmbeded(dwIoBase, 0x0D, 0x01);//CR13 2648 BBbWriteEmbeded(dwIoBase, 0x0D, 0x01);//CR13
diff --git a/drivers/staging/vt6655/baseband.h b/drivers/staging/vt6655/baseband.h
index eb0368ad850..075342563c3 100644
--- a/drivers/staging/vt6655/baseband.h
+++ b/drivers/staging/vt6655/baseband.h
@@ -137,26 +137,26 @@ BBvCaculateParameter (
137 unsigned char *pbyPhySgn 137 unsigned char *pbyPhySgn
138 ); 138 );
139 139
140BOOL BBbReadEmbeded(DWORD_PTR dwIoBase, BYTE byBBAddr, unsigned char *pbyData); 140BOOL BBbReadEmbeded(unsigned long dwIoBase, BYTE byBBAddr, unsigned char *pbyData);
141BOOL BBbWriteEmbeded(DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byData); 141BOOL BBbWriteEmbeded(unsigned long dwIoBase, BYTE byBBAddr, BYTE byData);
142 142
143void BBvReadAllRegs(DWORD_PTR dwIoBase, unsigned char *pbyBBRegs); 143void BBvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyBBRegs);
144void BBvLoopbackOn(PSDevice pDevice); 144void BBvLoopbackOn(PSDevice pDevice);
145void BBvLoopbackOff(PSDevice pDevice); 145void BBvLoopbackOff(PSDevice pDevice);
146void BBvSetShortSlotTime(PSDevice pDevice); 146void BBvSetShortSlotTime(PSDevice pDevice);
147BOOL BBbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits); 147BOOL BBbIsRegBitsOn(unsigned long dwIoBase, BYTE byBBAddr, BYTE byTestBits);
148BOOL BBbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits); 148BOOL BBbIsRegBitsOff(unsigned long dwIoBase, BYTE byBBAddr, BYTE byTestBits);
149void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData); 149void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData);
150 150
151// VT3253 Baseband 151// VT3253 Baseband
152BOOL BBbVT3253Init(PSDevice pDevice); 152BOOL BBbVT3253Init(PSDevice pDevice);
153void BBvSoftwareReset(DWORD_PTR dwIoBase); 153void BBvSoftwareReset(unsigned long dwIoBase);
154void BBvPowerSaveModeON(DWORD_PTR dwIoBase); 154void BBvPowerSaveModeON(unsigned long dwIoBase);
155void BBvPowerSaveModeOFF(DWORD_PTR dwIoBase); 155void BBvPowerSaveModeOFF(unsigned long dwIoBase);
156void BBvSetTxAntennaMode(DWORD_PTR dwIoBase, BYTE byAntennaMode); 156void BBvSetTxAntennaMode(unsigned long dwIoBase, BYTE byAntennaMode);
157void BBvSetRxAntennaMode(DWORD_PTR dwIoBase, BYTE byAntennaMode); 157void BBvSetRxAntennaMode(unsigned long dwIoBase, BYTE byAntennaMode);
158void BBvSetDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID); 158void BBvSetDeepSleep(unsigned long dwIoBase, BYTE byLocalID);
159void BBvExitDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID); 159void BBvExitDeepSleep(unsigned long dwIoBase, BYTE byLocalID);
160 160
161// timer for antenna diversity 161// timer for antenna diversity
162 162
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 127660c52e0..747f8d3d142 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -1999,7 +1999,7 @@ BYTE CARDbyGetPktType (void *pDeviceHandler)
1999 * Return Value: none 1999 * Return Value: none
2000 * 2000 *
2001 */ 2001 */
2002void CARDvSetLoopbackMode (DWORD_PTR dwIoBase, WORD wLoopbackMode) 2002void CARDvSetLoopbackMode (unsigned long dwIoBase, WORD wLoopbackMode)
2003{ 2003{
2004 switch(wLoopbackMode) { 2004 switch(wLoopbackMode) {
2005 case CARD_LB_NONE: 2005 case CARD_LB_NONE:
@@ -2092,7 +2092,7 @@ QWORD CARDqGetTSFOffset (BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2)
2092 * Return Value: TRUE if success; otherwise FALSE 2092 * Return Value: TRUE if success; otherwise FALSE
2093 * 2093 *
2094 */ 2094 */
2095BOOL CARDbGetCurrentTSF (DWORD_PTR dwIoBase, PQWORD pqwCurrTSF) 2095BOOL CARDbGetCurrentTSF (unsigned long dwIoBase, PQWORD pqwCurrTSF)
2096{ 2096{
2097 WORD ww; 2097 WORD ww;
2098 BYTE byData; 2098 BYTE byData;
@@ -2170,7 +2170,7 @@ QWORD CARDqGetNextTBTT (QWORD qwTSF, WORD wBeaconInterval)
2170 * Return Value: none 2170 * Return Value: none
2171 * 2171 *
2172 */ 2172 */
2173void CARDvSetFirstNextTBTT (DWORD_PTR dwIoBase, WORD wBeaconInterval) 2173void CARDvSetFirstNextTBTT (unsigned long dwIoBase, WORD wBeaconInterval)
2174{ 2174{
2175 2175
2176 QWORD qwNextTBTT; 2176 QWORD qwNextTBTT;
@@ -2203,7 +2203,7 @@ void CARDvSetFirstNextTBTT (DWORD_PTR dwIoBase, WORD wBeaconInterval)
2203 * Return Value: none 2203 * Return Value: none
2204 * 2204 *
2205 */ 2205 */
2206void CARDvUpdateNextTBTT (DWORD_PTR dwIoBase, QWORD qwTSF, WORD wBeaconInterval) 2206void CARDvUpdateNextTBTT (unsigned long dwIoBase, QWORD qwTSF, WORD wBeaconInterval)
2207{ 2207{
2208 2208
2209 qwTSF = CARDqGetNextTBTT(qwTSF, wBeaconInterval); 2209 qwTSF = CARDqGetNextTBTT(qwTSF, wBeaconInterval);
diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h
index 40a7d6d5daa..b63842cd71a 100644
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@@ -91,11 +91,11 @@ void vUpdateIFS(void *pDeviceHandler);
91void CARDvUpdateBasicTopRate(void *pDeviceHandler); 91void CARDvUpdateBasicTopRate(void *pDeviceHandler);
92BOOL CARDbAddBasicRate(void *pDeviceHandler, WORD wRateIdx); 92BOOL CARDbAddBasicRate(void *pDeviceHandler, WORD wRateIdx);
93BOOL CARDbIsOFDMinBasicRate(void *pDeviceHandler); 93BOOL CARDbIsOFDMinBasicRate(void *pDeviceHandler);
94void CARDvSetLoopbackMode(DWORD_PTR dwIoBase, WORD wLoopbackMode); 94void CARDvSetLoopbackMode(unsigned long dwIoBase, WORD wLoopbackMode);
95BOOL CARDbSoftwareReset(void *pDeviceHandler); 95BOOL CARDbSoftwareReset(void *pDeviceHandler);
96void CARDvSetFirstNextTBTT(DWORD_PTR dwIoBase, WORD wBeaconInterval); 96void CARDvSetFirstNextTBTT(unsigned long dwIoBase, WORD wBeaconInterval);
97void CARDvUpdateNextTBTT(DWORD_PTR dwIoBase, QWORD qwTSF, WORD wBeaconInterval); 97void CARDvUpdateNextTBTT(unsigned long dwIoBase, QWORD qwTSF, WORD wBeaconInterval);
98BOOL CARDbGetCurrentTSF(DWORD_PTR dwIoBase, PQWORD pqwCurrTSF); 98BOOL CARDbGetCurrentTSF(unsigned long dwIoBase, PQWORD pqwCurrTSF);
99QWORD CARDqGetNextTBTT(QWORD qwTSF, WORD wBeaconInterval); 99QWORD CARDqGetNextTBTT(QWORD qwTSF, WORD wBeaconInterval);
100QWORD CARDqGetTSFOffset(BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2); 100QWORD CARDqGetTSFOffset(BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2);
101BOOL CARDbSetTxPower(void *pDeviceHandler, unsigned long ulTxPower); 101BOOL CARDbSetTxPower(void *pDeviceHandler, unsigned long ulTxPower);
diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c
index 74fe9b5b788..3fab4d5713f 100644
--- a/drivers/staging/vt6655/key.c
+++ b/drivers/staging/vt6655/key.c
@@ -59,7 +59,7 @@ static int msglevel =MSG_LEVEL_INFO;
59 59
60/*--------------------- Static Functions --------------------------*/ 60/*--------------------- Static Functions --------------------------*/
61static void 61static void
62s_vCheckKeyTableValid (PSKeyManagement pTable, DWORD_PTR dwIoBase) 62s_vCheckKeyTableValid (PSKeyManagement pTable, unsigned long dwIoBase)
63{ 63{
64 int i; 64 int i;
65 65
@@ -96,7 +96,7 @@ s_vCheckKeyTableValid (PSKeyManagement pTable, DWORD_PTR dwIoBase)
96 * Return Value: none 96 * Return Value: none
97 * 97 *
98 */ 98 */
99void KeyvInitTable (PSKeyManagement pTable, DWORD_PTR dwIoBase) 99void KeyvInitTable (PSKeyManagement pTable, unsigned long dwIoBase)
100{ 100{
101 int i; 101 int i;
102 int jj; 102 int jj;
@@ -197,7 +197,7 @@ BOOL KeybSetKey (
197 PQWORD pKeyRSC, 197 PQWORD pKeyRSC,
198 unsigned char *pbyKey, 198 unsigned char *pbyKey,
199 BYTE byKeyDecMode, 199 BYTE byKeyDecMode,
200 DWORD_PTR dwIoBase, 200 unsigned long dwIoBase,
201 BYTE byLocalID 201 BYTE byLocalID
202 ) 202 )
203{ 203{
@@ -366,7 +366,7 @@ BOOL KeybRemoveKey (
366 PSKeyManagement pTable, 366 PSKeyManagement pTable,
367 unsigned char *pbyBSSID, 367 unsigned char *pbyBSSID,
368 DWORD dwKeyIndex, 368 DWORD dwKeyIndex,
369 DWORD_PTR dwIoBase 369 unsigned long dwIoBase
370 ) 370 )
371{ 371{
372 int i; 372 int i;
@@ -438,7 +438,7 @@ BOOL KeybRemoveKey (
438BOOL KeybRemoveAllKey ( 438BOOL KeybRemoveAllKey (
439 PSKeyManagement pTable, 439 PSKeyManagement pTable,
440 unsigned char *pbyBSSID, 440 unsigned char *pbyBSSID,
441 DWORD_PTR dwIoBase 441 unsigned long dwIoBase
442 ) 442 )
443{ 443{
444 int i,u; 444 int i,u;
@@ -473,7 +473,7 @@ BOOL KeybRemoveAllKey (
473void KeyvRemoveWEPKey ( 473void KeyvRemoveWEPKey (
474 PSKeyManagement pTable, 474 PSKeyManagement pTable,
475 DWORD dwKeyIndex, 475 DWORD dwKeyIndex,
476 DWORD_PTR dwIoBase 476 unsigned long dwIoBase
477 ) 477 )
478{ 478{
479 479
@@ -494,7 +494,7 @@ void KeyvRemoveWEPKey (
494 494
495void KeyvRemoveAllWEPKey ( 495void KeyvRemoveAllWEPKey (
496 PSKeyManagement pTable, 496 PSKeyManagement pTable,
497 DWORD_PTR dwIoBase 497 unsigned long dwIoBase
498 ) 498 )
499{ 499{
500 int i; 500 int i;
@@ -638,7 +638,7 @@ BOOL KeybSetDefaultKey (
638 PQWORD pKeyRSC, 638 PQWORD pKeyRSC,
639 unsigned char *pbyKey, 639 unsigned char *pbyKey,
640 BYTE byKeyDecMode, 640 BYTE byKeyDecMode,
641 DWORD_PTR dwIoBase, 641 unsigned long dwIoBase,
642 BYTE byLocalID 642 BYTE byLocalID
643 ) 643 )
644{ 644{
@@ -745,7 +745,7 @@ BOOL KeybSetAllGroupKey (
745 PQWORD pKeyRSC, 745 PQWORD pKeyRSC,
746 unsigned char *pbyKey, 746 unsigned char *pbyKey,
747 BYTE byKeyDecMode, 747 BYTE byKeyDecMode,
748 DWORD_PTR dwIoBase, 748 unsigned long dwIoBase,
749 BYTE byLocalID 749 BYTE byLocalID
750 ) 750 )
751{ 751{
diff --git a/drivers/staging/vt6655/key.h b/drivers/staging/vt6655/key.h
index e8a74b469ef..c9179e82e08 100644
--- a/drivers/staging/vt6655/key.h
+++ b/drivers/staging/vt6655/key.h
@@ -101,7 +101,7 @@ typedef struct tagSKeyManagement
101 101
102/*--------------------- Export Functions --------------------------*/ 102/*--------------------- Export Functions --------------------------*/
103 103
104void KeyvInitTable(PSKeyManagement pTable, DWORD_PTR dwIoBase); 104void KeyvInitTable(PSKeyManagement pTable, unsigned long dwIoBase);
105 105
106BOOL KeybGetKey( 106BOOL KeybGetKey(
107 PSKeyManagement pTable, 107 PSKeyManagement pTable,
@@ -118,7 +118,7 @@ BOOL KeybSetKey(
118 PQWORD pKeyRSC, 118 PQWORD pKeyRSC,
119 unsigned char *pbyKey, 119 unsigned char *pbyKey,
120 BYTE byKeyDecMode, 120 BYTE byKeyDecMode,
121 DWORD_PTR dwIoBase, 121 unsigned long dwIoBase,
122 BYTE byLocalID 122 BYTE byLocalID
123 ); 123 );
124 124
@@ -129,7 +129,7 @@ BOOL KeybSetDefaultKey(
129 PQWORD pKeyRSC, 129 PQWORD pKeyRSC,
130 unsigned char *pbyKey, 130 unsigned char *pbyKey,
131 BYTE byKeyDecMode, 131 BYTE byKeyDecMode,
132 DWORD_PTR dwIoBase, 132 unsigned long dwIoBase,
133 BYTE byLocalID 133 BYTE byLocalID
134 ); 134 );
135 135
@@ -137,7 +137,7 @@ BOOL KeybRemoveKey(
137 PSKeyManagement pTable, 137 PSKeyManagement pTable,
138 unsigned char *pbyBSSID, 138 unsigned char *pbyBSSID,
139 DWORD dwKeyIndex, 139 DWORD dwKeyIndex,
140 DWORD_PTR dwIoBase 140 unsigned long dwIoBase
141 ); 141 );
142 142
143BOOL KeybGetTransmitKey( 143BOOL KeybGetTransmitKey(
@@ -155,18 +155,18 @@ BOOL KeybCheckPairewiseKey(
155BOOL KeybRemoveAllKey( 155BOOL KeybRemoveAllKey(
156 PSKeyManagement pTable, 156 PSKeyManagement pTable,
157 unsigned char *pbyBSSID, 157 unsigned char *pbyBSSID,
158 DWORD_PTR dwIoBase 158 unsigned long dwIoBase
159 ); 159 );
160 160
161void KeyvRemoveWEPKey( 161void KeyvRemoveWEPKey(
162 PSKeyManagement pTable, 162 PSKeyManagement pTable,
163 DWORD dwKeyIndex, 163 DWORD dwKeyIndex,
164 DWORD_PTR dwIoBase 164 unsigned long dwIoBase
165 ); 165 );
166 166
167void KeyvRemoveAllWEPKey( 167void KeyvRemoveAllWEPKey(
168 PSKeyManagement pTable, 168 PSKeyManagement pTable,
169 DWORD_PTR dwIoBase 169 unsigned long dwIoBase
170 ); 170 );
171 171
172BOOL KeybSetAllGroupKey ( 172BOOL KeybSetAllGroupKey (
@@ -176,7 +176,7 @@ BOOL KeybSetAllGroupKey (
176 PQWORD pKeyRSC, 176 PQWORD pKeyRSC,
177 unsigned char *pbyKey, 177 unsigned char *pbyKey,
178 BYTE byKeyDecMode, 178 BYTE byKeyDecMode,
179 DWORD_PTR dwIoBase, 179 unsigned long dwIoBase,
180 BYTE byLocalID 180 BYTE byLocalID
181 ); 181 );
182 182
diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
index 9ec1248bbf9..02616892bda 100644
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@@ -103,7 +103,7 @@ static int msglevel =MSG_LEVEL_INFO;
103 * Return Value: none 103 * Return Value: none
104 * 104 *
105 */ 105 */
106void MACvReadAllRegs (DWORD_PTR dwIoBase, unsigned char *pbyMacRegs) 106void MACvReadAllRegs (unsigned long dwIoBase, unsigned char *pbyMacRegs)
107{ 107{
108 int ii; 108 int ii;
109 109
@@ -140,7 +140,7 @@ void MACvReadAllRegs (DWORD_PTR dwIoBase, unsigned char *pbyMacRegs)
140 * Return Value: TRUE if all test bits On; otherwise FALSE 140 * Return Value: TRUE if all test bits On; otherwise FALSE
141 * 141 *
142 */ 142 */
143BOOL MACbIsRegBitsOn (DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits) 143BOOL MACbIsRegBitsOn (unsigned long dwIoBase, BYTE byRegOfs, BYTE byTestBits)
144{ 144{
145 BYTE byData; 145 BYTE byData;
146 146
@@ -163,7 +163,7 @@ BOOL MACbIsRegBitsOn (DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits)
163 * Return Value: TRUE if all test bits Off; otherwise FALSE 163 * Return Value: TRUE if all test bits Off; otherwise FALSE
164 * 164 *
165 */ 165 */
166BOOL MACbIsRegBitsOff (DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits) 166BOOL MACbIsRegBitsOff (unsigned long dwIoBase, BYTE byRegOfs, BYTE byTestBits)
167{ 167{
168 BYTE byData; 168 BYTE byData;
169 169
@@ -184,7 +184,7 @@ BOOL MACbIsRegBitsOff (DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits)
184 * Return Value: TRUE if interrupt is disable; otherwise FALSE 184 * Return Value: TRUE if interrupt is disable; otherwise FALSE
185 * 185 *
186 */ 186 */
187BOOL MACbIsIntDisable (DWORD_PTR dwIoBase) 187BOOL MACbIsIntDisable (unsigned long dwIoBase)
188{ 188{
189 DWORD dwData; 189 DWORD dwData;
190 190
@@ -209,7 +209,7 @@ BOOL MACbIsIntDisable (DWORD_PTR dwIoBase)
209 * Return Value: Mask Value read 209 * Return Value: Mask Value read
210 * 210 *
211 */ 211 */
212BYTE MACbyReadMultiAddr (DWORD_PTR dwIoBase, unsigned int uByteIdx) 212BYTE MACbyReadMultiAddr (unsigned long dwIoBase, unsigned int uByteIdx)
213{ 213{
214 BYTE byData; 214 BYTE byData;
215 215
@@ -234,7 +234,7 @@ BYTE MACbyReadMultiAddr (DWORD_PTR dwIoBase, unsigned int uByteIdx)
234 * Return Value: none 234 * Return Value: none
235 * 235 *
236 */ 236 */
237void MACvWriteMultiAddr (DWORD_PTR dwIoBase, unsigned int uByteIdx, BYTE byData) 237void MACvWriteMultiAddr (unsigned long dwIoBase, unsigned int uByteIdx, BYTE byData)
238{ 238{
239 MACvSelectPage1(dwIoBase); 239 MACvSelectPage1(dwIoBase);
240 VNSvOutPortB(dwIoBase + MAC_REG_MAR0 + uByteIdx, byData); 240 VNSvOutPortB(dwIoBase + MAC_REG_MAR0 + uByteIdx, byData);
@@ -255,7 +255,7 @@ void MACvWriteMultiAddr (DWORD_PTR dwIoBase, unsigned int uByteIdx, BYTE byData)
255 * Return Value: none 255 * Return Value: none
256 * 256 *
257 */ 257 */
258void MACvSetMultiAddrByHash (DWORD_PTR dwIoBase, BYTE byHashIdx) 258void MACvSetMultiAddrByHash (unsigned long dwIoBase, BYTE byHashIdx)
259{ 259{
260 unsigned int uByteIdx; 260 unsigned int uByteIdx;
261 BYTE byBitMask; 261 BYTE byBitMask;
@@ -286,7 +286,7 @@ void MACvSetMultiAddrByHash (DWORD_PTR dwIoBase, BYTE byHashIdx)
286 * Return Value: none 286 * Return Value: none
287 * 287 *
288 */ 288 */
289void MACvResetMultiAddrByHash (DWORD_PTR dwIoBase, BYTE byHashIdx) 289void MACvResetMultiAddrByHash (unsigned long dwIoBase, BYTE byHashIdx)
290{ 290{
291 unsigned int uByteIdx; 291 unsigned int uByteIdx;
292 BYTE byBitMask; 292 BYTE byBitMask;
@@ -317,7 +317,7 @@ void MACvResetMultiAddrByHash (DWORD_PTR dwIoBase, BYTE byHashIdx)
317 * Return Value: none 317 * Return Value: none
318 * 318 *
319 */ 319 */
320void MACvSetRxThreshold (DWORD_PTR dwIoBase, BYTE byThreshold) 320void MACvSetRxThreshold (unsigned long dwIoBase, BYTE byThreshold)
321{ 321{
322 BYTE byOrgValue; 322 BYTE byOrgValue;
323 323
@@ -342,7 +342,7 @@ void MACvSetRxThreshold (DWORD_PTR dwIoBase, BYTE byThreshold)
342 * Return Value: none 342 * Return Value: none
343 * 343 *
344 */ 344 */
345void MACvGetRxThreshold (DWORD_PTR dwIoBase, unsigned char *pbyThreshold) 345void MACvGetRxThreshold (unsigned long dwIoBase, unsigned char *pbyThreshold)
346{ 346{
347 // get FCR0 347 // get FCR0
348 VNSvInPortB(dwIoBase + MAC_REG_FCR0, pbyThreshold); 348 VNSvInPortB(dwIoBase + MAC_REG_FCR0, pbyThreshold);
@@ -363,7 +363,7 @@ void MACvGetRxThreshold (DWORD_PTR dwIoBase, unsigned char *pbyThreshold)
363 * Return Value: none 363 * Return Value: none
364 * 364 *
365 */ 365 */
366void MACvSetTxThreshold (DWORD_PTR dwIoBase, BYTE byThreshold) 366void MACvSetTxThreshold (unsigned long dwIoBase, BYTE byThreshold)
367{ 367{
368 BYTE byOrgValue; 368 BYTE byOrgValue;
369 369
@@ -388,7 +388,7 @@ void MACvSetTxThreshold (DWORD_PTR dwIoBase, BYTE byThreshold)
388 * Return Value: none 388 * Return Value: none
389 * 389 *
390 */ 390 */
391void MACvGetTxThreshold (DWORD_PTR dwIoBase, unsigned char *pbyThreshold) 391void MACvGetTxThreshold (unsigned long dwIoBase, unsigned char *pbyThreshold)
392{ 392{
393 // get FCR0 393 // get FCR0
394 VNSvInPortB(dwIoBase + MAC_REG_FCR0, pbyThreshold); 394 VNSvInPortB(dwIoBase + MAC_REG_FCR0, pbyThreshold);
@@ -409,7 +409,7 @@ void MACvGetTxThreshold (DWORD_PTR dwIoBase, unsigned char *pbyThreshold)
409 * Return Value: none 409 * Return Value: none
410 * 410 *
411 */ 411 */
412void MACvSetDmaLength (DWORD_PTR dwIoBase, BYTE byDmaLength) 412void MACvSetDmaLength (unsigned long dwIoBase, BYTE byDmaLength)
413{ 413{
414 BYTE byOrgValue; 414 BYTE byOrgValue;
415 415
@@ -434,7 +434,7 @@ void MACvSetDmaLength (DWORD_PTR dwIoBase, BYTE byDmaLength)
434 * Return Value: none 434 * Return Value: none
435 * 435 *
436 */ 436 */
437void MACvGetDmaLength (DWORD_PTR dwIoBase, unsigned char *pbyDmaLength) 437void MACvGetDmaLength (unsigned long dwIoBase, unsigned char *pbyDmaLength)
438{ 438{
439 // get FCR0 439 // get FCR0
440 VNSvInPortB(dwIoBase + MAC_REG_FCR0, pbyDmaLength); 440 VNSvInPortB(dwIoBase + MAC_REG_FCR0, pbyDmaLength);
@@ -455,7 +455,7 @@ void MACvGetDmaLength (DWORD_PTR dwIoBase, unsigned char *pbyDmaLength)
455 * Return Value: none 455 * Return Value: none
456 * 456 *
457 */ 457 */
458void MACvSetShortRetryLimit (DWORD_PTR dwIoBase, BYTE byRetryLimit) 458void MACvSetShortRetryLimit (unsigned long dwIoBase, BYTE byRetryLimit)
459{ 459{
460 // set SRT 460 // set SRT
461 VNSvOutPortB(dwIoBase + MAC_REG_SRT, byRetryLimit); 461 VNSvOutPortB(dwIoBase + MAC_REG_SRT, byRetryLimit);
@@ -474,7 +474,7 @@ void MACvSetShortRetryLimit (DWORD_PTR dwIoBase, BYTE byRetryLimit)
474 * Return Value: none 474 * Return Value: none
475 * 475 *
476 */ 476 */
477void MACvGetShortRetryLimit (DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit) 477void MACvGetShortRetryLimit (unsigned long dwIoBase, unsigned char *pbyRetryLimit)
478{ 478{
479 // get SRT 479 // get SRT
480 VNSvInPortB(dwIoBase + MAC_REG_SRT, pbyRetryLimit); 480 VNSvInPortB(dwIoBase + MAC_REG_SRT, pbyRetryLimit);
@@ -494,7 +494,7 @@ void MACvGetShortRetryLimit (DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit)
494 * Return Value: none 494 * Return Value: none
495 * 495 *
496 */ 496 */
497void MACvSetLongRetryLimit (DWORD_PTR dwIoBase, BYTE byRetryLimit) 497void MACvSetLongRetryLimit (unsigned long dwIoBase, BYTE byRetryLimit)
498{ 498{
499 // set LRT 499 // set LRT
500 VNSvOutPortB(dwIoBase + MAC_REG_LRT, byRetryLimit); 500 VNSvOutPortB(dwIoBase + MAC_REG_LRT, byRetryLimit);
@@ -513,7 +513,7 @@ void MACvSetLongRetryLimit (DWORD_PTR dwIoBase, BYTE byRetryLimit)
513 * Return Value: none 513 * Return Value: none
514 * 514 *
515 */ 515 */
516void MACvGetLongRetryLimit (DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit) 516void MACvGetLongRetryLimit (unsigned long dwIoBase, unsigned char *pbyRetryLimit)
517{ 517{
518 // get LRT 518 // get LRT
519 VNSvInPortB(dwIoBase + MAC_REG_LRT, pbyRetryLimit); 519 VNSvInPortB(dwIoBase + MAC_REG_LRT, pbyRetryLimit);
@@ -533,7 +533,7 @@ void MACvGetLongRetryLimit (DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit)
533 * Return Value: none 533 * Return Value: none
534 * 534 *
535 */ 535 */
536void MACvSetLoopbackMode (DWORD_PTR dwIoBase, BYTE byLoopbackMode) 536void MACvSetLoopbackMode (unsigned long dwIoBase, BYTE byLoopbackMode)
537{ 537{
538 BYTE byOrgValue; 538 BYTE byOrgValue;
539 539
@@ -559,7 +559,7 @@ void MACvSetLoopbackMode (DWORD_PTR dwIoBase, BYTE byLoopbackMode)
559 * Return Value: TRUE if in Loopback mode; otherwise FALSE 559 * Return Value: TRUE if in Loopback mode; otherwise FALSE
560 * 560 *
561 */ 561 */
562BOOL MACbIsInLoopbackMode (DWORD_PTR dwIoBase) 562BOOL MACbIsInLoopbackMode (unsigned long dwIoBase)
563{ 563{
564 BYTE byOrgValue; 564 BYTE byOrgValue;
565 565
@@ -583,7 +583,7 @@ BOOL MACbIsInLoopbackMode (DWORD_PTR dwIoBase)
583 * Return Value: none 583 * Return Value: none
584 * 584 *
585 */ 585 */
586void MACvSetPacketFilter (DWORD_PTR dwIoBase, WORD wFilterType) 586void MACvSetPacketFilter (unsigned long dwIoBase, WORD wFilterType)
587{ 587{
588 BYTE byOldRCR; 588 BYTE byOldRCR;
589 BYTE byNewRCR = 0; 589 BYTE byNewRCR = 0;
@@ -643,7 +643,7 @@ void MACvSetPacketFilter (DWORD_PTR dwIoBase, WORD wFilterType)
643 * Return Value: none 643 * Return Value: none
644 * 644 *
645 */ 645 */
646void MACvSaveContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf) 646void MACvSaveContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf)
647{ 647{
648 int ii; 648 int ii;
649 649
@@ -676,7 +676,7 @@ void MACvSaveContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf)
676 * Return Value: none 676 * Return Value: none
677 * 677 *
678 */ 678 */
679void MACvRestoreContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf) 679void MACvRestoreContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf)
680{ 680{
681 int ii; 681 int ii;
682 682
@@ -728,7 +728,7 @@ void MACvRestoreContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf)
728 * Return Value: TRUE if all values are the same; otherwise FALSE 728 * Return Value: TRUE if all values are the same; otherwise FALSE
729 * 729 *
730 */ 730 */
731BOOL MACbCompareContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf) 731BOOL MACbCompareContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf)
732{ 732{
733 DWORD dwData; 733 DWORD dwData;
734 734
@@ -773,7 +773,7 @@ BOOL MACbCompareContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf)
773 * Return Value: TRUE if Reset Success; otherwise FALSE 773 * Return Value: TRUE if Reset Success; otherwise FALSE
774 * 774 *
775 */ 775 */
776BOOL MACbSoftwareReset (DWORD_PTR dwIoBase) 776BOOL MACbSoftwareReset (unsigned long dwIoBase)
777{ 777{
778 BYTE byData; 778 BYTE byData;
779 WORD ww; 779 WORD ww;
@@ -806,7 +806,7 @@ BOOL MACbSoftwareReset (DWORD_PTR dwIoBase)
806 * Return Value: TRUE if success; otherwise FALSE 806 * Return Value: TRUE if success; otherwise FALSE
807 * 807 *
808 */ 808 */
809BOOL MACbSafeSoftwareReset (DWORD_PTR dwIoBase) 809BOOL MACbSafeSoftwareReset (unsigned long dwIoBase)
810{ 810{
811 BYTE abyTmpRegData[MAC_MAX_CONTEXT_SIZE_PAGE0+MAC_MAX_CONTEXT_SIZE_PAGE1]; 811 BYTE abyTmpRegData[MAC_MAX_CONTEXT_SIZE_PAGE0+MAC_MAX_CONTEXT_SIZE_PAGE1];
812 BOOL bRetVal; 812 BOOL bRetVal;
@@ -839,7 +839,7 @@ BOOL MACbSafeSoftwareReset (DWORD_PTR dwIoBase)
839 * Return Value: TRUE if success; otherwise FALSE 839 * Return Value: TRUE if success; otherwise FALSE
840 * 840 *
841 */ 841 */
842BOOL MACbSafeRxOff (DWORD_PTR dwIoBase) 842BOOL MACbSafeRxOff (unsigned long dwIoBase)
843{ 843{
844 WORD ww; 844 WORD ww;
845 DWORD dwData; 845 DWORD dwData;
@@ -900,7 +900,7 @@ BOOL MACbSafeRxOff (DWORD_PTR dwIoBase)
900 * Return Value: TRUE if success; otherwise FALSE 900 * Return Value: TRUE if success; otherwise FALSE
901 * 901 *
902 */ 902 */
903BOOL MACbSafeTxOff (DWORD_PTR dwIoBase) 903BOOL MACbSafeTxOff (unsigned long dwIoBase)
904{ 904{
905 WORD ww; 905 WORD ww;
906 DWORD dwData; 906 DWORD dwData;
@@ -964,7 +964,7 @@ BOOL MACbSafeTxOff (DWORD_PTR dwIoBase)
964 * Return Value: TRUE if success; otherwise FALSE 964 * Return Value: TRUE if success; otherwise FALSE
965 * 965 *
966 */ 966 */
967BOOL MACbSafeStop (DWORD_PTR dwIoBase) 967BOOL MACbSafeStop (unsigned long dwIoBase)
968{ 968{
969 MACvRegBitsOff(dwIoBase, MAC_REG_TCR, TCR_AUTOBCNTX); 969 MACvRegBitsOff(dwIoBase, MAC_REG_TCR, TCR_AUTOBCNTX);
970 970
@@ -999,7 +999,7 @@ BOOL MACbSafeStop (DWORD_PTR dwIoBase)
999 * Return Value: TRUE if success; otherwise FALSE 999 * Return Value: TRUE if success; otherwise FALSE
1000 * 1000 *
1001 */ 1001 */
1002BOOL MACbShutdown (DWORD_PTR dwIoBase) 1002BOOL MACbShutdown (unsigned long dwIoBase)
1003{ 1003{
1004 // disable MAC IMR 1004 // disable MAC IMR
1005 MACvIntDisable(dwIoBase); 1005 MACvIntDisable(dwIoBase);
@@ -1026,7 +1026,7 @@ BOOL MACbShutdown (DWORD_PTR dwIoBase)
1026 * Return Value: none 1026 * Return Value: none
1027 * 1027 *
1028 */ 1028 */
1029void MACvInitialize (DWORD_PTR dwIoBase) 1029void MACvInitialize (unsigned long dwIoBase)
1030{ 1030{
1031 // clear sticky bits 1031 // clear sticky bits
1032 MACvClearStckDS(dwIoBase); 1032 MACvClearStckDS(dwIoBase);
@@ -1079,7 +1079,7 @@ void MACvInitialize (DWORD_PTR dwIoBase)
1079 * Return Value: none 1079 * Return Value: none
1080 * 1080 *
1081 */ 1081 */
1082void MACvSetCurrRx0DescAddr (DWORD_PTR dwIoBase, DWORD dwCurrDescAddr) 1082void MACvSetCurrRx0DescAddr (unsigned long dwIoBase, DWORD dwCurrDescAddr)
1083{ 1083{
1084WORD ww; 1084WORD ww;
1085BYTE byData; 1085BYTE byData;
@@ -1117,7 +1117,7 @@ BYTE byOrgDMACtl;
1117 * Return Value: none 1117 * Return Value: none
1118 * 1118 *
1119 */ 1119 */
1120void MACvSetCurrRx1DescAddr (DWORD_PTR dwIoBase, DWORD dwCurrDescAddr) 1120void MACvSetCurrRx1DescAddr (unsigned long dwIoBase, DWORD dwCurrDescAddr)
1121{ 1121{
1122WORD ww; 1122WORD ww;
1123BYTE byData; 1123BYTE byData;
@@ -1155,7 +1155,7 @@ BYTE byOrgDMACtl;
1155 * Return Value: none 1155 * Return Value: none
1156 * 1156 *
1157 */ 1157 */
1158void MACvSetCurrTx0DescAddrEx (DWORD_PTR dwIoBase, DWORD dwCurrDescAddr) 1158void MACvSetCurrTx0DescAddrEx (unsigned long dwIoBase, DWORD dwCurrDescAddr)
1159{ 1159{
1160WORD ww; 1160WORD ww;
1161BYTE byData; 1161BYTE byData;
@@ -1194,7 +1194,7 @@ BYTE byOrgDMACtl;
1194 * 1194 *
1195 */ 1195 */
1196 //TxDMA1 = AC0DMA 1196 //TxDMA1 = AC0DMA
1197void MACvSetCurrAC0DescAddrEx (DWORD_PTR dwIoBase, DWORD dwCurrDescAddr) 1197void MACvSetCurrAC0DescAddrEx (unsigned long dwIoBase, DWORD dwCurrDescAddr)
1198{ 1198{
1199WORD ww; 1199WORD ww;
1200BYTE byData; 1200BYTE byData;
@@ -1221,7 +1221,7 @@ BYTE byOrgDMACtl;
1221 1221
1222 1222
1223 1223
1224void MACvSetCurrTXDescAddr (int iTxType, DWORD_PTR dwIoBase, DWORD dwCurrDescAddr) 1224void MACvSetCurrTXDescAddr (int iTxType, unsigned long dwIoBase, DWORD dwCurrDescAddr)
1225{ 1225{
1226 if(iTxType == TYPE_AC0DMA){ 1226 if(iTxType == TYPE_AC0DMA){
1227 MACvSetCurrAC0DescAddrEx(dwIoBase, dwCurrDescAddr); 1227 MACvSetCurrAC0DescAddrEx(dwIoBase, dwCurrDescAddr);
@@ -1244,7 +1244,7 @@ void MACvSetCurrTXDescAddr (int iTxType, DWORD_PTR dwIoBase, DWORD dwCurrDescAdd
1244 * Return Value: none 1244 * Return Value: none
1245 * 1245 *
1246 */ 1246 */
1247void MACvTimer0MicroSDelay (DWORD_PTR dwIoBase, unsigned int uDelay) 1247void MACvTimer0MicroSDelay (unsigned long dwIoBase, unsigned int uDelay)
1248{ 1248{
1249BYTE byValue; 1249BYTE byValue;
1250unsigned int uu,ii; 1250unsigned int uu,ii;
@@ -1280,7 +1280,7 @@ unsigned int uu,ii;
1280 * Return Value: none 1280 * Return Value: none
1281 * 1281 *
1282 */ 1282 */
1283void MACvOneShotTimer0MicroSec (DWORD_PTR dwIoBase, unsigned int uDelayTime) 1283void MACvOneShotTimer0MicroSec (unsigned long dwIoBase, unsigned int uDelayTime)
1284{ 1284{
1285 VNSvOutPortB(dwIoBase + MAC_REG_TMCTL0, 0); 1285 VNSvOutPortB(dwIoBase + MAC_REG_TMCTL0, 0);
1286 VNSvOutPortD(dwIoBase + MAC_REG_TMDATA0, uDelayTime); 1286 VNSvOutPortD(dwIoBase + MAC_REG_TMDATA0, uDelayTime);
@@ -1301,7 +1301,7 @@ void MACvOneShotTimer0MicroSec (DWORD_PTR dwIoBase, unsigned int uDelayTime)
1301 * Return Value: none 1301 * Return Value: none
1302 * 1302 *
1303 */ 1303 */
1304void MACvOneShotTimer1MicroSec (DWORD_PTR dwIoBase, unsigned int uDelayTime) 1304void MACvOneShotTimer1MicroSec (unsigned long dwIoBase, unsigned int uDelayTime)
1305{ 1305{
1306 VNSvOutPortB(dwIoBase + MAC_REG_TMCTL1, 0); 1306 VNSvOutPortB(dwIoBase + MAC_REG_TMCTL1, 0);
1307 VNSvOutPortD(dwIoBase + MAC_REG_TMDATA1, uDelayTime); 1307 VNSvOutPortD(dwIoBase + MAC_REG_TMDATA1, uDelayTime);
@@ -1309,7 +1309,7 @@ void MACvOneShotTimer1MicroSec (DWORD_PTR dwIoBase, unsigned int uDelayTime)
1309} 1309}
1310 1310
1311 1311
1312void MACvSetMISCFifo (DWORD_PTR dwIoBase, WORD wOffset, DWORD dwData) 1312void MACvSetMISCFifo (unsigned long dwIoBase, WORD wOffset, DWORD dwData)
1313{ 1313{
1314 if (wOffset > 273) 1314 if (wOffset > 273)
1315 return; 1315 return;
@@ -1319,7 +1319,7 @@ void MACvSetMISCFifo (DWORD_PTR dwIoBase, WORD wOffset, DWORD dwData)
1319} 1319}
1320 1320
1321 1321
1322BOOL MACbTxDMAOff (DWORD_PTR dwIoBase, unsigned int idx) 1322BOOL MACbTxDMAOff (unsigned long dwIoBase, unsigned int idx)
1323{ 1323{
1324BYTE byData; 1324BYTE byData;
1325unsigned int ww = 0; 1325unsigned int ww = 0;
@@ -1347,7 +1347,7 @@ unsigned int ww = 0;
1347 return TRUE; 1347 return TRUE;
1348} 1348}
1349 1349
1350void MACvClearBusSusInd (DWORD_PTR dwIoBase) 1350void MACvClearBusSusInd (unsigned long dwIoBase)
1351{ 1351{
1352 DWORD dwOrgValue; 1352 DWORD dwOrgValue;
1353 unsigned int ww; 1353 unsigned int ww;
@@ -1369,7 +1369,7 @@ void MACvClearBusSusInd (DWORD_PTR dwIoBase)
1369 } 1369 }
1370} 1370}
1371 1371
1372void MACvEnableBusSusEn (DWORD_PTR dwIoBase) 1372void MACvEnableBusSusEn (unsigned long dwIoBase)
1373{ 1373{
1374 BYTE byOrgValue; 1374 BYTE byOrgValue;
1375 DWORD dwOrgValue; 1375 DWORD dwOrgValue;
@@ -1391,7 +1391,7 @@ void MACvEnableBusSusEn (DWORD_PTR dwIoBase)
1391 } 1391 }
1392} 1392}
1393 1393
1394BOOL MACbFlushSYNCFifo (DWORD_PTR dwIoBase) 1394BOOL MACbFlushSYNCFifo (unsigned long dwIoBase)
1395{ 1395{
1396 BYTE byOrgValue; 1396 BYTE byOrgValue;
1397 unsigned int ww; 1397 unsigned int ww;
@@ -1415,7 +1415,7 @@ BOOL MACbFlushSYNCFifo (DWORD_PTR dwIoBase)
1415 return TRUE; 1415 return TRUE;
1416} 1416}
1417 1417
1418BOOL MACbPSWakeup (DWORD_PTR dwIoBase) 1418BOOL MACbPSWakeup (unsigned long dwIoBase)
1419{ 1419{
1420 BYTE byOrgValue; 1420 BYTE byOrgValue;
1421 unsigned int ww; 1421 unsigned int ww;
@@ -1455,7 +1455,7 @@ BOOL MACbPSWakeup (DWORD_PTR dwIoBase)
1455 * 1455 *
1456 */ 1456 */
1457 1457
1458void MACvSetKeyEntry (DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, 1458void MACvSetKeyEntry (unsigned long dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx,
1459 unsigned int uKeyIdx, unsigned char *pbyAddr, unsigned long *pdwKey, BYTE byLocalID) 1459 unsigned int uKeyIdx, unsigned char *pbyAddr, unsigned long *pdwKey, BYTE byLocalID)
1460{ 1460{
1461WORD wOffset; 1461WORD wOffset;
@@ -1522,7 +1522,7 @@ int ii;
1522 * Return Value: none 1522 * Return Value: none
1523 * 1523 *
1524 */ 1524 */
1525void MACvDisableKeyEntry (DWORD_PTR dwIoBase, unsigned int uEntryIdx) 1525void MACvDisableKeyEntry (unsigned long dwIoBase, unsigned int uEntryIdx)
1526{ 1526{
1527WORD wOffset; 1527WORD wOffset;
1528 1528
@@ -1550,7 +1550,7 @@ WORD wOffset;
1550 * 1550 *
1551 */ 1551 */
1552 1552
1553void MACvSetDefaultKeyEntry (DWORD_PTR dwIoBase, unsigned int uKeyLen, 1553void MACvSetDefaultKeyEntry (unsigned long dwIoBase, unsigned int uKeyLen,
1554 unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID) 1554 unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID)
1555{ 1555{
1556WORD wOffset; 1556WORD wOffset;
@@ -1601,7 +1601,7 @@ int ii;
1601 * 1601 *
1602 */ 1602 */
1603/* 1603/*
1604void MACvEnableDefaultKey (DWORD_PTR dwIoBase, BYTE byLocalID) 1604void MACvEnableDefaultKey (unsigned long dwIoBase, BYTE byLocalID)
1605{ 1605{
1606WORD wOffset; 1606WORD wOffset;
1607DWORD dwData; 1607DWORD dwData;
@@ -1636,7 +1636,7 @@ DWORD dwData;
1636 * Return Value: none 1636 * Return Value: none
1637 * 1637 *
1638 */ 1638 */
1639void MACvDisableDefaultKey (DWORD_PTR dwIoBase) 1639void MACvDisableDefaultKey (unsigned long dwIoBase)
1640{ 1640{
1641WORD wOffset; 1641WORD wOffset;
1642DWORD dwData; 1642DWORD dwData;
@@ -1666,7 +1666,7 @@ DWORD dwData;
1666 * Return Value: none 1666 * Return Value: none
1667 * 1667 *
1668 */ 1668 */
1669void MACvSetDefaultTKIPKeyEntry (DWORD_PTR dwIoBase, unsigned int uKeyLen, 1669void MACvSetDefaultTKIPKeyEntry (unsigned long dwIoBase, unsigned int uKeyLen,
1670 unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID) 1670 unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID)
1671{ 1671{
1672WORD wOffset; 1672WORD wOffset;
@@ -1723,7 +1723,7 @@ int ii;
1723 * 1723 *
1724 */ 1724 */
1725 1725
1726void MACvSetDefaultKeyCtl (DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, BYTE byLocalID) 1726void MACvSetDefaultKeyCtl (unsigned long dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, BYTE byLocalID)
1727{ 1727{
1728WORD wOffset; 1728WORD wOffset;
1729DWORD dwData; 1729DWORD dwData;
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index 0ded9a6d46d..96653a4d33d 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -1075,80 +1075,80 @@
1075/*--------------------- Export Functions --------------------------*/ 1075/*--------------------- Export Functions --------------------------*/
1076 1076
1077extern WORD TxRate_iwconfig;//2008-5-8 <add> by chester 1077extern WORD TxRate_iwconfig;//2008-5-8 <add> by chester
1078void MACvReadAllRegs(DWORD_PTR dwIoBase, unsigned char *pbyMacRegs); 1078void MACvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyMacRegs);
1079 1079
1080BOOL MACbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits); 1080BOOL MACbIsRegBitsOn(unsigned long dwIoBase, BYTE byRegOfs, BYTE byTestBits);
1081BOOL MACbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits); 1081BOOL MACbIsRegBitsOff(unsigned long dwIoBase, BYTE byRegOfs, BYTE byTestBits);
1082 1082
1083BOOL MACbIsIntDisable(DWORD_PTR dwIoBase); 1083BOOL MACbIsIntDisable(unsigned long dwIoBase);
1084 1084
1085BYTE MACbyReadMultiAddr(DWORD_PTR dwIoBase, unsigned int uByteIdx); 1085BYTE MACbyReadMultiAddr(unsigned long dwIoBase, unsigned int uByteIdx);
1086void MACvWriteMultiAddr(DWORD_PTR dwIoBase, unsigned int uByteIdx, BYTE byData); 1086void MACvWriteMultiAddr(unsigned long dwIoBase, unsigned int uByteIdx, BYTE byData);
1087void MACvSetMultiAddrByHash(DWORD_PTR dwIoBase, BYTE byHashIdx); 1087void MACvSetMultiAddrByHash(unsigned long dwIoBase, BYTE byHashIdx);
1088void MACvResetMultiAddrByHash(DWORD_PTR dwIoBase, BYTE byHashIdx); 1088void MACvResetMultiAddrByHash(unsigned long dwIoBase, BYTE byHashIdx);
1089 1089
1090void MACvSetRxThreshold(DWORD_PTR dwIoBase, BYTE byThreshold); 1090void MACvSetRxThreshold(unsigned long dwIoBase, BYTE byThreshold);
1091void MACvGetRxThreshold(DWORD_PTR dwIoBase, unsigned char *pbyThreshold); 1091void MACvGetRxThreshold(unsigned long dwIoBase, unsigned char *pbyThreshold);
1092 1092
1093void MACvSetTxThreshold(DWORD_PTR dwIoBase, BYTE byThreshold); 1093void MACvSetTxThreshold(unsigned long dwIoBase, BYTE byThreshold);
1094void MACvGetTxThreshold(DWORD_PTR dwIoBase, unsigned char *pbyThreshold); 1094void MACvGetTxThreshold(unsigned long dwIoBase, unsigned char *pbyThreshold);
1095 1095
1096void MACvSetDmaLength(DWORD_PTR dwIoBase, BYTE byDmaLength); 1096void MACvSetDmaLength(unsigned long dwIoBase, BYTE byDmaLength);
1097void MACvGetDmaLength(DWORD_PTR dwIoBase, unsigned char *pbyDmaLength); 1097void MACvGetDmaLength(unsigned long dwIoBase, unsigned char *pbyDmaLength);
1098 1098
1099void MACvSetShortRetryLimit(DWORD_PTR dwIoBase, BYTE byRetryLimit); 1099void MACvSetShortRetryLimit(unsigned long dwIoBase, BYTE byRetryLimit);
1100void MACvGetShortRetryLimit(DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit); 1100void MACvGetShortRetryLimit(unsigned long dwIoBase, unsigned char *pbyRetryLimit);
1101 1101
1102void MACvSetLongRetryLimit(DWORD_PTR dwIoBase, BYTE byRetryLimit); 1102void MACvSetLongRetryLimit(unsigned long dwIoBase, BYTE byRetryLimit);
1103void MACvGetLongRetryLimit(DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit); 1103void MACvGetLongRetryLimit(unsigned long dwIoBase, unsigned char *pbyRetryLimit);
1104 1104
1105void MACvSetLoopbackMode(DWORD_PTR dwIoBase, BYTE byLoopbackMode); 1105void MACvSetLoopbackMode(unsigned long dwIoBase, BYTE byLoopbackMode);
1106BOOL MACbIsInLoopbackMode(DWORD_PTR dwIoBase); 1106BOOL MACbIsInLoopbackMode(unsigned long dwIoBase);
1107 1107
1108void MACvSetPacketFilter(DWORD_PTR dwIoBase, WORD wFilterType); 1108void MACvSetPacketFilter(unsigned long dwIoBase, WORD wFilterType);
1109 1109
1110void MACvSaveContext(DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf); 1110void MACvSaveContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf);
1111void MACvRestoreContext(DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf); 1111void MACvRestoreContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf);
1112BOOL MACbCompareContext(DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf); 1112BOOL MACbCompareContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf);
1113 1113
1114BOOL MACbSoftwareReset(DWORD_PTR dwIoBase); 1114BOOL MACbSoftwareReset(unsigned long dwIoBase);
1115BOOL MACbSafeSoftwareReset(DWORD_PTR dwIoBase); 1115BOOL MACbSafeSoftwareReset(unsigned long dwIoBase);
1116BOOL MACbSafeRxOff(DWORD_PTR dwIoBase); 1116BOOL MACbSafeRxOff(unsigned long dwIoBase);
1117BOOL MACbSafeTxOff(DWORD_PTR dwIoBase); 1117BOOL MACbSafeTxOff(unsigned long dwIoBase);
1118BOOL MACbSafeStop(DWORD_PTR dwIoBase); 1118BOOL MACbSafeStop(unsigned long dwIoBase);
1119BOOL MACbShutdown(DWORD_PTR dwIoBase); 1119BOOL MACbShutdown(unsigned long dwIoBase);
1120void MACvInitialize(DWORD_PTR dwIoBase); 1120void MACvInitialize(unsigned long dwIoBase);
1121void MACvSetCurrRx0DescAddr(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); 1121void MACvSetCurrRx0DescAddr(unsigned long dwIoBase, DWORD dwCurrDescAddr);
1122void MACvSetCurrRx1DescAddr(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); 1122void MACvSetCurrRx1DescAddr(unsigned long dwIoBase, DWORD dwCurrDescAddr);
1123void MACvSetCurrTXDescAddr(int iTxType, DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); 1123void MACvSetCurrTXDescAddr(int iTxType, unsigned long dwIoBase, DWORD dwCurrDescAddr);
1124void MACvSetCurrTx0DescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); 1124void MACvSetCurrTx0DescAddrEx(unsigned long dwIoBase, DWORD dwCurrDescAddr);
1125void MACvSetCurrAC0DescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); 1125void MACvSetCurrAC0DescAddrEx(unsigned long dwIoBase, DWORD dwCurrDescAddr);
1126void MACvSetCurrSyncDescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); 1126void MACvSetCurrSyncDescAddrEx(unsigned long dwIoBase, DWORD dwCurrDescAddr);
1127void MACvSetCurrATIMDescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); 1127void MACvSetCurrATIMDescAddrEx(unsigned long dwIoBase, DWORD dwCurrDescAddr);
1128void MACvTimer0MicroSDelay(DWORD_PTR dwIoBase, unsigned int uDelay); 1128void MACvTimer0MicroSDelay(unsigned long dwIoBase, unsigned int uDelay);
1129void MACvOneShotTimer0MicroSec(DWORD_PTR dwIoBase, unsigned int uDelayTime); 1129void MACvOneShotTimer0MicroSec(unsigned long dwIoBase, unsigned int uDelayTime);
1130void MACvOneShotTimer1MicroSec(DWORD_PTR dwIoBase, unsigned int uDelayTime); 1130void MACvOneShotTimer1MicroSec(unsigned long dwIoBase, unsigned int uDelayTime);
1131 1131
1132void MACvSetMISCFifo(DWORD_PTR dwIoBase, WORD wOffset, DWORD dwData); 1132void MACvSetMISCFifo(unsigned long dwIoBase, WORD wOffset, DWORD dwData);
1133 1133
1134BOOL MACbTxDMAOff (DWORD_PTR dwIoBase, unsigned int idx); 1134BOOL MACbTxDMAOff (unsigned long dwIoBase, unsigned int idx);
1135 1135
1136void MACvClearBusSusInd(DWORD_PTR dwIoBase); 1136void MACvClearBusSusInd(unsigned long dwIoBase);
1137void MACvEnableBusSusEn(DWORD_PTR dwIoBase); 1137void MACvEnableBusSusEn(unsigned long dwIoBase);
1138 1138
1139BOOL MACbFlushSYNCFifo(DWORD_PTR dwIoBase); 1139BOOL MACbFlushSYNCFifo(unsigned long dwIoBase);
1140BOOL MACbPSWakeup(DWORD_PTR dwIoBase); 1140BOOL MACbPSWakeup(unsigned long dwIoBase);
1141 1141
1142void MACvSetKeyEntry(DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, 1142void MACvSetKeyEntry(unsigned long dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx,
1143 unsigned int uKeyIdx, unsigned char *pbyAddr, unsigned long *pdwKey, BYTE byLocalID); 1143 unsigned int uKeyIdx, unsigned char *pbyAddr, unsigned long *pdwKey, BYTE byLocalID);
1144void MACvDisableKeyEntry(DWORD_PTR dwIoBase, unsigned int uEntryIdx); 1144void MACvDisableKeyEntry(unsigned long dwIoBase, unsigned int uEntryIdx);
1145void MACvSetDefaultKeyEntry(DWORD_PTR dwIoBase, unsigned int uKeyLen, 1145void MACvSetDefaultKeyEntry(unsigned long dwIoBase, unsigned int uKeyLen,
1146 unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID); 1146 unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID);
1147//void MACvEnableDefaultKey(DWORD_PTR dwIoBase, BYTE byLocalID); 1147//void MACvEnableDefaultKey(unsigned long dwIoBase, BYTE byLocalID);
1148void MACvDisableDefaultKey(DWORD_PTR dwIoBase); 1148void MACvDisableDefaultKey(unsigned long dwIoBase);
1149void MACvSetDefaultTKIPKeyEntry(DWORD_PTR dwIoBase, unsigned int uKeyLen, 1149void MACvSetDefaultTKIPKeyEntry(unsigned long dwIoBase, unsigned int uKeyLen,
1150 unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID); 1150 unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID);
1151void MACvSetDefaultKeyCtl(DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, BYTE byLocalID); 1151void MACvSetDefaultKeyCtl(unsigned long dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, BYTE byLocalID);
1152 1152
1153#endif // __MAC_H__ 1153#endif // __MAC_H__
1154 1154
diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c
index c86504dc38b..63e5e5044e1 100644
--- a/drivers/staging/vt6655/rf.c
+++ b/drivers/staging/vt6655/rf.c
@@ -474,7 +474,7 @@ const DWORD dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {
474 * Return Value: TRUE if succeeded; FALSE if failed. 474 * Return Value: TRUE if succeeded; FALSE if failed.
475 * 475 *
476 */ 476 */
477BOOL s_bAL7230Init (DWORD_PTR dwIoBase) 477BOOL s_bAL7230Init (unsigned long dwIoBase)
478{ 478{
479 int ii; 479 int ii;
480 BOOL bResult; 480 BOOL bResult;
@@ -517,7 +517,7 @@ BOOL s_bAL7230Init (DWORD_PTR dwIoBase)
517} 517}
518 518
519// Need to Pull PLLON low when writing channel registers through 3-wire interface 519// Need to Pull PLLON low when writing channel registers through 3-wire interface
520BOOL s_bAL7230SelectChannel (DWORD_PTR dwIoBase, BYTE byChannel) 520BOOL s_bAL7230SelectChannel (unsigned long dwIoBase, BYTE byChannel)
521{ 521{
522 BOOL bResult; 522 BOOL bResult;
523 523
@@ -622,7 +622,7 @@ BOOL s_bAL7230SelectChannel (DWORD_PTR dwIoBase, BYTE byChannel)
622 * Return Value: TRUE if succeeded; FALSE if failed. 622 * Return Value: TRUE if succeeded; FALSE if failed.
623 * 623 *
624 */ 624 */
625BOOL IFRFbWriteEmbeded (DWORD_PTR dwIoBase, DWORD dwData) 625BOOL IFRFbWriteEmbeded (unsigned long dwIoBase, DWORD dwData)
626{ 626{
627 WORD ww; 627 WORD ww;
628 DWORD dwValue; 628 DWORD dwValue;
@@ -684,7 +684,7 @@ BOOL IFRFbWriteEmbeded (DWORD_PTR dwIoBase, DWORD dwData)
684 * Return Value: TRUE if succeeded; FALSE if failed. 684 * Return Value: TRUE if succeeded; FALSE if failed.
685 * 685 *
686 */ 686 */
687BOOL RFbAL2230Init (DWORD_PTR dwIoBase) 687BOOL RFbAL2230Init (unsigned long dwIoBase)
688{ 688{
689 int ii; 689 int ii;
690 BOOL bResult; 690 BOOL bResult;
@@ -734,7 +734,7 @@ MACvTimer0MicroSDelay(dwIoBase, 30); //delay 30 us
734 return bResult; 734 return bResult;
735} 735}
736 736
737BOOL RFbAL2230SelectChannel (DWORD_PTR dwIoBase, BYTE byChannel) 737BOOL RFbAL2230SelectChannel (unsigned long dwIoBase, BYTE byChannel)
738{ 738{
739 BOOL bResult; 739 BOOL bResult;
740 740
@@ -875,7 +875,7 @@ BOOL bResult = TRUE;
875 * Return Value: TRUE if succeeded; FALSE if failed. 875 * Return Value: TRUE if succeeded; FALSE if failed.
876 * 876 *
877 */ 877 */
878BOOL RFbSelectChannel (DWORD_PTR dwIoBase, BYTE byRFType, BYTE byChannel) 878BOOL RFbSelectChannel (unsigned long dwIoBase, BYTE byRFType, BYTE byChannel)
879{ 879{
880BOOL bResult = TRUE; 880BOOL bResult = TRUE;
881 switch (byRFType) { 881 switch (byRFType) {
@@ -911,7 +911,7 @@ BOOL bResult = TRUE;
911 * Return Value: None. 911 * Return Value: None.
912 * 912 *
913 */ 913 */
914BOOL RFvWriteWakeProgSyn (DWORD_PTR dwIoBase, BYTE byRFType, unsigned int uChannel) 914BOOL RFvWriteWakeProgSyn (unsigned long dwIoBase, BYTE byRFType, unsigned int uChannel)
915{ 915{
916 int ii; 916 int ii;
917 BYTE byInitCount = 0; 917 BYTE byInitCount = 0;
@@ -1232,7 +1232,7 @@ RFvRSSITodBm (
1232 1232
1233// Post processing for the 11b/g and 11a. 1233// Post processing for the 11b/g and 11a.
1234// for save time on changing Reg2,3,5,7,10,12,15 1234// for save time on changing Reg2,3,5,7,10,12,15
1235BOOL RFbAL7230SelectChannelPostProcess (DWORD_PTR dwIoBase, BYTE byOldChannel, BYTE byNewChannel) 1235BOOL RFbAL7230SelectChannelPostProcess (unsigned long dwIoBase, BYTE byOldChannel, BYTE byNewChannel)
1236{ 1236{
1237 BOOL bResult; 1237 BOOL bResult;
1238 1238
diff --git a/drivers/staging/vt6655/rf.h b/drivers/staging/vt6655/rf.h
index 7571b3d1ca4..b2895733bf6 100644
--- a/drivers/staging/vt6655/rf.h
+++ b/drivers/staging/vt6655/rf.h
@@ -76,12 +76,12 @@
76 76
77/*--------------------- Export Functions --------------------------*/ 77/*--------------------- Export Functions --------------------------*/
78 78
79BOOL IFRFbWriteEmbeded(DWORD_PTR dwIoBase, DWORD dwData); 79BOOL IFRFbWriteEmbeded(unsigned long dwIoBase, DWORD dwData);
80BOOL RFbSelectChannel(DWORD_PTR dwIoBase, BYTE byRFType, BYTE byChannel); 80BOOL RFbSelectChannel(unsigned long dwIoBase, BYTE byRFType, BYTE byChannel);
81BOOL RFbInit ( 81BOOL RFbInit (
82 PSDevice pDevice 82 PSDevice pDevice
83 ); 83 );
84BOOL RFvWriteWakeProgSyn(DWORD_PTR dwIoBase, BYTE byRFType, unsigned int uChannel); 84BOOL RFvWriteWakeProgSyn(unsigned long dwIoBase, BYTE byRFType, unsigned int uChannel);
85BOOL RFbSetPower(PSDevice pDevice, unsigned int uRATE, unsigned int uCH); 85BOOL RFbSetPower(PSDevice pDevice, unsigned int uRATE, unsigned int uCH);
86BOOL RFbRawSetPower( 86BOOL RFbRawSetPower(
87 PSDevice pDevice, 87 PSDevice pDevice,
@@ -97,7 +97,7 @@ RFvRSSITodBm(
97 ); 97 );
98 98
99//{{ RobertYu: 20050104 99//{{ RobertYu: 20050104
100BOOL RFbAL7230SelectChannelPostProcess(DWORD_PTR dwIoBase, BYTE byOldChannel, BYTE byNewChannel); 100BOOL RFbAL7230SelectChannelPostProcess(unsigned long dwIoBase, BYTE byOldChannel, BYTE byNewChannel);
101//}} RobertYu 101//}} RobertYu
102 102
103#endif // __RF_H__ 103#endif // __RF_H__
diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c
index 26f7a9ca60a..500da8cf687 100644
--- a/drivers/staging/vt6655/srom.c
+++ b/drivers/staging/vt6655/srom.c
@@ -76,7 +76,7 @@
76 * Return Value: data read 76 * Return Value: data read
77 * 77 *
78 */ 78 */
79BYTE SROMbyReadEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset) 79BYTE SROMbyReadEmbedded(unsigned long dwIoBase, BYTE byContntOffset)
80{ 80{
81 WORD wDelay, wNoACK; 81 WORD wDelay, wNoACK;
82 BYTE byWait; 82 BYTE byWait;
@@ -125,7 +125,7 @@ BYTE SROMbyReadEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset)
125 * Return Value: TRUE if succeeded; FALSE if failed. 125 * Return Value: TRUE if succeeded; FALSE if failed.
126 * 126 *
127 */ 127 */
128BOOL SROMbWriteEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byData) 128BOOL SROMbWriteEmbedded(unsigned long dwIoBase, BYTE byContntOffset, BYTE byData)
129{ 129{
130 WORD wDelay, wNoACK; 130 WORD wDelay, wNoACK;
131 BYTE byWait; 131 BYTE byWait;
@@ -178,7 +178,7 @@ BOOL SROMbWriteEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byData)
178 * Return Value: none 178 * Return Value: none
179 * 179 *
180 */ 180 */
181void SROMvRegBitsOn(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byBits) 181void SROMvRegBitsOn(unsigned long dwIoBase, BYTE byContntOffset, BYTE byBits)
182{ 182{
183 BYTE byOrgData; 183 BYTE byOrgData;
184 184
@@ -199,7 +199,7 @@ void SROMvRegBitsOn(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byBits)
199 * none 199 * none
200 * 200 *
201 */ 201 */
202void SROMvRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byBits) 202void SROMvRegBitsOff(unsigned long dwIoBase, BYTE byContntOffset, BYTE byBits)
203{ 203{
204 BYTE byOrgData; 204 BYTE byOrgData;
205 205
@@ -222,7 +222,7 @@ void SROMvRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byBits)
222 * Return Value: TRUE if all test bits on; otherwise FALSE 222 * Return Value: TRUE if all test bits on; otherwise FALSE
223 * 223 *
224 */ 224 */
225BOOL SROMbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits) 225BOOL SROMbIsRegBitsOn(unsigned long dwIoBase, BYTE byContntOffset, BYTE byTestBits)
226{ 226{
227 BYTE byOrgData; 227 BYTE byOrgData;
228 228
@@ -245,7 +245,7 @@ BOOL SROMbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits)
245 * Return Value: TRUE if all test bits off; otherwise FALSE 245 * Return Value: TRUE if all test bits off; otherwise FALSE
246 * 246 *
247 */ 247 */
248BOOL SROMbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits) 248BOOL SROMbIsRegBitsOff(unsigned long dwIoBase, BYTE byContntOffset, BYTE byTestBits)
249{ 249{
250 BYTE byOrgData; 250 BYTE byOrgData;
251 251
@@ -266,7 +266,7 @@ BOOL SROMbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits)
266 * Return Value: none 266 * Return Value: none
267 * 267 *
268 */ 268 */
269void SROMvReadAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs) 269void SROMvReadAllContents(unsigned long dwIoBase, unsigned char *pbyEepromRegs)
270{ 270{
271 int ii; 271 int ii;
272 272
@@ -291,7 +291,7 @@ void SROMvReadAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs)
291 * Return Value: none 291 * Return Value: none
292 * 292 *
293 */ 293 */
294void SROMvWriteAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs) 294void SROMvWriteAllContents(unsigned long dwIoBase, unsigned char *pbyEepromRegs)
295{ 295{
296 int ii; 296 int ii;
297 297
@@ -315,7 +315,7 @@ void SROMvWriteAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs)
315 * Return Value: none 315 * Return Value: none
316 * 316 *
317 */ 317 */
318void SROMvReadEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress) 318void SROMvReadEtherAddress(unsigned long dwIoBase, unsigned char *pbyEtherAddress)
319{ 319{
320 BYTE ii; 320 BYTE ii;
321 321
@@ -340,7 +340,7 @@ void SROMvReadEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress)
340 * Return Value: none 340 * Return Value: none
341 * 341 *
342 */ 342 */
343void SROMvWriteEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress) 343void SROMvWriteEtherAddress(unsigned long dwIoBase, unsigned char *pbyEtherAddress)
344{ 344{
345 BYTE ii; 345 BYTE ii;
346 346
@@ -364,7 +364,7 @@ void SROMvWriteEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress)
364 * Return Value: none 364 * Return Value: none
365 * 365 *
366 */ 366 */
367void SROMvReadSubSysVenId(DWORD_PTR dwIoBase, unsigned long *pdwSubSysVenId) 367void SROMvReadSubSysVenId(unsigned long dwIoBase, unsigned long *pdwSubSysVenId)
368{ 368{
369 unsigned char *pbyData; 369 unsigned char *pbyData;
370 370
@@ -389,7 +389,7 @@ void SROMvReadSubSysVenId(DWORD_PTR dwIoBase, unsigned long *pdwSubSysVenId)
389 * Return Value: TRUE if success; otherwise FALSE 389 * Return Value: TRUE if success; otherwise FALSE
390 * 390 *
391 */ 391 */
392BOOL SROMbAutoLoad(DWORD_PTR dwIoBase) 392BOOL SROMbAutoLoad(unsigned long dwIoBase)
393{ 393{
394 BYTE byWait; 394 BYTE byWait;
395 int ii; 395 int ii;
diff --git a/drivers/staging/vt6655/srom.h b/drivers/staging/vt6655/srom.h
index 53e3f596a33..1df61f446c9 100644
--- a/drivers/staging/vt6655/srom.h
+++ b/drivers/staging/vt6655/srom.h
@@ -135,23 +135,23 @@ typedef struct tagSSromReg {
135 135
136/*--------------------- Export Functions --------------------------*/ 136/*--------------------- Export Functions --------------------------*/
137 137
138BYTE SROMbyReadEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset); 138BYTE SROMbyReadEmbedded(unsigned long dwIoBase, BYTE byContntOffset);
139BOOL SROMbWriteEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byData); 139BOOL SROMbWriteEmbedded(unsigned long dwIoBase, BYTE byContntOffset, BYTE byData);
140 140
141void SROMvRegBitsOn(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byBits); 141void SROMvRegBitsOn(unsigned long dwIoBase, BYTE byContntOffset, BYTE byBits);
142void SROMvRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byBits); 142void SROMvRegBitsOff(unsigned long dwIoBase, BYTE byContntOffset, BYTE byBits);
143 143
144BOOL SROMbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits); 144BOOL SROMbIsRegBitsOn(unsigned long dwIoBase, BYTE byContntOffset, BYTE byTestBits);
145BOOL SROMbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits); 145BOOL SROMbIsRegBitsOff(unsigned long dwIoBase, BYTE byContntOffset, BYTE byTestBits);
146 146
147void SROMvReadAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs); 147void SROMvReadAllContents(unsigned long dwIoBase, unsigned char *pbyEepromRegs);
148void SROMvWriteAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs); 148void SROMvWriteAllContents(unsigned long dwIoBase, unsigned char *pbyEepromRegs);
149 149
150void SROMvReadEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress); 150void SROMvReadEtherAddress(unsigned long dwIoBase, unsigned char *pbyEtherAddress);
151void SROMvWriteEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress); 151void SROMvWriteEtherAddress(unsigned long dwIoBase, unsigned char *pbyEtherAddress);
152 152
153void SROMvReadSubSysVenId(DWORD_PTR dwIoBase, unsigned long *pdwSubSysVenId); 153void SROMvReadSubSysVenId(unsigned long dwIoBase, unsigned long *pdwSubSysVenId);
154 154
155BOOL SROMbAutoLoad (DWORD_PTR dwIoBase); 155BOOL SROMbAutoLoad (unsigned long dwIoBase);
156 156
157#endif // __EEPROM_H__ 157#endif // __EEPROM_H__
diff --git a/drivers/staging/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h
index c684f1a4c91..69319a3c94c 100644
--- a/drivers/staging/vt6655/ttype.h
+++ b/drivers/staging/vt6655/ttype.h
@@ -86,8 +86,6 @@ typedef UQuadWord QWORD; // 64-bit
86 86
87/****** Common pointer types ***********************************************/ 87/****** Common pointer types ***********************************************/
88 88
89typedef unsigned long DWORD_PTR; // 32-bit
90
91// boolean pointer 89// boolean pointer
92typedef unsigned int * PUINT; 90typedef unsigned int * PUINT;
93 91