diff options
author | Charles Clément <caratorn@gmail.com> | 2010-08-01 11:15:50 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 21:17:57 -0400 |
commit | 7b6a001313a9b11a1f0985de05fff514db41d72d (patch) | |
tree | c5f5bdcb4fcef70b5a2613a6382a0cd065bda892 /drivers | |
parent | 5a5a2a6ad4aa2467bcc34fa50e85c2afc90bab05 (diff) |
Staging: vt6655: replace BOOL with in kernel bool
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
50 files changed, 470 insertions, 472 deletions
diff --git a/drivers/staging/vt6655/IEEE11h.c b/drivers/staging/vt6655/IEEE11h.c index 1ab1d420cbd9..e07ebd578d44 100644 --- a/drivers/staging/vt6655/IEEE11h.c +++ b/drivers/staging/vt6655/IEEE11h.c | |||
@@ -98,11 +98,11 @@ typedef struct _WLAN_FRAME_TPCREP { | |||
98 | /*--------------------- Static Variables --------------------------*/ | 98 | /*--------------------- Static Variables --------------------------*/ |
99 | 99 | ||
100 | /*--------------------- Static Functions --------------------------*/ | 100 | /*--------------------- Static Functions --------------------------*/ |
101 | static BOOL s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq, | 101 | static bool s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq, |
102 | unsigned int uLength) | 102 | unsigned int uLength) |
103 | { | 103 | { |
104 | size_t uNumOfEIDs = 0; | 104 | size_t uNumOfEIDs = 0; |
105 | BOOL bResult = true; | 105 | bool bResult = true; |
106 | 106 | ||
107 | if (uLength <= WLAN_A3FR_MAXLEN) { | 107 | if (uLength <= WLAN_A3FR_MAXLEN) { |
108 | memcpy(pMgmt->abyCurrentMSRReq, pMSRReq, uLength); | 108 | memcpy(pMgmt->abyCurrentMSRReq, pMSRReq, uLength); |
@@ -118,7 +118,7 @@ static BOOL s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq, | |||
118 | } | 118 | } |
119 | 119 | ||
120 | 120 | ||
121 | static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, unsigned char byRate, unsigned char byRSSI) | 121 | static bool s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, unsigned char byRate, unsigned char byRSSI) |
122 | { | 122 | { |
123 | PWLAN_FRAME_TPCREP pFrame; | 123 | PWLAN_FRAME_TPCREP pFrame; |
124 | PSTxMgmtPacket pTxPacket = NULL; | 124 | PSTxMgmtPacket pTxPacket = NULL; |
@@ -203,7 +203,7 @@ static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, unsigned | |||
203 | * Return Value: None. | 203 | * Return Value: None. |
204 | * | 204 | * |
205 | -*/ | 205 | -*/ |
206 | BOOL | 206 | bool |
207 | IEEE11hbMgrRxAction ( | 207 | IEEE11hbMgrRxAction ( |
208 | void *pMgmtHandle, | 208 | void *pMgmtHandle, |
209 | void *pRxPacket | 209 | void *pRxPacket |
@@ -266,7 +266,7 @@ IEEE11hbMgrRxAction ( | |||
266 | } | 266 | } |
267 | 267 | ||
268 | 268 | ||
269 | BOOL IEEE11hbMSRRepTx ( | 269 | bool IEEE11hbMSRRepTx ( |
270 | void *pMgmtHandle | 270 | void *pMgmtHandle |
271 | ) | 271 | ) |
272 | { | 272 | { |
diff --git a/drivers/staging/vt6655/IEEE11h.h b/drivers/staging/vt6655/IEEE11h.h index ae32498a511d..542340b96e38 100644 --- a/drivers/staging/vt6655/IEEE11h.h +++ b/drivers/staging/vt6655/IEEE11h.h | |||
@@ -45,7 +45,7 @@ | |||
45 | 45 | ||
46 | /*--------------------- Export Functions --------------------------*/ | 46 | /*--------------------- Export Functions --------------------------*/ |
47 | 47 | ||
48 | BOOL IEEE11hbMSRRepTx ( | 48 | bool IEEE11hbMSRRepTx ( |
49 | void *pMgmtHandle | 49 | void *pMgmtHandle |
50 | ); | 50 | ); |
51 | 51 | ||
diff --git a/drivers/staging/vt6655/aes_ccmp.c b/drivers/staging/vt6655/aes_ccmp.c index 12910f312a2a..e30168f2da2f 100644 --- a/drivers/staging/vt6655/aes_ccmp.c +++ b/drivers/staging/vt6655/aes_ccmp.c | |||
@@ -243,7 +243,7 @@ unsigned char abyRoundKey[16]; | |||
243 | * Return Value: MIC compare result | 243 | * Return Value: MIC compare result |
244 | * | 244 | * |
245 | */ | 245 | */ |
246 | BOOL AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize) | 246 | bool AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize) |
247 | { | 247 | { |
248 | unsigned char abyNonce[13]; | 248 | unsigned char abyNonce[13]; |
249 | unsigned char MIC_IV[16]; | 249 | unsigned char MIC_IV[16]; |
@@ -260,7 +260,7 @@ unsigned char *pbyIV; | |||
260 | unsigned char *pbyPayload; | 260 | unsigned char *pbyPayload; |
261 | unsigned short wHLen = 22; | 261 | unsigned short wHLen = 22; |
262 | unsigned short wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;//8 is IV, 8 is MIC, 4 is CRC | 262 | unsigned short wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;//8 is IV, 8 is MIC, 4 is CRC |
263 | BOOL bA4 = false; | 263 | bool bA4 = false; |
264 | unsigned char byTmp; | 264 | unsigned char byTmp; |
265 | unsigned short wCnt; | 265 | unsigned short wCnt; |
266 | int ii,jj,kk; | 266 | int ii,jj,kk; |
diff --git a/drivers/staging/vt6655/aes_ccmp.h b/drivers/staging/vt6655/aes_ccmp.h index 5671db3b37d5..c8b28b0e9bdc 100644 --- a/drivers/staging/vt6655/aes_ccmp.h +++ b/drivers/staging/vt6655/aes_ccmp.h | |||
@@ -41,6 +41,6 @@ | |||
41 | /*--------------------- Export Variables --------------------------*/ | 41 | /*--------------------- Export Variables --------------------------*/ |
42 | 42 | ||
43 | /*--------------------- Export Functions --------------------------*/ | 43 | /*--------------------- Export Functions --------------------------*/ |
44 | BOOL AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize); | 44 | bool AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize); |
45 | 45 | ||
46 | #endif //__AES_H__ | 46 | #endif //__AES_H__ |
diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index 6ad0bfa520fd..1e1c6e34f786 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c | |||
@@ -1857,9 +1857,9 @@ BBvCaculateParameter ( | |||
1857 | unsigned int cbBitCount; | 1857 | unsigned int cbBitCount; |
1858 | unsigned int cbUsCount = 0; | 1858 | unsigned int cbUsCount = 0; |
1859 | unsigned int cbTmp; | 1859 | unsigned int cbTmp; |
1860 | BOOL bExtBit; | 1860 | bool bExtBit; |
1861 | unsigned char byPreambleType = pDevice->byPreambleType; | 1861 | unsigned char byPreambleType = pDevice->byPreambleType; |
1862 | BOOL bCCK = pDevice->bCCK; | 1862 | bool bCCK = pDevice->bCCK; |
1863 | 1863 | ||
1864 | cbBitCount = cbFrameLength * 8; | 1864 | cbBitCount = cbFrameLength * 8; |
1865 | bExtBit = false; | 1865 | bExtBit = false; |
@@ -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 | */ |
2018 | BOOL BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char *pbyData) | 2018 | bool BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char *pbyData) |
2019 | { | 2019 | { |
2020 | unsigned short ww; | 2020 | unsigned short ww; |
2021 | unsigned char byValue; | 2021 | unsigned char byValue; |
@@ -2058,7 +2058,7 @@ BOOL BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch | |||
2058 | * Return Value: true if succeeded; false if failed. | 2058 | * Return Value: true if succeeded; false if failed. |
2059 | * | 2059 | * |
2060 | */ | 2060 | */ |
2061 | BOOL BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byData) | 2061 | bool BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byData) |
2062 | { | 2062 | { |
2063 | unsigned short ww; | 2063 | unsigned short ww; |
2064 | unsigned char byValue; | 2064 | unsigned char byValue; |
@@ -2100,7 +2100,7 @@ BOOL BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned c | |||
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 | */ |
2103 | BOOL BBbIsRegBitsOn (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits) | 2103 | bool BBbIsRegBitsOn (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits) |
2104 | { | 2104 | { |
2105 | unsigned char byOrgData; | 2105 | unsigned char byOrgData; |
2106 | 2106 | ||
@@ -2123,7 +2123,7 @@ BOOL BBbIsRegBitsOn (unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch | |||
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 | */ |
2126 | BOOL BBbIsRegBitsOff (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits) | 2126 | bool BBbIsRegBitsOff (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits) |
2127 | { | 2127 | { |
2128 | unsigned char byOrgData; | 2128 | unsigned char byOrgData; |
2129 | 2129 | ||
@@ -2146,9 +2146,9 @@ BOOL BBbIsRegBitsOff (unsigned long dwIoBase, unsigned char byBBAddr, unsigned c | |||
2146 | * | 2146 | * |
2147 | */ | 2147 | */ |
2148 | 2148 | ||
2149 | BOOL BBbVT3253Init (PSDevice pDevice) | 2149 | bool BBbVT3253Init (PSDevice pDevice) |
2150 | { | 2150 | { |
2151 | BOOL bResult = true; | 2151 | bool bResult = true; |
2152 | int ii; | 2152 | int ii; |
2153 | unsigned long dwIoBase = pDevice->PortOffset; | 2153 | unsigned long dwIoBase = pDevice->PortOffset; |
2154 | unsigned char byRFType = pDevice->byRFType; | 2154 | unsigned char byRFType = pDevice->byRFType; |
diff --git a/drivers/staging/vt6655/baseband.h b/drivers/staging/vt6655/baseband.h index cc303401bc4b..8294bdbb7b51 100644 --- a/drivers/staging/vt6655/baseband.h +++ b/drivers/staging/vt6655/baseband.h | |||
@@ -137,19 +137,19 @@ BBvCaculateParameter ( | |||
137 | unsigned char *pbyPhySgn | 137 | unsigned char *pbyPhySgn |
138 | ); | 138 | ); |
139 | 139 | ||
140 | BOOL BBbReadEmbeded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char *pbyData); | 140 | bool BBbReadEmbeded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char *pbyData); |
141 | BOOL BBbWriteEmbeded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byData); | 141 | bool BBbWriteEmbeded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byData); |
142 | 142 | ||
143 | void BBvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyBBRegs); | 143 | void BBvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyBBRegs); |
144 | void BBvLoopbackOn(PSDevice pDevice); | 144 | void BBvLoopbackOn(PSDevice pDevice); |
145 | void BBvLoopbackOff(PSDevice pDevice); | 145 | void BBvLoopbackOff(PSDevice pDevice); |
146 | void BBvSetShortSlotTime(PSDevice pDevice); | 146 | void BBvSetShortSlotTime(PSDevice pDevice); |
147 | BOOL BBbIsRegBitsOn(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits); | 147 | bool BBbIsRegBitsOn(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits); |
148 | BOOL BBbIsRegBitsOff(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits); | 148 | bool BBbIsRegBitsOff(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits); |
149 | void BBvSetVGAGainOffset(PSDevice pDevice, unsigned char byData); | 149 | void BBvSetVGAGainOffset(PSDevice pDevice, unsigned char byData); |
150 | 150 | ||
151 | // VT3253 Baseband | 151 | // VT3253 Baseband |
152 | BOOL BBbVT3253Init(PSDevice pDevice); | 152 | bool BBbVT3253Init(PSDevice pDevice); |
153 | void BBvSoftwareReset(unsigned long dwIoBase); | 153 | void BBvSoftwareReset(unsigned long dwIoBase); |
154 | void BBvPowerSaveModeON(unsigned long dwIoBase); | 154 | void BBvPowerSaveModeON(unsigned long dwIoBase); |
155 | void BBvPowerSaveModeOFF(unsigned long dwIoBase); | 155 | void BBvPowerSaveModeOFF(unsigned long dwIoBase); |
diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c index c9563b2b38f0..57c1cc90afcc 100644 --- a/drivers/staging/vt6655/bssdb.c +++ b/drivers/staging/vt6655/bssdb.c | |||
@@ -284,7 +284,7 @@ if(pDevice->bLinkPass==false) pCurrBSS->bSelected = false; | |||
284 | void | 284 | void |
285 | BSSvClearBSSList( | 285 | BSSvClearBSSList( |
286 | void *hDeviceContext, | 286 | void *hDeviceContext, |
287 | BOOL bKeepCurrBSSID | 287 | bool bKeepCurrBSSID |
288 | ) | 288 | ) |
289 | { | 289 | { |
290 | PSDevice pDevice = (PSDevice)hDeviceContext; | 290 | PSDevice pDevice = (PSDevice)hDeviceContext; |
@@ -367,7 +367,7 @@ BSSpAddrIsInBSSList( | |||
367 | * | 367 | * |
368 | -*/ | 368 | -*/ |
369 | 369 | ||
370 | BOOL | 370 | bool |
371 | BSSbInsertToBSSList ( | 371 | BSSbInsertToBSSList ( |
372 | void *hDeviceContext, | 372 | void *hDeviceContext, |
373 | unsigned char *abyBSSIDAddr, | 373 | unsigned char *abyBSSIDAddr, |
@@ -394,7 +394,7 @@ BSSbInsertToBSSList ( | |||
394 | PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; | 394 | PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; |
395 | PKnownBSS pBSSList = NULL; | 395 | PKnownBSS pBSSList = NULL; |
396 | unsigned int ii; | 396 | unsigned int ii; |
397 | BOOL bParsingQuiet = false; | 397 | bool bParsingQuiet = false; |
398 | PWLAN_IE_QUIET pQuiet = NULL; | 398 | PWLAN_IE_QUIET pQuiet = NULL; |
399 | 399 | ||
400 | 400 | ||
@@ -492,7 +492,7 @@ BSSbInsertToBSSList ( | |||
492 | if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || (pBSSList->bWPA2Valid == true)) { | 492 | if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || (pBSSList->bWPA2Valid == true)) { |
493 | 493 | ||
494 | PSKeyItem pTransmitKey = NULL; | 494 | PSKeyItem pTransmitKey = NULL; |
495 | BOOL bIs802_1x = false; | 495 | bool bIs802_1x = false; |
496 | 496 | ||
497 | for (ii = 0; ii < pBSSList->wAKMSSAuthCount; ii ++) { | 497 | for (ii = 0; ii < pBSSList->wAKMSSAuthCount; ii ++) { |
498 | if (pBSSList->abyAKMSSAuthType[ii] == WLAN_11i_AKMSS_802_1X) { | 498 | if (pBSSList->abyAKMSSAuthType[ii] == WLAN_11i_AKMSS_802_1X) { |
@@ -583,14 +583,14 @@ BSSbInsertToBSSList ( | |||
583 | -*/ | 583 | -*/ |
584 | // TODO: input structure modify | 584 | // TODO: input structure modify |
585 | 585 | ||
586 | BOOL | 586 | bool |
587 | BSSbUpdateToBSSList ( | 587 | BSSbUpdateToBSSList ( |
588 | void *hDeviceContext, | 588 | void *hDeviceContext, |
589 | QWORD qwTimestamp, | 589 | QWORD qwTimestamp, |
590 | unsigned short wBeaconInterval, | 590 | unsigned short wBeaconInterval, |
591 | unsigned short wCapInfo, | 591 | unsigned short wCapInfo, |
592 | unsigned char byCurrChannel, | 592 | unsigned char byCurrChannel, |
593 | BOOL bChannelHit, | 593 | bool bChannelHit, |
594 | PWLAN_IE_SSID pSSID, | 594 | PWLAN_IE_SSID pSSID, |
595 | PWLAN_IE_SUPP_RATES pSuppRates, | 595 | PWLAN_IE_SUPP_RATES pSuppRates, |
596 | PWLAN_IE_SUPP_RATES pExtSuppRates, | 596 | PWLAN_IE_SUPP_RATES pExtSuppRates, |
@@ -610,7 +610,7 @@ BSSbUpdateToBSSList ( | |||
610 | PSMgmtObject pMgmt = pDevice->pMgmt; | 610 | PSMgmtObject pMgmt = pDevice->pMgmt; |
611 | PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; | 611 | PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; |
612 | long ldBm; | 612 | long ldBm; |
613 | BOOL bParsingQuiet = false; | 613 | bool bParsingQuiet = false; |
614 | PWLAN_IE_QUIET pQuiet = NULL; | 614 | PWLAN_IE_QUIET pQuiet = NULL; |
615 | 615 | ||
616 | 616 | ||
@@ -761,7 +761,7 @@ BSSbUpdateToBSSList ( | |||
761 | * | 761 | * |
762 | -*/ | 762 | -*/ |
763 | 763 | ||
764 | BOOL | 764 | bool |
765 | BSSDBbIsSTAInNodeDB(void *pMgmtObject, unsigned char *abyDstAddr, | 765 | BSSDBbIsSTAInNodeDB(void *pMgmtObject, unsigned char *abyDstAddr, |
766 | unsigned int *puNodeIndex) | 766 | unsigned int *puNodeIndex) |
767 | { | 767 | { |
@@ -1001,7 +1001,7 @@ BSSvAddMulticastNode( | |||
1001 | -*/ | 1001 | -*/ |
1002 | //2008-4-14 <add> by chester for led issue | 1002 | //2008-4-14 <add> by chester for led issue |
1003 | #ifdef FOR_LED_ON_NOTEBOOK | 1003 | #ifdef FOR_LED_ON_NOTEBOOK |
1004 | BOOL cc=false; | 1004 | bool cc=false; |
1005 | unsigned int status; | 1005 | unsigned int status; |
1006 | #endif | 1006 | #endif |
1007 | void | 1007 | void |
diff --git a/drivers/staging/vt6655/bssdb.h b/drivers/staging/vt6655/bssdb.h index b69af4dc307d..0af421186122 100644 --- a/drivers/staging/vt6655/bssdb.h +++ b/drivers/staging/vt6655/bssdb.h | |||
@@ -90,13 +90,13 @@ typedef enum _NDIS_802_11_NETWORK_TYPE | |||
90 | 90 | ||
91 | 91 | ||
92 | typedef struct tagSERPObject { | 92 | typedef struct tagSERPObject { |
93 | BOOL bERPExist; | 93 | bool bERPExist; |
94 | unsigned char byERP; | 94 | unsigned char byERP; |
95 | }ERPObject, *PERPObject; | 95 | }ERPObject, *PERPObject; |
96 | 96 | ||
97 | 97 | ||
98 | typedef struct tagSRSNCapObject { | 98 | typedef struct tagSRSNCapObject { |
99 | BOOL bRSNCapExist; | 99 | bool bRSNCapExist; |
100 | unsigned short wRSNCap; | 100 | unsigned short wRSNCap; |
101 | }SRSNCapObject, *PSRSNCapObject; | 101 | }SRSNCapObject, *PSRSNCapObject; |
102 | 102 | ||
@@ -104,7 +104,7 @@ typedef struct tagSRSNCapObject { | |||
104 | #pragma pack(1) | 104 | #pragma pack(1) |
105 | typedef struct tagKnownBSS { | 105 | typedef struct tagKnownBSS { |
106 | // BSS info | 106 | // BSS info |
107 | BOOL bActive; | 107 | bool bActive; |
108 | unsigned char abyBSSID[WLAN_BSSID_LEN]; | 108 | unsigned char abyBSSID[WLAN_BSSID_LEN]; |
109 | unsigned int uChannel; | 109 | unsigned int uChannel; |
110 | unsigned char abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; | 110 | unsigned char abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; |
@@ -122,10 +122,10 @@ typedef struct tagKnownBSS { | |||
122 | long ldBmAverage[RSSI_STAT_COUNT]; | 122 | long ldBmAverage[RSSI_STAT_COUNT]; |
123 | long ldBmAverRange; | 123 | long ldBmAverRange; |
124 | //For any BSSID selection improvment | 124 | //For any BSSID selection improvment |
125 | BOOL bSelected; | 125 | bool bSelected; |
126 | 126 | ||
127 | //++ WPA informations | 127 | //++ WPA informations |
128 | BOOL bWPAValid; | 128 | bool bWPAValid; |
129 | unsigned char byGKType; | 129 | unsigned char byGKType; |
130 | unsigned char abyPKType[4]; | 130 | unsigned char abyPKType[4]; |
131 | unsigned short wPKCount; | 131 | unsigned short wPKCount; |
@@ -136,7 +136,7 @@ typedef struct tagKnownBSS { | |||
136 | //-- | 136 | //-- |
137 | 137 | ||
138 | //++ WPA2 informations | 138 | //++ WPA2 informations |
139 | BOOL bWPA2Valid; | 139 | bool bWPA2Valid; |
140 | unsigned char byCSSGK; | 140 | unsigned char byCSSGK; |
141 | unsigned short wCSSPKCount; | 141 | unsigned short wCSSPKCount; |
142 | unsigned char abyCSSPK[4]; | 142 | unsigned char abyCSSPK[4]; |
@@ -181,14 +181,14 @@ typedef enum tagNODE_STATE { | |||
181 | // STA node info | 181 | // STA node info |
182 | typedef struct tagKnownNodeDB { | 182 | typedef struct tagKnownNodeDB { |
183 | // STA info | 183 | // STA info |
184 | BOOL bActive; | 184 | bool bActive; |
185 | unsigned char abyMACAddr[WLAN_ADDR_LEN]; | 185 | unsigned char abyMACAddr[WLAN_ADDR_LEN]; |
186 | unsigned char abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; | 186 | unsigned char abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; |
187 | unsigned char abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; | 187 | unsigned char abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; |
188 | unsigned short wTxDataRate; | 188 | unsigned short wTxDataRate; |
189 | BOOL bShortPreamble; | 189 | bool bShortPreamble; |
190 | BOOL bERPExist; | 190 | bool bERPExist; |
191 | BOOL bShortSlotTime; | 191 | bool bShortSlotTime; |
192 | unsigned int uInActiveCount; | 192 | unsigned int uInActiveCount; |
193 | unsigned short wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp. | 193 | unsigned short wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp. |
194 | unsigned short wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon. | 194 | unsigned short wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon. |
@@ -202,15 +202,15 @@ typedef struct tagKnownNodeDB { | |||
202 | unsigned short wListenInterval; | 202 | unsigned short wListenInterval; |
203 | unsigned short wAID; | 203 | unsigned short wAID; |
204 | NODE_STATE eNodeState; | 204 | NODE_STATE eNodeState; |
205 | BOOL bPSEnable; | 205 | bool bPSEnable; |
206 | BOOL bRxPSPoll; | 206 | bool bRxPSPoll; |
207 | unsigned char byAuthSequence; | 207 | unsigned char byAuthSequence; |
208 | unsigned long ulLastRxJiffer; | 208 | unsigned long ulLastRxJiffer; |
209 | unsigned char bySuppRate; | 209 | unsigned char bySuppRate; |
210 | unsigned long dwFlags; | 210 | unsigned long dwFlags; |
211 | unsigned short wEnQueueCnt; | 211 | unsigned short wEnQueueCnt; |
212 | 212 | ||
213 | BOOL bOnFly; | 213 | bool bOnFly; |
214 | unsigned long long KeyRSC; | 214 | unsigned long long KeyRSC; |
215 | unsigned char byKeyIndex; | 215 | unsigned char byKeyIndex; |
216 | unsigned long dwKeyIndex; | 216 | unsigned long dwKeyIndex; |
@@ -221,7 +221,7 @@ typedef struct tagKnownNodeDB { | |||
221 | unsigned char abyWepKey[WLAN_WEPMAX_KEYLEN]; | 221 | unsigned char abyWepKey[WLAN_WEPMAX_KEYLEN]; |
222 | // | 222 | // |
223 | // Auto rate fallback vars | 223 | // Auto rate fallback vars |
224 | BOOL bIsInFallback; | 224 | bool bIsInFallback; |
225 | unsigned int uAverageRSSI; | 225 | unsigned int uAverageRSSI; |
226 | unsigned int uRateRecoveryTimeout; | 226 | unsigned int uRateRecoveryTimeout; |
227 | unsigned int uRatePollTimeout; | 227 | unsigned int uRatePollTimeout; |
@@ -260,10 +260,10 @@ BSSpAddrIsInBSSList( | |||
260 | void | 260 | void |
261 | BSSvClearBSSList( | 261 | BSSvClearBSSList( |
262 | void *hDeviceContext, | 262 | void *hDeviceContext, |
263 | BOOL bKeepCurrBSSID | 263 | bool bKeepCurrBSSID |
264 | ); | 264 | ); |
265 | 265 | ||
266 | BOOL | 266 | bool |
267 | BSSbInsertToBSSList( | 267 | BSSbInsertToBSSList( |
268 | void *hDeviceContext, | 268 | void *hDeviceContext, |
269 | unsigned char *abyBSSIDAddr, | 269 | unsigned char *abyBSSIDAddr, |
@@ -285,14 +285,14 @@ BSSbInsertToBSSList( | |||
285 | ); | 285 | ); |
286 | 286 | ||
287 | 287 | ||
288 | BOOL | 288 | bool |
289 | BSSbUpdateToBSSList( | 289 | BSSbUpdateToBSSList( |
290 | void *hDeviceContext, | 290 | void *hDeviceContext, |
291 | QWORD qwTimestamp, | 291 | QWORD qwTimestamp, |
292 | unsigned short wBeaconInterval, | 292 | unsigned short wBeaconInterval, |
293 | unsigned short wCapInfo, | 293 | unsigned short wCapInfo, |
294 | unsigned char byCurrChannel, | 294 | unsigned char byCurrChannel, |
295 | BOOL bChannelHit, | 295 | bool bChannelHit, |
296 | PWLAN_IE_SSID pSSID, | 296 | PWLAN_IE_SSID pSSID, |
297 | PWLAN_IE_SUPP_RATES pSuppRates, | 297 | PWLAN_IE_SUPP_RATES pSuppRates, |
298 | PWLAN_IE_SUPP_RATES pExtSuppRates, | 298 | PWLAN_IE_SUPP_RATES pExtSuppRates, |
@@ -308,7 +308,7 @@ BSSbUpdateToBSSList( | |||
308 | ); | 308 | ); |
309 | 309 | ||
310 | 310 | ||
311 | BOOL | 311 | bool |
312 | BSSDBbIsSTAInNodeDB(void *hDeviceContext, unsigned char *abyDstAddr, | 312 | BSSDBbIsSTAInNodeDB(void *hDeviceContext, unsigned char *abyDstAddr, |
313 | unsigned int *puNodeIndex); | 313 | unsigned int *puNodeIndex); |
314 | 314 | ||
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index baf94ebb88b2..32d095c4d51c 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c | |||
@@ -369,7 +369,7 @@ s_vSetRSPINF (PSDevice pDevice, CARD_PHY_TYPE ePHYType, void *pvSupportRateIEs, | |||
369 | * | 369 | * |
370 | */ | 370 | */ |
371 | /* | 371 | /* |
372 | BOOL CARDbSendPacket (void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength) | 372 | bool CARDbSendPacket (void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength) |
373 | { | 373 | { |
374 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 374 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
375 | if (ePktType == PKT_TYPE_802_11_MNG) { | 375 | if (ePktType == PKT_TYPE_802_11_MNG) { |
@@ -397,7 +397,7 @@ BOOL CARDbSendPacket (void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktTyp | |||
397 | * Return Value: true if short preamble; otherwise false | 397 | * Return Value: true if short preamble; otherwise false |
398 | * | 398 | * |
399 | */ | 399 | */ |
400 | BOOL CARDbIsShortPreamble (void *pDeviceHandler) | 400 | bool CARDbIsShortPreamble (void *pDeviceHandler) |
401 | { | 401 | { |
402 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 402 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
403 | if (pDevice->byPreambleType == 0) { | 403 | if (pDevice->byPreambleType == 0) { |
@@ -418,7 +418,7 @@ BOOL CARDbIsShortPreamble (void *pDeviceHandler) | |||
418 | * Return Value: true if short slot time; otherwise false | 418 | * Return Value: true if short slot time; otherwise false |
419 | * | 419 | * |
420 | */ | 420 | */ |
421 | BOOL CARDbIsShorSlotTime (void *pDeviceHandler) | 421 | bool CARDbIsShorSlotTime (void *pDeviceHandler) |
422 | { | 422 | { |
423 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 423 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
424 | return(pDevice->bShortSlotTime); | 424 | return(pDevice->bShortSlotTime); |
@@ -437,7 +437,7 @@ BOOL CARDbIsShorSlotTime (void *pDeviceHandler) | |||
437 | * Return Value: None. | 437 | * Return Value: None. |
438 | * | 438 | * |
439 | */ | 439 | */ |
440 | BOOL CARDbSetPhyParameter (void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned short wCapInfo, unsigned char byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs) | 440 | bool CARDbSetPhyParameter (void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned short wCapInfo, unsigned char byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs) |
441 | { | 441 | { |
442 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 442 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
443 | unsigned char byCWMaxMin = 0; | 443 | unsigned char byCWMaxMin = 0; |
@@ -624,7 +624,7 @@ BOOL CARDbSetPhyParameter (void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigne | |||
624 | * Return Value: none | 624 | * Return Value: none |
625 | * | 625 | * |
626 | */ | 626 | */ |
627 | BOOL CARDbUpdateTSF (void *pDeviceHandler, unsigned char byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF) | 627 | bool CARDbUpdateTSF (void *pDeviceHandler, unsigned char byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF) |
628 | { | 628 | { |
629 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 629 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
630 | QWORD qwTSFOffset; | 630 | QWORD qwTSFOffset; |
@@ -659,7 +659,7 @@ BOOL CARDbUpdateTSF (void *pDeviceHandler, unsigned char byRxRate, QWORD qwBSSTi | |||
659 | * Return Value: true if succeed; otherwise false | 659 | * Return Value: true if succeed; otherwise false |
660 | * | 660 | * |
661 | */ | 661 | */ |
662 | BOOL CARDbSetBeaconPeriod (void *pDeviceHandler, unsigned short wBeaconInterval) | 662 | bool CARDbSetBeaconPeriod (void *pDeviceHandler, unsigned short wBeaconInterval) |
663 | { | 663 | { |
664 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 664 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
665 | unsigned int uBeaconInterval = 0; | 665 | unsigned int uBeaconInterval = 0; |
@@ -713,7 +713,7 @@ BOOL CARDbSetBeaconPeriod (void *pDeviceHandler, unsigned short wBeaconInterval) | |||
713 | * Return Value: true if all data packet complete; otherwise false. | 713 | * Return Value: true if all data packet complete; otherwise false. |
714 | * | 714 | * |
715 | */ | 715 | */ |
716 | BOOL CARDbStopTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) | 716 | bool CARDbStopTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) |
717 | { | 717 | { |
718 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 718 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
719 | 719 | ||
@@ -771,7 +771,7 @@ BOOL CARDbStopTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) | |||
771 | * Return Value: true if success; false if failed. | 771 | * Return Value: true if success; false if failed. |
772 | * | 772 | * |
773 | */ | 773 | */ |
774 | BOOL CARDbStartTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) | 774 | bool CARDbStartTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) |
775 | { | 775 | { |
776 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 776 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
777 | 777 | ||
@@ -813,7 +813,7 @@ BOOL CARDbStartTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) | |||
813 | * Return Value: true if success; false if failed. | 813 | * Return Value: true if success; false if failed. |
814 | * | 814 | * |
815 | */ | 815 | */ |
816 | BOOL CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE eOPMode) | 816 | bool CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE eOPMode) |
817 | { | 817 | { |
818 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 818 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
819 | 819 | ||
@@ -882,7 +882,7 @@ BOOL CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE e | |||
882 | * Return Value: true if succeed; otherwise false | 882 | * Return Value: true if succeed; otherwise false |
883 | * | 883 | * |
884 | */ | 884 | */ |
885 | BOOL CARDbSetTxDataRate( | 885 | bool CARDbSetTxDataRate( |
886 | void *pDeviceHandler, | 886 | void *pDeviceHandler, |
887 | unsigned short wDataRate | 887 | unsigned short wDataRate |
888 | ) | 888 | ) |
@@ -907,7 +907,7 @@ BOOL CARDbSetTxDataRate( | |||
907 | * Return Value: true if power down success; otherwise false | 907 | * Return Value: true if power down success; otherwise false |
908 | * | 908 | * |
909 | -*/ | 909 | -*/ |
910 | BOOL | 910 | bool |
911 | CARDbPowerDown( | 911 | CARDbPowerDown( |
912 | void *pDeviceHandler | 912 | void *pDeviceHandler |
913 | ) | 913 | ) |
@@ -946,10 +946,10 @@ CARDbPowerDown( | |||
946 | * Return Value: true if success; otherwise false | 946 | * Return Value: true if success; otherwise false |
947 | * | 947 | * |
948 | */ | 948 | */ |
949 | BOOL CARDbRadioPowerOff (void *pDeviceHandler) | 949 | bool CARDbRadioPowerOff (void *pDeviceHandler) |
950 | { | 950 | { |
951 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 951 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
952 | BOOL bResult = true; | 952 | bool bResult = true; |
953 | 953 | ||
954 | if (pDevice->bRadioOff == true) | 954 | if (pDevice->bRadioOff == true) |
955 | return true; | 955 | return true; |
@@ -995,10 +995,10 @@ MACvRegBitsOn(pDevice->PortOffset, MAC_REG_GPIOCTL0, LED_ACTSET); //LED issue | |||
995 | * Return Value: true if success; otherwise false | 995 | * Return Value: true if success; otherwise false |
996 | * | 996 | * |
997 | */ | 997 | */ |
998 | BOOL CARDbRadioPowerOn (void *pDeviceHandler) | 998 | bool CARDbRadioPowerOn (void *pDeviceHandler) |
999 | { | 999 | { |
1000 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 1000 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
1001 | BOOL bResult = true; | 1001 | bool bResult = true; |
1002 | printk("chester power on\n"); | 1002 | printk("chester power on\n"); |
1003 | if (pDevice->bRadioControlOff == true){ | 1003 | if (pDevice->bRadioControlOff == true){ |
1004 | if (pDevice->bHWRadioOff == true) printk("chester bHWRadioOff\n"); | 1004 | if (pDevice->bHWRadioOff == true) printk("chester bHWRadioOff\n"); |
@@ -1039,7 +1039,7 @@ MACvRegBitsOff(pDevice->PortOffset, MAC_REG_GPIOCTL0, LED_ACTSET); //LED issue | |||
1039 | 1039 | ||
1040 | 1040 | ||
1041 | 1041 | ||
1042 | BOOL CARDbRemoveKey (void *pDeviceHandler, unsigned char *pbyBSSID) | 1042 | bool CARDbRemoveKey (void *pDeviceHandler, unsigned char *pbyBSSID) |
1043 | { | 1043 | { |
1044 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 1044 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
1045 | 1045 | ||
@@ -1064,11 +1064,11 @@ BOOL CARDbRemoveKey (void *pDeviceHandler, unsigned char *pbyBSSID) | |||
1064 | * Return Value: none. | 1064 | * Return Value: none. |
1065 | * | 1065 | * |
1066 | -*/ | 1066 | -*/ |
1067 | BOOL | 1067 | bool |
1068 | CARDbAdd_PMKID_Candidate ( | 1068 | CARDbAdd_PMKID_Candidate ( |
1069 | void *pDeviceHandler, | 1069 | void *pDeviceHandler, |
1070 | unsigned char *pbyBSSID, | 1070 | unsigned char *pbyBSSID, |
1071 | BOOL bRSNCapExist, | 1071 | bool bRSNCapExist, |
1072 | unsigned short wRSNCap | 1072 | unsigned short wRSNCap |
1073 | ) | 1073 | ) |
1074 | { | 1074 | { |
@@ -1139,7 +1139,7 @@ CARDpGetCurrentAddress ( | |||
1139 | * Return Value: none. | 1139 | * Return Value: none. |
1140 | * | 1140 | * |
1141 | -*/ | 1141 | -*/ |
1142 | BOOL | 1142 | bool |
1143 | CARDbStartMeasure ( | 1143 | CARDbStartMeasure ( |
1144 | void *pDeviceHandler, | 1144 | void *pDeviceHandler, |
1145 | void *pvMeasureEIDs, | 1145 | void *pvMeasureEIDs, |
@@ -1150,7 +1150,7 @@ CARDbStartMeasure ( | |||
1150 | PWLAN_IE_MEASURE_REQ pEID = (PWLAN_IE_MEASURE_REQ) pvMeasureEIDs; | 1150 | PWLAN_IE_MEASURE_REQ pEID = (PWLAN_IE_MEASURE_REQ) pvMeasureEIDs; |
1151 | QWORD qwCurrTSF; | 1151 | QWORD qwCurrTSF; |
1152 | QWORD qwStartTSF; | 1152 | QWORD qwStartTSF; |
1153 | BOOL bExpired = true; | 1153 | bool bExpired = true; |
1154 | unsigned short wDuration = 0; | 1154 | unsigned short wDuration = 0; |
1155 | 1155 | ||
1156 | if ((pEID == NULL) || | 1156 | if ((pEID == NULL) || |
@@ -1266,7 +1266,7 @@ CARDbStartMeasure ( | |||
1266 | * Return Value: none. | 1266 | * Return Value: none. |
1267 | * | 1267 | * |
1268 | -*/ | 1268 | -*/ |
1269 | BOOL | 1269 | bool |
1270 | CARDbChannelSwitch ( | 1270 | CARDbChannelSwitch ( |
1271 | void *pDeviceHandler, | 1271 | void *pDeviceHandler, |
1272 | unsigned char byMode, | 1272 | unsigned char byMode, |
@@ -1275,7 +1275,7 @@ CARDbChannelSwitch ( | |||
1275 | ) | 1275 | ) |
1276 | { | 1276 | { |
1277 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 1277 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
1278 | BOOL bResult = true; | 1278 | bool bResult = true; |
1279 | 1279 | ||
1280 | if (byCount == 0) { | 1280 | if (byCount == 0) { |
1281 | bResult = set_channel(pDevice, byNewChannel); | 1281 | bResult = set_channel(pDevice, byNewChannel); |
@@ -1309,10 +1309,10 @@ CARDbChannelSwitch ( | |||
1309 | * Return Value: none. | 1309 | * Return Value: none. |
1310 | * | 1310 | * |
1311 | -*/ | 1311 | -*/ |
1312 | BOOL | 1312 | bool |
1313 | CARDbSetQuiet ( | 1313 | CARDbSetQuiet ( |
1314 | void *pDeviceHandler, | 1314 | void *pDeviceHandler, |
1315 | BOOL bResetQuiet, | 1315 | bool bResetQuiet, |
1316 | unsigned char byQuietCount, | 1316 | unsigned char byQuietCount, |
1317 | unsigned char byQuietPeriod, | 1317 | unsigned char byQuietPeriod, |
1318 | unsigned short wQuietDuration, | 1318 | unsigned short wQuietDuration, |
@@ -1365,7 +1365,7 @@ CARDbSetQuiet ( | |||
1365 | * Return Value: none. | 1365 | * Return Value: none. |
1366 | * | 1366 | * |
1367 | -*/ | 1367 | -*/ |
1368 | BOOL | 1368 | bool |
1369 | CARDbStartQuiet ( | 1369 | CARDbStartQuiet ( |
1370 | void *pDeviceHandler | 1370 | void *pDeviceHandler |
1371 | ) | 1371 | ) |
@@ -1946,7 +1946,7 @@ void CARDvUpdateBasicTopRate (void *pDeviceHandler) | |||
1946 | * Return Value: true if succeeded; false if failed. | 1946 | * Return Value: true if succeeded; false if failed. |
1947 | * | 1947 | * |
1948 | */ | 1948 | */ |
1949 | BOOL CARDbAddBasicRate (void *pDeviceHandler, unsigned short wRateIdx) | 1949 | bool CARDbAddBasicRate (void *pDeviceHandler, unsigned short wRateIdx) |
1950 | { | 1950 | { |
1951 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 1951 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
1952 | unsigned short wRate = (unsigned short)(1<<wRateIdx); | 1952 | unsigned short wRate = (unsigned short)(1<<wRateIdx); |
@@ -1959,7 +1959,7 @@ BOOL CARDbAddBasicRate (void *pDeviceHandler, unsigned short wRateIdx) | |||
1959 | return(true); | 1959 | return(true); |
1960 | } | 1960 | } |
1961 | 1961 | ||
1962 | BOOL CARDbIsOFDMinBasicRate (void *pDeviceHandler) | 1962 | bool CARDbIsOFDMinBasicRate (void *pDeviceHandler) |
1963 | { | 1963 | { |
1964 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 1964 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
1965 | int ii; | 1965 | int ii; |
@@ -2028,7 +2028,7 @@ void CARDvSetLoopbackMode (unsigned long dwIoBase, unsigned short wLoopbackMode) | |||
2028 | * Return Value: none | 2028 | * Return Value: none |
2029 | * | 2029 | * |
2030 | */ | 2030 | */ |
2031 | BOOL CARDbSoftwareReset (void *pDeviceHandler) | 2031 | bool CARDbSoftwareReset (void *pDeviceHandler) |
2032 | { | 2032 | { |
2033 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 2033 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
2034 | 2034 | ||
@@ -2092,7 +2092,7 @@ QWORD CARDqGetTSFOffset (unsigned char 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 | */ |
2095 | BOOL CARDbGetCurrentTSF (unsigned long dwIoBase, PQWORD pqwCurrTSF) | 2095 | bool CARDbGetCurrentTSF (unsigned long dwIoBase, PQWORD pqwCurrTSF) |
2096 | { | 2096 | { |
2097 | unsigned short ww; | 2097 | unsigned short ww; |
2098 | unsigned char byData; | 2098 | unsigned char byData; |
diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h index 4c5a085f4303..e0836e1d5116 100644 --- a/drivers/staging/vt6655/card.h +++ b/drivers/staging/vt6655/card.h | |||
@@ -30,6 +30,7 @@ | |||
30 | #define __CARD_H__ | 30 | #define __CARD_H__ |
31 | 31 | ||
32 | #include "ttype.h" | 32 | #include "ttype.h" |
33 | #include <linux/types.h> | ||
33 | 34 | ||
34 | /*--------------------- Export Definitions -------------------------*/ | 35 | /*--------------------- Export Definitions -------------------------*/ |
35 | // | 36 | // |
@@ -89,51 +90,51 @@ typedef enum _CARD_OP_MODE { | |||
89 | void CARDvSetRSPINF(void *pDeviceHandler, CARD_PHY_TYPE ePHYType); | 90 | void CARDvSetRSPINF(void *pDeviceHandler, CARD_PHY_TYPE ePHYType); |
90 | void vUpdateIFS(void *pDeviceHandler); | 91 | void vUpdateIFS(void *pDeviceHandler); |
91 | void CARDvUpdateBasicTopRate(void *pDeviceHandler); | 92 | void CARDvUpdateBasicTopRate(void *pDeviceHandler); |
92 | BOOL CARDbAddBasicRate(void *pDeviceHandler, unsigned short wRateIdx); | 93 | bool CARDbAddBasicRate(void *pDeviceHandler, unsigned short wRateIdx); |
93 | BOOL CARDbIsOFDMinBasicRate(void *pDeviceHandler); | 94 | bool CARDbIsOFDMinBasicRate(void *pDeviceHandler); |
94 | void CARDvSetLoopbackMode(unsigned long dwIoBase, unsigned short wLoopbackMode); | 95 | void CARDvSetLoopbackMode(unsigned long dwIoBase, unsigned short wLoopbackMode); |
95 | BOOL CARDbSoftwareReset(void *pDeviceHandler); | 96 | bool CARDbSoftwareReset(void *pDeviceHandler); |
96 | void CARDvSetFirstNextTBTT(unsigned long dwIoBase, unsigned short wBeaconInterval); | 97 | void CARDvSetFirstNextTBTT(unsigned long dwIoBase, unsigned short wBeaconInterval); |
97 | void CARDvUpdateNextTBTT(unsigned long dwIoBase, QWORD qwTSF, unsigned short wBeaconInterval); | 98 | void CARDvUpdateNextTBTT(unsigned long dwIoBase, QWORD qwTSF, unsigned short wBeaconInterval); |
98 | BOOL CARDbGetCurrentTSF(unsigned long dwIoBase, PQWORD pqwCurrTSF); | 99 | bool CARDbGetCurrentTSF(unsigned long dwIoBase, PQWORD pqwCurrTSF); |
99 | QWORD CARDqGetNextTBTT(QWORD qwTSF, unsigned short wBeaconInterval); | 100 | QWORD CARDqGetNextTBTT(QWORD qwTSF, unsigned short wBeaconInterval); |
100 | QWORD CARDqGetTSFOffset(unsigned char byRxRate, QWORD qwTSF1, QWORD qwTSF2); | 101 | QWORD CARDqGetTSFOffset(unsigned char byRxRate, QWORD qwTSF1, QWORD qwTSF2); |
101 | BOOL CARDbSetTxPower(void *pDeviceHandler, unsigned long ulTxPower); | 102 | bool CARDbSetTxPower(void *pDeviceHandler, unsigned long ulTxPower); |
102 | unsigned char CARDbyGetPktType(void *pDeviceHandler); | 103 | unsigned char CARDbyGetPktType(void *pDeviceHandler); |
103 | void CARDvSafeResetTx(void *pDeviceHandler); | 104 | void CARDvSafeResetTx(void *pDeviceHandler); |
104 | void CARDvSafeResetRx(void *pDeviceHandler); | 105 | void CARDvSafeResetRx(void *pDeviceHandler); |
105 | 106 | ||
106 | //xxx | 107 | //xxx |
107 | BOOL CARDbRadioPowerOff(void *pDeviceHandler); | 108 | bool CARDbRadioPowerOff(void *pDeviceHandler); |
108 | BOOL CARDbRadioPowerOn(void *pDeviceHandler); | 109 | bool CARDbRadioPowerOn(void *pDeviceHandler); |
109 | //BOOL CARDbSendPacket(void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength); | 110 | //bool CARDbSendPacket(void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength); |
110 | BOOL CARDbIsShortPreamble(void *pDeviceHandler); | 111 | bool CARDbIsShortPreamble(void *pDeviceHandler); |
111 | BOOL CARDbIsShorSlotTime(void *pDeviceHandler); | 112 | bool CARDbIsShorSlotTime(void *pDeviceHandler); |
112 | BOOL CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned short wCapInfo, unsigned char byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs); | 113 | bool CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned short wCapInfo, unsigned char byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs); |
113 | BOOL CARDbUpdateTSF(void *pDeviceHandler, unsigned char byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF); | 114 | bool CARDbUpdateTSF(void *pDeviceHandler, unsigned char byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF); |
114 | BOOL CARDbStopTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType); | 115 | bool CARDbStopTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType); |
115 | BOOL CARDbStartTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType); | 116 | bool CARDbStartTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType); |
116 | BOOL CARDbSetBeaconPeriod(void *pDeviceHandler, unsigned short wBeaconInterval); | 117 | bool CARDbSetBeaconPeriod(void *pDeviceHandler, unsigned short wBeaconInterval); |
117 | BOOL CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE eOPMode); | 118 | bool CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE eOPMode); |
118 | 119 | ||
119 | BOOL | 120 | bool |
120 | CARDbPowerDown( | 121 | CARDbPowerDown( |
121 | void *pDeviceHandler | 122 | void *pDeviceHandler |
122 | ); | 123 | ); |
123 | 124 | ||
124 | BOOL CARDbSetTxDataRate( | 125 | bool CARDbSetTxDataRate( |
125 | void *pDeviceHandler, | 126 | void *pDeviceHandler, |
126 | unsigned short wDataRate | 127 | unsigned short wDataRate |
127 | ); | 128 | ); |
128 | 129 | ||
129 | 130 | ||
130 | BOOL CARDbRemoveKey (void *pDeviceHandler, unsigned char *pbyBSSID); | 131 | bool CARDbRemoveKey (void *pDeviceHandler, unsigned char *pbyBSSID); |
131 | 132 | ||
132 | BOOL | 133 | bool |
133 | CARDbAdd_PMKID_Candidate ( | 134 | CARDbAdd_PMKID_Candidate ( |
134 | void *pDeviceHandler, | 135 | void *pDeviceHandler, |
135 | unsigned char *pbyBSSID, | 136 | unsigned char *pbyBSSID, |
136 | BOOL bRSNCapExist, | 137 | bool bRSNCapExist, |
137 | unsigned short wRSNCap | 138 | unsigned short wRSNCap |
138 | ); | 139 | ); |
139 | 140 | ||
@@ -142,14 +143,14 @@ CARDpGetCurrentAddress ( | |||
142 | void *pDeviceHandler | 143 | void *pDeviceHandler |
143 | ); | 144 | ); |
144 | 145 | ||
145 | BOOL | 146 | bool |
146 | CARDbStartMeasure ( | 147 | CARDbStartMeasure ( |
147 | void *pDeviceHandler, | 148 | void *pDeviceHandler, |
148 | void *pvMeasureEIDs, | 149 | void *pvMeasureEIDs, |
149 | unsigned int uNumOfMeasureEIDs | 150 | unsigned int uNumOfMeasureEIDs |
150 | ); | 151 | ); |
151 | 152 | ||
152 | BOOL | 153 | bool |
153 | CARDbChannelSwitch ( | 154 | CARDbChannelSwitch ( |
154 | void *pDeviceHandler, | 155 | void *pDeviceHandler, |
155 | unsigned char byMode, | 156 | unsigned char byMode, |
@@ -157,17 +158,17 @@ CARDbChannelSwitch ( | |||
157 | unsigned char byCount | 158 | unsigned char byCount |
158 | ); | 159 | ); |
159 | 160 | ||
160 | BOOL | 161 | bool |
161 | CARDbSetQuiet ( | 162 | CARDbSetQuiet ( |
162 | void *pDeviceHandler, | 163 | void *pDeviceHandler, |
163 | BOOL bResetQuiet, | 164 | bool bResetQuiet, |
164 | unsigned char byQuietCount, | 165 | unsigned char byQuietCount, |
165 | unsigned char byQuietPeriod, | 166 | unsigned char byQuietPeriod, |
166 | unsigned short wQuietDuration, | 167 | unsigned short wQuietDuration, |
167 | unsigned short wQuietOffset | 168 | unsigned short wQuietOffset |
168 | ); | 169 | ); |
169 | 170 | ||
170 | BOOL | 171 | bool |
171 | CARDbStartQuiet ( | 172 | CARDbStartQuiet ( |
172 | void *pDeviceHandler | 173 | void *pDeviceHandler |
173 | ); | 174 | ); |
diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c index 2aac9d16ea90..47c156bb70a9 100644 --- a/drivers/staging/vt6655/channel.c +++ b/drivers/staging/vt6655/channel.c | |||
@@ -373,9 +373,9 @@ static struct | |||
373 | * 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165 (Value 23 ~ 56) | 373 | * 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165 (Value 23 ~ 56) |
374 | */ | 374 | */ |
375 | 375 | ||
376 | BOOL is_channel_valid(unsigned int ChannelIndex) | 376 | bool is_channel_valid(unsigned int ChannelIndex) |
377 | { | 377 | { |
378 | BOOL bValid; | 378 | bool bValid; |
379 | 379 | ||
380 | bValid = false; | 380 | bValid = false; |
381 | /* | 381 | /* |
@@ -407,7 +407,7 @@ exit: | |||
407 | * 0x000000000000000F means channel 1,2,..15 are supported | 407 | * 0x000000000000000F means channel 1,2,..15 are supported |
408 | */ | 408 | */ |
409 | 409 | ||
410 | BOOL channel_get_list(unsigned int uCountryCodeIdx, unsigned char *pbyChannelTable) | 410 | bool channel_get_list(unsigned int uCountryCodeIdx, unsigned char *pbyChannelTable) |
411 | { | 411 | { |
412 | if (uCountryCodeIdx >= CCODE_MAX) | 412 | if (uCountryCodeIdx >= CCODE_MAX) |
413 | return (false); | 413 | return (false); |
@@ -420,7 +420,7 @@ BOOL channel_get_list(unsigned int uCountryCodeIdx, unsigned char *pbyChannelTab | |||
420 | void init_channel_table(void *pDeviceHandler) | 420 | void init_channel_table(void *pDeviceHandler) |
421 | { | 421 | { |
422 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 422 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
423 | BOOL bMultiBand = false; | 423 | bool bMultiBand = false; |
424 | unsigned int ii; | 424 | unsigned int ii; |
425 | 425 | ||
426 | for(ii = 1 ; ii<=CARD_MAX_CHANNEL_TBL ; ii++) { | 426 | for(ii = 1 ; ii<=CARD_MAX_CHANNEL_TBL ; ii++) { |
@@ -525,10 +525,10 @@ unsigned char get_channel_number(void *pDeviceHandler, unsigned char byChannelIn | |||
525 | * Return Value: true if succeeded; false if failed. | 525 | * Return Value: true if succeeded; false if failed. |
526 | * | 526 | * |
527 | */ | 527 | */ |
528 | BOOL set_channel (void *pDeviceHandler, unsigned int uConnectionChannel) | 528 | bool set_channel (void *pDeviceHandler, unsigned int uConnectionChannel) |
529 | { | 529 | { |
530 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 530 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
531 | BOOL bResult = true; | 531 | bool bResult = true; |
532 | 532 | ||
533 | 533 | ||
534 | if (pDevice->byCurrentCh == uConnectionChannel) { | 534 | if (pDevice->byCurrentCh == uConnectionChannel) { |
@@ -745,7 +745,7 @@ void set_country_IE(void *pDeviceHandler, void *pIE) | |||
745 | pIECountry->len += 3; | 745 | pIECountry->len += 3; |
746 | } | 746 | } |
747 | 747 | ||
748 | BOOL get_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex, | 748 | bool get_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex, |
749 | unsigned char *pbyChannelNumber, unsigned char *pbyMap) | 749 | unsigned char *pbyChannelNumber, unsigned char *pbyMap) |
750 | { | 750 | { |
751 | 751 | ||
diff --git a/drivers/staging/vt6655/channel.h b/drivers/staging/vt6655/channel.h index 0c82b44a8522..7038f0d3bde9 100644 --- a/drivers/staging/vt6655/channel.h +++ b/drivers/staging/vt6655/channel.h | |||
@@ -31,23 +31,23 @@ | |||
31 | typedef struct tagSChannelTblElement { | 31 | typedef struct tagSChannelTblElement { |
32 | unsigned char byChannelNumber; | 32 | unsigned char byChannelNumber; |
33 | unsigned int uFrequency; | 33 | unsigned int uFrequency; |
34 | BOOL bValid; | 34 | bool bValid; |
35 | unsigned char byMAP; | 35 | unsigned char byMAP; |
36 | }SChannelTblElement, *PSChannelTblElement; | 36 | }SChannelTblElement, *PSChannelTblElement; |
37 | 37 | ||
38 | 38 | ||
39 | /*--------------------- Export Functions --------------------------*/ | 39 | /*--------------------- Export Functions --------------------------*/ |
40 | 40 | ||
41 | BOOL is_channel_valid(unsigned int CountryCode); | 41 | bool is_channel_valid(unsigned int CountryCode); |
42 | void init_channel_table(void *pDeviceHandler); | 42 | void init_channel_table(void *pDeviceHandler); |
43 | unsigned char get_channel_mapping(void *pDeviceHandler, unsigned char byChannelNumber, CARD_PHY_TYPE ePhyType); | 43 | unsigned char get_channel_mapping(void *pDeviceHandler, unsigned char byChannelNumber, CARD_PHY_TYPE ePhyType); |
44 | BOOL channel_get_list(unsigned int uCountryCodeIdx, unsigned char *pbyChannelTable); | 44 | bool channel_get_list(unsigned int uCountryCodeIdx, unsigned char *pbyChannelTable); |
45 | unsigned char get_channel_number(void *pDeviceHandler, unsigned char byChannelIndex); | 45 | unsigned char get_channel_number(void *pDeviceHandler, unsigned char byChannelIndex); |
46 | BOOL set_channel(void *pDeviceHandler, unsigned int uConnectionChannel); | 46 | bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel); |
47 | void set_country_info(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, void *pIE); | 47 | void set_country_info(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, void *pIE); |
48 | unsigned char set_support_channels(void *pDeviceHandler, unsigned char *pbyIEs); | 48 | unsigned char set_support_channels(void *pDeviceHandler, unsigned char *pbyIEs); |
49 | void set_country_IE(void *pDeviceHandler, void *pIE); | 49 | void set_country_IE(void *pDeviceHandler, void *pIE); |
50 | BOOL get_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex, | 50 | bool get_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex, |
51 | unsigned char *pbyChannelNumber, unsigned char *pbyMap); | 51 | unsigned char *pbyChannelNumber, unsigned char *pbyMap); |
52 | void set_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex, | 52 | void set_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex, |
53 | unsigned char byMap); | 53 | unsigned char byMap); |
diff --git a/drivers/staging/vt6655/datarate.c b/drivers/staging/vt6655/datarate.c index acdc45afea53..efbb8f45f728 100644 --- a/drivers/staging/vt6655/datarate.c +++ b/drivers/staging/vt6655/datarate.c | |||
@@ -199,7 +199,7 @@ RATEvParseMaxRate ( | |||
199 | void *pDeviceHandler, | 199 | void *pDeviceHandler, |
200 | PWLAN_IE_SUPP_RATES pItemRates, | 200 | PWLAN_IE_SUPP_RATES pItemRates, |
201 | PWLAN_IE_SUPP_RATES pItemExtRates, | 201 | PWLAN_IE_SUPP_RATES pItemExtRates, |
202 | BOOL bUpdateBasicRate, | 202 | bool bUpdateBasicRate, |
203 | unsigned short *pwMaxBasicRate, | 203 | unsigned short *pwMaxBasicRate, |
204 | unsigned short *pwMaxSuppRate, | 204 | unsigned short *pwMaxSuppRate, |
205 | unsigned short *pwSuppRate, | 205 | unsigned short *pwSuppRate, |
@@ -317,7 +317,7 @@ PSDevice pDevice = (PSDevice) pDeviceHandler; | |||
317 | unsigned short wIdxDownRate = 0; | 317 | unsigned short wIdxDownRate = 0; |
318 | unsigned int ii; | 318 | unsigned int ii; |
319 | //unsigned long dwRateTable[MAX_RATE] = {1, 2, 5, 11, 6, 9, 12, 18, 24, 36, 48, 54}; | 319 | //unsigned long dwRateTable[MAX_RATE] = {1, 2, 5, 11, 6, 9, 12, 18, 24, 36, 48, 54}; |
320 | BOOL bAutoRate[MAX_RATE] = {true,true,true,true,false,false,true,true,true,true,true,true}; | 320 | bool bAutoRate[MAX_RATE] = {true,true,true,true,false,false,true,true,true,true,true,true}; |
321 | unsigned long dwThroughputTbl[MAX_RATE] = {10, 20, 55, 110, 60, 90, 120, 180, 240, 360, 480, 540}; | 321 | unsigned long dwThroughputTbl[MAX_RATE] = {10, 20, 55, 110, 60, 90, 120, 180, 240, 360, 480, 540}; |
322 | unsigned long dwThroughput = 0; | 322 | unsigned long dwThroughput = 0; |
323 | unsigned short wIdxUpRate = 0; | 323 | unsigned short wIdxUpRate = 0; |
diff --git a/drivers/staging/vt6655/datarate.h b/drivers/staging/vt6655/datarate.h index 307e441aea4d..4f8ea0b0532d 100644 --- a/drivers/staging/vt6655/datarate.h +++ b/drivers/staging/vt6655/datarate.h | |||
@@ -59,7 +59,7 @@ RATEvParseMaxRate( | |||
59 | void *pDeviceHandler, | 59 | void *pDeviceHandler, |
60 | PWLAN_IE_SUPP_RATES pItemRates, | 60 | PWLAN_IE_SUPP_RATES pItemRates, |
61 | PWLAN_IE_SUPP_RATES pItemExtRates, | 61 | PWLAN_IE_SUPP_RATES pItemExtRates, |
62 | BOOL bUpdateBasicRate, | 62 | bool bUpdateBasicRate, |
63 | unsigned short *pwMaxBasicRate, | 63 | unsigned short *pwMaxBasicRate, |
64 | unsigned short *pwMaxSuppRate, | 64 | unsigned short *pwMaxSuppRate, |
65 | unsigned short *pwSuppRate, | 65 | unsigned short *pwSuppRate, |
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 64ceb23db001..2e7c2fd7b7e6 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h | |||
@@ -279,7 +279,7 @@ typedef struct tagSPMKIDCandidateEvent { | |||
279 | #define MAX_QUIET_COUNT 8 | 279 | #define MAX_QUIET_COUNT 8 |
280 | 280 | ||
281 | typedef struct tagSQuietControl { | 281 | typedef struct tagSQuietControl { |
282 | BOOL bEnable; | 282 | bool bEnable; |
283 | unsigned long dwStartTime; | 283 | unsigned long dwStartTime; |
284 | unsigned char byPeriod; | 284 | unsigned char byPeriod; |
285 | unsigned short wDuration; | 285 | unsigned short wDuration; |
@@ -326,7 +326,7 @@ typedef struct tagSDeFragControlBlock | |||
326 | struct sk_buff* skb; | 326 | struct sk_buff* skb; |
327 | unsigned char *pbyRxBuffer; | 327 | unsigned char *pbyRxBuffer; |
328 | unsigned int cbFrameLength; | 328 | unsigned int cbFrameLength; |
329 | BOOL bInUse; | 329 | bool bInUse; |
330 | } SDeFragControlBlock, *PSDeFragControlBlock; | 330 | } SDeFragControlBlock, *PSDeFragControlBlock; |
331 | 331 | ||
332 | 332 | ||
@@ -480,10 +480,10 @@ typedef struct __device_info { | |||
480 | 480 | ||
481 | unsigned char byMaxPwrLevel; | 481 | unsigned char byMaxPwrLevel; |
482 | unsigned char byZoneType; | 482 | unsigned char byZoneType; |
483 | BOOL bZoneRegExist; | 483 | bool bZoneRegExist; |
484 | unsigned char byOriginalZonetype; | 484 | unsigned char byOriginalZonetype; |
485 | unsigned char abyMacContext[MAC_MAX_CONTEXT_REG]; | 485 | unsigned char abyMacContext[MAC_MAX_CONTEXT_REG]; |
486 | BOOL bLinkPass; // link status: OK or fail | 486 | bool bLinkPass; // link status: OK or fail |
487 | unsigned char abyCurrentNetAddr[ETH_ALEN]; | 487 | unsigned char abyCurrentNetAddr[ETH_ALEN]; |
488 | 488 | ||
489 | // Adapter statistics | 489 | // Adapter statistics |
@@ -505,7 +505,7 @@ typedef struct __device_info { | |||
505 | unsigned char byAntennaCount; | 505 | unsigned char byAntennaCount; |
506 | unsigned char byRxAntennaMode; | 506 | unsigned char byRxAntennaMode; |
507 | unsigned char byTxAntennaMode; | 507 | unsigned char byTxAntennaMode; |
508 | BOOL bTxRxAntInv; | 508 | bool bTxRxAntInv; |
509 | 509 | ||
510 | unsigned char *pbyTmpBuff; | 510 | unsigned char *pbyTmpBuff; |
511 | unsigned int uSIFS; //Current SIFS | 511 | unsigned int uSIFS; //Current SIFS |
@@ -544,7 +544,7 @@ typedef struct __device_info { | |||
544 | unsigned char byLongRetryLimit; | 544 | unsigned char byLongRetryLimit; |
545 | CARD_OP_MODE eOPMode; | 545 | CARD_OP_MODE eOPMode; |
546 | unsigned char byOpMode; | 546 | unsigned char byOpMode; |
547 | BOOL bBSSIDFilter; | 547 | bool bBSSIDFilter; |
548 | unsigned short wMaxTransmitMSDULifetime; | 548 | unsigned short wMaxTransmitMSDULifetime; |
549 | unsigned char abyBSSID[ETH_ALEN]; | 549 | unsigned char abyBSSID[ETH_ALEN]; |
550 | unsigned char abyDesireBSSID[ETH_ALEN]; | 550 | unsigned char abyDesireBSSID[ETH_ALEN]; |
@@ -556,51 +556,51 @@ typedef struct __device_info { | |||
556 | 556 | ||
557 | unsigned long dwMaxReceiveLifetime; // dot11MaxReceiveLifetime | 557 | unsigned long dwMaxReceiveLifetime; // dot11MaxReceiveLifetime |
558 | 558 | ||
559 | BOOL bCCK; | 559 | bool bCCK; |
560 | BOOL bEncryptionEnable; | 560 | bool bEncryptionEnable; |
561 | BOOL bLongHeader; | 561 | bool bLongHeader; |
562 | BOOL bShortSlotTime; | 562 | bool bShortSlotTime; |
563 | BOOL bProtectMode; | 563 | bool bProtectMode; |
564 | BOOL bNonERPPresent; | 564 | bool bNonERPPresent; |
565 | BOOL bBarkerPreambleMd; | 565 | bool bBarkerPreambleMd; |
566 | 566 | ||
567 | unsigned char byERPFlag; | 567 | unsigned char byERPFlag; |
568 | unsigned short wUseProtectCntDown; | 568 | unsigned short wUseProtectCntDown; |
569 | 569 | ||
570 | BOOL bRadioControlOff; | 570 | bool bRadioControlOff; |
571 | BOOL bRadioOff; | 571 | bool bRadioOff; |
572 | BOOL bEnablePSMode; | 572 | bool bEnablePSMode; |
573 | unsigned short wListenInterval; | 573 | unsigned short wListenInterval; |
574 | BOOL bPWBitOn; | 574 | bool bPWBitOn; |
575 | WMAC_POWER_MODE ePSMode; | 575 | WMAC_POWER_MODE ePSMode; |
576 | 576 | ||
577 | 577 | ||
578 | // GPIO Radio Control | 578 | // GPIO Radio Control |
579 | unsigned char byRadioCtl; | 579 | unsigned char byRadioCtl; |
580 | unsigned char byGPIO; | 580 | unsigned char byGPIO; |
581 | BOOL bHWRadioOff; | 581 | bool bHWRadioOff; |
582 | BOOL bPrvActive4RadioOFF; | 582 | bool bPrvActive4RadioOFF; |
583 | BOOL bGPIOBlockRead; | 583 | bool bGPIOBlockRead; |
584 | 584 | ||
585 | // Beacon releated | 585 | // Beacon releated |
586 | unsigned short wSeqCounter; | 586 | unsigned short wSeqCounter; |
587 | unsigned short wBCNBufLen; | 587 | unsigned short wBCNBufLen; |
588 | BOOL bBeaconBufReady; | 588 | bool bBeaconBufReady; |
589 | BOOL bBeaconSent; | 589 | bool bBeaconSent; |
590 | BOOL bIsBeaconBufReadySet; | 590 | bool bIsBeaconBufReadySet; |
591 | unsigned int cbBeaconBufReadySetCnt; | 591 | unsigned int cbBeaconBufReadySetCnt; |
592 | BOOL bFixRate; | 592 | bool bFixRate; |
593 | unsigned char byCurrentCh; | 593 | unsigned char byCurrentCh; |
594 | unsigned int uScanTime; | 594 | unsigned int uScanTime; |
595 | 595 | ||
596 | CMD_STATE eCommandState; | 596 | CMD_STATE eCommandState; |
597 | 597 | ||
598 | CMD_CODE eCommand; | 598 | CMD_CODE eCommand; |
599 | BOOL bBeaconTx; | 599 | bool bBeaconTx; |
600 | 600 | ||
601 | BOOL bStopBeacon; | 601 | bool bStopBeacon; |
602 | BOOL bStopDataPkt; | 602 | bool bStopDataPkt; |
603 | BOOL bStopTx0Pkt; | 603 | bool bStopTx0Pkt; |
604 | unsigned int uAutoReConnectTime; | 604 | unsigned int uAutoReConnectTime; |
605 | 605 | ||
606 | // 802.11 counter | 606 | // 802.11 counter |
@@ -609,18 +609,18 @@ typedef struct __device_info { | |||
609 | unsigned int uCmdDequeueIdx; | 609 | unsigned int uCmdDequeueIdx; |
610 | unsigned int uCmdEnqueueIdx; | 610 | unsigned int uCmdEnqueueIdx; |
611 | unsigned int cbFreeCmdQueue; | 611 | unsigned int cbFreeCmdQueue; |
612 | BOOL bCmdRunning; | 612 | bool bCmdRunning; |
613 | BOOL bCmdClear; | 613 | bool bCmdClear; |
614 | 614 | ||
615 | 615 | ||
616 | 616 | ||
617 | BOOL bRoaming; | 617 | bool bRoaming; |
618 | //WOW | 618 | //WOW |
619 | unsigned char abyIPAddr[4]; | 619 | unsigned char abyIPAddr[4]; |
620 | 620 | ||
621 | unsigned long ulTxPower; | 621 | unsigned long ulTxPower; |
622 | NDIS_802_11_WEP_STATUS eEncryptionStatus; | 622 | NDIS_802_11_WEP_STATUS eEncryptionStatus; |
623 | BOOL bTransmitKey; | 623 | bool bTransmitKey; |
624 | //2007-0925-01<Add>by MikeLiu | 624 | //2007-0925-01<Add>by MikeLiu |
625 | //mike add :save old Encryption | 625 | //mike add :save old Encryption |
626 | NDIS_802_11_WEP_STATUS eOldEncryptionStatus; | 626 | NDIS_802_11_WEP_STATUS eOldEncryptionStatus; |
@@ -637,31 +637,31 @@ typedef struct __device_info { | |||
637 | unsigned int uKeyLength; | 637 | unsigned int uKeyLength; |
638 | unsigned char abyKey[WLAN_WEP232_KEYLEN]; | 638 | unsigned char abyKey[WLAN_WEP232_KEYLEN]; |
639 | 639 | ||
640 | BOOL bAES; | 640 | bool bAES; |
641 | unsigned char byCntMeasure; | 641 | unsigned char byCntMeasure; |
642 | 642 | ||
643 | // for AP mode | 643 | // for AP mode |
644 | unsigned int uAssocCount; | 644 | unsigned int uAssocCount; |
645 | BOOL bMoreData; | 645 | bool bMoreData; |
646 | 646 | ||
647 | // QoS | 647 | // QoS |
648 | BOOL bGrpAckPolicy; | 648 | bool bGrpAckPolicy; |
649 | 649 | ||
650 | // for OID_802_11_ASSOCIATION_INFORMATION | 650 | // for OID_802_11_ASSOCIATION_INFORMATION |
651 | BOOL bAssocInfoSet; | 651 | bool bAssocInfoSet; |
652 | 652 | ||
653 | 653 | ||
654 | unsigned char byAutoFBCtrl; | 654 | unsigned char byAutoFBCtrl; |
655 | 655 | ||
656 | BOOL bTxMICFail; | 656 | bool bTxMICFail; |
657 | BOOL bRxMICFail; | 657 | bool bRxMICFail; |
658 | 658 | ||
659 | 659 | ||
660 | unsigned int uRATEIdx; | 660 | unsigned int uRATEIdx; |
661 | 661 | ||
662 | 662 | ||
663 | // For Update BaseBand VGA Gain Offset | 663 | // For Update BaseBand VGA Gain Offset |
664 | BOOL bUpdateBBVGA; | 664 | bool bUpdateBBVGA; |
665 | unsigned int uBBVGADiffCount; | 665 | unsigned int uBBVGADiffCount; |
666 | unsigned char byBBVGANew; | 666 | unsigned char byBBVGANew; |
667 | unsigned char byBBVGACurrent; | 667 | unsigned char byBBVGACurrent; |
@@ -672,7 +672,7 @@ typedef struct __device_info { | |||
672 | unsigned char byBBPreEDIndex; | 672 | unsigned char byBBPreEDIndex; |
673 | 673 | ||
674 | 674 | ||
675 | BOOL bRadioCmd; | 675 | bool bRadioCmd; |
676 | unsigned long dwDiagRefCount; | 676 | unsigned long dwDiagRefCount; |
677 | 677 | ||
678 | // For FOE Tuning | 678 | // For FOE Tuning |
@@ -713,12 +713,12 @@ typedef struct __device_info { | |||
713 | #ifdef TxInSleep | 713 | #ifdef TxInSleep |
714 | struct timer_list sTimerTxData; | 714 | struct timer_list sTimerTxData; |
715 | unsigned long nTxDataTimeCout; | 715 | unsigned long nTxDataTimeCout; |
716 | BOOL fTxDataInSleep; | 716 | bool fTxDataInSleep; |
717 | BOOL IsTxDataTrigger; | 717 | bool IsTxDataTrigger; |
718 | #endif | 718 | #endif |
719 | 719 | ||
720 | #ifdef WPA_SM_Transtatus | 720 | #ifdef WPA_SM_Transtatus |
721 | BOOL fWPA_Authened; //is WPA/WPA-PSK or WPA2/WPA2-PSK authen?? | 721 | bool fWPA_Authened; //is WPA/WPA-PSK or WPA2/WPA2-PSK authen?? |
722 | #endif | 722 | #endif |
723 | unsigned char byReAssocCount; //mike add:re-association retry times! | 723 | unsigned char byReAssocCount; //mike add:re-association retry times! |
724 | unsigned char byLinkWaitCount; | 724 | unsigned char byLinkWaitCount; |
@@ -726,8 +726,8 @@ typedef struct __device_info { | |||
726 | 726 | ||
727 | unsigned char abyNodeName[17]; | 727 | unsigned char abyNodeName[17]; |
728 | 728 | ||
729 | BOOL bDiversityRegCtlON; | 729 | bool bDiversityRegCtlON; |
730 | BOOL bDiversityEnable; | 730 | bool bDiversityEnable; |
731 | unsigned long ulDiversityNValue; | 731 | unsigned long ulDiversityNValue; |
732 | unsigned long ulDiversityMValue; | 732 | unsigned long ulDiversityMValue; |
733 | unsigned char byTMax; | 733 | unsigned char byTMax; |
@@ -763,12 +763,12 @@ typedef struct __device_info { | |||
763 | 763 | ||
764 | 764 | ||
765 | // for 802.11h | 765 | // for 802.11h |
766 | BOOL b11hEnable; | 766 | bool b11hEnable; |
767 | unsigned char abyCountryCode[3]; | 767 | unsigned char abyCountryCode[3]; |
768 | // for 802.11h DFS | 768 | // for 802.11h DFS |
769 | unsigned int uNumOfMeasureEIDs; | 769 | unsigned int uNumOfMeasureEIDs; |
770 | PWLAN_IE_MEASURE_REQ pCurrMeasureEID; | 770 | PWLAN_IE_MEASURE_REQ pCurrMeasureEID; |
771 | BOOL bMeasureInProgress; | 771 | bool bMeasureInProgress; |
772 | unsigned char byOrgChannel; | 772 | unsigned char byOrgChannel; |
773 | unsigned char byOrgRCR; | 773 | unsigned char byOrgRCR; |
774 | unsigned long dwOrgMAR0; | 774 | unsigned long dwOrgMAR0; |
@@ -777,50 +777,50 @@ typedef struct __device_info { | |||
777 | unsigned char byCCAFraction; | 777 | unsigned char byCCAFraction; |
778 | unsigned char abyRPIs[8]; | 778 | unsigned char abyRPIs[8]; |
779 | unsigned long dwRPIs[8]; | 779 | unsigned long dwRPIs[8]; |
780 | BOOL bChannelSwitch; | 780 | bool bChannelSwitch; |
781 | unsigned char byNewChannel; | 781 | unsigned char byNewChannel; |
782 | unsigned char byChannelSwitchCount; | 782 | unsigned char byChannelSwitchCount; |
783 | BOOL bQuietEnable; | 783 | bool bQuietEnable; |
784 | BOOL bEnableFirstQuiet; | 784 | bool bEnableFirstQuiet; |
785 | unsigned char byQuietStartCount; | 785 | unsigned char byQuietStartCount; |
786 | unsigned int uQuietEnqueue; | 786 | unsigned int uQuietEnqueue; |
787 | unsigned long dwCurrentQuietEndTime; | 787 | unsigned long dwCurrentQuietEndTime; |
788 | SQuietControl sQuiet[MAX_QUIET_COUNT]; | 788 | SQuietControl sQuiet[MAX_QUIET_COUNT]; |
789 | // for 802.11h TPC | 789 | // for 802.11h TPC |
790 | BOOL bCountryInfo5G; | 790 | bool bCountryInfo5G; |
791 | BOOL bCountryInfo24G; | 791 | bool bCountryInfo24G; |
792 | 792 | ||
793 | unsigned short wBeaconInterval; | 793 | unsigned short wBeaconInterval; |
794 | 794 | ||
795 | //WPA supplicant deamon | 795 | //WPA supplicant deamon |
796 | struct net_device *wpadev; | 796 | struct net_device *wpadev; |
797 | BOOL bWPADEVUp; | 797 | bool bWPADEVUp; |
798 | struct sk_buff *skb; | 798 | struct sk_buff *skb; |
799 | #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT | 799 | #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT |
800 | /* | 800 | /* |
801 | BOOL bwextstep0; | 801 | bool bwextstep0; |
802 | BOOL bwextstep1; | 802 | bool bwextstep1; |
803 | BOOL bwextstep2; | 803 | bool bwextstep2; |
804 | BOOL bwextstep3; | 804 | bool bwextstep3; |
805 | */ | 805 | */ |
806 | unsigned int bwextcount; | 806 | unsigned int bwextcount; |
807 | BOOL bWPASuppWextEnabled; | 807 | bool bWPASuppWextEnabled; |
808 | #endif | 808 | #endif |
809 | 809 | ||
810 | //-- | 810 | //-- |
811 | #ifdef HOSTAP | 811 | #ifdef HOSTAP |
812 | // user space daemon: hostapd, is used for HOSTAP | 812 | // user space daemon: hostapd, is used for HOSTAP |
813 | BOOL bEnableHostapd; | 813 | bool bEnableHostapd; |
814 | BOOL bEnable8021x; | 814 | bool bEnable8021x; |
815 | BOOL bEnableHostWEP; | 815 | bool bEnableHostWEP; |
816 | struct net_device *apdev; | 816 | struct net_device *apdev; |
817 | int (*tx_80211)(struct sk_buff *skb, struct net_device *dev); | 817 | int (*tx_80211)(struct sk_buff *skb, struct net_device *dev); |
818 | #endif | 818 | #endif |
819 | unsigned int uChannel; | 819 | unsigned int uChannel; |
820 | BOOL bMACSuspend; | 820 | bool bMACSuspend; |
821 | 821 | ||
822 | struct iw_statistics wstats; // wireless stats | 822 | struct iw_statistics wstats; // wireless stats |
823 | BOOL bCommit; | 823 | bool bCommit; |
824 | 824 | ||
825 | } DEVICE_INFO, *PSDevice; | 825 | } DEVICE_INFO, *PSDevice; |
826 | 826 | ||
@@ -880,7 +880,7 @@ void InitRxManagementQueue(PSDevice pDevice); | |||
880 | 880 | ||
881 | 881 | ||
882 | 882 | ||
883 | inline static BOOL device_get_ip(PSDevice pInfo) { | 883 | inline static bool device_get_ip(PSDevice pInfo) { |
884 | struct in_device* in_dev=(struct in_device*) pInfo->dev->ip_ptr; | 884 | struct in_device* in_dev=(struct in_device*) pInfo->dev->ip_ptr; |
885 | struct in_ifaddr* ifa; | 885 | struct in_ifaddr* ifa; |
886 | 886 | ||
@@ -920,9 +920,9 @@ static inline PDEVICE_TD_INFO alloc_td_info(void) { | |||
920 | 920 | ||
921 | /*--------------------- Export Functions --------------------------*/ | 921 | /*--------------------- Export Functions --------------------------*/ |
922 | 922 | ||
923 | BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeIndex); | 923 | bool device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeIndex); |
924 | BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF); | 924 | bool device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF); |
925 | int Config_FileOperation(PSDevice pDevice,BOOL fwrite,unsigned char *Parameter); | 925 | int Config_FileOperation(PSDevice pDevice, bool fwrite, unsigned char *Parameter); |
926 | #endif | 926 | #endif |
927 | 927 | ||
928 | 928 | ||
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 2acc3857c862..4d6b66a4fd9d 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c | |||
@@ -294,9 +294,9 @@ DEFINE_PCI_DEVICE_TABLE(vt6655_pci_id_table) = { | |||
294 | 294 | ||
295 | 295 | ||
296 | static int vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent); | 296 | static int vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent); |
297 | static BOOL vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice, PCHIP_INFO); | 297 | static bool vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice, PCHIP_INFO); |
298 | static void device_free_info(PSDevice pDevice); | 298 | static void device_free_info(PSDevice pDevice); |
299 | static BOOL device_get_pci_info(PSDevice, struct pci_dev* pcid); | 299 | static bool device_get_pci_info(PSDevice, struct pci_dev* pcid); |
300 | static void device_print_info(PSDevice pDevice); | 300 | static void device_print_info(PSDevice pDevice); |
301 | static struct net_device_stats *device_get_stats(struct net_device *dev); | 301 | static struct net_device_stats *device_get_stats(struct net_device *dev); |
302 | static void device_init_diversity_timer(PSDevice pDevice); | 302 | static void device_init_diversity_timer(PSDevice pDevice); |
@@ -327,12 +327,12 @@ static void device_init_td1_ring(PSDevice pDevice); | |||
327 | 327 | ||
328 | static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev); | 328 | static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev); |
329 | //2008-0714<Add>by Mike Liu | 329 | //2008-0714<Add>by Mike Liu |
330 | static BOOL device_release_WPADEV(PSDevice pDevice); | 330 | static bool device_release_WPADEV(PSDevice pDevice); |
331 | 331 | ||
332 | static int ethtool_ioctl(struct net_device *dev, void *useraddr); | 332 | static int ethtool_ioctl(struct net_device *dev, void *useraddr); |
333 | static int device_rx_srv(PSDevice pDevice, unsigned int uIdx); | 333 | static int device_rx_srv(PSDevice pDevice, unsigned int uIdx); |
334 | static int device_tx_srv(PSDevice pDevice, unsigned int uIdx); | 334 | static int device_tx_srv(PSDevice pDevice, unsigned int uIdx); |
335 | static BOOL device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pDesc); | 335 | static bool device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pDesc); |
336 | static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType); | 336 | static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType); |
337 | static void device_free_tx_buf(PSDevice pDevice, PSTxDesc pDesc); | 337 | static void device_free_tx_buf(PSDevice pDevice, PSTxDesc pDesc); |
338 | static void device_free_td0_ring(PSDevice pDevice); | 338 | static void device_free_td0_ring(PSDevice pDevice); |
@@ -386,7 +386,7 @@ device_set_int_opt(int *opt, int val, int min, int max, int def,char* name,char* | |||
386 | } | 386 | } |
387 | 387 | ||
388 | static void | 388 | static void |
389 | device_set_bool_opt(unsigned int *opt, int val,BOOL def,u32 flag, char* name,char* devname) { | 389 | device_set_bool_opt(unsigned int *opt, int val,bool def,u32 flag, char* name,char* devname) { |
390 | (*opt)&=(~flag); | 390 | (*opt)&=(~flag); |
391 | if (val==-1) | 391 | if (val==-1) |
392 | *opt|=(def ? flag : 0); | 392 | *opt|=(def ? flag : 0); |
@@ -870,7 +870,7 @@ static void device_init_diversity_timer(PSDevice pDevice) { | |||
870 | } | 870 | } |
871 | 871 | ||
872 | 872 | ||
873 | static BOOL device_release_WPADEV(PSDevice pDevice) | 873 | static bool device_release_WPADEV(PSDevice pDevice) |
874 | { | 874 | { |
875 | viawget_wpa_header *wpahdr; | 875 | viawget_wpa_header *wpahdr; |
876 | int ii=0; | 876 | int ii=0; |
@@ -919,7 +919,7 @@ static const struct net_device_ops device_netdev_ops = { | |||
919 | static int __devinit | 919 | static int __devinit |
920 | vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) | 920 | vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) |
921 | { | 921 | { |
922 | static BOOL bFirst = true; | 922 | static bool bFirst = true; |
923 | struct net_device* dev = NULL; | 923 | struct net_device* dev = NULL; |
924 | PCHIP_INFO pChip_info = (PCHIP_INFO)ent->driver_data; | 924 | PCHIP_INFO pChip_info = (PCHIP_INFO)ent->driver_data; |
925 | PSDevice pDevice; | 925 | PSDevice pDevice; |
@@ -1123,7 +1123,7 @@ static void device_print_info(PSDevice pDevice) | |||
1123 | 1123 | ||
1124 | } | 1124 | } |
1125 | 1125 | ||
1126 | static BOOL __devinit vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice, | 1126 | static bool __devinit vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice, |
1127 | PCHIP_INFO pChip_info) { | 1127 | PCHIP_INFO pChip_info) { |
1128 | 1128 | ||
1129 | PSDevice p; | 1129 | PSDevice p; |
@@ -1151,7 +1151,7 @@ static BOOL __devinit vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice, | |||
1151 | return true; | 1151 | return true; |
1152 | } | 1152 | } |
1153 | 1153 | ||
1154 | static BOOL device_get_pci_info(PSDevice pDevice, struct pci_dev* pcid) { | 1154 | static bool device_get_pci_info(PSDevice pDevice, struct pci_dev* pcid) { |
1155 | 1155 | ||
1156 | u16 pci_cmd; | 1156 | u16 pci_cmd; |
1157 | u8 b; | 1157 | u8 b; |
@@ -1266,7 +1266,7 @@ device_release_WPADEV(pDevice); | |||
1266 | } | 1266 | } |
1267 | } | 1267 | } |
1268 | 1268 | ||
1269 | static BOOL device_init_rings(PSDevice pDevice) { | 1269 | static bool device_init_rings(PSDevice pDevice) { |
1270 | void* vir_pool; | 1270 | void* vir_pool; |
1271 | 1271 | ||
1272 | 1272 | ||
@@ -1624,7 +1624,7 @@ static int device_rx_srv(PSDevice pDevice, unsigned int uIdx) { | |||
1624 | } | 1624 | } |
1625 | 1625 | ||
1626 | 1626 | ||
1627 | static BOOL device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pRD) { | 1627 | static bool device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pRD) { |
1628 | 1628 | ||
1629 | PDEVICE_RD_INFO pRDInfo=pRD->pRDInfo; | 1629 | PDEVICE_RD_INFO pRDInfo=pRD->pRDInfo; |
1630 | 1630 | ||
@@ -1651,7 +1651,7 @@ static BOOL device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pRD) { | |||
1651 | 1651 | ||
1652 | 1652 | ||
1653 | 1653 | ||
1654 | BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) { | 1654 | bool device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) { |
1655 | 1655 | ||
1656 | pDeF->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); | 1656 | pDeF->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); |
1657 | if (pDeF->skb == NULL) | 1657 | if (pDeF->skb == NULL) |
@@ -1666,7 +1666,7 @@ BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) { | |||
1666 | 1666 | ||
1667 | static int device_tx_srv(PSDevice pDevice, unsigned int uIdx) { | 1667 | static int device_tx_srv(PSDevice pDevice, unsigned int uIdx) { |
1668 | PSTxDesc pTD; | 1668 | PSTxDesc pTD; |
1669 | BOOL bFull=false; | 1669 | bool bFull=false; |
1670 | int works = 0; | 1670 | int works = 0; |
1671 | unsigned char byTsr0; | 1671 | unsigned char byTsr0; |
1672 | unsigned char byTsr1; | 1672 | unsigned char byTsr1; |
@@ -2118,13 +2118,13 @@ static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) { | |||
2118 | 2118 | ||
2119 | 2119 | ||
2120 | 2120 | ||
2121 | BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeIndex) { | 2121 | bool device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeIndex) { |
2122 | PSMgmtObject pMgmt = pDevice->pMgmt; | 2122 | PSMgmtObject pMgmt = pDevice->pMgmt; |
2123 | PSTxDesc pHeadTD, pLastTD; | 2123 | PSTxDesc pHeadTD, pLastTD; |
2124 | unsigned int cbFrameBodySize; | 2124 | unsigned int cbFrameBodySize; |
2125 | unsigned int uMACfragNum; | 2125 | unsigned int uMACfragNum; |
2126 | unsigned char byPktType; | 2126 | unsigned char byPktType; |
2127 | BOOL bNeedEncryption = false; | 2127 | bool bNeedEncryption = false; |
2128 | PSKeyItem pTransmitKey = NULL; | 2128 | PSKeyItem pTransmitKey = NULL; |
2129 | unsigned int cbHeaderSize; | 2129 | unsigned int cbHeaderSize; |
2130 | unsigned int ii; | 2130 | unsigned int ii; |
@@ -2279,14 +2279,14 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { | |||
2279 | unsigned int cbFrameBodySize; | 2279 | unsigned int cbFrameBodySize; |
2280 | unsigned char byPktType; | 2280 | unsigned char byPktType; |
2281 | unsigned int cbHeaderSize; | 2281 | unsigned int cbHeaderSize; |
2282 | BOOL bNeedEncryption = false; | 2282 | bool bNeedEncryption = false; |
2283 | PSKeyItem pTransmitKey = NULL; | 2283 | PSKeyItem pTransmitKey = NULL; |
2284 | SKeyItem STempKey; | 2284 | SKeyItem STempKey; |
2285 | unsigned int ii; | 2285 | unsigned int ii; |
2286 | BOOL bTKIP_UseGTK = false; | 2286 | bool bTKIP_UseGTK = false; |
2287 | BOOL bNeedDeAuth = false; | 2287 | bool bNeedDeAuth = false; |
2288 | unsigned char *pbyBSSID; | 2288 | unsigned char *pbyBSSID; |
2289 | BOOL bNodeExist = false; | 2289 | bool bNodeExist = false; |
2290 | 2290 | ||
2291 | 2291 | ||
2292 | 2292 | ||
@@ -2638,7 +2638,7 @@ pDevice->byTopCCKBasicRate,pDevice->byTopOFDMBasicRate); | |||
2638 | unsigned char Packet_Type; //802.1x Authentication | 2638 | unsigned char Packet_Type; //802.1x Authentication |
2639 | unsigned char Descriptor_type; | 2639 | unsigned char Descriptor_type; |
2640 | unsigned short Key_info; | 2640 | unsigned short Key_info; |
2641 | BOOL bTxeapol_key = false; | 2641 | bool bTxeapol_key = false; |
2642 | Protocol_Version = skb->data[ETH_HLEN]; | 2642 | Protocol_Version = skb->data[ETH_HLEN]; |
2643 | Packet_Type = skb->data[ETH_HLEN+1]; | 2643 | Packet_Type = skb->data[ETH_HLEN+1]; |
2644 | Descriptor_type = skb->data[ETH_HLEN+1+1+2]; | 2644 | Descriptor_type = skb->data[ETH_HLEN+1+1+2]; |
@@ -2996,7 +2996,7 @@ static int Config_FileGetParameter(unsigned char *string, | |||
2996 | return true; | 2996 | return true; |
2997 | } | 2997 | } |
2998 | 2998 | ||
2999 | int Config_FileOperation(PSDevice pDevice,BOOL fwrite,unsigned char *Parameter) { | 2999 | int Config_FileOperation(PSDevice pDevice,bool fwrite,unsigned char *Parameter) { |
3000 | unsigned char *config_path = CONFIG_PATH; | 3000 | unsigned char *config_path = CONFIG_PATH; |
3001 | unsigned char *buffer = NULL; | 3001 | unsigned char *buffer = NULL; |
3002 | unsigned char tmpbuffer[20]; | 3002 | unsigned char tmpbuffer[20]; |
diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c index 7ffd1b4d740c..15130733693e 100644 --- a/drivers/staging/vt6655/dpc.c +++ b/drivers/staging/vt6655/dpc.c | |||
@@ -85,10 +85,10 @@ s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize, | |||
85 | 85 | ||
86 | static void | 86 | static void |
87 | s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr, | 87 | s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr, |
88 | unsigned int cbPacketSize, BOOL bIsWEP, BOOL bExtIV, | 88 | unsigned int cbPacketSize, bool bIsWEP, bool bExtIV, |
89 | unsigned int *pcbHeadSize); | 89 | unsigned int *pcbHeadSize); |
90 | 90 | ||
91 | static BOOL s_bAPModeRxCtl( | 91 | static bool s_bAPModeRxCtl( |
92 | PSDevice pDevice, | 92 | PSDevice pDevice, |
93 | unsigned char *pbyFrame, | 93 | unsigned char *pbyFrame, |
94 | int iSANodeIndex | 94 | int iSANodeIndex |
@@ -96,7 +96,7 @@ static BOOL s_bAPModeRxCtl( | |||
96 | 96 | ||
97 | 97 | ||
98 | 98 | ||
99 | static BOOL s_bAPModeRxData ( | 99 | static bool s_bAPModeRxData ( |
100 | PSDevice pDevice, | 100 | PSDevice pDevice, |
101 | struct sk_buff* skb, | 101 | struct sk_buff* skb, |
102 | unsigned int FrameSize, | 102 | unsigned int FrameSize, |
@@ -106,28 +106,28 @@ static BOOL s_bAPModeRxData ( | |||
106 | ); | 106 | ); |
107 | 107 | ||
108 | 108 | ||
109 | static BOOL s_bHandleRxEncryption( | 109 | static bool s_bHandleRxEncryption( |
110 | PSDevice pDevice, | 110 | PSDevice pDevice, |
111 | unsigned char *pbyFrame, | 111 | unsigned char *pbyFrame, |
112 | unsigned int FrameSize, | 112 | unsigned int FrameSize, |
113 | unsigned char *pbyRsr, | 113 | unsigned char *pbyRsr, |
114 | unsigned char *pbyNewRsr, | 114 | unsigned char *pbyNewRsr, |
115 | PSKeyItem *pKeyOut, | 115 | PSKeyItem *pKeyOut, |
116 | int * pbExtIV, | 116 | bool *pbExtIV, |
117 | unsigned short *pwRxTSC15_0, | 117 | unsigned short *pwRxTSC15_0, |
118 | unsigned long *pdwRxTSC47_16 | 118 | unsigned long *pdwRxTSC47_16 |
119 | ); | 119 | ); |
120 | 120 | ||
121 | static BOOL s_bHostWepRxEncryption( | 121 | static bool s_bHostWepRxEncryption( |
122 | 122 | ||
123 | PSDevice pDevice, | 123 | PSDevice pDevice, |
124 | unsigned char *pbyFrame, | 124 | unsigned char *pbyFrame, |
125 | unsigned int FrameSize, | 125 | unsigned int FrameSize, |
126 | unsigned char *pbyRsr, | 126 | unsigned char *pbyRsr, |
127 | BOOL bOnFly, | 127 | bool bOnFly, |
128 | PSKeyItem pKey, | 128 | PSKeyItem pKey, |
129 | unsigned char *pbyNewRsr, | 129 | unsigned char *pbyNewRsr, |
130 | int * pbExtIV, | 130 | bool *pbExtIV, |
131 | unsigned short *pwRxTSC15_0, | 131 | unsigned short *pwRxTSC15_0, |
132 | unsigned long *pdwRxTSC47_16 | 132 | unsigned long *pdwRxTSC47_16 |
133 | 133 | ||
@@ -154,7 +154,7 @@ static BOOL s_bHostWepRxEncryption( | |||
154 | -*/ | 154 | -*/ |
155 | static void | 155 | static void |
156 | s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr, | 156 | s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr, |
157 | unsigned int cbPacketSize, BOOL bIsWEP, BOOL bExtIV, | 157 | unsigned int cbPacketSize, bool bIsWEP, bool bExtIV, |
158 | unsigned int *pcbHeadSize) | 158 | unsigned int *pcbHeadSize) |
159 | { | 159 | { |
160 | unsigned char *pbyRxBuffer; | 160 | unsigned char *pbyRxBuffer; |
@@ -313,7 +313,7 @@ void MngWorkItem(void *Context) | |||
313 | 313 | ||
314 | 314 | ||
315 | 315 | ||
316 | BOOL | 316 | bool |
317 | device_receive_frame ( | 317 | device_receive_frame ( |
318 | PSDevice pDevice, | 318 | PSDevice pDevice, |
319 | PSRxDesc pCurrRD | 319 | PSRxDesc pCurrRD |
@@ -335,8 +335,8 @@ device_receive_frame ( | |||
335 | PQWORD pqwTSFTime; | 335 | PQWORD pqwTSFTime; |
336 | unsigned short *pwFrameSize; | 336 | unsigned short *pwFrameSize; |
337 | unsigned char *pbyFrame; | 337 | unsigned char *pbyFrame; |
338 | BOOL bDeFragRx = false; | 338 | bool bDeFragRx = false; |
339 | BOOL bIsWEP = false; | 339 | bool bIsWEP = false; |
340 | unsigned int cbHeaderOffset; | 340 | unsigned int cbHeaderOffset; |
341 | unsigned int FrameSize; | 341 | unsigned int FrameSize; |
342 | unsigned short wEtherType = 0; | 342 | unsigned short wEtherType = 0; |
@@ -344,7 +344,7 @@ device_receive_frame ( | |||
344 | int iDANodeIndex = -1; | 344 | int iDANodeIndex = -1; |
345 | unsigned int ii; | 345 | unsigned int ii; |
346 | unsigned int cbIVOffset; | 346 | unsigned int cbIVOffset; |
347 | BOOL bExtIV = false; | 347 | bool bExtIV = false; |
348 | unsigned char *pbyRxSts; | 348 | unsigned char *pbyRxSts; |
349 | unsigned char *pbyRxRate; | 349 | unsigned char *pbyRxRate; |
350 | unsigned char *pbySQ; | 350 | unsigned char *pbySQ; |
@@ -358,7 +358,7 @@ device_receive_frame ( | |||
358 | long ldBm = 0; | 358 | long ldBm = 0; |
359 | long ldBmThreshold = 0; | 359 | long ldBmThreshold = 0; |
360 | PS802_11Header pMACHeader; | 360 | PS802_11Header pMACHeader; |
361 | BOOL bRxeapol_key = false; | 361 | bool bRxeapol_key = false; |
362 | 362 | ||
363 | // DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- device_receive_frame---\n"); | 363 | // DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- device_receive_frame---\n"); |
364 | 364 | ||
@@ -477,7 +477,7 @@ device_receive_frame ( | |||
477 | 477 | ||
478 | 478 | ||
479 | if (IS_FC_WEP(pbyFrame)) { | 479 | if (IS_FC_WEP(pbyFrame)) { |
480 | BOOL bRxDecryOK = false; | 480 | bool bRxDecryOK = false; |
481 | 481 | ||
482 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"rx WEP pkt\n"); | 482 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"rx WEP pkt\n"); |
483 | bIsWEP = true; | 483 | bIsWEP = true; |
@@ -1018,7 +1018,7 @@ device_receive_frame ( | |||
1018 | } | 1018 | } |
1019 | 1019 | ||
1020 | 1020 | ||
1021 | static BOOL s_bAPModeRxCtl ( | 1021 | static bool s_bAPModeRxCtl ( |
1022 | PSDevice pDevice, | 1022 | PSDevice pDevice, |
1023 | unsigned char *pbyFrame, | 1023 | unsigned char *pbyFrame, |
1024 | int iSANodeIndex | 1024 | int iSANodeIndex |
@@ -1142,14 +1142,14 @@ static BOOL s_bAPModeRxCtl ( | |||
1142 | 1142 | ||
1143 | } | 1143 | } |
1144 | 1144 | ||
1145 | static BOOL s_bHandleRxEncryption ( | 1145 | static bool s_bHandleRxEncryption ( |
1146 | PSDevice pDevice, | 1146 | PSDevice pDevice, |
1147 | unsigned char *pbyFrame, | 1147 | unsigned char *pbyFrame, |
1148 | unsigned int FrameSize, | 1148 | unsigned int FrameSize, |
1149 | unsigned char *pbyRsr, | 1149 | unsigned char *pbyRsr, |
1150 | unsigned char *pbyNewRsr, | 1150 | unsigned char *pbyNewRsr, |
1151 | PSKeyItem *pKeyOut, | 1151 | PSKeyItem *pKeyOut, |
1152 | int * pbExtIV, | 1152 | bool *pbExtIV, |
1153 | unsigned short *pwRxTSC15_0, | 1153 | unsigned short *pwRxTSC15_0, |
1154 | unsigned long *pdwRxTSC47_16 | 1154 | unsigned long *pdwRxTSC47_16 |
1155 | ) | 1155 | ) |
@@ -1288,15 +1288,15 @@ static BOOL s_bHandleRxEncryption ( | |||
1288 | } | 1288 | } |
1289 | 1289 | ||
1290 | 1290 | ||
1291 | static BOOL s_bHostWepRxEncryption ( | 1291 | static bool s_bHostWepRxEncryption ( |
1292 | PSDevice pDevice, | 1292 | PSDevice pDevice, |
1293 | unsigned char *pbyFrame, | 1293 | unsigned char *pbyFrame, |
1294 | unsigned int FrameSize, | 1294 | unsigned int FrameSize, |
1295 | unsigned char *pbyRsr, | 1295 | unsigned char *pbyRsr, |
1296 | BOOL bOnFly, | 1296 | bool bOnFly, |
1297 | PSKeyItem pKey, | 1297 | PSKeyItem pKey, |
1298 | unsigned char *pbyNewRsr, | 1298 | unsigned char *pbyNewRsr, |
1299 | int * pbExtIV, | 1299 | bool *pbExtIV, |
1300 | unsigned short *pwRxTSC15_0, | 1300 | unsigned short *pwRxTSC15_0, |
1301 | unsigned long *pdwRxTSC47_16 | 1301 | unsigned long *pdwRxTSC47_16 |
1302 | ) | 1302 | ) |
@@ -1419,7 +1419,7 @@ static BOOL s_bHostWepRxEncryption ( | |||
1419 | 1419 | ||
1420 | 1420 | ||
1421 | 1421 | ||
1422 | static BOOL s_bAPModeRxData ( | 1422 | static bool s_bAPModeRxData ( |
1423 | PSDevice pDevice, | 1423 | PSDevice pDevice, |
1424 | struct sk_buff* skb, | 1424 | struct sk_buff* skb, |
1425 | unsigned int FrameSize, | 1425 | unsigned int FrameSize, |
@@ -1429,8 +1429,8 @@ static BOOL s_bAPModeRxData ( | |||
1429 | ) | 1429 | ) |
1430 | { | 1430 | { |
1431 | PSMgmtObject pMgmt = pDevice->pMgmt; | 1431 | PSMgmtObject pMgmt = pDevice->pMgmt; |
1432 | BOOL bRelayAndForward = false; | 1432 | bool bRelayAndForward = false; |
1433 | BOOL bRelayOnly = false; | 1433 | bool bRelayOnly = false; |
1434 | unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; | 1434 | unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; |
1435 | unsigned short wAID; | 1435 | unsigned short wAID; |
1436 | 1436 | ||
diff --git a/drivers/staging/vt6655/dpc.h b/drivers/staging/vt6655/dpc.h index e574963fee0c..c1b6e76a421f 100644 --- a/drivers/staging/vt6655/dpc.h +++ b/drivers/staging/vt6655/dpc.h | |||
@@ -41,7 +41,7 @@ | |||
41 | 41 | ||
42 | /*--------------------- Export Functions --------------------------*/ | 42 | /*--------------------- Export Functions --------------------------*/ |
43 | 43 | ||
44 | BOOL | 44 | bool |
45 | device_receive_frame ( | 45 | device_receive_frame ( |
46 | PSDevice pDevice, | 46 | PSDevice pDevice, |
47 | PSRxDesc pCurrRD | 47 | PSRxDesc pCurrRD |
diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c index 89e3d48b4262..5b83f942cdab 100644 --- a/drivers/staging/vt6655/hostap.c +++ b/drivers/staging/vt6655/hostap.c | |||
@@ -479,7 +479,7 @@ static int hostap_set_encryption(PSDevice pDevice, | |||
479 | int ret = 0; | 479 | int ret = 0; |
480 | int iNodeIndex = -1; | 480 | int iNodeIndex = -1; |
481 | int ii; | 481 | int ii; |
482 | BOOL bKeyTableFull = false; | 482 | bool bKeyTableFull = false; |
483 | unsigned short wKeyCtl = 0; | 483 | unsigned short wKeyCtl = 0; |
484 | 484 | ||
485 | 485 | ||
diff --git a/drivers/staging/vt6655/iocmd.h b/drivers/staging/vt6655/iocmd.h index 3deaafae7df1..53c50c0fc813 100644 --- a/drivers/staging/vt6655/iocmd.h +++ b/drivers/staging/vt6655/iocmd.h | |||
@@ -37,7 +37,6 @@ | |||
37 | #define DEF | 37 | #define DEF |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | //typedef int BOOL; | ||
41 | //typedef uint32_t u32; | 40 | //typedef uint32_t u32; |
42 | //typedef uint16_t u16; | 41 | //typedef uint16_t u16; |
43 | //typedef uint8_t u8; | 42 | //typedef uint8_t u8; |
@@ -136,8 +135,8 @@ typedef struct tagSCmdBSSJoin { | |||
136 | u16 wBBPType; | 135 | u16 wBBPType; |
137 | u8 ssid[SSID_MAXLEN + 2]; | 136 | u8 ssid[SSID_MAXLEN + 2]; |
138 | u32 uChannel; | 137 | u32 uChannel; |
139 | BOOL bPSEnable; | 138 | bool bPSEnable; |
140 | BOOL bShareKeyAuth; | 139 | bool bShareKeyAuth; |
141 | 140 | ||
142 | } SCmdBSSJoin, *PSCmdBSSJoin; | 141 | } SCmdBSSJoin, *PSCmdBSSJoin; |
143 | 142 | ||
@@ -147,7 +146,7 @@ typedef struct tagSCmdBSSJoin { | |||
147 | 146 | ||
148 | typedef struct tagSCmdZoneTypeSet { | 147 | typedef struct tagSCmdZoneTypeSet { |
149 | 148 | ||
150 | BOOL bWrite; | 149 | bool bWrite; |
151 | WZONETYPE ZoneType; | 150 | WZONETYPE ZoneType; |
152 | 151 | ||
153 | } SCmdZoneTypeSet, *PSCmdZoneTypeSet; | 152 | } SCmdZoneTypeSet, *PSCmdZoneTypeSet; |
@@ -158,7 +157,7 @@ typedef struct tagSWPAResult { | |||
158 | u8 proto; | 157 | u8 proto; |
159 | u8 key_mgmt; | 158 | u8 key_mgmt; |
160 | u8 eap_type; | 159 | u8 eap_type; |
161 | BOOL authenticated; | 160 | bool authenticated; |
162 | } SWPAResult, *PSWPAResult; | 161 | } SWPAResult, *PSWPAResult; |
163 | #endif | 162 | #endif |
164 | 163 | ||
@@ -169,7 +168,7 @@ typedef struct tagSCmdStartAP { | |||
169 | u8 ssid[SSID_MAXLEN + 2]; | 168 | u8 ssid[SSID_MAXLEN + 2]; |
170 | u32 uChannel; | 169 | u32 uChannel; |
171 | u32 uBeaconInt; | 170 | u32 uBeaconInt; |
172 | BOOL bShareKeyAuth; | 171 | bool bShareKeyAuth; |
173 | u8 byBasicRate; | 172 | u8 byBasicRate; |
174 | 173 | ||
175 | } SCmdStartAP, *PSCmdStartAP; | 174 | } SCmdStartAP, *PSCmdStartAP; |
@@ -177,10 +176,10 @@ typedef struct tagSCmdStartAP { | |||
177 | 176 | ||
178 | typedef struct tagSCmdSetWEP { | 177 | typedef struct tagSCmdSetWEP { |
179 | 178 | ||
180 | BOOL bEnableWep; | 179 | bool bEnableWep; |
181 | u8 byKeyIndex; | 180 | u8 byKeyIndex; |
182 | u8 abyWepKey[WEP_NKEYS][WEP_KEYMAXLEN]; | 181 | u8 abyWepKey[WEP_NKEYS][WEP_KEYMAXLEN]; |
183 | BOOL bWepKeyAvailable[WEP_NKEYS]; | 182 | bool bWepKeyAvailable[WEP_NKEYS]; |
184 | u32 auWepKeyLength[WEP_NKEYS]; | 183 | u32 auWepKeyLength[WEP_NKEYS]; |
185 | 184 | ||
186 | } SCmdSetWEP, *PSCmdSetWEP; | 185 | } SCmdSetWEP, *PSCmdSetWEP; |
@@ -200,7 +199,7 @@ typedef struct tagSBSSIDItem { | |||
200 | u16 wBeaconInterval; | 199 | u16 wBeaconInterval; |
201 | u16 wCapInfo; // for address of byNetType at align 4 | 200 | u16 wCapInfo; // for address of byNetType at align 4 |
202 | 201 | ||
203 | BOOL bWEPOn; | 202 | bool bWEPOn; |
204 | u32 uRSSI; | 203 | u32 uRSSI; |
205 | 204 | ||
206 | } SBSSIDItem; | 205 | } SBSSIDItem; |
@@ -215,7 +214,7 @@ typedef struct tagSBSSIDList { | |||
215 | 214 | ||
216 | typedef struct tagSCmdLinkStatus { | 215 | typedef struct tagSCmdLinkStatus { |
217 | 216 | ||
218 | BOOL bLink; | 217 | bool bLink; |
219 | u16 wBSSType; | 218 | u16 wBSSType; |
220 | u8 byState; | 219 | u8 byState; |
221 | u8 abyBSSID[BSSID_LEN]; | 220 | u8 abyBSSID[BSSID_LEN]; |
@@ -359,12 +358,12 @@ typedef struct tagSNodeItem { | |||
359 | u16 wInActiveCount; | 358 | u16 wInActiveCount; |
360 | u16 wEnQueueCnt; | 359 | u16 wEnQueueCnt; |
361 | u16 wFlags; | 360 | u16 wFlags; |
362 | BOOL bPWBitOn; | 361 | bool bPWBitOn; |
363 | u8 byKeyIndex; | 362 | u8 byKeyIndex; |
364 | u16 wWepKeyLength; | 363 | u16 wWepKeyLength; |
365 | u8 abyWepKey[WEP_KEYMAXLEN]; | 364 | u8 abyWepKey[WEP_KEYMAXLEN]; |
366 | // Auto rate fallback vars | 365 | // Auto rate fallback vars |
367 | BOOL bIsInFallback; | 366 | bool bIsInFallback; |
368 | u32 uTxFailures; | 367 | u32 uTxFailures; |
369 | u32 uTxAttempts; | 368 | u32 uTxAttempts; |
370 | u16 wFailureRatio; | 369 | u16 wFailureRatio; |
diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c index 67b07208215a..0ff8d7bbf2a7 100644 --- a/drivers/staging/vt6655/key.c +++ b/drivers/staging/vt6655/key.c | |||
@@ -131,7 +131,7 @@ void KeyvInitTable (PSKeyManagement pTable, unsigned long dwIoBase) | |||
131 | * Return Value: true if found otherwise false | 131 | * Return Value: true if found otherwise false |
132 | * | 132 | * |
133 | */ | 133 | */ |
134 | BOOL KeybGetKey ( | 134 | bool KeybGetKey ( |
135 | PSKeyManagement pTable, | 135 | PSKeyManagement pTable, |
136 | unsigned char *pbyBSSID, | 136 | unsigned char *pbyBSSID, |
137 | unsigned long dwKeyIndex, | 137 | unsigned long dwKeyIndex, |
@@ -189,7 +189,7 @@ BOOL KeybGetKey ( | |||
189 | * Return Value: true if success otherwise false | 189 | * Return Value: true if success otherwise false |
190 | * | 190 | * |
191 | */ | 191 | */ |
192 | BOOL KeybSetKey ( | 192 | bool KeybSetKey ( |
193 | PSKeyManagement pTable, | 193 | PSKeyManagement pTable, |
194 | unsigned char *pbyBSSID, | 194 | unsigned char *pbyBSSID, |
195 | unsigned long dwKeyIndex, | 195 | unsigned long dwKeyIndex, |
@@ -362,7 +362,7 @@ BOOL KeybSetKey ( | |||
362 | * Return Value: true if success otherwise false | 362 | * Return Value: true if success otherwise false |
363 | * | 363 | * |
364 | */ | 364 | */ |
365 | BOOL KeybRemoveKey ( | 365 | bool KeybRemoveKey ( |
366 | PSKeyManagement pTable, | 366 | PSKeyManagement pTable, |
367 | unsigned char *pbyBSSID, | 367 | unsigned char *pbyBSSID, |
368 | unsigned long dwKeyIndex, | 368 | unsigned long dwKeyIndex, |
@@ -435,7 +435,7 @@ BOOL KeybRemoveKey ( | |||
435 | * Return Value: true if success otherwise false | 435 | * Return Value: true if success otherwise false |
436 | * | 436 | * |
437 | */ | 437 | */ |
438 | BOOL KeybRemoveAllKey ( | 438 | bool KeybRemoveAllKey ( |
439 | PSKeyManagement pTable, | 439 | PSKeyManagement pTable, |
440 | unsigned char *pbyBSSID, | 440 | unsigned char *pbyBSSID, |
441 | unsigned long dwIoBase | 441 | unsigned long dwIoBase |
@@ -517,7 +517,7 @@ void KeyvRemoveAllWEPKey ( | |||
517 | * Return Value: true if found otherwise false | 517 | * Return Value: true if found otherwise false |
518 | * | 518 | * |
519 | */ | 519 | */ |
520 | BOOL KeybGetTransmitKey ( | 520 | bool KeybGetTransmitKey ( |
521 | PSKeyManagement pTable, | 521 | PSKeyManagement pTable, |
522 | unsigned char *pbyBSSID, | 522 | unsigned char *pbyBSSID, |
523 | unsigned long dwKeyType, | 523 | unsigned long dwKeyType, |
@@ -597,7 +597,7 @@ BOOL KeybGetTransmitKey ( | |||
597 | * Return Value: true if found otherwise false | 597 | * Return Value: true if found otherwise false |
598 | * | 598 | * |
599 | */ | 599 | */ |
600 | BOOL KeybCheckPairewiseKey ( | 600 | bool KeybCheckPairewiseKey ( |
601 | PSKeyManagement pTable, | 601 | PSKeyManagement pTable, |
602 | PSKeyItem *pKey | 602 | PSKeyItem *pKey |
603 | ) | 603 | ) |
@@ -631,7 +631,7 @@ BOOL KeybCheckPairewiseKey ( | |||
631 | * Return Value: true if success otherwise false | 631 | * Return Value: true if success otherwise false |
632 | * | 632 | * |
633 | */ | 633 | */ |
634 | BOOL KeybSetDefaultKey ( | 634 | bool KeybSetDefaultKey ( |
635 | PSKeyManagement pTable, | 635 | PSKeyManagement pTable, |
636 | unsigned long dwKeyIndex, | 636 | unsigned long dwKeyIndex, |
637 | unsigned long uKeyLength, | 637 | unsigned long uKeyLength, |
@@ -738,7 +738,7 @@ BOOL KeybSetDefaultKey ( | |||
738 | * Return Value: true if success otherwise false | 738 | * Return Value: true if success otherwise false |
739 | * | 739 | * |
740 | */ | 740 | */ |
741 | BOOL KeybSetAllGroupKey ( | 741 | bool KeybSetAllGroupKey ( |
742 | PSKeyManagement pTable, | 742 | PSKeyManagement pTable, |
743 | unsigned long dwKeyIndex, | 743 | unsigned long dwKeyIndex, |
744 | unsigned long uKeyLength, | 744 | unsigned long uKeyLength, |
diff --git a/drivers/staging/vt6655/key.h b/drivers/staging/vt6655/key.h index a1f09a48eb6d..6b2dad331a5b 100644 --- a/drivers/staging/vt6655/key.h +++ b/drivers/staging/vt6655/key.h | |||
@@ -57,7 +57,7 @@ | |||
57 | 57 | ||
58 | typedef struct tagSKeyItem | 58 | typedef struct tagSKeyItem |
59 | { | 59 | { |
60 | BOOL bKeyValid; | 60 | bool bKeyValid; |
61 | unsigned long uKeyLength; | 61 | unsigned long uKeyLength; |
62 | unsigned char abyKey[MAX_KEY_LEN]; | 62 | unsigned char abyKey[MAX_KEY_LEN]; |
63 | QWORD KeyRSC; | 63 | QWORD KeyRSC; |
@@ -76,11 +76,11 @@ typedef struct tagSKeyTable | |||
76 | SKeyItem PairwiseKey; | 76 | SKeyItem PairwiseKey; |
77 | SKeyItem GroupKey[MAX_GROUP_KEY]; //64*5 = 320, 320+8=328 | 77 | SKeyItem GroupKey[MAX_GROUP_KEY]; //64*5 = 320, 320+8=328 |
78 | unsigned long dwGTKeyIndex; // GroupTransmitKey Index | 78 | unsigned long dwGTKeyIndex; // GroupTransmitKey Index |
79 | BOOL bInUse; | 79 | bool bInUse; |
80 | //2006-1116-01,<Modify> by NomadZhao | 80 | //2006-1116-01,<Modify> by NomadZhao |
81 | //unsigned short wKeyCtl; | 81 | //unsigned short wKeyCtl; |
82 | //BOOL bSoftWEP; | 82 | //bool bSoftWEP; |
83 | BOOL bSoftWEP; | 83 | bool bSoftWEP; |
84 | unsigned short wKeyCtl; // for address of wKeyCtl at align 4 | 84 | unsigned short wKeyCtl; // for address of wKeyCtl at align 4 |
85 | 85 | ||
86 | unsigned char byReserved1[6]; | 86 | unsigned char byReserved1[6]; |
@@ -103,14 +103,14 @@ typedef struct tagSKeyManagement | |||
103 | 103 | ||
104 | void KeyvInitTable(PSKeyManagement pTable, unsigned long dwIoBase); | 104 | void KeyvInitTable(PSKeyManagement pTable, unsigned long dwIoBase); |
105 | 105 | ||
106 | BOOL KeybGetKey( | 106 | bool KeybGetKey( |
107 | PSKeyManagement pTable, | 107 | PSKeyManagement pTable, |
108 | unsigned char *pbyBSSID, | 108 | unsigned char *pbyBSSID, |
109 | unsigned long dwKeyIndex, | 109 | unsigned long dwKeyIndex, |
110 | PSKeyItem *pKey | 110 | PSKeyItem *pKey |
111 | ); | 111 | ); |
112 | 112 | ||
113 | BOOL KeybSetKey( | 113 | bool KeybSetKey( |
114 | PSKeyManagement pTable, | 114 | PSKeyManagement pTable, |
115 | unsigned char *pbyBSSID, | 115 | unsigned char *pbyBSSID, |
116 | unsigned long dwKeyIndex, | 116 | unsigned long dwKeyIndex, |
@@ -122,7 +122,7 @@ BOOL KeybSetKey( | |||
122 | unsigned char byLocalID | 122 | unsigned char byLocalID |
123 | ); | 123 | ); |
124 | 124 | ||
125 | BOOL KeybSetDefaultKey( | 125 | bool KeybSetDefaultKey( |
126 | PSKeyManagement pTable, | 126 | PSKeyManagement pTable, |
127 | unsigned long dwKeyIndex, | 127 | unsigned long dwKeyIndex, |
128 | unsigned long uKeyLength, | 128 | unsigned long uKeyLength, |
@@ -133,26 +133,26 @@ BOOL KeybSetDefaultKey( | |||
133 | unsigned char byLocalID | 133 | unsigned char byLocalID |
134 | ); | 134 | ); |
135 | 135 | ||
136 | BOOL KeybRemoveKey( | 136 | bool KeybRemoveKey( |
137 | PSKeyManagement pTable, | 137 | PSKeyManagement pTable, |
138 | unsigned char *pbyBSSID, | 138 | unsigned char *pbyBSSID, |
139 | unsigned long dwKeyIndex, | 139 | unsigned long dwKeyIndex, |
140 | unsigned long dwIoBase | 140 | unsigned long dwIoBase |
141 | ); | 141 | ); |
142 | 142 | ||
143 | BOOL KeybGetTransmitKey( | 143 | bool KeybGetTransmitKey( |
144 | PSKeyManagement pTable, | 144 | PSKeyManagement pTable, |
145 | unsigned char *pbyBSSID, | 145 | unsigned char *pbyBSSID, |
146 | unsigned long dwKeyType, | 146 | unsigned long dwKeyType, |
147 | PSKeyItem *pKey | 147 | PSKeyItem *pKey |
148 | ); | 148 | ); |
149 | 149 | ||
150 | BOOL KeybCheckPairewiseKey( | 150 | bool KeybCheckPairewiseKey( |
151 | PSKeyManagement pTable, | 151 | PSKeyManagement pTable, |
152 | PSKeyItem *pKey | 152 | PSKeyItem *pKey |
153 | ); | 153 | ); |
154 | 154 | ||
155 | BOOL KeybRemoveAllKey( | 155 | bool KeybRemoveAllKey( |
156 | PSKeyManagement pTable, | 156 | PSKeyManagement pTable, |
157 | unsigned char *pbyBSSID, | 157 | unsigned char *pbyBSSID, |
158 | unsigned long dwIoBase | 158 | unsigned long dwIoBase |
@@ -169,7 +169,7 @@ void KeyvRemoveAllWEPKey( | |||
169 | unsigned long dwIoBase | 169 | unsigned long dwIoBase |
170 | ); | 170 | ); |
171 | 171 | ||
172 | BOOL KeybSetAllGroupKey ( | 172 | bool KeybSetAllGroupKey ( |
173 | PSKeyManagement pTable, | 173 | PSKeyManagement pTable, |
174 | unsigned long dwKeyIndex, | 174 | unsigned long dwKeyIndex, |
175 | unsigned long uKeyLength, | 175 | unsigned long uKeyLength, |
diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index afeccd2449ef..f8d1651341f8 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c | |||
@@ -140,7 +140,7 @@ void MACvReadAllRegs (unsigned long 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 | */ |
143 | BOOL MACbIsRegBitsOn (unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits) | 143 | bool MACbIsRegBitsOn (unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits) |
144 | { | 144 | { |
145 | unsigned char byData; | 145 | unsigned char byData; |
146 | 146 | ||
@@ -163,7 +163,7 @@ BOOL MACbIsRegBitsOn (unsigned long dwIoBase, unsigned char byRegOfs, unsigned c | |||
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 | */ |
166 | BOOL MACbIsRegBitsOff (unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits) | 166 | bool MACbIsRegBitsOff (unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits) |
167 | { | 167 | { |
168 | unsigned char byData; | 168 | unsigned char byData; |
169 | 169 | ||
@@ -184,7 +184,7 @@ BOOL MACbIsRegBitsOff (unsigned long dwIoBase, unsigned char byRegOfs, unsigned | |||
184 | * Return Value: true if interrupt is disable; otherwise false | 184 | * Return Value: true if interrupt is disable; otherwise false |
185 | * | 185 | * |
186 | */ | 186 | */ |
187 | BOOL MACbIsIntDisable (unsigned long dwIoBase) | 187 | bool MACbIsIntDisable (unsigned long dwIoBase) |
188 | { | 188 | { |
189 | unsigned long dwData; | 189 | unsigned long dwData; |
190 | 190 | ||
@@ -559,7 +559,7 @@ void MACvSetLoopbackMode (unsigned long dwIoBase, unsigned char 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 | */ |
562 | BOOL MACbIsInLoopbackMode (unsigned long dwIoBase) | 562 | bool MACbIsInLoopbackMode (unsigned long dwIoBase) |
563 | { | 563 | { |
564 | unsigned char byOrgValue; | 564 | unsigned char byOrgValue; |
565 | 565 | ||
@@ -728,7 +728,7 @@ void MACvRestoreContext (unsigned long 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 | */ |
731 | BOOL MACbCompareContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf) | 731 | bool MACbCompareContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf) |
732 | { | 732 | { |
733 | unsigned long dwData; | 733 | unsigned long dwData; |
734 | 734 | ||
@@ -773,7 +773,7 @@ BOOL MACbCompareContext (unsigned long 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 | */ |
776 | BOOL MACbSoftwareReset (unsigned long dwIoBase) | 776 | bool MACbSoftwareReset (unsigned long dwIoBase) |
777 | { | 777 | { |
778 | unsigned char byData; | 778 | unsigned char byData; |
779 | unsigned short ww; | 779 | unsigned short ww; |
@@ -806,10 +806,10 @@ BOOL MACbSoftwareReset (unsigned long dwIoBase) | |||
806 | * Return Value: true if success; otherwise false | 806 | * Return Value: true if success; otherwise false |
807 | * | 807 | * |
808 | */ | 808 | */ |
809 | BOOL MACbSafeSoftwareReset (unsigned long dwIoBase) | 809 | bool MACbSafeSoftwareReset (unsigned long dwIoBase) |
810 | { | 810 | { |
811 | unsigned char abyTmpRegData[MAC_MAX_CONTEXT_SIZE_PAGE0+MAC_MAX_CONTEXT_SIZE_PAGE1]; | 811 | unsigned char abyTmpRegData[MAC_MAX_CONTEXT_SIZE_PAGE0+MAC_MAX_CONTEXT_SIZE_PAGE1]; |
812 | BOOL bRetVal; | 812 | bool bRetVal; |
813 | 813 | ||
814 | // PATCH.... | 814 | // PATCH.... |
815 | // save some important register's value, then do | 815 | // save some important register's value, then do |
@@ -839,7 +839,7 @@ BOOL MACbSafeSoftwareReset (unsigned long dwIoBase) | |||
839 | * Return Value: true if success; otherwise false | 839 | * Return Value: true if success; otherwise false |
840 | * | 840 | * |
841 | */ | 841 | */ |
842 | BOOL MACbSafeRxOff (unsigned long dwIoBase) | 842 | bool MACbSafeRxOff (unsigned long dwIoBase) |
843 | { | 843 | { |
844 | unsigned short ww; | 844 | unsigned short ww; |
845 | unsigned long dwData; | 845 | unsigned long dwData; |
@@ -900,7 +900,7 @@ BOOL MACbSafeRxOff (unsigned long dwIoBase) | |||
900 | * Return Value: true if success; otherwise false | 900 | * Return Value: true if success; otherwise false |
901 | * | 901 | * |
902 | */ | 902 | */ |
903 | BOOL MACbSafeTxOff (unsigned long dwIoBase) | 903 | bool MACbSafeTxOff (unsigned long dwIoBase) |
904 | { | 904 | { |
905 | unsigned short ww; | 905 | unsigned short ww; |
906 | unsigned long dwData; | 906 | unsigned long dwData; |
@@ -964,7 +964,7 @@ BOOL MACbSafeTxOff (unsigned long dwIoBase) | |||
964 | * Return Value: true if success; otherwise false | 964 | * Return Value: true if success; otherwise false |
965 | * | 965 | * |
966 | */ | 966 | */ |
967 | BOOL MACbSafeStop (unsigned long dwIoBase) | 967 | bool 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 (unsigned long dwIoBase) | |||
999 | * Return Value: true if success; otherwise false | 999 | * Return Value: true if success; otherwise false |
1000 | * | 1000 | * |
1001 | */ | 1001 | */ |
1002 | BOOL MACbShutdown (unsigned long dwIoBase) | 1002 | bool MACbShutdown (unsigned long dwIoBase) |
1003 | { | 1003 | { |
1004 | // disable MAC IMR | 1004 | // disable MAC IMR |
1005 | MACvIntDisable(dwIoBase); | 1005 | MACvIntDisable(dwIoBase); |
@@ -1319,7 +1319,7 @@ void MACvSetMISCFifo (unsigned long dwIoBase, unsigned short wOffset, unsigned l | |||
1319 | } | 1319 | } |
1320 | 1320 | ||
1321 | 1321 | ||
1322 | BOOL MACbTxDMAOff (unsigned long dwIoBase, unsigned int idx) | 1322 | bool MACbTxDMAOff (unsigned long dwIoBase, unsigned int idx) |
1323 | { | 1323 | { |
1324 | unsigned char byData; | 1324 | unsigned char byData; |
1325 | unsigned int ww = 0; | 1325 | unsigned int ww = 0; |
@@ -1391,7 +1391,7 @@ void MACvEnableBusSusEn (unsigned long dwIoBase) | |||
1391 | } | 1391 | } |
1392 | } | 1392 | } |
1393 | 1393 | ||
1394 | BOOL MACbFlushSYNCFifo (unsigned long dwIoBase) | 1394 | bool MACbFlushSYNCFifo (unsigned long dwIoBase) |
1395 | { | 1395 | { |
1396 | unsigned char byOrgValue; | 1396 | unsigned char byOrgValue; |
1397 | unsigned int ww; | 1397 | unsigned int ww; |
@@ -1415,7 +1415,7 @@ BOOL MACbFlushSYNCFifo (unsigned long dwIoBase) | |||
1415 | return true; | 1415 | return true; |
1416 | } | 1416 | } |
1417 | 1417 | ||
1418 | BOOL MACbPSWakeup (unsigned long dwIoBase) | 1418 | bool MACbPSWakeup (unsigned long dwIoBase) |
1419 | { | 1419 | { |
1420 | unsigned char byOrgValue; | 1420 | unsigned char byOrgValue; |
1421 | unsigned int ww; | 1421 | unsigned int ww; |
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index ad3459f42332..b96d27ee2540 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h | |||
@@ -1077,10 +1077,10 @@ | |||
1077 | extern unsigned short TxRate_iwconfig;//2008-5-8 <add> by chester | 1077 | extern unsigned short TxRate_iwconfig;//2008-5-8 <add> by chester |
1078 | void MACvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyMacRegs); | 1078 | void MACvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyMacRegs); |
1079 | 1079 | ||
1080 | BOOL MACbIsRegBitsOn(unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits); | 1080 | bool MACbIsRegBitsOn(unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits); |
1081 | BOOL MACbIsRegBitsOff(unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits); | 1081 | bool MACbIsRegBitsOff(unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits); |
1082 | 1082 | ||
1083 | BOOL MACbIsIntDisable(unsigned long dwIoBase); | 1083 | bool MACbIsIntDisable(unsigned long dwIoBase); |
1084 | 1084 | ||
1085 | unsigned char MACbyReadMultiAddr(unsigned long dwIoBase, unsigned int uByteIdx); | 1085 | unsigned char MACbyReadMultiAddr(unsigned long dwIoBase, unsigned int uByteIdx); |
1086 | void MACvWriteMultiAddr(unsigned long dwIoBase, unsigned int uByteIdx, unsigned char byData); | 1086 | void MACvWriteMultiAddr(unsigned long dwIoBase, unsigned int uByteIdx, unsigned char byData); |
@@ -1103,20 +1103,20 @@ void MACvSetLongRetryLimit(unsigned long dwIoBase, unsigned char byRetryLimit); | |||
1103 | void MACvGetLongRetryLimit(unsigned long dwIoBase, unsigned char *pbyRetryLimit); | 1103 | void MACvGetLongRetryLimit(unsigned long dwIoBase, unsigned char *pbyRetryLimit); |
1104 | 1104 | ||
1105 | void MACvSetLoopbackMode(unsigned long dwIoBase, unsigned char byLoopbackMode); | 1105 | void MACvSetLoopbackMode(unsigned long dwIoBase, unsigned char byLoopbackMode); |
1106 | BOOL MACbIsInLoopbackMode(unsigned long dwIoBase); | 1106 | bool MACbIsInLoopbackMode(unsigned long dwIoBase); |
1107 | 1107 | ||
1108 | void MACvSetPacketFilter(unsigned long dwIoBase, unsigned short wFilterType); | 1108 | void MACvSetPacketFilter(unsigned long dwIoBase, unsigned short wFilterType); |
1109 | 1109 | ||
1110 | void MACvSaveContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); | 1110 | void MACvSaveContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); |
1111 | void MACvRestoreContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); | 1111 | void MACvRestoreContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); |
1112 | BOOL MACbCompareContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); | 1112 | bool MACbCompareContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); |
1113 | 1113 | ||
1114 | BOOL MACbSoftwareReset(unsigned long dwIoBase); | 1114 | bool MACbSoftwareReset(unsigned long dwIoBase); |
1115 | BOOL MACbSafeSoftwareReset(unsigned long dwIoBase); | 1115 | bool MACbSafeSoftwareReset(unsigned long dwIoBase); |
1116 | BOOL MACbSafeRxOff(unsigned long dwIoBase); | 1116 | bool MACbSafeRxOff(unsigned long dwIoBase); |
1117 | BOOL MACbSafeTxOff(unsigned long dwIoBase); | 1117 | bool MACbSafeTxOff(unsigned long dwIoBase); |
1118 | BOOL MACbSafeStop(unsigned long dwIoBase); | 1118 | bool MACbSafeStop(unsigned long dwIoBase); |
1119 | BOOL MACbShutdown(unsigned long dwIoBase); | 1119 | bool MACbShutdown(unsigned long dwIoBase); |
1120 | void MACvInitialize(unsigned long dwIoBase); | 1120 | void MACvInitialize(unsigned long dwIoBase); |
1121 | void MACvSetCurrRx0DescAddr(unsigned long dwIoBase, unsigned long dwCurrDescAddr); | 1121 | void MACvSetCurrRx0DescAddr(unsigned long dwIoBase, unsigned long dwCurrDescAddr); |
1122 | void MACvSetCurrRx1DescAddr(unsigned long dwIoBase, unsigned long dwCurrDescAddr); | 1122 | void MACvSetCurrRx1DescAddr(unsigned long dwIoBase, unsigned long dwCurrDescAddr); |
@@ -1131,13 +1131,13 @@ void MACvOneShotTimer1MicroSec(unsigned long dwIoBase, unsigned int uDelayTime); | |||
1131 | 1131 | ||
1132 | void MACvSetMISCFifo(unsigned long dwIoBase, unsigned short wOffset, unsigned long dwData); | 1132 | void MACvSetMISCFifo(unsigned long dwIoBase, unsigned short wOffset, unsigned long dwData); |
1133 | 1133 | ||
1134 | BOOL MACbTxDMAOff (unsigned long dwIoBase, unsigned int idx); | 1134 | bool MACbTxDMAOff (unsigned long dwIoBase, unsigned int idx); |
1135 | 1135 | ||
1136 | void MACvClearBusSusInd(unsigned long dwIoBase); | 1136 | void MACvClearBusSusInd(unsigned long dwIoBase); |
1137 | void MACvEnableBusSusEn(unsigned long dwIoBase); | 1137 | void MACvEnableBusSusEn(unsigned long dwIoBase); |
1138 | 1138 | ||
1139 | BOOL MACbFlushSYNCFifo(unsigned long dwIoBase); | 1139 | bool MACbFlushSYNCFifo(unsigned long dwIoBase); |
1140 | BOOL MACbPSWakeup(unsigned long dwIoBase); | 1140 | bool MACbPSWakeup(unsigned long dwIoBase); |
1141 | 1141 | ||
1142 | void MACvSetKeyEntry(unsigned long dwIoBase, unsigned short wKeyCtl, unsigned int uEntryIdx, | 1142 | void MACvSetKeyEntry(unsigned long dwIoBase, unsigned short wKeyCtl, unsigned int uEntryIdx, |
1143 | unsigned int uKeyIdx, unsigned char *pbyAddr, unsigned long *pdwKey, unsigned char byLocalID); | 1143 | unsigned int uKeyIdx, unsigned char *pbyAddr, unsigned long *pdwKey, unsigned char byLocalID); |
diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c index cadd12e7eb24..7207aca13012 100644 --- a/drivers/staging/vt6655/power.c +++ b/drivers/staging/vt6655/power.c | |||
@@ -182,11 +182,11 @@ PSvDisablePowerSaving( | |||
182 | -*/ | 182 | -*/ |
183 | 183 | ||
184 | 184 | ||
185 | BOOL | 185 | bool |
186 | PSbConsiderPowerDown( | 186 | PSbConsiderPowerDown( |
187 | void *hDeviceContext, | 187 | void *hDeviceContext, |
188 | BOOL bCheckRxDMA, | 188 | bool bCheckRxDMA, |
189 | BOOL bCheckCountToWakeUp | 189 | bool bCheckCountToWakeUp |
190 | ) | 190 | ) |
191 | { | 191 | { |
192 | PSDevice pDevice = (PSDevice)hDeviceContext; | 192 | PSDevice pDevice = (PSDevice)hDeviceContext; |
@@ -296,7 +296,7 @@ PSvSendPSPOLL( | |||
296 | * None. | 296 | * None. |
297 | * | 297 | * |
298 | -*/ | 298 | -*/ |
299 | BOOL | 299 | bool |
300 | PSbSendNullPacket( | 300 | PSbSendNullPacket( |
301 | void *hDeviceContext | 301 | void *hDeviceContext |
302 | ) | 302 | ) |
@@ -382,7 +382,7 @@ PSbSendNullPacket( | |||
382 | * | 382 | * |
383 | -*/ | 383 | -*/ |
384 | 384 | ||
385 | BOOL | 385 | bool |
386 | PSbIsNextTBTTWakeUp( | 386 | PSbIsNextTBTTWakeUp( |
387 | void *hDeviceContext | 387 | void *hDeviceContext |
388 | ) | 388 | ) |
@@ -390,7 +390,7 @@ PSbIsNextTBTTWakeUp( | |||
390 | 390 | ||
391 | PSDevice pDevice = (PSDevice)hDeviceContext; | 391 | PSDevice pDevice = (PSDevice)hDeviceContext; |
392 | PSMgmtObject pMgmt = pDevice->pMgmt; | 392 | PSMgmtObject pMgmt = pDevice->pMgmt; |
393 | BOOL bWakeUp = false; | 393 | bool bWakeUp = false; |
394 | 394 | ||
395 | if (pMgmt->wListenInterval >= 2) { | 395 | if (pMgmt->wListenInterval >= 2) { |
396 | if (pMgmt->wCountToWakeUp == 0) { | 396 | if (pMgmt->wCountToWakeUp == 0) { |
diff --git a/drivers/staging/vt6655/power.h b/drivers/staging/vt6655/power.h index 61196bc6f9c5..01013b592285 100644 --- a/drivers/staging/vt6655/power.h +++ b/drivers/staging/vt6655/power.h | |||
@@ -48,11 +48,11 @@ | |||
48 | // PSDevice pDevice | 48 | // PSDevice pDevice |
49 | // PSDevice hDeviceContext | 49 | // PSDevice hDeviceContext |
50 | 50 | ||
51 | BOOL | 51 | bool |
52 | PSbConsiderPowerDown( | 52 | PSbConsiderPowerDown( |
53 | void *hDeviceContext, | 53 | void *hDeviceContext, |
54 | BOOL bCheckRxDMA, | 54 | bool bCheckRxDMA, |
55 | BOOL bCheckCountToWakeUp | 55 | bool bCheckCountToWakeUp |
56 | ); | 56 | ); |
57 | 57 | ||
58 | void | 58 | void |
@@ -71,12 +71,12 @@ PSvSendPSPOLL( | |||
71 | void *hDeviceContext | 71 | void *hDeviceContext |
72 | ); | 72 | ); |
73 | 73 | ||
74 | BOOL | 74 | bool |
75 | PSbSendNullPacket( | 75 | PSbSendNullPacket( |
76 | void *hDeviceContext | 76 | void *hDeviceContext |
77 | ); | 77 | ); |
78 | 78 | ||
79 | BOOL | 79 | bool |
80 | PSbIsNextTBTTWakeUp( | 80 | PSbIsNextTBTTWakeUp( |
81 | void *hDeviceContext | 81 | void *hDeviceContext |
82 | ); | 82 | ); |
diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index eb75548e21ac..b8ec783e55e0 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c | |||
@@ -474,10 +474,10 @@ const unsigned long 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 | */ |
477 | BOOL s_bAL7230Init (unsigned long dwIoBase) | 477 | bool s_bAL7230Init (unsigned long dwIoBase) |
478 | { | 478 | { |
479 | int ii; | 479 | int ii; |
480 | BOOL bResult; | 480 | bool bResult; |
481 | 481 | ||
482 | bResult = true; | 482 | bResult = true; |
483 | 483 | ||
@@ -517,9 +517,9 @@ BOOL s_bAL7230Init (unsigned long 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 |
520 | BOOL s_bAL7230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) | 520 | bool s_bAL7230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) |
521 | { | 521 | { |
522 | BOOL bResult; | 522 | bool bResult; |
523 | 523 | ||
524 | bResult = true; | 524 | bResult = true; |
525 | 525 | ||
@@ -622,7 +622,7 @@ BOOL s_bAL7230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) | |||
622 | * Return Value: true if succeeded; false if failed. | 622 | * Return Value: true if succeeded; false if failed. |
623 | * | 623 | * |
624 | */ | 624 | */ |
625 | BOOL IFRFbWriteEmbeded (unsigned long dwIoBase, unsigned long dwData) | 625 | bool IFRFbWriteEmbeded (unsigned long dwIoBase, unsigned long dwData) |
626 | { | 626 | { |
627 | unsigned short ww; | 627 | unsigned short ww; |
628 | unsigned long dwValue; | 628 | unsigned long dwValue; |
@@ -684,10 +684,10 @@ BOOL IFRFbWriteEmbeded (unsigned long dwIoBase, unsigned long dwData) | |||
684 | * Return Value: true if succeeded; false if failed. | 684 | * Return Value: true if succeeded; false if failed. |
685 | * | 685 | * |
686 | */ | 686 | */ |
687 | BOOL RFbAL2230Init (unsigned long dwIoBase) | 687 | bool RFbAL2230Init (unsigned long dwIoBase) |
688 | { | 688 | { |
689 | int ii; | 689 | int ii; |
690 | BOOL bResult; | 690 | bool bResult; |
691 | 691 | ||
692 | bResult = true; | 692 | bResult = true; |
693 | 693 | ||
@@ -734,9 +734,9 @@ MACvTimer0MicroSDelay(dwIoBase, 30); //delay 30 us | |||
734 | return bResult; | 734 | return bResult; |
735 | } | 735 | } |
736 | 736 | ||
737 | BOOL RFbAL2230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) | 737 | bool RFbAL2230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) |
738 | { | 738 | { |
739 | BOOL bResult; | 739 | bool bResult; |
740 | 740 | ||
741 | bResult = true; | 741 | bResult = true; |
742 | 742 | ||
@@ -807,11 +807,11 @@ BOOL RFbAL2230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) | |||
807 | * Return Value: true if succeeded; false if failed. | 807 | * Return Value: true if succeeded; false if failed. |
808 | * | 808 | * |
809 | */ | 809 | */ |
810 | BOOL RFbInit ( | 810 | bool RFbInit ( |
811 | PSDevice pDevice | 811 | PSDevice pDevice |
812 | ) | 812 | ) |
813 | { | 813 | { |
814 | BOOL bResult = true; | 814 | bool bResult = true; |
815 | switch (pDevice->byRFType) { | 815 | switch (pDevice->byRFType) { |
816 | case RF_AIROHA : | 816 | case RF_AIROHA : |
817 | case RF_AL2230S: | 817 | case RF_AL2230S: |
@@ -845,11 +845,11 @@ BOOL bResult = true; | |||
845 | * Return Value: true if succeeded; false if failed. | 845 | * Return Value: true if succeeded; false if failed. |
846 | * | 846 | * |
847 | */ | 847 | */ |
848 | BOOL RFbShutDown ( | 848 | bool RFbShutDown ( |
849 | PSDevice pDevice | 849 | PSDevice pDevice |
850 | ) | 850 | ) |
851 | { | 851 | { |
852 | BOOL bResult = true; | 852 | bool bResult = true; |
853 | 853 | ||
854 | switch (pDevice->byRFType) { | 854 | switch (pDevice->byRFType) { |
855 | case RF_AIROHA7230 : | 855 | case RF_AIROHA7230 : |
@@ -875,9 +875,9 @@ 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 | */ |
878 | BOOL RFbSelectChannel (unsigned long dwIoBase, unsigned char byRFType, unsigned char byChannel) | 878 | bool RFbSelectChannel (unsigned long dwIoBase, unsigned char byRFType, unsigned char byChannel) |
879 | { | 879 | { |
880 | BOOL bResult = true; | 880 | bool bResult = true; |
881 | switch (byRFType) { | 881 | switch (byRFType) { |
882 | 882 | ||
883 | case RF_AIROHA : | 883 | case RF_AIROHA : |
@@ -911,7 +911,7 @@ BOOL bResult = true; | |||
911 | * Return Value: None. | 911 | * Return Value: None. |
912 | * | 912 | * |
913 | */ | 913 | */ |
914 | BOOL RFvWriteWakeProgSyn (unsigned long dwIoBase, unsigned char byRFType, unsigned int uChannel) | 914 | bool RFvWriteWakeProgSyn (unsigned long dwIoBase, unsigned char byRFType, unsigned int uChannel) |
915 | { | 915 | { |
916 | int ii; | 916 | int ii; |
917 | unsigned char byInitCount = 0; | 917 | unsigned char byInitCount = 0; |
@@ -996,13 +996,13 @@ BOOL RFvWriteWakeProgSyn (unsigned long dwIoBase, unsigned char byRFType, unsign | |||
996 | * Return Value: true if succeeded; false if failed. | 996 | * Return Value: true if succeeded; false if failed. |
997 | * | 997 | * |
998 | */ | 998 | */ |
999 | BOOL RFbSetPower ( | 999 | bool RFbSetPower ( |
1000 | PSDevice pDevice, | 1000 | PSDevice pDevice, |
1001 | unsigned int uRATE, | 1001 | unsigned int uRATE, |
1002 | unsigned int uCH | 1002 | unsigned int uCH |
1003 | ) | 1003 | ) |
1004 | { | 1004 | { |
1005 | BOOL bResult = true; | 1005 | bool bResult = true; |
1006 | unsigned char byPwr = 0; | 1006 | unsigned char byPwr = 0; |
1007 | unsigned char byDec = 0; | 1007 | unsigned char byDec = 0; |
1008 | unsigned char byPwrdBm = 0; | 1008 | unsigned char byPwrdBm = 0; |
@@ -1135,13 +1135,13 @@ unsigned char byPwrdBm = 0; | |||
1135 | * | 1135 | * |
1136 | */ | 1136 | */ |
1137 | 1137 | ||
1138 | BOOL RFbRawSetPower ( | 1138 | bool RFbRawSetPower ( |
1139 | PSDevice pDevice, | 1139 | PSDevice pDevice, |
1140 | unsigned char byPwr, | 1140 | unsigned char byPwr, |
1141 | unsigned int uRATE | 1141 | unsigned int uRATE |
1142 | ) | 1142 | ) |
1143 | { | 1143 | { |
1144 | BOOL bResult = true; | 1144 | bool bResult = true; |
1145 | unsigned long dwMax7230Pwr = 0; | 1145 | unsigned long dwMax7230Pwr = 0; |
1146 | 1146 | ||
1147 | if (byPwr >= pDevice->byMaxPwrLevel) { | 1147 | if (byPwr >= pDevice->byMaxPwrLevel) { |
@@ -1232,9 +1232,9 @@ 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 |
1235 | BOOL RFbAL7230SelectChannelPostProcess (unsigned long dwIoBase, unsigned char byOldChannel, unsigned char byNewChannel) | 1235 | bool RFbAL7230SelectChannelPostProcess (unsigned long dwIoBase, unsigned char byOldChannel, unsigned char byNewChannel) |
1236 | { | 1236 | { |
1237 | BOOL bResult; | 1237 | bool bResult; |
1238 | 1238 | ||
1239 | bResult = true; | 1239 | bResult = true; |
1240 | 1240 | ||
diff --git a/drivers/staging/vt6655/rf.h b/drivers/staging/vt6655/rf.h index c85657107de5..1f8d82e13041 100644 --- a/drivers/staging/vt6655/rf.h +++ b/drivers/staging/vt6655/rf.h | |||
@@ -76,14 +76,14 @@ | |||
76 | 76 | ||
77 | /*--------------------- Export Functions --------------------------*/ | 77 | /*--------------------- Export Functions --------------------------*/ |
78 | 78 | ||
79 | BOOL IFRFbWriteEmbeded(unsigned long dwIoBase, unsigned long dwData); | 79 | bool IFRFbWriteEmbeded(unsigned long dwIoBase, unsigned long dwData); |
80 | BOOL RFbSelectChannel(unsigned long dwIoBase, unsigned char byRFType, unsigned char byChannel); | 80 | bool RFbSelectChannel(unsigned long dwIoBase, unsigned char byRFType, unsigned char byChannel); |
81 | BOOL RFbInit ( | 81 | bool RFbInit ( |
82 | PSDevice pDevice | 82 | PSDevice pDevice |
83 | ); | 83 | ); |
84 | BOOL RFvWriteWakeProgSyn(unsigned long dwIoBase, unsigned char byRFType, unsigned int uChannel); | 84 | bool RFvWriteWakeProgSyn(unsigned long dwIoBase, unsigned char byRFType, unsigned int uChannel); |
85 | BOOL RFbSetPower(PSDevice pDevice, unsigned int uRATE, unsigned int uCH); | 85 | bool RFbSetPower(PSDevice pDevice, unsigned int uRATE, unsigned int uCH); |
86 | BOOL RFbRawSetPower( | 86 | bool RFbRawSetPower( |
87 | PSDevice pDevice, | 87 | PSDevice pDevice, |
88 | unsigned char byPwr, | 88 | unsigned char byPwr, |
89 | unsigned int uRATE | 89 | unsigned int uRATE |
@@ -97,7 +97,7 @@ RFvRSSITodBm( | |||
97 | ); | 97 | ); |
98 | 98 | ||
99 | //{{ RobertYu: 20050104 | 99 | //{{ RobertYu: 20050104 |
100 | BOOL RFbAL7230SelectChannelPostProcess(unsigned long dwIoBase, unsigned char byOldChannel, unsigned char byNewChannel); | 100 | bool RFbAL7230SelectChannelPostProcess(unsigned long dwIoBase, unsigned char byOldChannel, unsigned char byNewChannel); |
101 | //}} RobertYu | 101 | //}} RobertYu |
102 | 102 | ||
103 | #endif // __RF_H__ | 103 | #endif // __RF_H__ |
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 91c9a0d0b639..c920cf694054 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c | |||
@@ -135,8 +135,8 @@ s_vFillRTSHead( | |||
135 | unsigned char byPktType, | 135 | unsigned char byPktType, |
136 | void * pvRTS, | 136 | void * pvRTS, |
137 | unsigned int cbFrameLength, | 137 | unsigned int cbFrameLength, |
138 | BOOL bNeedAck, | 138 | bool bNeedAck, |
139 | BOOL bDisCRC, | 139 | bool bDisCRC, |
140 | PSEthernetHeader psEthHeader, | 140 | PSEthernetHeader psEthHeader, |
141 | unsigned short wCurrentRate, | 141 | unsigned short wCurrentRate, |
142 | unsigned char byFBOption | 142 | unsigned char byFBOption |
@@ -152,7 +152,7 @@ s_vGenerateTxParameter( | |||
152 | void * pvRTS, | 152 | void * pvRTS, |
153 | void * pvCTS, | 153 | void * pvCTS, |
154 | unsigned int cbFrameSize, | 154 | unsigned int cbFrameSize, |
155 | BOOL bNeedACK, | 155 | bool bNeedACK, |
156 | unsigned int uDMAIdx, | 156 | unsigned int uDMAIdx, |
157 | PSEthernetHeader psEthHeader, | 157 | PSEthernetHeader psEthHeader, |
158 | unsigned short wCurrentRate | 158 | unsigned short wCurrentRate |
@@ -173,7 +173,7 @@ static void s_vFillFragParameter( | |||
173 | static unsigned int | 173 | static unsigned int |
174 | s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, | 174 | s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, |
175 | unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD, | 175 | unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD, |
176 | PSEthernetHeader psEthHeader, unsigned char *pPacket, BOOL bNeedEncrypt, | 176 | PSEthernetHeader psEthHeader, unsigned char *pPacket, bool bNeedEncrypt, |
177 | PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum); | 177 | PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum); |
178 | 178 | ||
179 | 179 | ||
@@ -185,7 +185,7 @@ s_uFillDataHead ( | |||
185 | void * pTxDataHead, | 185 | void * pTxDataHead, |
186 | unsigned int cbFrameLength, | 186 | unsigned int cbFrameLength, |
187 | unsigned int uDMAIdx, | 187 | unsigned int uDMAIdx, |
188 | BOOL bNeedAck, | 188 | bool bNeedAck, |
189 | unsigned int uFragIdx, | 189 | unsigned int uFragIdx, |
190 | unsigned int cbLastFragmentSize, | 190 | unsigned int cbLastFragmentSize, |
191 | unsigned int uMACfragNum, | 191 | unsigned int uMACfragNum, |
@@ -372,7 +372,7 @@ s_uGetTxRsvTime ( | |||
372 | unsigned char byPktType, | 372 | unsigned char byPktType, |
373 | unsigned int cbFrameLength, | 373 | unsigned int cbFrameLength, |
374 | unsigned short wRate, | 374 | unsigned short wRate, |
375 | BOOL bNeedAck | 375 | bool bNeedAck |
376 | ) | 376 | ) |
377 | { | 377 | { |
378 | unsigned int uDataTime, uAckTime; | 378 | unsigned int uDataTime, uAckTime; |
@@ -446,14 +446,14 @@ s_uGetDataDuration ( | |||
446 | unsigned int cbFrameLength, | 446 | unsigned int cbFrameLength, |
447 | unsigned char byPktType, | 447 | unsigned char byPktType, |
448 | unsigned short wRate, | 448 | unsigned short wRate, |
449 | BOOL bNeedAck, | 449 | bool bNeedAck, |
450 | unsigned int uFragIdx, | 450 | unsigned int uFragIdx, |
451 | unsigned int cbLastFragmentSize, | 451 | unsigned int cbLastFragmentSize, |
452 | unsigned int uMACfragNum, | 452 | unsigned int uMACfragNum, |
453 | unsigned char byFBOption | 453 | unsigned char byFBOption |
454 | ) | 454 | ) |
455 | { | 455 | { |
456 | BOOL bLastFrag = 0; | 456 | bool bLastFrag = 0; |
457 | unsigned int uAckTime =0, uNextPktTime = 0; | 457 | unsigned int uAckTime =0, uNextPktTime = 0; |
458 | 458 | ||
459 | 459 | ||
@@ -617,7 +617,7 @@ s_uGetRTSCTSDuration ( | |||
617 | unsigned int cbFrameLength, | 617 | unsigned int cbFrameLength, |
618 | unsigned char byPktType, | 618 | unsigned char byPktType, |
619 | unsigned short wRate, | 619 | unsigned short wRate, |
620 | BOOL bNeedAck, | 620 | bool bNeedAck, |
621 | unsigned char byFBOption | 621 | unsigned char byFBOption |
622 | ) | 622 | ) |
623 | { | 623 | { |
@@ -715,7 +715,7 @@ s_uFillDataHead ( | |||
715 | void * pTxDataHead, | 715 | void * pTxDataHead, |
716 | unsigned int cbFrameLength, | 716 | unsigned int cbFrameLength, |
717 | unsigned int uDMAIdx, | 717 | unsigned int uDMAIdx, |
718 | BOOL bNeedAck, | 718 | bool bNeedAck, |
719 | unsigned int uFragIdx, | 719 | unsigned int uFragIdx, |
720 | unsigned int cbLastFragmentSize, | 720 | unsigned int cbLastFragmentSize, |
721 | unsigned int uMACfragNum, | 721 | unsigned int uMACfragNum, |
@@ -846,8 +846,8 @@ s_vFillRTSHead ( | |||
846 | unsigned char byPktType, | 846 | unsigned char byPktType, |
847 | void * pvRTS, | 847 | void * pvRTS, |
848 | unsigned int cbFrameLength, | 848 | unsigned int cbFrameLength, |
849 | BOOL bNeedAck, | 849 | bool bNeedAck, |
850 | BOOL bDisCRC, | 850 | bool bDisCRC, |
851 | PSEthernetHeader psEthHeader, | 851 | PSEthernetHeader psEthHeader, |
852 | unsigned short wCurrentRate, | 852 | unsigned short wCurrentRate, |
853 | unsigned char byFBOption | 853 | unsigned char byFBOption |
@@ -1041,8 +1041,8 @@ s_vFillCTSHead ( | |||
1041 | unsigned char byPktType, | 1041 | unsigned char byPktType, |
1042 | void * pvCTS, | 1042 | void * pvCTS, |
1043 | unsigned int cbFrameLength, | 1043 | unsigned int cbFrameLength, |
1044 | BOOL bNeedAck, | 1044 | bool bNeedAck, |
1045 | BOOL bDisCRC, | 1045 | bool bDisCRC, |
1046 | unsigned short wCurrentRate, | 1046 | unsigned short wCurrentRate, |
1047 | unsigned char byFBOption | 1047 | unsigned char byFBOption |
1048 | ) | 1048 | ) |
@@ -1148,7 +1148,7 @@ s_vGenerateTxParameter ( | |||
1148 | void * pvRTS, | 1148 | void * pvRTS, |
1149 | void * pvCTS, | 1149 | void * pvCTS, |
1150 | unsigned int cbFrameSize, | 1150 | unsigned int cbFrameSize, |
1151 | BOOL bNeedACK, | 1151 | bool bNeedACK, |
1152 | unsigned int uDMAIdx, | 1152 | unsigned int uDMAIdx, |
1153 | PSEthernetHeader psEthHeader, | 1153 | PSEthernetHeader psEthHeader, |
1154 | unsigned short wCurrentRate | 1154 | unsigned short wCurrentRate |
@@ -1156,7 +1156,7 @@ s_vGenerateTxParameter ( | |||
1156 | { | 1156 | { |
1157 | unsigned int cbMACHdLen = WLAN_HDR_ADDR3_LEN; //24 | 1157 | unsigned int cbMACHdLen = WLAN_HDR_ADDR3_LEN; //24 |
1158 | unsigned short wFifoCtl; | 1158 | unsigned short wFifoCtl; |
1159 | BOOL bDisCRC = false; | 1159 | bool bDisCRC = false; |
1160 | unsigned char byFBOption = AUTO_FB_NONE; | 1160 | unsigned char byFBOption = AUTO_FB_NONE; |
1161 | // unsigned short wCurrentRate = pDevice->wCurrentRate; | 1161 | // unsigned short wCurrentRate = pDevice->wCurrentRate; |
1162 | 1162 | ||
@@ -1307,7 +1307,7 @@ s_vFillFragParameter( | |||
1307 | static unsigned int | 1307 | static unsigned int |
1308 | s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, | 1308 | s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, |
1309 | unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD, | 1309 | unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD, |
1310 | PSEthernetHeader psEthHeader, unsigned char *pPacket, BOOL bNeedEncrypt, | 1310 | PSEthernetHeader psEthHeader, unsigned char *pPacket, bool bNeedEncrypt, |
1311 | PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum) | 1311 | PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum) |
1312 | { | 1312 | { |
1313 | unsigned int cbMACHdLen; | 1313 | unsigned int cbMACHdLen; |
@@ -1340,15 +1340,15 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT | |||
1340 | unsigned long *pdwMIC_L; | 1340 | unsigned long *pdwMIC_L; |
1341 | unsigned long *pdwMIC_R; | 1341 | unsigned long *pdwMIC_R; |
1342 | unsigned long dwSafeMIC_L, dwSafeMIC_R; //Fix "Last Frag Size" < "MIC length". | 1342 | unsigned long dwSafeMIC_L, dwSafeMIC_R; //Fix "Last Frag Size" < "MIC length". |
1343 | BOOL bMIC2Frag = false; | 1343 | bool bMIC2Frag = false; |
1344 | unsigned int uMICFragLen = 0; | 1344 | unsigned int uMICFragLen = 0; |
1345 | unsigned int uMACfragNum = 1; | 1345 | unsigned int uMACfragNum = 1; |
1346 | unsigned int uPadding = 0; | 1346 | unsigned int uPadding = 0; |
1347 | unsigned int cbReqCount = 0; | 1347 | unsigned int cbReqCount = 0; |
1348 | 1348 | ||
1349 | BOOL bNeedACK; | 1349 | bool bNeedACK; |
1350 | BOOL bRTS; | 1350 | bool bRTS; |
1351 | BOOL bIsAdhoc; | 1351 | bool bIsAdhoc; |
1352 | unsigned char *pbyType; | 1352 | unsigned char *pbyType; |
1353 | PSTxDesc ptdCurr; | 1353 | PSTxDesc ptdCurr; |
1354 | PSTxBufHead psTxBufHd = (PSTxBufHead) pbyTxBufferAddr; | 1354 | PSTxBufHead psTxBufHd = (PSTxBufHead) pbyTxBufferAddr; |
@@ -1362,7 +1362,7 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT | |||
1362 | unsigned short wTxBufSize; // FFinfo size | 1362 | unsigned short wTxBufSize; // FFinfo size |
1363 | unsigned int uTotalCopyLength = 0; | 1363 | unsigned int uTotalCopyLength = 0; |
1364 | unsigned char byFBOption = AUTO_FB_NONE; | 1364 | unsigned char byFBOption = AUTO_FB_NONE; |
1365 | BOOL bIsWEP256 = false; | 1365 | bool bIsWEP256 = false; |
1366 | PSMgmtObject pMgmt = pDevice->pMgmt; | 1366 | PSMgmtObject pMgmt = pDevice->pMgmt; |
1367 | 1367 | ||
1368 | 1368 | ||
@@ -2070,14 +2070,14 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT | |||
2070 | 2070 | ||
2071 | void | 2071 | void |
2072 | vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, | 2072 | vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, |
2073 | BOOL bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx, | 2073 | bool bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx, |
2074 | PSTxDesc pHeadTD, PSEthernetHeader psEthHeader, unsigned char *pPacket, | 2074 | PSTxDesc pHeadTD, PSEthernetHeader psEthHeader, unsigned char *pPacket, |
2075 | PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum, | 2075 | PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum, |
2076 | unsigned int *pcbHeaderSize) | 2076 | unsigned int *pcbHeaderSize) |
2077 | { | 2077 | { |
2078 | unsigned int wTxBufSize; // FFinfo size | 2078 | unsigned int wTxBufSize; // FFinfo size |
2079 | BOOL bNeedACK; | 2079 | bool bNeedACK; |
2080 | BOOL bIsAdhoc; | 2080 | bool bIsAdhoc; |
2081 | unsigned short cbMacHdLen; | 2081 | unsigned short cbMacHdLen; |
2082 | PSTxBufHead pTxBufHead = (PSTxBufHead) pbyTxBufferAddr; | 2082 | PSTxBufHead pTxBufHead = (PSTxBufHead) pbyTxBufferAddr; |
2083 | 2083 | ||
@@ -2234,7 +2234,7 @@ vGenerateMACHeader ( | |||
2234 | unsigned char *pbyBufferAddr, | 2234 | unsigned char *pbyBufferAddr, |
2235 | unsigned short wDuration, | 2235 | unsigned short wDuration, |
2236 | PSEthernetHeader psEthHeader, | 2236 | PSEthernetHeader psEthHeader, |
2237 | BOOL bNeedEncrypt, | 2237 | bool bNeedEncrypt, |
2238 | unsigned short wFragType, | 2238 | unsigned short wFragType, |
2239 | unsigned int uDMAIdx, | 2239 | unsigned int uDMAIdx, |
2240 | unsigned int uFragIdx | 2240 | unsigned int uFragIdx |
@@ -2314,8 +2314,8 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { | |||
2314 | PS802_11Header pMACHeader; | 2314 | PS802_11Header pMACHeader; |
2315 | unsigned int cbHeaderSize; | 2315 | unsigned int cbHeaderSize; |
2316 | unsigned int cbFrameBodySize; | 2316 | unsigned int cbFrameBodySize; |
2317 | BOOL bNeedACK; | 2317 | bool bNeedACK; |
2318 | BOOL bIsPSPOLL = false; | 2318 | bool bIsPSPOLL = false; |
2319 | PSTxBufHead pTxBufHead; | 2319 | PSTxBufHead pTxBufHead; |
2320 | unsigned int cbFrameSize; | 2320 | unsigned int cbFrameSize; |
2321 | unsigned int cbIVlen = 0; | 2321 | unsigned int cbIVlen = 0; |
@@ -2716,7 +2716,7 @@ cbGetFragCount ( | |||
2716 | unsigned int cbMIClen = 0; | 2716 | unsigned int cbMIClen = 0; |
2717 | unsigned int cbFCSlen = 4; | 2717 | unsigned int cbFCSlen = 4; |
2718 | unsigned int uMACfragNum = 1; | 2718 | unsigned int uMACfragNum = 1; |
2719 | BOOL bNeedACK; | 2719 | bool bNeedACK; |
2720 | 2720 | ||
2721 | 2721 | ||
2722 | 2722 | ||
@@ -2798,8 +2798,8 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un | |||
2798 | PS802_11Header pMACHeader; | 2798 | PS802_11Header pMACHeader; |
2799 | unsigned int cbHeaderSize; | 2799 | unsigned int cbHeaderSize; |
2800 | unsigned int cbFrameBodySize; | 2800 | unsigned int cbFrameBodySize; |
2801 | BOOL bNeedACK; | 2801 | bool bNeedACK; |
2802 | BOOL bIsPSPOLL = false; | 2802 | bool bIsPSPOLL = false; |
2803 | PSTxBufHead pTxBufHead; | 2803 | PSTxBufHead pTxBufHead; |
2804 | unsigned int cbFrameSize; | 2804 | unsigned int cbFrameSize; |
2805 | unsigned int cbIVlen = 0; | 2805 | unsigned int cbIVlen = 0; |
@@ -2822,7 +2822,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un | |||
2822 | unsigned short wCurrentRate = RATE_1M; | 2822 | unsigned short wCurrentRate = RATE_1M; |
2823 | PUWLAN_80211HDR p80211Header; | 2823 | PUWLAN_80211HDR p80211Header; |
2824 | unsigned int uNodeIndex = 0; | 2824 | unsigned int uNodeIndex = 0; |
2825 | BOOL bNodeExist = false; | 2825 | bool bNodeExist = false; |
2826 | SKeyItem STempKey; | 2826 | SKeyItem STempKey; |
2827 | PSKeyItem pTransmitKey = NULL; | 2827 | PSKeyItem pTransmitKey = NULL; |
2828 | unsigned char *pbyIVHead; | 2828 | unsigned char *pbyIVHead; |
diff --git a/drivers/staging/vt6655/rxtx.h b/drivers/staging/vt6655/rxtx.h index d4883337eaac..fa827b828a30 100644 --- a/drivers/staging/vt6655/rxtx.h +++ b/drivers/staging/vt6655/rxtx.h | |||
@@ -42,12 +42,12 @@ | |||
42 | /* | 42 | /* |
43 | void | 43 | void |
44 | vGenerateMACHeader(PSDevice pDevice, unsigned long dwTxBufferAddr, unsigned char *pbySkbData, | 44 | vGenerateMACHeader(PSDevice pDevice, unsigned long dwTxBufferAddr, unsigned char *pbySkbData, |
45 | unsigned int cbPacketSize, BOOL bDMA0Used, unsigned int *pcbHeadSize, | 45 | unsigned int cbPacketSize, bool bDMA0Used, unsigned int *pcbHeadSize, |
46 | unsigned int *pcbAppendPayload); | 46 | unsigned int *pcbAppendPayload); |
47 | 47 | ||
48 | void | 48 | void |
49 | vProcessRxMACHeader(PSDevice pDevice, unsigned long dwRxBufferAddr, unsigned int cbPacketSize, | 49 | vProcessRxMACHeader(PSDevice pDevice, unsigned long dwRxBufferAddr, unsigned int cbPacketSize, |
50 | BOOL bIsWEP, unsigned int *pcbHeadSize); | 50 | bool bIsWEP, unsigned int *pcbHeadSize); |
51 | */ | 51 | */ |
52 | 52 | ||
53 | 53 | ||
@@ -57,7 +57,7 @@ vGenerateMACHeader ( | |||
57 | unsigned char *pbyBufferAddr, | 57 | unsigned char *pbyBufferAddr, |
58 | unsigned short wDuration, | 58 | unsigned short wDuration, |
59 | PSEthernetHeader psEthHeader, | 59 | PSEthernetHeader psEthHeader, |
60 | BOOL bNeedEncrypt, | 60 | bool bNeedEncrypt, |
61 | unsigned short wFragType, | 61 | unsigned short wFragType, |
62 | unsigned int uDMAIdx, | 62 | unsigned int uDMAIdx, |
63 | unsigned int uFragIdx | 63 | unsigned int uFragIdx |
@@ -75,7 +75,7 @@ cbGetFragCount( | |||
75 | 75 | ||
76 | void | 76 | void |
77 | vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktTyp, unsigned char *pbyTxBufferAddr, | 77 | vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktTyp, unsigned char *pbyTxBufferAddr, |
78 | BOOL bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx, PSTxDesc pHeadTD, | 78 | bool bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx, PSTxDesc pHeadTD, |
79 | PSEthernetHeader psEthHeader, unsigned char *pPacket, PSKeyItem pTransmitKey, | 79 | PSEthernetHeader psEthHeader, unsigned char *pPacket, PSKeyItem pTransmitKey, |
80 | unsigned int uNodeIndex, unsigned int *puMACfragNum, unsigned int *pcbHeaderSize); | 80 | unsigned int uNodeIndex, unsigned int *puMACfragNum, unsigned int *pcbHeaderSize); |
81 | 81 | ||
diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index a67d57facadb..6a0a232d1a0c 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c | |||
@@ -125,7 +125,7 @@ unsigned char SROMbyReadEmbedded(unsigned long dwIoBase, unsigned char byContntO | |||
125 | * Return Value: true if succeeded; false if failed. | 125 | * Return Value: true if succeeded; false if failed. |
126 | * | 126 | * |
127 | */ | 127 | */ |
128 | BOOL SROMbWriteEmbedded(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byData) | 128 | bool SROMbWriteEmbedded(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byData) |
129 | { | 129 | { |
130 | unsigned short wDelay, wNoACK; | 130 | unsigned short wDelay, wNoACK; |
131 | unsigned char byWait; | 131 | unsigned char byWait; |
@@ -222,7 +222,7 @@ void SROMvRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsig | |||
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 | */ |
225 | BOOL SROMbIsRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits) | 225 | bool SROMbIsRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits) |
226 | { | 226 | { |
227 | unsigned char byOrgData; | 227 | unsigned char byOrgData; |
228 | 228 | ||
@@ -245,7 +245,7 @@ BOOL SROMbIsRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsi | |||
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 | */ |
248 | BOOL SROMbIsRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits) | 248 | bool SROMbIsRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits) |
249 | { | 249 | { |
250 | unsigned char byOrgData; | 250 | unsigned char byOrgData; |
251 | 251 | ||
@@ -389,7 +389,7 @@ void SROMvReadSubSysVenId(unsigned long dwIoBase, unsigned long *pdwSubSysVenId) | |||
389 | * Return Value: true if success; otherwise false | 389 | * Return Value: true if success; otherwise false |
390 | * | 390 | * |
391 | */ | 391 | */ |
392 | BOOL SROMbAutoLoad(unsigned long dwIoBase) | 392 | bool SROMbAutoLoad(unsigned long dwIoBase) |
393 | { | 393 | { |
394 | unsigned char byWait; | 394 | unsigned char byWait; |
395 | int ii; | 395 | int ii; |
diff --git a/drivers/staging/vt6655/srom.h b/drivers/staging/vt6655/srom.h index 65a4b4859c64..4c261dac01b5 100644 --- a/drivers/staging/vt6655/srom.h +++ b/drivers/staging/vt6655/srom.h | |||
@@ -136,13 +136,13 @@ typedef struct tagSSromReg { | |||
136 | /*--------------------- Export Functions --------------------------*/ | 136 | /*--------------------- Export Functions --------------------------*/ |
137 | 137 | ||
138 | unsigned char SROMbyReadEmbedded(unsigned long dwIoBase, unsigned char byContntOffset); | 138 | unsigned char SROMbyReadEmbedded(unsigned long dwIoBase, unsigned char byContntOffset); |
139 | BOOL SROMbWriteEmbedded(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byData); | 139 | bool SROMbWriteEmbedded(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byData); |
140 | 140 | ||
141 | void SROMvRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byBits); | 141 | void SROMvRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byBits); |
142 | void SROMvRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byBits); | 142 | void SROMvRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byBits); |
143 | 143 | ||
144 | BOOL SROMbIsRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits); | 144 | bool SROMbIsRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits); |
145 | BOOL SROMbIsRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits); | 145 | bool SROMbIsRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits); |
146 | 146 | ||
147 | void SROMvReadAllContents(unsigned long dwIoBase, unsigned char *pbyEepromRegs); | 147 | void SROMvReadAllContents(unsigned long dwIoBase, unsigned char *pbyEepromRegs); |
148 | void SROMvWriteAllContents(unsigned long dwIoBase, unsigned char *pbyEepromRegs); | 148 | void SROMvWriteAllContents(unsigned long dwIoBase, unsigned char *pbyEepromRegs); |
@@ -152,6 +152,6 @@ void SROMvWriteEtherAddress(unsigned long dwIoBase, unsigned char *pbyEtherAddre | |||
152 | 152 | ||
153 | void SROMvReadSubSysVenId(unsigned long dwIoBase, unsigned long *pdwSubSysVenId); | 153 | void SROMvReadSubSysVenId(unsigned long dwIoBase, unsigned long *pdwSubSysVenId); |
154 | 154 | ||
155 | BOOL SROMbAutoLoad (unsigned long dwIoBase); | 155 | bool SROMbAutoLoad (unsigned long dwIoBase); |
156 | 156 | ||
157 | #endif // __EEPROM_H__ | 157 | #endif // __EEPROM_H__ |
diff --git a/drivers/staging/vt6655/tether.c b/drivers/staging/vt6655/tether.c index 87a88f39cb19..1cf8508e407d 100644 --- a/drivers/staging/vt6655/tether.c +++ b/drivers/staging/vt6655/tether.c | |||
@@ -96,7 +96,7 @@ unsigned char ETHbyGetHashIndexByCrc32 (unsigned char *pbyMultiAddr) | |||
96 | * Return Value: true if ok; false if error. | 96 | * Return Value: true if ok; false if error. |
97 | * | 97 | * |
98 | */ | 98 | */ |
99 | BOOL ETHbIsBufferCrc32Ok (unsigned char *pbyBuffer, unsigned int cbFrameLength) | 99 | bool ETHbIsBufferCrc32Ok (unsigned char *pbyBuffer, unsigned int cbFrameLength) |
100 | { | 100 | { |
101 | unsigned long dwCRC; | 101 | unsigned long dwCRC; |
102 | 102 | ||
diff --git a/drivers/staging/vt6655/tether.h b/drivers/staging/vt6655/tether.h index 337db666b09e..787d885deee9 100644 --- a/drivers/staging/vt6655/tether.h +++ b/drivers/staging/vt6655/tether.h | |||
@@ -195,7 +195,7 @@ S802_11Header, *PS802_11Header; | |||
195 | 195 | ||
196 | unsigned char ETHbyGetHashIndexByCrc32(unsigned char *pbyMultiAddr); | 196 | unsigned char ETHbyGetHashIndexByCrc32(unsigned char *pbyMultiAddr); |
197 | //unsigned char ETHbyGetHashIndexByCrc(unsigned char *pbyMultiAddr); | 197 | //unsigned char ETHbyGetHashIndexByCrc(unsigned char *pbyMultiAddr); |
198 | BOOL ETHbIsBufferCrc32Ok(unsigned char *pbyBuffer, unsigned int cbFrameLength); | 198 | bool ETHbIsBufferCrc32Ok(unsigned char *pbyBuffer, unsigned int cbFrameLength); |
199 | 199 | ||
200 | #endif // __TETHER_H__ | 200 | #endif // __TETHER_H__ |
201 | 201 | ||
diff --git a/drivers/staging/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h index 269479388024..37c8fba1fd1d 100644 --- a/drivers/staging/vt6655/ttype.h +++ b/drivers/staging/vt6655/ttype.h | |||
@@ -37,8 +37,6 @@ | |||
37 | #define TxInSleep | 37 | #define TxInSleep |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | typedef int BOOL; | ||
41 | |||
42 | //2007-0809-01<Add>by MikeLiu | 40 | //2007-0809-01<Add>by MikeLiu |
43 | #ifndef update_BssList | 41 | #ifndef update_BssList |
44 | #define update_BssList | 42 | #define update_BssList |
diff --git a/drivers/staging/vt6655/vntwifi.c b/drivers/staging/vt6655/vntwifi.c index 85a662cc7b2c..fcf26ab920d0 100644 --- a/drivers/staging/vt6655/vntwifi.c +++ b/drivers/staging/vt6655/vntwifi.c | |||
@@ -358,7 +358,7 @@ VNTWIFIvSetEncryptionMode ( | |||
358 | 358 | ||
359 | 359 | ||
360 | 360 | ||
361 | BOOL | 361 | bool |
362 | VNTWIFIbConfigPhyMode ( | 362 | VNTWIFIbConfigPhyMode ( |
363 | void *pMgmtHandle, | 363 | void *pMgmtHandle, |
364 | CARD_PHY_TYPE ePhyType | 364 | CARD_PHY_TYPE ePhyType |
@@ -494,7 +494,7 @@ void | |||
494 | VNTWIFIvUpdateNodeTxCounter( | 494 | VNTWIFIvUpdateNodeTxCounter( |
495 | void *pMgmtHandle, | 495 | void *pMgmtHandle, |
496 | unsigned char *pbyDestAddress, | 496 | unsigned char *pbyDestAddress, |
497 | BOOL bTxOk, | 497 | bool bTxOk, |
498 | unsigned short wRate, | 498 | unsigned short wRate, |
499 | unsigned char *pbyTxFailCount | 499 | unsigned char *pbyTxFailCount |
500 | ) | 500 | ) |
@@ -600,7 +600,7 @@ VNTWIFIvGetTxRate( | |||
600 | unsigned char | 600 | unsigned char |
601 | VNTWIFIbyGetKeyCypher( | 601 | VNTWIFIbyGetKeyCypher( |
602 | void *pMgmtHandle, | 602 | void *pMgmtHandle, |
603 | BOOL bGroupKey | 603 | bool bGroupKey |
604 | ) | 604 | ) |
605 | { | 605 | { |
606 | PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; | 606 | PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; |
@@ -614,7 +614,7 @@ VNTWIFIbyGetKeyCypher( | |||
614 | 614 | ||
615 | 615 | ||
616 | /* | 616 | /* |
617 | BOOL | 617 | bool |
618 | VNTWIFIbInit( | 618 | VNTWIFIbInit( |
619 | void *pAdapterHandler, | 619 | void *pAdapterHandler, |
620 | void **pMgmtHandler | 620 | void **pMgmtHandler |
@@ -658,7 +658,7 @@ VNTWIFIbInit( | |||
658 | 658 | ||
659 | 659 | ||
660 | 660 | ||
661 | BOOL | 661 | bool |
662 | VNTWIFIbSetPMKIDCache ( | 662 | VNTWIFIbSetPMKIDCache ( |
663 | void *pMgmtObject, | 663 | void *pMgmtObject, |
664 | unsigned long ulCount, | 664 | unsigned long ulCount, |
@@ -701,7 +701,7 @@ VNTWIFIwGetMaxSupportRate( | |||
701 | void | 701 | void |
702 | VNTWIFIvSet11h ( | 702 | VNTWIFIvSet11h ( |
703 | void *pMgmtObject, | 703 | void *pMgmtObject, |
704 | BOOL b11hEnable | 704 | bool b11hEnable |
705 | ) | 705 | ) |
706 | { | 706 | { |
707 | PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; | 707 | PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; |
@@ -709,10 +709,10 @@ VNTWIFIvSet11h ( | |||
709 | pMgmt->b11hEnable = b11hEnable; | 709 | pMgmt->b11hEnable = b11hEnable; |
710 | } | 710 | } |
711 | 711 | ||
712 | BOOL | 712 | bool |
713 | VNTWIFIbMeasureReport( | 713 | VNTWIFIbMeasureReport( |
714 | void *pMgmtObject, | 714 | void *pMgmtObject, |
715 | BOOL bEndOfReport, | 715 | bool bEndOfReport, |
716 | void *pvMeasureEID, | 716 | void *pvMeasureEID, |
717 | unsigned char byReportMode, | 717 | unsigned char byReportMode, |
718 | unsigned char byBasicMap, | 718 | unsigned char byBasicMap, |
@@ -769,7 +769,7 @@ VNTWIFIbMeasureReport( | |||
769 | } | 769 | } |
770 | 770 | ||
771 | 771 | ||
772 | BOOL | 772 | bool |
773 | VNTWIFIbChannelSwitch( | 773 | VNTWIFIbChannelSwitch( |
774 | void *pMgmtObject, | 774 | void *pMgmtObject, |
775 | unsigned char byNewChannel | 775 | unsigned char byNewChannel |
@@ -785,7 +785,7 @@ VNTWIFIbChannelSwitch( | |||
785 | } | 785 | } |
786 | 786 | ||
787 | /* | 787 | /* |
788 | BOOL | 788 | bool |
789 | VNTWIFIbRadarPresent( | 789 | VNTWIFIbRadarPresent( |
790 | void *pMgmtObject, | 790 | void *pMgmtObject, |
791 | unsigned char byChannel | 791 | unsigned char byChannel |
diff --git a/drivers/staging/vt6655/vntwifi.h b/drivers/staging/vt6655/vntwifi.h index d832f2d17814..f4327abaa773 100644 --- a/drivers/staging/vt6655/vntwifi.h +++ b/drivers/staging/vt6655/vntwifi.h | |||
@@ -195,7 +195,7 @@ VNTWIFIvSetEncryptionMode ( | |||
195 | ); | 195 | ); |
196 | 196 | ||
197 | 197 | ||
198 | BOOL | 198 | bool |
199 | VNTWIFIbConfigPhyMode( | 199 | VNTWIFIbConfigPhyMode( |
200 | void *pMgmtHandle, | 200 | void *pMgmtHandle, |
201 | CARD_PHY_TYPE ePhyType | 201 | CARD_PHY_TYPE ePhyType |
@@ -224,7 +224,7 @@ void | |||
224 | VNTWIFIvUpdateNodeTxCounter( | 224 | VNTWIFIvUpdateNodeTxCounter( |
225 | void *pMgmtHandle, | 225 | void *pMgmtHandle, |
226 | unsigned char *pbyDestAddress, | 226 | unsigned char *pbyDestAddress, |
227 | BOOL bTxOk, | 227 | bool bTxOk, |
228 | unsigned short wRate, | 228 | unsigned short wRate, |
229 | unsigned char *pbyTxFailCount | 229 | unsigned char *pbyTxFailCount |
230 | ); | 230 | ); |
@@ -240,7 +240,7 @@ VNTWIFIvGetTxRate( | |||
240 | unsigned char *pbyOFDMBasicRate | 240 | unsigned char *pbyOFDMBasicRate |
241 | ); | 241 | ); |
242 | /* | 242 | /* |
243 | BOOL | 243 | bool |
244 | VNTWIFIbInit( | 244 | VNTWIFIbInit( |
245 | void *pAdapterHandler, | 245 | void *pAdapterHandler, |
246 | void **pMgmtHandler | 246 | void **pMgmtHandler |
@@ -250,20 +250,20 @@ VNTWIFIbInit( | |||
250 | unsigned char | 250 | unsigned char |
251 | VNTWIFIbyGetKeyCypher( | 251 | VNTWIFIbyGetKeyCypher( |
252 | void *pMgmtHandle, | 252 | void *pMgmtHandle, |
253 | BOOL bGroupKey | 253 | bool bGroupKey |
254 | ); | 254 | ); |
255 | 255 | ||
256 | 256 | ||
257 | 257 | ||
258 | 258 | ||
259 | BOOL | 259 | bool |
260 | VNTWIFIbSetPMKIDCache ( | 260 | VNTWIFIbSetPMKIDCache ( |
261 | void *pMgmtObject, | 261 | void *pMgmtObject, |
262 | unsigned long ulCount, | 262 | unsigned long ulCount, |
263 | void *pPMKIDInfo | 263 | void *pPMKIDInfo |
264 | ); | 264 | ); |
265 | 265 | ||
266 | BOOL | 266 | bool |
267 | VNTWIFIbCommandRunning ( | 267 | VNTWIFIbCommandRunning ( |
268 | void *pMgmtObject | 268 | void *pMgmtObject |
269 | ); | 269 | ); |
@@ -277,13 +277,13 @@ VNTWIFIwGetMaxSupportRate( | |||
277 | void | 277 | void |
278 | VNTWIFIvSet11h ( | 278 | VNTWIFIvSet11h ( |
279 | void *pMgmtObject, | 279 | void *pMgmtObject, |
280 | BOOL b11hEnable | 280 | bool b11hEnable |
281 | ); | 281 | ); |
282 | 282 | ||
283 | BOOL | 283 | bool |
284 | VNTWIFIbMeasureReport( | 284 | VNTWIFIbMeasureReport( |
285 | void *pMgmtObject, | 285 | void *pMgmtObject, |
286 | BOOL bEndOfReport, | 286 | bool bEndOfReport, |
287 | void *pvMeasureEID, | 287 | void *pvMeasureEID, |
288 | unsigned char byReportMode, | 288 | unsigned char byReportMode, |
289 | unsigned char byBasicMap, | 289 | unsigned char byBasicMap, |
@@ -291,13 +291,13 @@ VNTWIFIbMeasureReport( | |||
291 | unsigned char *pbyRPIs | 291 | unsigned char *pbyRPIs |
292 | ); | 292 | ); |
293 | 293 | ||
294 | BOOL | 294 | bool |
295 | VNTWIFIbChannelSwitch( | 295 | VNTWIFIbChannelSwitch( |
296 | void *pMgmtObject, | 296 | void *pMgmtObject, |
297 | unsigned char byNewChannel | 297 | unsigned char byNewChannel |
298 | ); | 298 | ); |
299 | /* | 299 | /* |
300 | BOOL | 300 | bool |
301 | VNTWIFIbRadarPresent( | 301 | VNTWIFIbRadarPresent( |
302 | void *pMgmtObject, | 302 | void *pMgmtObject, |
303 | unsigned char byChannel | 303 | unsigned char byChannel |
diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c index d64e47440d57..abd6745bc3fe 100644 --- a/drivers/staging/vt6655/wcmd.c +++ b/drivers/staging/vt6655/wcmd.c | |||
@@ -86,7 +86,7 @@ s_MgrMakeProbeRequest( | |||
86 | 86 | ||
87 | 87 | ||
88 | static | 88 | static |
89 | BOOL | 89 | bool |
90 | s_bCommandComplete ( | 90 | s_bCommandComplete ( |
91 | PSDevice pDevice | 91 | PSDevice pDevice |
92 | ); | 92 | ); |
@@ -117,7 +117,7 @@ vAdHocBeaconStop(PSDevice pDevice) | |||
117 | { | 117 | { |
118 | 118 | ||
119 | PSMgmtObject pMgmt = &(pDevice->sMgmtObj); | 119 | PSMgmtObject pMgmt = &(pDevice->sMgmtObj); |
120 | BOOL bStop; | 120 | bool bStop; |
121 | 121 | ||
122 | /* | 122 | /* |
123 | * temporarily stop Beacon packet for AdHoc Server | 123 | * temporarily stop Beacon packet for AdHoc Server |
@@ -897,15 +897,15 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS | |||
897 | 897 | ||
898 | 898 | ||
899 | static | 899 | static |
900 | BOOL | 900 | bool |
901 | s_bCommandComplete ( | 901 | s_bCommandComplete ( |
902 | PSDevice pDevice | 902 | PSDevice pDevice |
903 | ) | 903 | ) |
904 | { | 904 | { |
905 | PWLAN_IE_SSID pSSID; | 905 | PWLAN_IE_SSID pSSID; |
906 | BOOL bRadioCmd = false; | 906 | bool bRadioCmd = false; |
907 | //unsigned short wDeAuthenReason = 0; | 907 | //unsigned short wDeAuthenReason = 0; |
908 | BOOL bForceSCAN = true; | 908 | bool bForceSCAN = true; |
909 | PSMgmtObject pMgmt = pDevice->pMgmt; | 909 | PSMgmtObject pMgmt = pDevice->pMgmt; |
910 | 910 | ||
911 | 911 | ||
@@ -980,7 +980,7 @@ s_bCommandComplete ( | |||
980 | 980 | ||
981 | 981 | ||
982 | 982 | ||
983 | BOOL bScheduleCommand ( | 983 | bool bScheduleCommand ( |
984 | void *hDeviceContext, | 984 | void *hDeviceContext, |
985 | CMD_CODE eCommand, | 985 | CMD_CODE eCommand, |
986 | unsigned char *pbyItem0 | 986 | unsigned char *pbyItem0 |
@@ -1061,7 +1061,7 @@ BOOL bScheduleCommand ( | |||
1061 | * Return Value: true if success; otherwise false | 1061 | * Return Value: true if success; otherwise false |
1062 | * | 1062 | * |
1063 | */ | 1063 | */ |
1064 | BOOL bClearBSSID_SCAN ( | 1064 | bool bClearBSSID_SCAN ( |
1065 | void *hDeviceContext | 1065 | void *hDeviceContext |
1066 | ) | 1066 | ) |
1067 | { | 1067 | { |
diff --git a/drivers/staging/vt6655/wcmd.h b/drivers/staging/vt6655/wcmd.h index dccd0096e107..69d4fc55b843 100644 --- a/drivers/staging/vt6655/wcmd.h +++ b/drivers/staging/vt6655/wcmd.h | |||
@@ -76,10 +76,10 @@ typedef enum tagCMD_STATUS { | |||
76 | typedef struct tagCMD_ITEM { | 76 | typedef struct tagCMD_ITEM { |
77 | CMD_CODE eCmd; | 77 | CMD_CODE eCmd; |
78 | unsigned char abyCmdDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; | 78 | unsigned char abyCmdDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; |
79 | BOOL bNeedRadioOFF; | 79 | bool bNeedRadioOFF; |
80 | unsigned short wDeAuthenReason; | 80 | unsigned short wDeAuthenReason; |
81 | BOOL bRadioCmd; | 81 | bool bRadioCmd; |
82 | BOOL bForceSCAN; | 82 | bool bForceSCAN; |
83 | } CMD_ITEM, *PCMD_ITEM; | 83 | } CMD_ITEM, *PCMD_ITEM; |
84 | 84 | ||
85 | // Command state | 85 | // Command state |
@@ -119,11 +119,11 @@ vCommandTimer ( | |||
119 | void *hDeviceContext | 119 | void *hDeviceContext |
120 | ); | 120 | ); |
121 | 121 | ||
122 | BOOL bClearBSSID_SCAN( | 122 | bool bClearBSSID_SCAN( |
123 | void *hDeviceContext | 123 | void *hDeviceContext |
124 | ); | 124 | ); |
125 | 125 | ||
126 | BOOL | 126 | bool |
127 | bScheduleCommand( | 127 | bScheduleCommand( |
128 | void *hDeviceContext, | 128 | void *hDeviceContext, |
129 | CMD_CODE eCommand, | 129 | CMD_CODE eCommand, |
diff --git a/drivers/staging/vt6655/wctl.c b/drivers/staging/vt6655/wctl.c index b3ef2e0d5f2b..c096583a7726 100644 --- a/drivers/staging/vt6655/wctl.c +++ b/drivers/staging/vt6655/wctl.c | |||
@@ -66,7 +66,7 @@ | |||
66 | * | 66 | * |
67 | */ | 67 | */ |
68 | 68 | ||
69 | BOOL WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader) | 69 | bool WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader) |
70 | { | 70 | { |
71 | unsigned int uIndex; | 71 | unsigned int uIndex; |
72 | unsigned int ii; | 72 | unsigned int ii; |
@@ -175,7 +175,7 @@ unsigned int ii; | |||
175 | * Return Value: true if it is valid fragment packet and we have resource to defragment; otherwise false | 175 | * Return Value: true if it is valid fragment packet and we have resource to defragment; otherwise false |
176 | * | 176 | * |
177 | */ | 177 | */ |
178 | BOOL WCTLbHandleFragment (PSDevice pDevice, PS802_11Header pMACHeader, unsigned int cbFrameLength, BOOL bWEP, BOOL bExtIV) | 178 | bool WCTLbHandleFragment (PSDevice pDevice, PS802_11Header pMACHeader, unsigned int cbFrameLength, bool bWEP, bool bExtIV) |
179 | { | 179 | { |
180 | unsigned int uHeaderSize; | 180 | unsigned int uHeaderSize; |
181 | 181 | ||
diff --git a/drivers/staging/vt6655/wctl.h b/drivers/staging/vt6655/wctl.h index f5255b1de338..a92bb6d2b3f0 100644 --- a/drivers/staging/vt6655/wctl.h +++ b/drivers/staging/vt6655/wctl.h | |||
@@ -97,9 +97,9 @@ | |||
97 | 97 | ||
98 | /*--------------------- Export Functions --------------------------*/ | 98 | /*--------------------- Export Functions --------------------------*/ |
99 | 99 | ||
100 | BOOL WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader); | 100 | bool WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader); |
101 | BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, | 101 | bool WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, |
102 | unsigned int cbFrameLength, BOOL bWEP, BOOL bExtIV); | 102 | unsigned int cbFrameLength, bool bWEP, bool bExtIV); |
103 | unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader); | 103 | unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader); |
104 | unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader); | 104 | unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader); |
105 | 105 | ||
diff --git a/drivers/staging/vt6655/wmgr.c b/drivers/staging/vt6655/wmgr.c index b81833d8ccb8..e540110a430e 100644 --- a/drivers/staging/vt6655/wmgr.c +++ b/drivers/staging/vt6655/wmgr.c | |||
@@ -94,7 +94,7 @@ static int msglevel =MSG_LEVEL_INFO; | |||
94 | 94 | ||
95 | /*--------------------- Static Functions --------------------------*/ | 95 | /*--------------------- Static Functions --------------------------*/ |
96 | //2008-8-4 <add> by chester | 96 | //2008-8-4 <add> by chester |
97 | static BOOL ChannelExceedZoneType( | 97 | static bool ChannelExceedZoneType( |
98 | PSDevice pDevice, | 98 | PSDevice pDevice, |
99 | unsigned char byCurrChannel | 99 | unsigned char byCurrChannel |
100 | ); | 100 | ); |
@@ -141,7 +141,7 @@ s_vMgrRxAssocResponse( | |||
141 | PSDevice pDevice, | 141 | PSDevice pDevice, |
142 | PSMgmtObject pMgmt, | 142 | PSMgmtObject pMgmt, |
143 | PSRxMgmtPacket pRxPacket, | 143 | PSRxMgmtPacket pRxPacket, |
144 | BOOL bReAssocType | 144 | bool bReAssocType |
145 | ); | 145 | ); |
146 | 146 | ||
147 | static | 147 | static |
@@ -226,7 +226,7 @@ s_vMgrRxBeacon( | |||
226 | PSDevice pDevice, | 226 | PSDevice pDevice, |
227 | PSMgmtObject pMgmt, | 227 | PSMgmtObject pMgmt, |
228 | PSRxMgmtPacket pRxPacket, | 228 | PSRxMgmtPacket pRxPacket, |
229 | BOOL bInScan | 229 | bool bInScan |
230 | ); | 230 | ); |
231 | 231 | ||
232 | static | 232 | static |
@@ -317,7 +317,7 @@ s_vMgrSynchBSS ( | |||
317 | ); | 317 | ); |
318 | 318 | ||
319 | 319 | ||
320 | static BOOL | 320 | static bool |
321 | s_bCipherMatch ( | 321 | s_bCipherMatch ( |
322 | PKnownBSS pBSSNode, | 322 | PKnownBSS pBSSNode, |
323 | NDIS_802_11_ENCRYPTION_STATUS EncStatus, | 323 | NDIS_802_11_ENCRYPTION_STATUS EncStatus, |
@@ -996,7 +996,7 @@ s_vMgrRxAssocResponse( | |||
996 | PSDevice pDevice, | 996 | PSDevice pDevice, |
997 | PSMgmtObject pMgmt, | 997 | PSMgmtObject pMgmt, |
998 | PSRxMgmtPacket pRxPacket, | 998 | PSRxMgmtPacket pRxPacket, |
999 | BOOL bReAssocType | 999 | bool bReAssocType |
1000 | ) | 1000 | ) |
1001 | { | 1001 | { |
1002 | WLAN_FR_ASSOCRESP sFrame; | 1002 | WLAN_FR_ASSOCRESP sFrame; |
@@ -1826,13 +1826,13 @@ s_vMgrRxDeauthentication( | |||
1826 | * True:exceed; | 1826 | * True:exceed; |
1827 | * False:normal case | 1827 | * False:normal case |
1828 | -*/ | 1828 | -*/ |
1829 | static BOOL | 1829 | static bool |
1830 | ChannelExceedZoneType( | 1830 | ChannelExceedZoneType( |
1831 | PSDevice pDevice, | 1831 | PSDevice pDevice, |
1832 | unsigned char byCurrChannel | 1832 | unsigned char byCurrChannel |
1833 | ) | 1833 | ) |
1834 | { | 1834 | { |
1835 | BOOL exceed=false; | 1835 | bool exceed=false; |
1836 | 1836 | ||
1837 | switch(pDevice->byZoneType) { | 1837 | switch(pDevice->byZoneType) { |
1838 | case 0x00: //USA:1~11 | 1838 | case 0x00: //USA:1~11 |
@@ -1869,20 +1869,20 @@ s_vMgrRxBeacon( | |||
1869 | PSDevice pDevice, | 1869 | PSDevice pDevice, |
1870 | PSMgmtObject pMgmt, | 1870 | PSMgmtObject pMgmt, |
1871 | PSRxMgmtPacket pRxPacket, | 1871 | PSRxMgmtPacket pRxPacket, |
1872 | BOOL bInScan | 1872 | bool bInScan |
1873 | ) | 1873 | ) |
1874 | { | 1874 | { |
1875 | 1875 | ||
1876 | PKnownBSS pBSSList; | 1876 | PKnownBSS pBSSList; |
1877 | WLAN_FR_BEACON sFrame; | 1877 | WLAN_FR_BEACON sFrame; |
1878 | QWORD qwTSFOffset; | 1878 | QWORD qwTSFOffset; |
1879 | BOOL bIsBSSIDEqual = false; | 1879 | bool bIsBSSIDEqual = false; |
1880 | BOOL bIsSSIDEqual = false; | 1880 | bool bIsSSIDEqual = false; |
1881 | BOOL bTSFLargeDiff = false; | 1881 | bool bTSFLargeDiff = false; |
1882 | BOOL bTSFOffsetPostive = false; | 1882 | bool bTSFOffsetPostive = false; |
1883 | BOOL bUpdateTSF = false; | 1883 | bool bUpdateTSF = false; |
1884 | BOOL bIsAPBeacon = false; | 1884 | bool bIsAPBeacon = false; |
1885 | BOOL bIsChannelEqual = false; | 1885 | bool bIsChannelEqual = false; |
1886 | unsigned int uLocateByteIndex; | 1886 | unsigned int uLocateByteIndex; |
1887 | unsigned char byTIMBitOn = 0; | 1887 | unsigned char byTIMBitOn = 0; |
1888 | unsigned short wAIDNumber = 0; | 1888 | unsigned short wAIDNumber = 0; |
@@ -1894,8 +1894,8 @@ s_vMgrRxBeacon( | |||
1894 | unsigned char byCurrChannel = pRxPacket->byRxChannel; | 1894 | unsigned char byCurrChannel = pRxPacket->byRxChannel; |
1895 | ERPObject sERP; | 1895 | ERPObject sERP; |
1896 | unsigned int uRateLen = WLAN_RATES_MAXLEN; | 1896 | unsigned int uRateLen = WLAN_RATES_MAXLEN; |
1897 | BOOL bChannelHit = false; | 1897 | bool bChannelHit = false; |
1898 | BOOL bUpdatePhyParameter = false; | 1898 | bool bUpdatePhyParameter = false; |
1899 | unsigned char byIEChannel = 0; | 1899 | unsigned char byIEChannel = 0; |
1900 | 1900 | ||
1901 | 1901 | ||
@@ -2803,7 +2803,7 @@ vMgrJoinBSSBegin( | |||
2803 | // Add current BSS to Candidate list | 2803 | // Add current BSS to Candidate list |
2804 | // This should only works for WPA2 BSS, and WPA2 BSS check must be done before. | 2804 | // This should only works for WPA2 BSS, and WPA2 BSS check must be done before. |
2805 | if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2) { | 2805 | if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2) { |
2806 | BOOL bResult = bAdd_PMKID_Candidate((void *)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj); | 2806 | bool bResult = bAdd_PMKID_Candidate((void *)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj); |
2807 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate: 1(%d)\n", bResult); | 2807 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate: 1(%d)\n", bResult); |
2808 | if (bResult == false) { | 2808 | if (bResult == false) { |
2809 | vFlush_PMKID_Candidate((void *)pDevice); | 2809 | vFlush_PMKID_Candidate((void *)pDevice); |
@@ -3155,8 +3155,8 @@ s_vMgrFormatTIM( | |||
3155 | unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; | 3155 | unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; |
3156 | unsigned char byMap; | 3156 | unsigned char byMap; |
3157 | unsigned int ii, jj; | 3157 | unsigned int ii, jj; |
3158 | BOOL bStartFound = false; | 3158 | bool bStartFound = false; |
3159 | BOOL bMulticast = false; | 3159 | bool bMulticast = false; |
3160 | unsigned short wStartIndex = 0; | 3160 | unsigned short wStartIndex = 0; |
3161 | unsigned short wEndIndex = 0; | 3161 | unsigned short wEndIndex = 0; |
3162 | 3162 | ||
@@ -4326,7 +4326,7 @@ s_vMgrRxProbeResponse( | |||
4326 | unsigned char byCurrChannel = pRxPacket->byRxChannel; | 4326 | unsigned char byCurrChannel = pRxPacket->byRxChannel; |
4327 | ERPObject sERP; | 4327 | ERPObject sERP; |
4328 | unsigned char byIEChannel = 0; | 4328 | unsigned char byIEChannel = 0; |
4329 | BOOL bChannelHit = true; | 4329 | bool bChannelHit = true; |
4330 | 4330 | ||
4331 | 4331 | ||
4332 | memset(&sFrame, 0, sizeof(WLAN_FR_PROBERESP)); | 4332 | memset(&sFrame, 0, sizeof(WLAN_FR_PROBERESP)); |
@@ -4543,7 +4543,7 @@ vMgrRxManagePacket( | |||
4543 | ) | 4543 | ) |
4544 | { | 4544 | { |
4545 | PSDevice pDevice = (PSDevice)hDeviceContext; | 4545 | PSDevice pDevice = (PSDevice)hDeviceContext; |
4546 | BOOL bInScan = false; | 4546 | bool bInScan = false; |
4547 | unsigned int uNodeIndex = 0; | 4547 | unsigned int uNodeIndex = 0; |
4548 | NODE_STATE eNodeState = 0; | 4548 | NODE_STATE eNodeState = 0; |
4549 | CMD_STATUS Status; | 4549 | CMD_STATUS Status; |
@@ -4684,7 +4684,7 @@ vMgrRxManagePacket( | |||
4684 | * true if success; false if failed. | 4684 | * true if success; false if failed. |
4685 | * | 4685 | * |
4686 | -*/ | 4686 | -*/ |
4687 | BOOL | 4687 | bool |
4688 | bMgrPrepareBeaconToSend( | 4688 | bMgrPrepareBeaconToSend( |
4689 | void *hDeviceContext, | 4689 | void *hDeviceContext, |
4690 | PSMgmtObject pMgmt | 4690 | PSMgmtObject pMgmt |
@@ -4808,7 +4808,7 @@ s_vMgrLogStatus( | |||
4808 | * Return Value: none. | 4808 | * Return Value: none. |
4809 | * | 4809 | * |
4810 | -*/ | 4810 | -*/ |
4811 | BOOL | 4811 | bool |
4812 | bAdd_PMKID_Candidate ( | 4812 | bAdd_PMKID_Candidate ( |
4813 | void *hDeviceContext, | 4813 | void *hDeviceContext, |
4814 | unsigned char *pbyBSSID, | 4814 | unsigned char *pbyBSSID, |
@@ -4882,7 +4882,7 @@ vFlush_PMKID_Candidate ( | |||
4882 | memset(&pDevice->gsPMKIDCandidate, 0, sizeof(SPMKIDCandidateEvent)); | 4882 | memset(&pDevice->gsPMKIDCandidate, 0, sizeof(SPMKIDCandidateEvent)); |
4883 | } | 4883 | } |
4884 | 4884 | ||
4885 | static BOOL | 4885 | static bool |
4886 | s_bCipherMatch ( | 4886 | s_bCipherMatch ( |
4887 | PKnownBSS pBSSNode, | 4887 | PKnownBSS pBSSNode, |
4888 | NDIS_802_11_ENCRYPTION_STATUS EncStatus, | 4888 | NDIS_802_11_ENCRYPTION_STATUS EncStatus, |
diff --git a/drivers/staging/vt6655/wmgr.h b/drivers/staging/vt6655/wmgr.h index 31ff2568e3e5..141e80b843af 100644 --- a/drivers/staging/vt6655/wmgr.h +++ b/drivers/staging/vt6655/wmgr.h | |||
@@ -280,7 +280,7 @@ typedef struct tagSMgmtObject | |||
280 | unsigned short wCurrAID; | 280 | unsigned short wCurrAID; |
281 | unsigned short wCurrATIMWindow; | 281 | unsigned short wCurrATIMWindow; |
282 | unsigned short wCurrBeaconPeriod; | 282 | unsigned short wCurrBeaconPeriod; |
283 | BOOL bIsDS; | 283 | bool bIsDS; |
284 | unsigned char byERPContext; | 284 | unsigned char byERPContext; |
285 | 285 | ||
286 | CMD_STATE eCommandState; | 286 | CMD_STATE eCommandState; |
@@ -301,7 +301,7 @@ typedef struct tagSMgmtObject | |||
301 | unsigned short wWPAIELen; | 301 | unsigned short wWPAIELen; |
302 | 302 | ||
303 | unsigned int uAssocCount; | 303 | unsigned int uAssocCount; |
304 | BOOL bMoreData; | 304 | bool bMoreData; |
305 | 305 | ||
306 | // Scan state vars | 306 | // Scan state vars |
307 | WMAC_SCAN_STATE eScanState; | 307 | WMAC_SCAN_STATE eScanState; |
@@ -317,13 +317,13 @@ typedef struct tagSMgmtObject | |||
317 | // Privacy | 317 | // Privacy |
318 | WMAC_AUTHENTICATION_MODE eAuthenMode; | 318 | WMAC_AUTHENTICATION_MODE eAuthenMode; |
319 | WMAC_ENCRYPTION_MODE eEncryptionMode; | 319 | WMAC_ENCRYPTION_MODE eEncryptionMode; |
320 | BOOL bShareKeyAlgorithm; | 320 | bool bShareKeyAlgorithm; |
321 | unsigned char abyChallenge[WLAN_CHALLENGE_LEN]; | 321 | unsigned char abyChallenge[WLAN_CHALLENGE_LEN]; |
322 | BOOL bPrivacyInvoked; | 322 | bool bPrivacyInvoked; |
323 | 323 | ||
324 | // Received beacon state vars | 324 | // Received beacon state vars |
325 | BOOL bInTIM; | 325 | bool bInTIM; |
326 | BOOL bMulticastTIM; | 326 | bool bMulticastTIM; |
327 | unsigned char byDTIMCount; | 327 | unsigned char byDTIMCount; |
328 | unsigned char byDTIMPeriod; | 328 | unsigned char byDTIMPeriod; |
329 | 329 | ||
@@ -331,10 +331,10 @@ typedef struct tagSMgmtObject | |||
331 | WMAC_POWER_MODE ePSMode; | 331 | WMAC_POWER_MODE ePSMode; |
332 | unsigned short wListenInterval; | 332 | unsigned short wListenInterval; |
333 | unsigned short wCountToWakeUp; | 333 | unsigned short wCountToWakeUp; |
334 | BOOL bInTIMWake; | 334 | bool bInTIMWake; |
335 | unsigned char *pbyPSPacketPool; | 335 | unsigned char *pbyPSPacketPool; |
336 | unsigned char byPSPacketPool[sizeof(STxMgmtPacket) + WLAN_NULLDATA_FR_MAXLEN]; | 336 | unsigned char byPSPacketPool[sizeof(STxMgmtPacket) + WLAN_NULLDATA_FR_MAXLEN]; |
337 | BOOL bRxBeaconInTBTTWake; | 337 | bool bRxBeaconInTBTTWake; |
338 | unsigned char abyPSTxMap[MAX_NODE_NUM + 1]; | 338 | unsigned char abyPSTxMap[MAX_NODE_NUM + 1]; |
339 | 339 | ||
340 | // management command related | 340 | // management command related |
@@ -366,7 +366,7 @@ typedef struct tagSMgmtObject | |||
366 | 366 | ||
367 | // WPA2 PMKID Cache | 367 | // WPA2 PMKID Cache |
368 | SPMKIDCache gsPMKIDCache; | 368 | SPMKIDCache gsPMKIDCache; |
369 | BOOL bRoaming; | 369 | bool bRoaming; |
370 | 370 | ||
371 | // rate fall back vars | 371 | // rate fall back vars |
372 | 372 | ||
@@ -377,8 +377,8 @@ typedef struct tagSMgmtObject | |||
377 | 377 | ||
378 | 378 | ||
379 | // for 802.11h | 379 | // for 802.11h |
380 | BOOL b11hEnable; | 380 | bool b11hEnable; |
381 | BOOL bSwitchChannel; | 381 | bool bSwitchChannel; |
382 | unsigned char byNewChannel; | 382 | unsigned char byNewChannel; |
383 | PWLAN_IE_MEASURE_REP pCurrMeasureEIDRep; | 383 | PWLAN_IE_MEASURE_REP pCurrMeasureEIDRep; |
384 | unsigned int uLengthOfRepEIDs; | 384 | unsigned int uLengthOfRepEIDs; |
@@ -480,14 +480,14 @@ vMgrDeAuthenBeginSta( | |||
480 | PCMD_STATUS pStatus | 480 | PCMD_STATUS pStatus |
481 | ); | 481 | ); |
482 | 482 | ||
483 | BOOL | 483 | bool |
484 | bMgrPrepareBeaconToSend( | 484 | bMgrPrepareBeaconToSend( |
485 | void *hDeviceContext, | 485 | void *hDeviceContext, |
486 | PSMgmtObject pMgmt | 486 | PSMgmtObject pMgmt |
487 | ); | 487 | ); |
488 | 488 | ||
489 | 489 | ||
490 | BOOL | 490 | bool |
491 | bAdd_PMKID_Candidate ( | 491 | bAdd_PMKID_Candidate ( |
492 | void *hDeviceContext, | 492 | void *hDeviceContext, |
493 | unsigned char *pbyBSSID, | 493 | unsigned char *pbyBSSID, |
diff --git a/drivers/staging/vt6655/wpa.c b/drivers/staging/vt6655/wpa.c index 5d357a25f9da..61ac46fa505e 100644 --- a/drivers/staging/vt6655/wpa.c +++ b/drivers/staging/vt6655/wpa.c | |||
@@ -237,7 +237,7 @@ WPA_ParseRSN ( | |||
237 | * Return Value: none. | 237 | * Return Value: none. |
238 | * | 238 | * |
239 | -*/ | 239 | -*/ |
240 | BOOL | 240 | bool |
241 | WPA_SearchRSN ( | 241 | WPA_SearchRSN ( |
242 | unsigned char byCmd, | 242 | unsigned char byCmd, |
243 | unsigned char byEncrypt, | 243 | unsigned char byEncrypt, |
@@ -297,7 +297,7 @@ WPA_SearchRSN ( | |||
297 | * Return Value: none. | 297 | * Return Value: none. |
298 | * | 298 | * |
299 | -*/ | 299 | -*/ |
300 | BOOL | 300 | bool |
301 | WPAb_Is_RSN ( | 301 | WPAb_Is_RSN ( |
302 | PWLAN_IE_RSN_EXT pRSN | 302 | PWLAN_IE_RSN_EXT pRSN |
303 | ) | 303 | ) |
diff --git a/drivers/staging/vt6655/wpa.h b/drivers/staging/vt6655/wpa.h index 99b2e0eacd31..921fd7ae9d38 100644 --- a/drivers/staging/vt6655/wpa.h +++ b/drivers/staging/vt6655/wpa.h | |||
@@ -69,14 +69,14 @@ WPA_ParseRSN( | |||
69 | PWLAN_IE_RSN_EXT pRSN | 69 | PWLAN_IE_RSN_EXT pRSN |
70 | ); | 70 | ); |
71 | 71 | ||
72 | BOOL | 72 | bool |
73 | WPA_SearchRSN( | 73 | WPA_SearchRSN( |
74 | unsigned char byCmd, | 74 | unsigned char byCmd, |
75 | unsigned char byEncrypt, | 75 | unsigned char byEncrypt, |
76 | PKnownBSS pBSSList | 76 | PKnownBSS pBSSList |
77 | ); | 77 | ); |
78 | 78 | ||
79 | BOOL | 79 | bool |
80 | WPAb_Is_RSN( | 80 | WPAb_Is_RSN( |
81 | PWLAN_IE_RSN_EXT pRSN | 81 | PWLAN_IE_RSN_EXT pRSN |
82 | ); | 82 | ); |
diff --git a/drivers/staging/vt6655/wpa2.c b/drivers/staging/vt6655/wpa2.c index b5f3a66f89d6..805164bed7e4 100644 --- a/drivers/staging/vt6655/wpa2.c +++ b/drivers/staging/vt6655/wpa2.c | |||
@@ -116,7 +116,7 @@ WPA2vParseRSN ( | |||
116 | int i, j; | 116 | int i, j; |
117 | unsigned short m = 0, n = 0; | 117 | unsigned short m = 0, n = 0; |
118 | unsigned char *pbyOUI; | 118 | unsigned char *pbyOUI; |
119 | BOOL bUseGK = false; | 119 | bool bUseGK = false; |
120 | 120 | ||
121 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"WPA2_ParseRSN: [%d]\n", pRSN->len); | 121 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"WPA2_ParseRSN: [%d]\n", pRSN->len); |
122 | 122 | ||
diff --git a/drivers/staging/vt6655/wpactl.c b/drivers/staging/vt6655/wpactl.c index 2b37bb8e375d..0142338bcafe 100644 --- a/drivers/staging/vt6655/wpactl.c +++ b/drivers/staging/vt6655/wpactl.c | |||
@@ -199,7 +199,7 @@ int wpa_set_wpadev(PSDevice pDevice, int val) | |||
199 | * | 199 | * |
200 | */ | 200 | */ |
201 | 201 | ||
202 | int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel) | 202 | int wpa_set_keys(PSDevice pDevice, void *ctx, bool fcpfkernel) |
203 | { | 203 | { |
204 | struct viawget_wpa_param *param=ctx; | 204 | struct viawget_wpa_param *param=ctx; |
205 | PSMgmtObject pMgmt = pDevice->pMgmt; | 205 | PSMgmtObject pMgmt = pDevice->pMgmt; |
@@ -755,7 +755,7 @@ static int wpa_set_associate(PSDevice pDevice, | |||
755 | unsigned char abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; | 755 | unsigned char abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; |
756 | unsigned char abyWPAIE[64]; | 756 | unsigned char abyWPAIE[64]; |
757 | int ret = 0; | 757 | int ret = 0; |
758 | BOOL bWepEnabled=false; | 758 | bool bWepEnabled=false; |
759 | 759 | ||
760 | // set key type & algorithm | 760 | // set key type & algorithm |
761 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pairwise_suite = %d\n", param->u.wpa_associate.pairwise_suite); | 761 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pairwise_suite = %d\n", param->u.wpa_associate.pairwise_suite); |
diff --git a/drivers/staging/vt6655/wpactl.h b/drivers/staging/vt6655/wpactl.h index 52bc7e3dbb48..dbe8e861d991 100644 --- a/drivers/staging/vt6655/wpactl.h +++ b/drivers/staging/vt6655/wpactl.h | |||
@@ -64,7 +64,7 @@ typedef unsigned long long NDIS_802_11_KEY_RSC; | |||
64 | 64 | ||
65 | int wpa_set_wpadev(PSDevice pDevice, int val); | 65 | int wpa_set_wpadev(PSDevice pDevice, int val); |
66 | int wpa_ioctl(PSDevice pDevice, struct iw_point *p); | 66 | int wpa_ioctl(PSDevice pDevice, struct iw_point *p); |
67 | int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel); | 67 | int wpa_set_keys(PSDevice pDevice, void *ctx, bool fcpfkernel); |
68 | 68 | ||
69 | #endif // __WPACL_H__ | 69 | #endif // __WPACL_H__ |
70 | 70 | ||
diff --git a/drivers/staging/vt6655/wroute.c b/drivers/staging/vt6655/wroute.c index 58348f57ff6f..66e2eeae628b 100644 --- a/drivers/staging/vt6655/wroute.c +++ b/drivers/staging/vt6655/wroute.c | |||
@@ -65,14 +65,14 @@ static int msglevel =MSG_LEVEL_INFO; | |||
65 | * Return Value: true if packet duplicate; otherwise false | 65 | * Return Value: true if packet duplicate; otherwise false |
66 | * | 66 | * |
67 | */ | 67 | */ |
68 | BOOL ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex) | 68 | bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex) |
69 | { | 69 | { |
70 | PSMgmtObject pMgmt = pDevice->pMgmt; | 70 | PSMgmtObject pMgmt = pDevice->pMgmt; |
71 | PSTxDesc pHeadTD, pLastTD; | 71 | PSTxDesc pHeadTD, pLastTD; |
72 | unsigned int cbFrameBodySize; | 72 | unsigned int cbFrameBodySize; |
73 | unsigned int uMACfragNum; | 73 | unsigned int uMACfragNum; |
74 | unsigned char byPktType; | 74 | unsigned char byPktType; |
75 | BOOL bNeedEncryption = false; | 75 | bool bNeedEncryption = false; |
76 | SKeyItem STempKey; | 76 | SKeyItem STempKey; |
77 | PSKeyItem pTransmitKey = NULL; | 77 | PSKeyItem pTransmitKey = NULL; |
78 | unsigned int cbHeaderSize; | 78 | unsigned int cbHeaderSize; |
diff --git a/drivers/staging/vt6655/wroute.h b/drivers/staging/vt6655/wroute.h index 79f3014ab000..34f9e43a6cc4 100644 --- a/drivers/staging/vt6655/wroute.h +++ b/drivers/staging/vt6655/wroute.h | |||
@@ -39,7 +39,7 @@ | |||
39 | 39 | ||
40 | /*--------------------- Export Functions --------------------------*/ | 40 | /*--------------------- Export Functions --------------------------*/ |
41 | 41 | ||
42 | BOOL ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex); | 42 | bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex); |
43 | 43 | ||
44 | #endif // __WROUTE_H__ | 44 | #endif // __WROUTE_H__ |
45 | 45 | ||