diff options
| author | Charles Clément <caratorn@gmail.com> | 2010-08-01 17:15:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 18:17:57 -0700 |
| 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 { /*--------------------- Static Variables --------------------------*/ /*--------------------- Static Functions --------------------------*/ -static BOOL s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq, +static bool s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq, unsigned int uLength) { size_t uNumOfEIDs = 0; - BOOL bResult = true; + bool bResult = true; if (uLength <= WLAN_A3FR_MAXLEN) { memcpy(pMgmt->abyCurrentMSRReq, pMSRReq, uLength); @@ -118,7 +118,7 @@ static BOOL s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq, } -static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, unsigned char byRate, unsigned char byRSSI) +static bool s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, unsigned char byRate, unsigned char byRSSI) { PWLAN_FRAME_TPCREP pFrame; PSTxMgmtPacket pTxPacket = NULL; @@ -203,7 +203,7 @@ static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, unsigned * Return Value: None. * -*/ -BOOL +bool IEEE11hbMgrRxAction ( void *pMgmtHandle, void *pRxPacket @@ -266,7 +266,7 @@ IEEE11hbMgrRxAction ( } -BOOL IEEE11hbMSRRepTx ( +bool IEEE11hbMSRRepTx ( void *pMgmtHandle ) { 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 @@ /*--------------------- Export Functions --------------------------*/ -BOOL IEEE11hbMSRRepTx ( +bool IEEE11hbMSRRepTx ( void *pMgmtHandle ); 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]; * Return Value: MIC compare result * */ -BOOL AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize) +bool AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize) { unsigned char abyNonce[13]; unsigned char MIC_IV[16]; @@ -260,7 +260,7 @@ unsigned char *pbyIV; unsigned char *pbyPayload; unsigned short wHLen = 22; unsigned short wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;//8 is IV, 8 is MIC, 4 is CRC -BOOL bA4 = false; +bool bA4 = false; unsigned char byTmp; unsigned short wCnt; 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 @@ /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -BOOL AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize); +bool AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize); #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 ( unsigned int cbBitCount; unsigned int cbUsCount = 0; unsigned int cbTmp; - BOOL bExtBit; + bool bExtBit; unsigned char byPreambleType = pDevice->byPreambleType; - BOOL bCCK = pDevice->bCCK; + bool bCCK = pDevice->bCCK; cbBitCount = cbFrameLength * 8; bExtBit = false; @@ -2015,7 +2015,7 @@ BBvCaculateParameter ( * Return Value: true if succeeded; false if failed. * */ -BOOL BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char *pbyData) +bool BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char *pbyData) { unsigned short ww; unsigned char byValue; @@ -2058,7 +2058,7 @@ BOOL BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch * Return Value: true if succeeded; false if failed. * */ -BOOL BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byData) +bool BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byData) { unsigned short ww; unsigned char byValue; @@ -2100,7 +2100,7 @@ BOOL BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned c * Return Value: true if all TestBits are set; false otherwise. * */ -BOOL BBbIsRegBitsOn (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits) +bool BBbIsRegBitsOn (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits) { unsigned char byOrgData; @@ -2123,7 +2123,7 @@ BOOL BBbIsRegBitsOn (unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch * Return Value: true if all TestBits are clear; false otherwise. * */ -BOOL BBbIsRegBitsOff (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits) +bool BBbIsRegBitsOff (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits) { unsigned char byOrgData; @@ -2146,9 +2146,9 @@ BOOL BBbIsRegBitsOff (unsigned long dwIoBase, unsigned char byBBAddr, unsigned c * */ -BOOL BBbVT3253Init (PSDevice pDevice) +bool BBbVT3253Init (PSDevice pDevice) { - BOOL bResult = true; + bool bResult = true; int ii; unsigned long dwIoBase = pDevice->PortOffset; 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 ( unsigned char *pbyPhySgn ); -BOOL BBbReadEmbeded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char *pbyData); -BOOL BBbWriteEmbeded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byData); +bool BBbReadEmbeded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char *pbyData); +bool BBbWriteEmbeded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byData); void BBvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyBBRegs); void BBvLoopbackOn(PSDevice pDevice); void BBvLoopbackOff(PSDevice pDevice); void BBvSetShortSlotTime(PSDevice pDevice); -BOOL BBbIsRegBitsOn(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits); -BOOL BBbIsRegBitsOff(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits); +bool BBbIsRegBitsOn(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits); +bool BBbIsRegBitsOff(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits); void BBvSetVGAGainOffset(PSDevice pDevice, unsigned char byData); // VT3253 Baseband -BOOL BBbVT3253Init(PSDevice pDevice); +bool BBbVT3253Init(PSDevice pDevice); void BBvSoftwareReset(unsigned long dwIoBase); void BBvPowerSaveModeON(unsigned long dwIoBase); 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; void BSSvClearBSSList( void *hDeviceContext, - BOOL bKeepCurrBSSID + bool bKeepCurrBSSID ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -367,7 +367,7 @@ BSSpAddrIsInBSSList( * -*/ -BOOL +bool BSSbInsertToBSSList ( void *hDeviceContext, unsigned char *abyBSSIDAddr, @@ -394,7 +394,7 @@ BSSbInsertToBSSList ( PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; PKnownBSS pBSSList = NULL; unsigned int ii; - BOOL bParsingQuiet = false; + bool bParsingQuiet = false; PWLAN_IE_QUIET pQuiet = NULL; @@ -492,7 +492,7 @@ BSSbInsertToBSSList ( if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || (pBSSList->bWPA2Valid == true)) { PSKeyItem pTransmitKey = NULL; - BOOL bIs802_1x = false; + bool bIs802_1x = false; for (ii = 0; ii < pBSSList->wAKMSSAuthCount; ii ++) { if (pBSSList->abyAKMSSAuthType[ii] == WLAN_11i_AKMSS_802_1X) { @@ -583,14 +583,14 @@ BSSbInsertToBSSList ( -*/ // TODO: input structure modify -BOOL +bool BSSbUpdateToBSSList ( void *hDeviceContext, QWORD qwTimestamp, unsigned short wBeaconInterval, unsigned short wCapInfo, unsigned char byCurrChannel, - BOOL bChannelHit, + bool bChannelHit, PWLAN_IE_SSID pSSID, PWLAN_IE_SUPP_RATES pSuppRates, PWLAN_IE_SUPP_RATES pExtSuppRates, @@ -610,7 +610,7 @@ BSSbUpdateToBSSList ( PSMgmtObject pMgmt = pDevice->pMgmt; PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; long ldBm; - BOOL bParsingQuiet = false; + bool bParsingQuiet = false; PWLAN_IE_QUIET pQuiet = NULL; @@ -761,7 +761,7 @@ BSSbUpdateToBSSList ( * -*/ -BOOL +bool BSSDBbIsSTAInNodeDB(void *pMgmtObject, unsigned char *abyDstAddr, unsigned int *puNodeIndex) { @@ -1001,7 +1001,7 @@ BSSvAddMulticastNode( -*/ //2008-4-14 <add> by chester for led issue #ifdef FOR_LED_ON_NOTEBOOK -BOOL cc=false; +bool cc=false; unsigned int status; #endif 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 typedef struct tagSERPObject { - BOOL bERPExist; + bool bERPExist; unsigned char byERP; }ERPObject, *PERPObject; typedef struct tagSRSNCapObject { - BOOL bRSNCapExist; + bool bRSNCapExist; unsigned short wRSNCap; }SRSNCapObject, *PSRSNCapObject; @@ -104,7 +104,7 @@ typedef struct tagSRSNCapObject { #pragma pack(1) typedef struct tagKnownBSS { // BSS info - BOOL bActive; + bool bActive; unsigned char abyBSSID[WLAN_BSSID_LEN]; unsigned int uChannel; unsigned char abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; @@ -122,10 +122,10 @@ typedef struct tagKnownBSS { long ldBmAverage[RSSI_STAT_COUNT]; long ldBmAverRange; //For any BSSID selection improvment - BOOL bSelected; + bool bSelected; //++ WPA informations - BOOL bWPAValid; + bool bWPAValid; unsigned char byGKType; unsigned char abyPKType[4]; unsigned short wPKCount; @@ -136,7 +136,7 @@ typedef struct tagKnownBSS { //-- //++ WPA2 informations - BOOL bWPA2Valid; + bool bWPA2Valid; unsigned char byCSSGK; unsigned short wCSSPKCount; unsigned char abyCSSPK[4]; @@ -181,14 +181,14 @@ typedef enum tagNODE_STATE { // STA node info typedef struct tagKnownNodeDB { // STA info - BOOL bActive; + bool bActive; unsigned char abyMACAddr[WLAN_ADDR_LEN]; unsigned char abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; unsigned char abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; unsigned short wTxDataRate; - BOOL bShortPreamble; - BOOL bERPExist; - BOOL bShortSlotTime; + bool bShortPreamble; + bool bERPExist; + bool bShortSlotTime; unsigned int uInActiveCount; unsigned short wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp. unsigned short wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon. @@ -202,15 +202,15 @@ typedef struct tagKnownNodeDB { unsigned short wListenInterval; unsigned short wAID; NODE_STATE eNodeState; - BOOL bPSEnable; - BOOL bRxPSPoll; + bool bPSEnable; + bool bRxPSPoll; unsigned char byAuthSequence; unsigned long ulLastRxJiffer; unsigned char bySuppRate; unsigned long dwFlags; unsigned short wEnQueueCnt; - BOOL bOnFly; + bool bOnFly; unsigned long long KeyRSC; unsigned char byKeyIndex; unsigned long dwKeyIndex; @@ -221,7 +221,7 @@ typedef struct tagKnownNodeDB { unsigned char abyWepKey[WLAN_WEPMAX_KEYLEN]; // // Auto rate fallback vars - BOOL bIsInFallback; + bool bIsInFallback; unsigned int uAverageRSSI; unsigned int uRateRecoveryTimeout; unsigned int uRatePollTimeout; @@ -260,10 +260,10 @@ BSSpAddrIsInBSSList( void BSSvClearBSSList( void *hDeviceContext, - BOOL bKeepCurrBSSID + bool bKeepCurrBSSID ); -BOOL +bool BSSbInsertToBSSList( void *hDeviceContext, unsigned char *abyBSSIDAddr, @@ -285,14 +285,14 @@ BSSbInsertToBSSList( ); -BOOL +bool BSSbUpdateToBSSList( void *hDeviceContext, QWORD qwTimestamp, unsigned short wBeaconInterval, unsigned short wCapInfo, unsigned char byCurrChannel, - BOOL bChannelHit, + bool bChannelHit, PWLAN_IE_SSID pSSID, PWLAN_IE_SUPP_RATES pSuppRates, PWLAN_IE_SUPP_RATES pExtSuppRates, @@ -308,7 +308,7 @@ BSSbUpdateToBSSList( ); -BOOL +bool BSSDBbIsSTAInNodeDB(void *hDeviceContext, unsigned char *abyDstAddr, unsigned int *puNodeIndex); 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, * */ /* -BOOL CARDbSendPacket (void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength) +bool CARDbSendPacket (void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength) { PSDevice pDevice = (PSDevice) pDeviceHandler; if (ePktType == PKT_TYPE_802_11_MNG) { @@ -397,7 +397,7 @@ BOOL CARDbSendPacket (void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktTyp * Return Value: true if short preamble; otherwise false * */ -BOOL CARDbIsShortPreamble (void *pDeviceHandler) +bool CARDbIsShortPreamble (void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; if (pDevice->byPreambleType == 0) { @@ -418,7 +418,7 @@ BOOL CARDbIsShortPreamble (void *pDeviceHandler) * Return Value: true if short slot time; otherwise false * */ -BOOL CARDbIsShorSlotTime (void *pDeviceHandler) +bool CARDbIsShorSlotTime (void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; return(pDevice->bShortSlotTime); @@ -437,7 +437,7 @@ BOOL CARDbIsShorSlotTime (void *pDeviceHandler) * Return Value: None. * */ -BOOL CARDbSetPhyParameter (void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned short wCapInfo, unsigned char byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs) +bool CARDbSetPhyParameter (void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned short wCapInfo, unsigned char byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs) { PSDevice pDevice = (PSDevice) pDeviceHandler; unsigned char byCWMaxMin = 0; @@ -624,7 +624,7 @@ BOOL CARDbSetPhyParameter (void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigne * Return Value: none * */ -BOOL CARDbUpdateTSF (void *pDeviceHandler, unsigned char byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF) +bool CARDbUpdateTSF (void *pDeviceHandler, unsigned char byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF) { PSDevice pDevice = (PSDevice) pDeviceHandler; QWORD qwTSFOffset; @@ -659,7 +659,7 @@ BOOL CARDbUpdateTSF (void *pDeviceHandler, unsigned char byRxRate, QWORD qwBSSTi * Return Value: true if succeed; otherwise false * */ -BOOL CARDbSetBeaconPeriod (void *pDeviceHandler, unsigned short wBeaconInterval) +bool CARDbSetBeaconPeriod (void *pDeviceHandler, unsigned short wBeaconInterval) { PSDevice pDevice = (PSDevice) pDeviceHandler; unsigned int uBeaconInterval = 0; @@ -713,7 +713,7 @@ BOOL CARDbSetBeaconPeriod (void *pDeviceHandler, unsigned short wBeaconInterval) * Return Value: true if all data packet complete; otherwise false. * */ -BOOL CARDbStopTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) +bool CARDbStopTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -771,7 +771,7 @@ BOOL CARDbStopTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) * Return Value: true if success; false if failed. * */ -BOOL CARDbStartTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) +bool CARDbStartTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -813,7 +813,7 @@ BOOL CARDbStartTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) * Return Value: true if success; false if failed. * */ -BOOL CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE eOPMode) +bool CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE eOPMode) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -882,7 +882,7 @@ BOOL CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE e * Return Value: true if succeed; otherwise false * */ -BOOL CARDbSetTxDataRate( +bool CARDbSetTxDataRate( void *pDeviceHandler, unsigned short wDataRate ) @@ -907,7 +907,7 @@ BOOL CARDbSetTxDataRate( * Return Value: true if power down success; otherwise false * -*/ -BOOL +bool CARDbPowerDown( void *pDeviceHandler ) @@ -946,10 +946,10 @@ CARDbPowerDown( * Return Value: true if success; otherwise false * */ -BOOL CARDbRadioPowerOff (void *pDeviceHandler) +bool CARDbRadioPowerOff (void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; - BOOL bResult = true; + bool bResult = true; if (pDevice->bRadioOff == true) return true; @@ -995,10 +995,10 @@ MACvRegBitsOn(pDevice->PortOffset, MAC_REG_GPIOCTL0, LED_ACTSET); //LED issue * Return Value: true if success; otherwise false * */ -BOOL CARDbRadioPowerOn (void *pDeviceHandler) +bool CARDbRadioPowerOn (void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; - BOOL bResult = true; + bool bResult = true; printk("chester power on\n"); if (pDevice->bRadioControlOff == true){ if (pDevice->bHWRadioOff == true) printk("chester bHWRadioOff\n"); @@ -1039,7 +1039,7 @@ MACvRegBitsOff(pDevice->PortOffset, MAC_REG_GPIOCTL0, LED_ACTSET); //LED issue -BOOL CARDbRemoveKey (void *pDeviceHandler, unsigned char *pbyBSSID) +bool CARDbRemoveKey (void *pDeviceHandler, unsigned char *pbyBSSID) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -1064,11 +1064,11 @@ BOOL CARDbRemoveKey (void *pDeviceHandler, unsigned char *pbyBSSID) * Return Value: none. * -*/ -BOOL +bool CARDbAdd_PMKID_Candidate ( void *pDeviceHandler, unsigned char *pbyBSSID, - BOOL bRSNCapExist, + bool bRSNCapExist, unsigned short wRSNCap ) { @@ -1139,7 +1139,7 @@ CARDpGetCurrentAddress ( * Return Value: none. * -*/ -BOOL +bool CARDbStartMeasure ( void *pDeviceHandler, void *pvMeasureEIDs, @@ -1150,7 +1150,7 @@ CARDbStartMeasure ( PWLAN_IE_MEASURE_REQ pEID = (PWLAN_IE_MEASURE_REQ) pvMeasureEIDs; QWORD qwCurrTSF; QWORD qwStartTSF; - BOOL bExpired = true; + bool bExpired = true; unsigned short wDuration = 0; if ((pEID == NULL) || @@ -1266,7 +1266,7 @@ CARDbStartMeasure ( * Return Value: none. * -*/ -BOOL +bool CARDbChannelSwitch ( void *pDeviceHandler, unsigned char byMode, @@ -1275,7 +1275,7 @@ CARDbChannelSwitch ( ) { PSDevice pDevice = (PSDevice) pDeviceHandler; - BOOL bResult = true; + bool bResult = true; if (byCount == 0) { bResult = set_channel(pDevice, byNewChannel); @@ -1309,10 +1309,10 @@ CARDbChannelSwitch ( * Return Value: none. * -*/ -BOOL +bool CARDbSetQuiet ( void *pDeviceHandler, - BOOL bResetQuiet, + bool bResetQuiet, unsigned char byQuietCount, unsigned char byQuietPeriod, unsigned short wQuietDuration, @@ -1365,7 +1365,7 @@ CARDbSetQuiet ( * Return Value: none. * -*/ -BOOL +bool CARDbStartQuiet ( void *pDeviceHandler ) @@ -1946,7 +1946,7 @@ void CARDvUpdateBasicTopRate (void *pDeviceHandler) * Return Value: true if succeeded; false if failed. * */ -BOOL CARDbAddBasicRate (void *pDeviceHandler, unsigned short wRateIdx) +bool CARDbAddBasicRate (void *pDeviceHandler, unsigned short wRateIdx) { PSDevice pDevice = (PSDevice) pDeviceHandler; unsigned short wRate = (unsigned short)(1<<wRateIdx); @@ -1959,7 +1959,7 @@ BOOL CARDbAddBasicRate (void *pDeviceHandler, unsigned short wRateIdx) return(true); } -BOOL CARDbIsOFDMinBasicRate (void *pDeviceHandler) +bool CARDbIsOFDMinBasicRate (void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; int ii; @@ -2028,7 +2028,7 @@ void CARDvSetLoopbackMode (unsigned long dwIoBase, unsigned short wLoopbackMode) * Return Value: none * */ -BOOL CARDbSoftwareReset (void *pDeviceHandler) +bool CARDbSoftwareReset (void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -2092,7 +2092,7 @@ QWORD CARDqGetTSFOffset (unsigned char byRxRate, QWORD qwTSF1, QWORD qwTSF2) * Return Value: true if success; otherwise false * */ -BOOL CARDbGetCurrentTSF (unsigned long dwIoBase, PQWORD pqwCurrTSF) +bool CARDbGetCurrentTSF (unsigned long dwIoBase, PQWORD pqwCurrTSF) { unsigned short ww; 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 @@ #define __CARD_H__ #include "ttype.h" +#include <linux/types.h> /*--------------------- Export Definitions -------------------------*/ // @@ -89,51 +90,51 @@ typedef enum _CARD_OP_MODE { void CARDvSetRSPINF(void *pDeviceHandler, CARD_PHY_TYPE ePHYType); void vUpdateIFS(void *pDeviceHandler); void CARDvUpdateBasicTopRate(void *pDeviceHandler); -BOOL CARDbAddBasicRate(void *pDeviceHandler, unsigned short wRateIdx); -BOOL CARDbIsOFDMinBasicRate(void *pDeviceHandler); +bool CARDbAddBasicRate(void *pDeviceHandler, unsigned short wRateIdx); +bool CARDbIsOFDMinBasicRate(void *pDeviceHandler); void CARDvSetLoopbackMode(unsigned long dwIoBase, unsigned short wLoopbackMode); -BOOL CARDbSoftwareReset(void *pDeviceHandler); +bool CARDbSoftwareReset(void *pDeviceHandler); void CARDvSetFirstNextTBTT(unsigned long dwIoBase, unsigned short wBeaconInterval); void CARDvUpdateNextTBTT(unsigned long dwIoBase, QWORD qwTSF, unsigned short wBeaconInterval); -BOOL CARDbGetCurrentTSF(unsigned long dwIoBase, PQWORD pqwCurrTSF); +bool CARDbGetCurrentTSF(unsigned long dwIoBase, PQWORD pqwCurrTSF); QWORD CARDqGetNextTBTT(QWORD qwTSF, unsigned short wBeaconInterval); QWORD CARDqGetTSFOffset(unsigned char byRxRate, QWORD qwTSF1, QWORD qwTSF2); -BOOL CARDbSetTxPower(void *pDeviceHandler, unsigned long ulTxPower); +bool CARDbSetTxPower(void *pDeviceHandler, unsigned long ulTxPower); unsigned char CARDbyGetPktType(void *pDeviceHandler); void CARDvSafeResetTx(void *pDeviceHandler); void CARDvSafeResetRx(void *pDeviceHandler); //xxx -BOOL CARDbRadioPowerOff(void *pDeviceHandler); -BOOL CARDbRadioPowerOn(void *pDeviceHandler); -//BOOL CARDbSendPacket(void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength); -BOOL CARDbIsShortPreamble(void *pDeviceHandler); -BOOL CARDbIsShorSlotTime(void *pDeviceHandler); -BOOL CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned short wCapInfo, unsigned char byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs); -BOOL CARDbUpdateTSF(void *pDeviceHandler, unsigned char byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF); -BOOL CARDbStopTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType); -BOOL CARDbStartTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType); -BOOL CARDbSetBeaconPeriod(void *pDeviceHandler, unsigned short wBeaconInterval); -BOOL CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE eOPMode); - -BOOL +bool CARDbRadioPowerOff(void *pDeviceHandler); +bool CARDbRadioPowerOn(void *pDeviceHandler); +//bool CARDbSendPacket(void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength); +bool CARDbIsShortPreamble(void *pDeviceHandler); +bool CARDbIsShorSlotTime(void *pDeviceHandler); +bool CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned short wCapInfo, unsigned char byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs); +bool CARDbUpdateTSF(void *pDeviceHandler, unsigned char byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF); +bool CARDbStopTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType); +bool CARDbStartTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType); +bool CARDbSetBeaconPeriod(void *pDeviceHandler, unsigned short wBeaconInterval); +bool CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE eOPMode); + +bool CARDbPowerDown( void *pDeviceHandler ); -BOOL CARDbSetTxDataRate( +bool CARDbSetTxDataRate( void *pDeviceHandler, unsigned short wDataRate ); -BOOL CARDbRemoveKey (void *pDeviceHandler, unsigned char *pbyBSSID); +bool CARDbRemoveKey (void *pDeviceHandler, unsigned char *pbyBSSID); -BOOL +bool CARDbAdd_PMKID_Candidate ( void *pDeviceHandler, unsigned char *pbyBSSID, - BOOL bRSNCapExist, + bool bRSNCapExist, unsigned short wRSNCap ); @@ -142,14 +143,14 @@ CARDpGetCurrentAddress ( void *pDeviceHandler ); -BOOL +bool CARDbStartMeasure ( void *pDeviceHandler, void *pvMeasureEIDs, unsigned int uNumOfMeasureEIDs ); -BOOL +bool CARDbChannelSwitch ( void *pDeviceHandler, unsigned char byMode, @@ -157,17 +158,17 @@ CARDbChannelSwitch ( unsigned char byCount ); -BOOL +bool CARDbSetQuiet ( void *pDeviceHandler, - BOOL bResetQuiet, + bool bResetQuiet, unsigned char byQuietCount, unsigned char byQuietPeriod, unsigned short wQuietDuration, unsigned short wQuietOffset ); -BOOL +bool CARDbStartQuiet ( void *pDeviceHandler ); 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 * 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165 (Value 23 ~ 56) */ -BOOL is_channel_valid(unsigned int ChannelIndex) +bool is_channel_valid(unsigned int ChannelIndex) { - BOOL bValid; + bool bValid; bValid = false; /* @@ -407,7 +407,7 @@ exit: * 0x000000000000000F means channel 1,2,..15 are supported */ -BOOL channel_get_list(unsigned int uCountryCodeIdx, unsigned char *pbyChannelTable) +bool channel_get_list(unsigned int uCountryCodeIdx, unsigned char *pbyChannelTable) { if (uCountryCodeIdx >= CCODE_MAX) return (false); @@ -420,7 +420,7 @@ BOOL channel_get_list(unsigned int uCountryCodeIdx, unsigned char *pbyChannelTab void init_channel_table(void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; - BOOL bMultiBand = false; + bool bMultiBand = false; unsigned int ii; for(ii = 1 ; ii<=CARD_MAX_CHANNEL_TBL ; ii++) { @@ -525,10 +525,10 @@ unsigned char get_channel_number(void *pDeviceHandler, unsigned char byChannelIn * Return Value: true if succeeded; false if failed. * */ -BOOL set_channel (void *pDeviceHandler, unsigned int uConnectionChannel) +bool set_channel (void *pDeviceHandler, unsigned int uConnectionChannel) { PSDevice pDevice = (PSDevice) pDeviceHandler; - BOOL bResult = true; + bool bResult = true; if (pDevice->byCurrentCh == uConnectionChannel) { @@ -745,7 +745,7 @@ void set_country_IE(void *pDeviceHandler, void *pIE) pIECountry->len += 3; } -BOOL get_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex, +bool get_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex, unsigned char *pbyChannelNumber, unsigned char *pbyMap) { 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 @@ typedef struct tagSChannelTblElement { unsigned char byChannelNumber; unsigned int uFrequency; - BOOL bValid; + bool bValid; unsigned char byMAP; }SChannelTblElement, *PSChannelTblElement; /*--------------------- Export Functions --------------------------*/ -BOOL is_channel_valid(unsigned int CountryCode); +bool is_channel_valid(unsigned int CountryCode); void init_channel_table(void *pDeviceHandler); unsigned char get_channel_mapping(void *pDeviceHandler, unsigned char byChannelNumber, CARD_PHY_TYPE ePhyType); -BOOL channel_get_list(unsigned int uCountryCodeIdx, unsigned char *pbyChannelTable); +bool channel_get_list(unsigned int uCountryCodeIdx, unsigned char *pbyChannelTable); unsigned char get_channel_number(void *pDeviceHandler, unsigned char byChannelIndex); -BOOL set_channel(void *pDeviceHandler, unsigned int uConnectionChannel); +bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel); void set_country_info(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, void *pIE); unsigned char set_support_channels(void *pDeviceHandler, unsigned char *pbyIEs); void set_country_IE(void *pDeviceHandler, void *pIE); -BOOL get_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex, +bool get_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex, unsigned char *pbyChannelNumber, unsigned char *pbyMap); void set_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex, 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 ( void *pDeviceHandler, PWLAN_IE_SUPP_RATES pItemRates, PWLAN_IE_SUPP_RATES pItemExtRates, - BOOL bUpdateBasicRate, + bool bUpdateBasicRate, unsigned short *pwMaxBasicRate, unsigned short *pwMaxSuppRate, unsigned short *pwSuppRate, @@ -317,7 +317,7 @@ PSDevice pDevice = (PSDevice) pDeviceHandler; unsigned short wIdxDownRate = 0; unsigned int ii; //unsigned long dwRateTable[MAX_RATE] = {1, 2, 5, 11, 6, 9, 12, 18, 24, 36, 48, 54}; -BOOL bAutoRate[MAX_RATE] = {true,true,true,true,false,false,true,true,true,true,true,true}; +bool bAutoRate[MAX_RATE] = {true,true,true,true,false,false,true,true,true,true,true,true}; unsigned long dwThroughputTbl[MAX_RATE] = {10, 20, 55, 110, 60, 90, 120, 180, 240, 360, 480, 540}; unsigned long dwThroughput = 0; 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( void *pDeviceHandler, PWLAN_IE_SUPP_RATES pItemRates, PWLAN_IE_SUPP_RATES pItemExtRates, - BOOL bUpdateBasicRate, + bool bUpdateBasicRate, unsigned short *pwMaxBasicRate, unsigned short *pwMaxSuppRate, 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 { #define MAX_QUIET_COUNT 8 typedef struct tagSQuietControl { - BOOL bEnable; + bool bEnable; unsigned long dwStartTime; unsigned char byPeriod; unsigned short wDuration; @@ -326,7 +326,7 @@ typedef struct tagSDeFragControlBlock struct sk_buff* skb; unsigned char *pbyRxBuffer; unsigned int cbFrameLength; - BOOL bInUse; + bool bInUse; } SDeFragControlBlock, *PSDeFragControlBlock; @@ -480,10 +480,10 @@ typedef struct __device_info { unsigned char byMaxPwrLevel; unsigned char byZoneType; - BOOL bZoneRegExist; + bool bZoneRegExist; unsigned char byOriginalZonetype; unsigned char abyMacContext[MAC_MAX_CONTEXT_REG]; - BOOL bLinkPass; // link status: OK or fail + bool bLinkPass; // link status: OK or fail unsigned char abyCurrentNetAddr[ETH_ALEN]; // Adapter statistics @@ -505,7 +505,7 @@ typedef struct __device_info { unsigned char byAntennaCount; unsigned char byRxAntennaMode; unsigned char byTxAntennaMode; - BOOL bTxRxAntInv; + bool bTxRxAntInv; unsigned char *pbyTmpBuff; unsigned int uSIFS; //Current SIFS @@ -544,7 +544,7 @@ typedef struct __device_info { unsigned char byLongRetryLimit; CARD_OP_MODE eOPMode; unsigned char byOpMode; - BOOL bBSSIDFilter; + bool bBSSIDFilter; unsigned short wMaxTransmitMSDULifetime; unsigned char abyBSSID[ETH_ALEN]; unsigned char abyDesireBSSID[ETH_ALEN]; @@ -556,51 +556,51 @@ typedef struct __device_info { unsigned long dwMaxReceiveLifetime; // dot11MaxReceiveLifetime - BOOL bCCK; - BOOL bEncryptionEnable; - BOOL bLongHeader; - BOOL bShortSlotTime; - BOOL bProtectMode; - BOOL bNonERPPresent; - BOOL bBarkerPreambleMd; + bool bCCK; + bool bEncryptionEnable; + bool bLongHeader; + bool bShortSlotTime; + bool bProtectMode; + bool bNonERPPresent; + bool bBarkerPreambleMd; unsigned char byERPFlag; unsigned short wUseProtectCntDown; - BOOL bRadioControlOff; - BOOL bRadioOff; - BOOL bEnablePSMode; + bool bRadioControlOff; + bool bRadioOff; + bool bEnablePSMode; unsigned short wListenInterval; - BOOL bPWBitOn; + bool bPWBitOn; WMAC_POWER_MODE ePSMode; // GPIO Radio Control unsigned char byRadioCtl; unsigned char byGPIO; - BOOL bHWRadioOff; - BOOL bPrvActive4RadioOFF; - BOOL bGPIOBlockRead; + bool bHWRadioOff; + bool bPrvActive4RadioOFF; + bool bGPIOBlockRead; // Beacon releated unsigned short wSeqCounter; unsigned short wBCNBufLen; - BOOL bBeaconBufReady; - BOOL bBeaconSent; - BOOL bIsBeaconBufReadySet; + bool bBeaconBufReady; + bool bBeaconSent; + bool bIsBeaconBufReadySet; unsigned int cbBeaconBufReadySetCnt; - BOOL bFixRate; + bool bFixRate; unsigned char byCurrentCh; unsigned int uScanTime; CMD_STATE eCommandState; CMD_CODE eCommand; - BOOL bBeaconTx; + bool bBeaconTx; - BOOL bStopBeacon; - BOOL bStopDataPkt; - BOOL bStopTx0Pkt; + bool bStopBeacon; + bool bStopDataPkt; + bool bStopTx0Pkt; unsigned int uAutoReConnectTime; // 802.11 counter @@ -609,18 +609,18 @@ typedef struct __device_info { unsigned int uCmdDequeueIdx; unsigned int uCmdEnqueueIdx; unsigned int cbFreeCmdQueue; - BOOL bCmdRunning; - BOOL bCmdClear; + bool bCmdRunning; + bool bCmdClear; - BOOL bRoaming; + bool bRoaming; //WOW unsigned char abyIPAddr[4]; unsigned long ulTxPower; NDIS_802_11_WEP_STATUS eEncryptionStatus; - BOOL bTransmitKey; + bool bTransmitKey; //2007-0925-01<Add>by MikeLiu //mike add :save old Encryption NDIS_802_11_WEP_STATUS eOldEncryptionStatus; @@ -637,31 +637,31 @@ typedef struct __device_info { unsigned int uKeyLength; unsigned char abyKey[WLAN_WEP232_KEYLEN]; - BOOL bAES; + bool bAES; unsigned char byCntMeasure; // for AP mode unsigned int uAssocCount; - BOOL bMoreData; + bool bMoreData; // QoS - BOOL bGrpAckPolicy; + bool bGrpAckPolicy; // for OID_802_11_ASSOCIATION_INFORMATION - BOOL bAssocInfoSet; + bool bAssocInfoSet; unsigned char byAutoFBCtrl; - BOOL bTxMICFail; - BOOL bRxMICFail; + bool bTxMICFail; + bool bRxMICFail; unsigned int uRATEIdx; // For Update BaseBand VGA Gain Offset - BOOL bUpdateBBVGA; + bool bUpdateBBVGA; unsigned int uBBVGADiffCount; unsigned char byBBVGANew; unsigned char byBBVGACurrent; @@ -672,7 +672,7 @@ typedef struct __device_info { unsigned char byBBPreEDIndex; - BOOL bRadioCmd; + bool bRadioCmd; unsigned long dwDiagRefCount; // For FOE Tuning @@ -713,12 +713,12 @@ typedef struct __device_info { #ifdef TxInSleep struct timer_list sTimerTxData; unsigned long nTxDataTimeCout; - BOOL fTxDataInSleep; - BOOL IsTxDataTrigger; + bool fTxDataInSleep; + bool IsTxDataTrigger; #endif #ifdef WPA_SM_Transtatus - BOOL fWPA_Authened; //is WPA/WPA-PSK or WPA2/WPA2-PSK authen?? + bool fWPA_Authened; //is WPA/WPA-PSK or WPA2/WPA2-PSK authen?? #endif unsigned char byReAssocCount; //mike add:re-association retry times! unsigned char byLinkWaitCount; @@ -726,8 +726,8 @@ typedef struct __device_info { unsigned char abyNodeName[17]; - BOOL bDiversityRegCtlON; - BOOL bDiversityEnable; + bool bDiversityRegCtlON; + bool bDiversityEnable; unsigned long ulDiversityNValue; unsigned long ulDiversityMValue; unsigned char byTMax; @@ -763,12 +763,12 @@ typedef struct __device_info { // for 802.11h - BOOL b11hEnable; + bool b11hEnable; unsigned char abyCountryCode[3]; // for 802.11h DFS unsigned int uNumOfMeasureEIDs; PWLAN_IE_MEASURE_REQ pCurrMeasureEID; - BOOL bMeasureInProgress; + bool bMeasureInProgress; unsigned char byOrgChannel; unsigned char byOrgRCR; unsigned long dwOrgMAR0; @@ -777,50 +777,50 @@ typedef struct __device_info { unsigned char byCCAFraction; unsigned char abyRPIs[8]; unsigned long dwRPIs[8]; - BOOL bChannelSwitch; + bool bChannelSwitch; unsigned char byNewChannel; unsigned char byChannelSwitchCount; - BOOL bQuietEnable; - BOOL bEnableFirstQuiet; + bool bQuietEnable; + bool bEnableFirstQuiet; unsigned char byQuietStartCount; unsigned int uQuietEnqueue; unsigned long dwCurrentQuietEndTime; SQuietControl sQuiet[MAX_QUIET_COUNT]; // for 802.11h TPC - BOOL bCountryInfo5G; - BOOL bCountryInfo24G; + bool bCountryInfo5G; + bool bCountryInfo24G; unsigned short wBeaconInterval; //WPA supplicant deamon struct net_device *wpadev; - BOOL bWPADEVUp; + bool bWPADEVUp; struct sk_buff *skb; #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT /* - BOOL bwextstep0; - BOOL bwextstep1; - BOOL bwextstep2; - BOOL bwextstep3; + bool bwextstep0; + bool bwextstep1; + bool bwextstep2; + bool bwextstep3; */ unsigned int bwextcount; - BOOL bWPASuppWextEnabled; + bool bWPASuppWextEnabled; #endif //-- #ifdef HOSTAP // user space daemon: hostapd, is used for HOSTAP - BOOL bEnableHostapd; - BOOL bEnable8021x; - BOOL bEnableHostWEP; + bool bEnableHostapd; + bool bEnable8021x; + bool bEnableHostWEP; struct net_device *apdev; int (*tx_80211)(struct sk_buff *skb, struct net_device *dev); #endif unsigned int uChannel; - BOOL bMACSuspend; + bool bMACSuspend; struct iw_statistics wstats; // wireless stats - BOOL bCommit; + bool bCommit; } DEVICE_INFO, *PSDevice; @@ -880,7 +880,7 @@ void InitRxManagementQueue(PSDevice pDevice); -inline static BOOL device_get_ip(PSDevice pInfo) { +inline static bool device_get_ip(PSDevice pInfo) { struct in_device* in_dev=(struct in_device*) pInfo->dev->ip_ptr; struct in_ifaddr* ifa; @@ -920,9 +920,9 @@ static inline PDEVICE_TD_INFO alloc_td_info(void) { /*--------------------- Export Functions --------------------------*/ -BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeIndex); -BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF); -int Config_FileOperation(PSDevice pDevice,BOOL fwrite,unsigned char *Parameter); +bool device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeIndex); +bool device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF); +int Config_FileOperation(PSDevice pDevice, bool fwrite, unsigned char *Parameter); #endif 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) = { static int vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent); -static BOOL vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice, PCHIP_INFO); +static bool vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice, PCHIP_INFO); static void device_free_info(PSDevice pDevice); -static BOOL device_get_pci_info(PSDevice, struct pci_dev* pcid); +static bool device_get_pci_info(PSDevice, struct pci_dev* pcid); static void device_print_info(PSDevice pDevice); static struct net_device_stats *device_get_stats(struct net_device *dev); static void device_init_diversity_timer(PSDevice pDevice); @@ -327,12 +327,12 @@ static void device_init_td1_ring(PSDevice pDevice); static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev); //2008-0714<Add>by Mike Liu -static BOOL device_release_WPADEV(PSDevice pDevice); +static bool device_release_WPADEV(PSDevice pDevice); static int ethtool_ioctl(struct net_device *dev, void *useraddr); static int device_rx_srv(PSDevice pDevice, unsigned int uIdx); static int device_tx_srv(PSDevice pDevice, unsigned int uIdx); -static BOOL device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pDesc); +static bool device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pDesc); static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType); static void device_free_tx_buf(PSDevice pDevice, PSTxDesc pDesc); 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* } static void -device_set_bool_opt(unsigned int *opt, int val,BOOL def,u32 flag, char* name,char* devname) { +device_set_bool_opt(unsigned int *opt, int val,bool def,u32 flag, char* name,char* devname) { (*opt)&=(~flag); if (val==-1) *opt|=(def ? flag : 0); @@ -870,7 +870,7 @@ static void device_init_diversity_timer(PSDevice pDevice) { } -static BOOL device_release_WPADEV(PSDevice pDevice) +static bool device_release_WPADEV(PSDevice pDevice) { viawget_wpa_header *wpahdr; int ii=0; @@ -919,7 +919,7 @@ static const struct net_device_ops device_netdev_ops = { static int __devinit vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) { - static BOOL bFirst = true; + static bool bFirst = true; struct net_device* dev = NULL; PCHIP_INFO pChip_info = (PCHIP_INFO)ent->driver_data; PSDevice pDevice; @@ -1123,7 +1123,7 @@ static void device_print_info(PSDevice pDevice) } -static BOOL __devinit vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice, +static bool __devinit vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice, PCHIP_INFO pChip_info) { PSDevice p; @@ -1151,7 +1151,7 @@ static BOOL __devinit vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice, return true; } -static BOOL device_get_pci_info(PSDevice pDevice, struct pci_dev* pcid) { +static bool device_get_pci_info(PSDevice pDevice, struct pci_dev* pcid) { u16 pci_cmd; u8 b; @@ -1266,7 +1266,7 @@ device_release_WPADEV(pDevice); } } -static BOOL device_init_rings(PSDevice pDevice) { +static bool device_init_rings(PSDevice pDevice) { void* vir_pool; @@ -1624,7 +1624,7 @@ static int device_rx_srv(PSDevice pDevice, unsigned int uIdx) { } -static BOOL device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pRD) { +static bool device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pRD) { PDEVICE_RD_INFO pRDInfo=pRD->pRDInfo; @@ -1651,7 +1651,7 @@ static BOOL device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pRD) { -BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) { +bool device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) { pDeF->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); if (pDeF->skb == NULL) @@ -1666,7 +1666,7 @@ BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) { static int device_tx_srv(PSDevice pDevice, unsigned int uIdx) { PSTxDesc pTD; - BOOL bFull=false; + bool bFull=false; int works = 0; unsigned char byTsr0; unsigned char byTsr1; @@ -2118,13 +2118,13 @@ static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) { -BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeIndex) { +bool device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeIndex) { PSMgmtObject pMgmt = pDevice->pMgmt; PSTxDesc pHeadTD, pLastTD; unsigned int cbFrameBodySize; unsigned int uMACfragNum; unsigned char byPktType; - BOOL bNeedEncryption = false; + bool bNeedEncryption = false; PSKeyItem pTransmitKey = NULL; unsigned int cbHeaderSize; unsigned int ii; @@ -2279,14 +2279,14 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { unsigned int cbFrameBodySize; unsigned char byPktType; unsigned int cbHeaderSize; - BOOL bNeedEncryption = false; + bool bNeedEncryption = false; PSKeyItem pTransmitKey = NULL; SKeyItem STempKey; unsigned int ii; - BOOL bTKIP_UseGTK = false; - BOOL bNeedDeAuth = false; + bool bTKIP_UseGTK = false; + bool bNeedDeAuth = false; unsigned char *pbyBSSID; - BOOL bNodeExist = false; + bool bNodeExist = false; @@ -2638,7 +2638,7 @@ pDevice->byTopCCKBasicRate,pDevice->byTopOFDMBasicRate); unsigned char Packet_Type; //802.1x Authentication unsigned char Descriptor_type; unsigned short Key_info; -BOOL bTxeapol_key = false; +bool bTxeapol_key = false; Protocol_Version = skb->data[ETH_HLEN]; Packet_Type = skb->data[ETH_HLEN+1]; Descriptor_type = skb->data[ETH_HLEN+1+1+2]; @@ -2996,7 +2996,7 @@ static int Config_FileGetParameter(unsigned char *string, return true; } -int Config_FileOperation(PSDevice pDevice,BOOL fwrite,unsigned char *Parameter) { +int Config_FileOperation(PSDevice pDevice,bool fwrite,unsigned char *Parameter) { unsigned char *config_path = CONFIG_PATH; unsigned char *buffer = NULL; 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, static void s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr, - unsigned int cbPacketSize, BOOL bIsWEP, BOOL bExtIV, + unsigned int cbPacketSize, bool bIsWEP, bool bExtIV, unsigned int *pcbHeadSize); -static BOOL s_bAPModeRxCtl( +static bool s_bAPModeRxCtl( PSDevice pDevice, unsigned char *pbyFrame, int iSANodeIndex @@ -96,7 +96,7 @@ static BOOL s_bAPModeRxCtl( -static BOOL s_bAPModeRxData ( +static bool s_bAPModeRxData ( PSDevice pDevice, struct sk_buff* skb, unsigned int FrameSize, @@ -106,28 +106,28 @@ static BOOL s_bAPModeRxData ( ); -static BOOL s_bHandleRxEncryption( +static bool s_bHandleRxEncryption( PSDevice pDevice, unsigned char *pbyFrame, unsigned int FrameSize, unsigned char *pbyRsr, unsigned char *pbyNewRsr, PSKeyItem *pKeyOut, - int * pbExtIV, + bool *pbExtIV, unsigned short *pwRxTSC15_0, unsigned long *pdwRxTSC47_16 ); -static BOOL s_bHostWepRxEncryption( +static bool s_bHostWepRxEncryption( PSDevice pDevice, unsigned char *pbyFrame, unsigned int FrameSize, unsigned char *pbyRsr, - BOOL bOnFly, + bool bOnFly, PSKeyItem pKey, unsigned char *pbyNewRsr, - int * pbExtIV, + bool *pbExtIV, unsigned short *pwRxTSC15_0, unsigned long *pdwRxTSC47_16 @@ -154,7 +154,7 @@ static BOOL s_bHostWepRxEncryption( -*/ static void s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr, - unsigned int cbPacketSize, BOOL bIsWEP, BOOL bExtIV, + unsigned int cbPacketSize, bool bIsWEP, bool bExtIV, unsigned int *pcbHeadSize) { unsigned char *pbyRxBuffer; @@ -313,7 +313,7 @@ void MngWorkItem(void *Context) -BOOL +bool device_receive_frame ( PSDevice pDevice, PSRxDesc pCurrRD @@ -335,8 +335,8 @@ device_receive_frame ( PQWORD pqwTSFTime; unsigned short *pwFrameSize; unsigned char *pbyFrame; - BOOL bDeFragRx = false; - BOOL bIsWEP = false; + bool bDeFragRx = false; + bool bIsWEP = false; unsigned int cbHeaderOffset; unsigned int FrameSize; unsigned short wEtherType = 0; @@ -344,7 +344,7 @@ device_receive_frame ( int iDANodeIndex = -1; unsigned int ii; unsigned int cbIVOffset; - BOOL bExtIV = false; + bool bExtIV = false; unsigned char *pbyRxSts; unsigned char *pbyRxRate; unsigned char *pbySQ; @@ -358,7 +358,7 @@ device_receive_frame ( long ldBm = 0; long ldBmThreshold = 0; PS802_11Header pMACHeader; - BOOL bRxeapol_key = false; + bool bRxeapol_key = false; // DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- device_receive_frame---\n"); @@ -477,7 +477,7 @@ device_receive_frame ( if (IS_FC_WEP(pbyFrame)) { - BOOL bRxDecryOK = false; + bool bRxDecryOK = false; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"rx WEP pkt\n"); bIsWEP = true; @@ -1018,7 +1018,7 @@ device_receive_frame ( } -static BOOL s_bAPModeRxCtl ( +static bool s_bAPModeRxCtl ( PSDevice pDevice, unsigned char *pbyFrame, int iSANodeIndex @@ -1142,14 +1142,14 @@ static BOOL s_bAPModeRxCtl ( } -static BOOL s_bHandleRxEncryption ( +static bool s_bHandleRxEncryption ( PSDevice pDevice, unsigned char *pbyFrame, unsigned int FrameSize, unsigned char *pbyRsr, unsigned char *pbyNewRsr, PSKeyItem *pKeyOut, - int * pbExtIV, + bool *pbExtIV, unsigned short *pwRxTSC15_0, unsigned long *pdwRxTSC47_16 ) @@ -1288,15 +1288,15 @@ static BOOL s_bHandleRxEncryption ( } -static BOOL s_bHostWepRxEncryption ( +static bool s_bHostWepRxEncryption ( PSDevice pDevice, unsigned char *pbyFrame, unsigned int FrameSize, unsigned char *pbyRsr, - BOOL bOnFly, + bool bOnFly, PSKeyItem pKey, unsigned char *pbyNewRsr, - int * pbExtIV, + bool *pbExtIV, unsigned short *pwRxTSC15_0, unsigned long *pdwRxTSC47_16 ) @@ -1419,7 +1419,7 @@ static BOOL s_bHostWepRxEncryption ( -static BOOL s_bAPModeRxData ( +static bool s_bAPModeRxData ( PSDevice pDevice, struct sk_buff* skb, unsigned int FrameSize, @@ -1429,8 +1429,8 @@ static BOOL s_bAPModeRxData ( ) { PSMgmtObject pMgmt = pDevice->pMgmt; - BOOL bRelayAndForward = false; - BOOL bRelayOnly = false; + bool bRelayAndForward = false; + bool bRelayOnly = false; unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; unsigned short wAID; 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 @@ /*--------------------- Export Functions --------------------------*/ -BOOL +bool device_receive_frame ( PSDevice pDevice, 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, int ret = 0; int iNodeIndex = -1; int ii; - BOOL bKeyTableFull = false; + bool bKeyTableFull = false; unsigned short wKeyCtl = 0; 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 @@ #define DEF #endif -//typedef int BOOL; //typedef uint32_t u32; //typedef uint16_t u16; //typedef uint8_t u8; @@ -136,8 +135,8 @@ typedef struct tagSCmdBSSJoin { u16 wBBPType; u8 ssid[SSID_MAXLEN + 2]; u32 uChannel; - BOOL bPSEnable; - BOOL bShareKeyAuth; + bool bPSEnable; + bool bShareKeyAuth; } SCmdBSSJoin, *PSCmdBSSJoin; @@ -147,7 +146,7 @@ typedef struct tagSCmdBSSJoin { typedef struct tagSCmdZoneTypeSet { - BOOL bWrite; + bool bWrite; WZONETYPE ZoneType; } SCmdZoneTypeSet, *PSCmdZoneTypeSet; @@ -158,7 +157,7 @@ typedef struct tagSWPAResult { u8 proto; u8 key_mgmt; u8 eap_type; - BOOL authenticated; + bool authenticated; } SWPAResult, *PSWPAResult; #endif @@ -169,7 +168,7 @@ typedef struct tagSCmdStartAP { u8 ssid[SSID_MAXLEN + 2]; u32 uChannel; u32 uBeaconInt; - BOOL bShareKeyAuth; + bool bShareKeyAuth; u8 byBasicRate; } SCmdStartAP, *PSCmdStartAP; @@ -177,10 +176,10 @@ typedef struct tagSCmdStartAP { typedef struct tagSCmdSetWEP { - BOOL bEnableWep; + bool bEnableWep; u8 byKeyIndex; u8 abyWepKey[WEP_NKEYS][WEP_KEYMAXLEN]; - BOOL bWepKeyAvailable[WEP_NKEYS]; + bool bWepKeyAvailable[WEP_NKEYS]; u32 auWepKeyLength[WEP_NKEYS]; } SCmdSetWEP, *PSCmdSetWEP; @@ -200,7 +199,7 @@ typedef struct tagSBSSIDItem { u16 wBeaconInterval; u16 wCapInfo; // for address of byNetType at align 4 - BOOL bWEPOn; + bool bWEPOn; u32 uRSSI; } SBSSIDItem; @@ -215,7 +214,7 @@ typedef struct tagSBSSIDList { typedef struct tagSCmdLinkStatus { - BOOL bLink; + bool bLink; u16 wBSSType; u8 byState; u8 abyBSSID[BSSID_LEN]; @@ -359,12 +358,12 @@ typedef struct tagSNodeItem { u16 wInActiveCount; u16 wEnQueueCnt; u16 wFlags; - BOOL bPWBitOn; + bool bPWBitOn; u8 byKeyIndex; u16 wWepKeyLength; u8 abyWepKey[WEP_KEYMAXLEN]; // Auto rate fallback vars - BOOL bIsInFallback; + bool bIsInFallback; u32 uTxFailures; u32 uTxAttempts; 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) * Return Value: true if found otherwise false * */ -BOOL KeybGetKey ( +bool KeybGetKey ( PSKeyManagement pTable, unsigned char *pbyBSSID, unsigned long dwKeyIndex, @@ -189,7 +189,7 @@ BOOL KeybGetKey ( * Return Value: true if success otherwise false * */ -BOOL KeybSetKey ( +bool KeybSetKey ( PSKeyManagement pTable, unsigned char *pbyBSSID, unsigned long dwKeyIndex, @@ -362,7 +362,7 @@ BOOL KeybSetKey ( * Return Value: true if success otherwise false * */ -BOOL KeybRemoveKey ( +bool KeybRemoveKey ( PSKeyManagement pTable, unsigned char *pbyBSSID, unsigned long dwKeyIndex, @@ -435,7 +435,7 @@ BOOL KeybRemoveKey ( * Return Value: true if success otherwise false * */ -BOOL KeybRemoveAllKey ( +bool KeybRemoveAllKey ( PSKeyManagement pTable, unsigned char *pbyBSSID, unsigned long dwIoBase @@ -517,7 +517,7 @@ void KeyvRemoveAllWEPKey ( * Return Value: true if found otherwise false * */ -BOOL KeybGetTransmitKey ( +bool KeybGetTransmitKey ( PSKeyManagement pTable, unsigned char *pbyBSSID, unsigned long dwKeyType, @@ -597,7 +597,7 @@ BOOL KeybGetTransmitKey ( * Return Value: true if found otherwise false * */ -BOOL KeybCheckPairewiseKey ( +bool KeybCheckPairewiseKey ( PSKeyManagement pTable, PSKeyItem *pKey ) @@ -631,7 +631,7 @@ BOOL KeybCheckPairewiseKey ( * Return Value: true if success otherwise false * */ -BOOL KeybSetDefaultKey ( +bool KeybSetDefaultKey ( PSKeyManagement pTable, unsigned long dwKeyIndex, unsigned long uKeyLength, @@ -738,7 +738,7 @@ BOOL KeybSetDefaultKey ( * Return Value: true if success otherwise false * */ -BOOL KeybSetAllGroupKey ( +bool KeybSetAllGroupKey ( PSKeyManagement pTable, unsigned long dwKeyIndex, 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 @@ typedef struct tagSKeyItem { - BOOL bKeyValid; + bool bKeyValid; unsigned long uKeyLength; unsigned char abyKey[MAX_KEY_LEN]; QWORD KeyRSC; @@ -76,11 +76,11 @@ typedef struct tagSKeyTable SKeyItem PairwiseKey; SKeyItem GroupKey[MAX_GROUP_KEY]; //64*5 = 320, 320+8=328 unsigned long dwGTKeyIndex; // GroupTransmitKey Index - BOOL bInUse; + bool bInUse; //2006-1116-01,<Modify> by NomadZhao //unsigned short wKeyCtl; - //BOOL bSoftWEP; - BOOL bSoftWEP; + //bool bSoftWEP; + bool bSoftWEP; unsigned short wKeyCtl; // for address of wKeyCtl at align 4 unsigned char byReserved1[6]; @@ -103,14 +103,14 @@ typedef struct tagSKeyManagement void KeyvInitTable(PSKeyManagement pTable, unsigned long dwIoBase); -BOOL KeybGetKey( +bool KeybGetKey( PSKeyManagement pTable, unsigned char *pbyBSSID, unsigned long dwKeyIndex, PSKeyItem *pKey ); -BOOL KeybSetKey( +bool KeybSetKey( PSKeyManagement pTable, unsigned char *pbyBSSID, unsigned long dwKeyIndex, @@ -122,7 +122,7 @@ BOOL KeybSetKey( unsigned char byLocalID ); -BOOL KeybSetDefaultKey( +bool KeybSetDefaultKey( PSKeyManagement pTable, unsigned long dwKeyIndex, unsigned long uKeyLength, @@ -133,26 +133,26 @@ BOOL KeybSetDefaultKey( unsigned char byLocalID ); -BOOL KeybRemoveKey( +bool KeybRemoveKey( PSKeyManagement pTable, unsigned char *pbyBSSID, unsigned long dwKeyIndex, unsigned long dwIoBase ); -BOOL KeybGetTransmitKey( +bool KeybGetTransmitKey( PSKeyManagement pTable, unsigned char *pbyBSSID, unsigned long dwKeyType, PSKeyItem *pKey ); -BOOL KeybCheckPairewiseKey( +bool KeybCheckPairewiseKey( PSKeyManagement pTable, PSKeyItem *pKey ); -BOOL KeybRemoveAllKey( +bool KeybRemoveAllKey( PSKeyManagement pTable, unsigned char *pbyBSSID, unsigned long dwIoBase @@ -169,7 +169,7 @@ void KeyvRemoveAllWEPKey( unsigned long dwIoBase ); -BOOL KeybSetAllGroupKey ( +bool KeybSetAllGroupKey ( PSKeyManagement pTable, unsigned long dwKeyIndex, 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) * Return Value: true if all test bits On; otherwise false * */ -BOOL MACbIsRegBitsOn (unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits) +bool MACbIsRegBitsOn (unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits) { unsigned char byData; @@ -163,7 +163,7 @@ BOOL MACbIsRegBitsOn (unsigned long dwIoBase, unsigned char byRegOfs, unsigned c * Return Value: true if all test bits Off; otherwise false * */ -BOOL MACbIsRegBitsOff (unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits) +bool MACbIsRegBitsOff (unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits) { unsigned char byData; @@ -184,7 +184,7 @@ BOOL MACbIsRegBitsOff (unsigned long dwIoBase, unsigned char byRegOfs, unsigned * Return Value: true if interrupt is disable; otherwise false * */ -BOOL MACbIsIntDisable (unsigned long dwIoBase) +bool MACbIsIntDisable (unsigned long dwIoBase) { unsigned long dwData; @@ -559,7 +559,7 @@ void MACvSetLoopbackMode (unsigned long dwIoBase, unsigned char byLoopbackMode) * Return Value: true if in Loopback mode; otherwise false * */ -BOOL MACbIsInLoopbackMode (unsigned long dwIoBase) +bool MACbIsInLoopbackMode (unsigned long dwIoBase) { unsigned char byOrgValue; @@ -728,7 +728,7 @@ void MACvRestoreContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf) * Return Value: true if all values are the same; otherwise false * */ -BOOL MACbCompareContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf) +bool MACbCompareContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf) { unsigned long dwData; @@ -773,7 +773,7 @@ BOOL MACbCompareContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf) * Return Value: true if Reset Success; otherwise false * */ -BOOL MACbSoftwareReset (unsigned long dwIoBase) +bool MACbSoftwareReset (unsigned long dwIoBase) { unsigned char byData; unsigned short ww; @@ -806,10 +806,10 @@ BOOL MACbSoftwareReset (unsigned long dwIoBase) * Return Value: true if success; otherwise false * */ -BOOL MACbSafeSoftwareReset (unsigned long dwIoBase) +bool MACbSafeSoftwareReset (unsigned long dwIoBase) { unsigned char abyTmpRegData[MAC_MAX_CONTEXT_SIZE_PAGE0+MAC_MAX_CONTEXT_SIZE_PAGE1]; - BOOL bRetVal; + bool bRetVal; // PATCH.... // save some important register's value, then do @@ -839,7 +839,7 @@ BOOL MACbSafeSoftwareReset (unsigned long dwIoBase) * Return Value: true if success; otherwise false * */ -BOOL MACbSafeRxOff (unsigned long dwIoBase) +bool MACbSafeRxOff (unsigned long dwIoBase) { unsigned short ww; unsigned long dwData; @@ -900,7 +900,7 @@ BOOL MACbSafeRxOff (unsigned long dwIoBase) * Return Value: true if success; otherwise false * */ -BOOL MACbSafeTxOff (unsigned long dwIoBase) +bool MACbSafeTxOff (unsigned long dwIoBase) { unsigned short ww; unsigned long dwData; @@ -964,7 +964,7 @@ BOOL MACbSafeTxOff (unsigned long dwIoBase) * Return Value: true if success; otherwise false * */ -BOOL MACbSafeStop (unsigned long dwIoBase) +bool MACbSafeStop (unsigned long dwIoBase) { MACvRegBitsOff(dwIoBase, MAC_REG_TCR, TCR_AUTOBCNTX); @@ -999,7 +999,7 @@ BOOL MACbSafeStop (unsigned long dwIoBase) * Return Value: true if success; otherwise false * */ -BOOL MACbShutdown (unsigned long dwIoBase) +bool MACbShutdown (unsigned long dwIoBase) { // disable MAC IMR MACvIntDisable(dwIoBase); @@ -1319,7 +1319,7 @@ void MACvSetMISCFifo (unsigned long dwIoBase, unsigned short wOffset, unsigned l } -BOOL MACbTxDMAOff (unsigned long dwIoBase, unsigned int idx) +bool MACbTxDMAOff (unsigned long dwIoBase, unsigned int idx) { unsigned char byData; unsigned int ww = 0; @@ -1391,7 +1391,7 @@ void MACvEnableBusSusEn (unsigned long dwIoBase) } } -BOOL MACbFlushSYNCFifo (unsigned long dwIoBase) +bool MACbFlushSYNCFifo (unsigned long dwIoBase) { unsigned char byOrgValue; unsigned int ww; @@ -1415,7 +1415,7 @@ BOOL MACbFlushSYNCFifo (unsigned long dwIoBase) return true; } -BOOL MACbPSWakeup (unsigned long dwIoBase) +bool MACbPSWakeup (unsigned long dwIoBase) { unsigned char byOrgValue; 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 @@ extern unsigned short TxRate_iwconfig;//2008-5-8 <add> by chester void MACvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyMacRegs); -BOOL MACbIsRegBitsOn(unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits); -BOOL MACbIsRegBitsOff(unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits); +bool MACbIsRegBitsOn(unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits); +bool MACbIsRegBitsOff(unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits); -BOOL MACbIsIntDisable(unsigned long dwIoBase); +bool MACbIsIntDisable(unsigned long dwIoBase); unsigned char MACbyReadMultiAddr(unsigned long dwIoBase, unsigned int uByteIdx); void MACvWriteMultiAddr(unsigned long dwIoBase, unsigned int uByteIdx, unsigned char byData); @@ -1103,20 +1103,20 @@ void MACvSetLongRetryLimit(unsigned long dwIoBase, unsigned char byRetryLimit); void MACvGetLongRetryLimit(unsigned long dwIoBase, unsigned char *pbyRetryLimit); void MACvSetLoopbackMode(unsigned long dwIoBase, unsigned char byLoopbackMode); -BOOL MACbIsInLoopbackMode(unsigned long dwIoBase); +bool MACbIsInLoopbackMode(unsigned long dwIoBase); void MACvSetPacketFilter(unsigned long dwIoBase, unsigned short wFilterType); void MACvSaveContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); void MACvRestoreContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); -BOOL MACbCompareContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); - -BOOL MACbSoftwareReset(unsigned long dwIoBase); -BOOL MACbSafeSoftwareReset(unsigned long dwIoBase); -BOOL MACbSafeRxOff(unsigned long dwIoBase); -BOOL MACbSafeTxOff(unsigned long dwIoBase); -BOOL MACbSafeStop(unsigned long dwIoBase); -BOOL MACbShutdown(unsigned long dwIoBase); +bool MACbCompareContext(unsigned long dwIoBase, unsigned char *pbyCxtBuf); + +bool MACbSoftwareReset(unsigned long dwIoBase); +bool MACbSafeSoftwareReset(unsigned long dwIoBase); +bool MACbSafeRxOff(unsigned long dwIoBase); +bool MACbSafeTxOff(unsigned long dwIoBase); +bool MACbSafeStop(unsigned long dwIoBase); +bool MACbShutdown(unsigned long dwIoBase); void MACvInitialize(unsigned long dwIoBase); void MACvSetCurrRx0DescAddr(unsigned long dwIoBase, unsigned long dwCurrDescAddr); void MACvSetCurrRx1DescAddr(unsigned long dwIoBase, unsigned long dwCurrDescAddr); @@ -1131,13 +1131,13 @@ void MACvOneShotTimer1MicroSec(unsigned long dwIoBase, unsigned int uDelayTime); void MACvSetMISCFifo(unsigned long dwIoBase, unsigned short wOffset, unsigned long dwData); -BOOL MACbTxDMAOff (unsigned long dwIoBase, unsigned int idx); +bool MACbTxDMAOff (unsigned long dwIoBase, unsigned int idx); void MACvClearBusSusInd(unsigned long dwIoBase); void MACvEnableBusSusEn(unsigned long dwIoBase); -BOOL MACbFlushSYNCFifo(unsigned long dwIoBase); -BOOL MACbPSWakeup(unsigned long dwIoBase); +bool MACbFlushSYNCFifo(unsigned long dwIoBase); +bool MACbPSWakeup(unsigned long dwIoBase); void MACvSetKeyEntry(unsigned long dwIoBase, unsigned short wKeyCtl, unsigned int uEntryIdx, 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( -*/ -BOOL +bool PSbConsiderPowerDown( void *hDeviceContext, - BOOL bCheckRxDMA, - BOOL bCheckCountToWakeUp + bool bCheckRxDMA, + bool bCheckCountToWakeUp ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -296,7 +296,7 @@ PSvSendPSPOLL( * None. * -*/ -BOOL +bool PSbSendNullPacket( void *hDeviceContext ) @@ -382,7 +382,7 @@ PSbSendNullPacket( * -*/ -BOOL +bool PSbIsNextTBTTWakeUp( void *hDeviceContext ) @@ -390,7 +390,7 @@ PSbIsNextTBTTWakeUp( PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = pDevice->pMgmt; - BOOL bWakeUp = false; + bool bWakeUp = false; if (pMgmt->wListenInterval >= 2) { 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 @@ // PSDevice pDevice // PSDevice hDeviceContext -BOOL +bool PSbConsiderPowerDown( void *hDeviceContext, - BOOL bCheckRxDMA, - BOOL bCheckCountToWakeUp + bool bCheckRxDMA, + bool bCheckCountToWakeUp ); void @@ -71,12 +71,12 @@ PSvSendPSPOLL( void *hDeviceContext ); -BOOL +bool PSbSendNullPacket( void *hDeviceContext ); -BOOL +bool PSbIsNextTBTTWakeUp( void *hDeviceContext ); 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] = { * Return Value: true if succeeded; false if failed. * */ -BOOL s_bAL7230Init (unsigned long dwIoBase) +bool s_bAL7230Init (unsigned long dwIoBase) { int ii; - BOOL bResult; + bool bResult; bResult = true; @@ -517,9 +517,9 @@ BOOL s_bAL7230Init (unsigned long dwIoBase) } // Need to Pull PLLON low when writing channel registers through 3-wire interface -BOOL s_bAL7230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) +bool s_bAL7230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) { - BOOL bResult; + bool bResult; bResult = true; @@ -622,7 +622,7 @@ BOOL s_bAL7230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) * Return Value: true if succeeded; false if failed. * */ -BOOL IFRFbWriteEmbeded (unsigned long dwIoBase, unsigned long dwData) +bool IFRFbWriteEmbeded (unsigned long dwIoBase, unsigned long dwData) { unsigned short ww; unsigned long dwValue; @@ -684,10 +684,10 @@ BOOL IFRFbWriteEmbeded (unsigned long dwIoBase, unsigned long dwData) * Return Value: true if succeeded; false if failed. * */ -BOOL RFbAL2230Init (unsigned long dwIoBase) +bool RFbAL2230Init (unsigned long dwIoBase) { int ii; - BOOL bResult; + bool bResult; bResult = true; @@ -734,9 +734,9 @@ MACvTimer0MicroSDelay(dwIoBase, 30); //delay 30 us return bResult; } -BOOL RFbAL2230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) +bool RFbAL2230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) { - BOOL bResult; + bool bResult; bResult = true; @@ -807,11 +807,11 @@ BOOL RFbAL2230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) * Return Value: true if succeeded; false if failed. * */ -BOOL RFbInit ( +bool RFbInit ( PSDevice pDevice ) { -BOOL bResult = true; +bool bResult = true; switch (pDevice->byRFType) { case RF_AIROHA : case RF_AL2230S: @@ -845,11 +845,11 @@ BOOL bResult = true; * Return Value: true if succeeded; false if failed. * */ -BOOL RFbShutDown ( +bool RFbShutDown ( PSDevice pDevice ) { -BOOL bResult = true; +bool bResult = true; switch (pDevice->byRFType) { case RF_AIROHA7230 : @@ -875,9 +875,9 @@ BOOL bResult = true; * Return Value: true if succeeded; false if failed. * */ -BOOL RFbSelectChannel (unsigned long dwIoBase, unsigned char byRFType, unsigned char byChannel) +bool RFbSelectChannel (unsigned long dwIoBase, unsigned char byRFType, unsigned char byChannel) { -BOOL bResult = true; +bool bResult = true; switch (byRFType) { case RF_AIROHA : @@ -911,7 +911,7 @@ BOOL bResult = true; * Return Value: None. * */ -BOOL RFvWriteWakeProgSyn (unsigned long dwIoBase, unsigned char byRFType, unsigned int uChannel) +bool RFvWriteWakeProgSyn (unsigned long dwIoBase, unsigned char byRFType, unsigned int uChannel) { int ii; unsigned char byInitCount = 0; @@ -996,13 +996,13 @@ BOOL RFvWriteWakeProgSyn (unsigned long dwIoBase, unsigned char byRFType, unsign * Return Value: true if succeeded; false if failed. * */ -BOOL RFbSetPower ( +bool RFbSetPower ( PSDevice pDevice, unsigned int uRATE, unsigned int uCH ) { -BOOL bResult = true; +bool bResult = true; unsigned char byPwr = 0; unsigned char byDec = 0; unsigned char byPwrdBm = 0; @@ -1135,13 +1135,13 @@ unsigned char byPwrdBm = 0; * */ -BOOL RFbRawSetPower ( +bool RFbRawSetPower ( PSDevice pDevice, unsigned char byPwr, unsigned int uRATE ) { -BOOL bResult = true; +bool bResult = true; unsigned long dwMax7230Pwr = 0; if (byPwr >= pDevice->byMaxPwrLevel) { @@ -1232,9 +1232,9 @@ RFvRSSITodBm ( // Post processing for the 11b/g and 11a. // for save time on changing Reg2,3,5,7,10,12,15 -BOOL RFbAL7230SelectChannelPostProcess (unsigned long dwIoBase, unsigned char byOldChannel, unsigned char byNewChannel) +bool RFbAL7230SelectChannelPostProcess (unsigned long dwIoBase, unsigned char byOldChannel, unsigned char byNewChannel) { - BOOL bResult; + bool bResult; bResult = true; 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 @@ /*--------------------- Export Functions --------------------------*/ -BOOL IFRFbWriteEmbeded(unsigned long dwIoBase, unsigned long dwData); -BOOL RFbSelectChannel(unsigned long dwIoBase, unsigned char byRFType, unsigned char byChannel); -BOOL RFbInit ( +bool IFRFbWriteEmbeded(unsigned long dwIoBase, unsigned long dwData); +bool RFbSelectChannel(unsigned long dwIoBase, unsigned char byRFType, unsigned char byChannel); +bool RFbInit ( PSDevice pDevice ); -BOOL RFvWriteWakeProgSyn(unsigned long dwIoBase, unsigned char byRFType, unsigned int uChannel); -BOOL RFbSetPower(PSDevice pDevice, unsigned int uRATE, unsigned int uCH); -BOOL RFbRawSetPower( +bool RFvWriteWakeProgSyn(unsigned long dwIoBase, unsigned char byRFType, unsigned int uChannel); +bool RFbSetPower(PSDevice pDevice, unsigned int uRATE, unsigned int uCH); +bool RFbRawSetPower( PSDevice pDevice, unsigned char byPwr, unsigned int uRATE @@ -97,7 +97,7 @@ RFvRSSITodBm( ); //{{ RobertYu: 20050104 -BOOL RFbAL7230SelectChannelPostProcess(unsigned long dwIoBase, unsigned char byOldChannel, unsigned char byNewChannel); +bool RFbAL7230SelectChannelPostProcess(unsigned long dwIoBase, unsigned char byOldChannel, unsigned char byNewChannel); //}} RobertYu #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( unsigned char byPktType, void * pvRTS, unsigned int cbFrameLength, - BOOL bNeedAck, - BOOL bDisCRC, + bool bNeedAck, + bool bDisCRC, PSEthernetHeader psEthHeader, unsigned short wCurrentRate, unsigned char byFBOption @@ -152,7 +152,7 @@ s_vGenerateTxParameter( void * pvRTS, void * pvCTS, unsigned int cbFrameSize, - BOOL bNeedACK, + bool bNeedACK, unsigned int uDMAIdx, PSEthernetHeader psEthHeader, unsigned short wCurrentRate @@ -173,7 +173,7 @@ static void s_vFillFragParameter( static unsigned int s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD, - PSEthernetHeader psEthHeader, unsigned char *pPacket, BOOL bNeedEncrypt, + PSEthernetHeader psEthHeader, unsigned char *pPacket, bool bNeedEncrypt, PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum); @@ -185,7 +185,7 @@ s_uFillDataHead ( void * pTxDataHead, unsigned int cbFrameLength, unsigned int uDMAIdx, - BOOL bNeedAck, + bool bNeedAck, unsigned int uFragIdx, unsigned int cbLastFragmentSize, unsigned int uMACfragNum, @@ -372,7 +372,7 @@ s_uGetTxRsvTime ( unsigned char byPktType, unsigned int cbFrameLength, unsigned short wRate, - BOOL bNeedAck + bool bNeedAck ) { unsigned int uDataTime, uAckTime; @@ -446,14 +446,14 @@ s_uGetDataDuration ( unsigned int cbFrameLength, unsigned char byPktType, unsigned short wRate, - BOOL bNeedAck, + bool bNeedAck, unsigned int uFragIdx, unsigned int cbLastFragmentSize, unsigned int uMACfragNum, unsigned char byFBOption ) { - BOOL bLastFrag = 0; + bool bLastFrag = 0; unsigned int uAckTime =0, uNextPktTime = 0; @@ -617,7 +617,7 @@ s_uGetRTSCTSDuration ( unsigned int cbFrameLength, unsigned char byPktType, unsigned short wRate, - BOOL bNeedAck, + bool bNeedAck, unsigned char byFBOption ) { @@ -715,7 +715,7 @@ s_uFillDataHead ( void * pTxDataHead, unsigned int cbFrameLength, unsigned int uDMAIdx, - BOOL bNeedAck, + bool bNeedAck, unsigned int uFragIdx, unsigned int cbLastFragmentSize, unsigned int uMACfragNum, @@ -846,8 +846,8 @@ s_vFillRTSHead ( unsigned char byPktType, void * pvRTS, unsigned int cbFrameLength, - BOOL bNeedAck, - BOOL bDisCRC, + bool bNeedAck, + bool bDisCRC, PSEthernetHeader psEthHeader, unsigned short wCurrentRate, unsigned char byFBOption @@ -1041,8 +1041,8 @@ s_vFillCTSHead ( unsigned char byPktType, void * pvCTS, unsigned int cbFrameLength, - BOOL bNeedAck, - BOOL bDisCRC, + bool bNeedAck, + bool bDisCRC, unsigned short wCurrentRate, unsigned char byFBOption ) @@ -1148,7 +1148,7 @@ s_vGenerateTxParameter ( void * pvRTS, void * pvCTS, unsigned int cbFrameSize, - BOOL bNeedACK, + bool bNeedACK, unsigned int uDMAIdx, PSEthernetHeader psEthHeader, unsigned short wCurrentRate @@ -1156,7 +1156,7 @@ s_vGenerateTxParameter ( { unsigned int cbMACHdLen = WLAN_HDR_ADDR3_LEN; //24 unsigned short wFifoCtl; - BOOL bDisCRC = false; + bool bDisCRC = false; unsigned char byFBOption = AUTO_FB_NONE; // unsigned short wCurrentRate = pDevice->wCurrentRate; @@ -1307,7 +1307,7 @@ s_vFillFragParameter( static unsigned int s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD, - PSEthernetHeader psEthHeader, unsigned char *pPacket, BOOL bNeedEncrypt, + PSEthernetHeader psEthHeader, unsigned char *pPacket, bool bNeedEncrypt, PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum) { unsigned int cbMACHdLen; @@ -1340,15 +1340,15 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT unsigned long *pdwMIC_L; unsigned long *pdwMIC_R; unsigned long dwSafeMIC_L, dwSafeMIC_R; //Fix "Last Frag Size" < "MIC length". - BOOL bMIC2Frag = false; + bool bMIC2Frag = false; unsigned int uMICFragLen = 0; unsigned int uMACfragNum = 1; unsigned int uPadding = 0; unsigned int cbReqCount = 0; - BOOL bNeedACK; - BOOL bRTS; - BOOL bIsAdhoc; + bool bNeedACK; + bool bRTS; + bool bIsAdhoc; unsigned char *pbyType; PSTxDesc ptdCurr; PSTxBufHead psTxBufHd = (PSTxBufHead) pbyTxBufferAddr; @@ -1362,7 +1362,7 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT unsigned short wTxBufSize; // FFinfo size unsigned int uTotalCopyLength = 0; unsigned char byFBOption = AUTO_FB_NONE; - BOOL bIsWEP256 = false; + bool bIsWEP256 = false; PSMgmtObject pMgmt = pDevice->pMgmt; @@ -2070,14 +2070,14 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT void vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, - BOOL bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx, + bool bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx, PSTxDesc pHeadTD, PSEthernetHeader psEthHeader, unsigned char *pPacket, PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum, unsigned int *pcbHeaderSize) { unsigned int wTxBufSize; // FFinfo size - BOOL bNeedACK; - BOOL bIsAdhoc; + bool bNeedACK; + bool bIsAdhoc; unsigned short cbMacHdLen; PSTxBufHead pTxBufHead = (PSTxBufHead) pbyTxBufferAddr; @@ -2234,7 +2234,7 @@ vGenerateMACHeader ( unsigned char *pbyBufferAddr, unsigned short wDuration, PSEthernetHeader psEthHeader, - BOOL bNeedEncrypt, + bool bNeedEncrypt, unsigned short wFragType, unsigned int uDMAIdx, unsigned int uFragIdx @@ -2314,8 +2314,8 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { PS802_11Header pMACHeader; unsigned int cbHeaderSize; unsigned int cbFrameBodySize; - BOOL bNeedACK; - BOOL bIsPSPOLL = false; + bool bNeedACK; + bool bIsPSPOLL = false; PSTxBufHead pTxBufHead; unsigned int cbFrameSize; unsigned int cbIVlen = 0; @@ -2716,7 +2716,7 @@ cbGetFragCount ( unsigned int cbMIClen = 0; unsigned int cbFCSlen = 4; unsigned int uMACfragNum = 1; - BOOL bNeedACK; + bool bNeedACK; @@ -2798,8 +2798,8 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un PS802_11Header pMACHeader; unsigned int cbHeaderSize; unsigned int cbFrameBodySize; - BOOL bNeedACK; - BOOL bIsPSPOLL = false; + bool bNeedACK; + bool bIsPSPOLL = false; PSTxBufHead pTxBufHead; unsigned int cbFrameSize; unsigned int cbIVlen = 0; @@ -2822,7 +2822,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un unsigned short wCurrentRate = RATE_1M; PUWLAN_80211HDR p80211Header; unsigned int uNodeIndex = 0; - BOOL bNodeExist = false; + bool bNodeExist = false; SKeyItem STempKey; PSKeyItem pTransmitKey = NULL; 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 @@ /* void vGenerateMACHeader(PSDevice pDevice, unsigned long dwTxBufferAddr, unsigned char *pbySkbData, - unsigned int cbPacketSize, BOOL bDMA0Used, unsigned int *pcbHeadSize, + unsigned int cbPacketSize, bool bDMA0Used, unsigned int *pcbHeadSize, unsigned int *pcbAppendPayload); void vProcessRxMACHeader(PSDevice pDevice, unsigned long dwRxBufferAddr, unsigned int cbPacketSize, - BOOL bIsWEP, unsigned int *pcbHeadSize); + bool bIsWEP, unsigned int *pcbHeadSize); */ @@ -57,7 +57,7 @@ vGenerateMACHeader ( unsigned char *pbyBufferAddr, unsigned short wDuration, PSEthernetHeader psEthHeader, - BOOL bNeedEncrypt, + bool bNeedEncrypt, unsigned short wFragType, unsigned int uDMAIdx, unsigned int uFragIdx @@ -75,7 +75,7 @@ cbGetFragCount( void vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktTyp, unsigned char *pbyTxBufferAddr, - BOOL bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx, PSTxDesc pHeadTD, + bool bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx, PSTxDesc pHeadTD, PSEthernetHeader psEthHeader, unsigned char *pPacket, PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum, unsigned int *pcbHeaderSize); 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 * Return Value: true if succeeded; false if failed. * */ -BOOL SROMbWriteEmbedded(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byData) +bool SROMbWriteEmbedded(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byData) { unsigned short wDelay, wNoACK; unsigned char byWait; @@ -222,7 +222,7 @@ void SROMvRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsig * Return Value: true if all test bits on; otherwise false * */ -BOOL SROMbIsRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits) +bool SROMbIsRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits) { unsigned char byOrgData; @@ -245,7 +245,7 @@ BOOL SROMbIsRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsi * Return Value: true if all test bits off; otherwise false * */ -BOOL SROMbIsRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits) +bool SROMbIsRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits) { unsigned char byOrgData; @@ -389,7 +389,7 @@ void SROMvReadSubSysVenId(unsigned long dwIoBase, unsigned long *pdwSubSysVenId) * Return Value: true if success; otherwise false * */ -BOOL SROMbAutoLoad(unsigned long dwIoBase) +bool SROMbAutoLoad(unsigned long dwIoBase) { unsigned char byWait; 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 { /*--------------------- Export Functions --------------------------*/ unsigned char SROMbyReadEmbedded(unsigned long dwIoBase, unsigned char byContntOffset); -BOOL SROMbWriteEmbedded(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byData); +bool SROMbWriteEmbedded(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byData); void SROMvRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byBits); void SROMvRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byBits); -BOOL SROMbIsRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits); -BOOL SROMbIsRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits); +bool SROMbIsRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits); +bool SROMbIsRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits); void SROMvReadAllContents(unsigned long dwIoBase, unsigned char *pbyEepromRegs); void SROMvWriteAllContents(unsigned long dwIoBase, unsigned char *pbyEepromRegs); @@ -152,6 +152,6 @@ void SROMvWriteEtherAddress(unsigned long dwIoBase, unsigned char *pbyEtherAddre void SROMvReadSubSysVenId(unsigned long dwIoBase, unsigned long *pdwSubSysVenId); -BOOL SROMbAutoLoad (unsigned long dwIoBase); +bool SROMbAutoLoad (unsigned long dwIoBase); #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) * Return Value: true if ok; false if error. * */ -BOOL ETHbIsBufferCrc32Ok (unsigned char *pbyBuffer, unsigned int cbFrameLength) +bool ETHbIsBufferCrc32Ok (unsigned char *pbyBuffer, unsigned int cbFrameLength) { unsigned long dwCRC; 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; unsigned char ETHbyGetHashIndexByCrc32(unsigned char *pbyMultiAddr); //unsigned char ETHbyGetHashIndexByCrc(unsigned char *pbyMultiAddr); -BOOL ETHbIsBufferCrc32Ok(unsigned char *pbyBuffer, unsigned int cbFrameLength); +bool ETHbIsBufferCrc32Ok(unsigned char *pbyBuffer, unsigned int cbFrameLength); #endif // __TETHER_H__ 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 @@ #define TxInSleep #endif -typedef int BOOL; - //2007-0809-01<Add>by MikeLiu #ifndef update_BssList #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 ( -BOOL +bool VNTWIFIbConfigPhyMode ( void *pMgmtHandle, CARD_PHY_TYPE ePhyType @@ -494,7 +494,7 @@ void VNTWIFIvUpdateNodeTxCounter( void *pMgmtHandle, unsigned char *pbyDestAddress, - BOOL bTxOk, + bool bTxOk, unsigned short wRate, unsigned char *pbyTxFailCount ) @@ -600,7 +600,7 @@ VNTWIFIvGetTxRate( unsigned char VNTWIFIbyGetKeyCypher( void *pMgmtHandle, - BOOL bGroupKey + bool bGroupKey ) { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; @@ -614,7 +614,7 @@ VNTWIFIbyGetKeyCypher( /* -BOOL +bool VNTWIFIbInit( void *pAdapterHandler, void **pMgmtHandler @@ -658,7 +658,7 @@ VNTWIFIbInit( -BOOL +bool VNTWIFIbSetPMKIDCache ( void *pMgmtObject, unsigned long ulCount, @@ -701,7 +701,7 @@ VNTWIFIwGetMaxSupportRate( void VNTWIFIvSet11h ( void *pMgmtObject, - BOOL b11hEnable + bool b11hEnable ) { PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; @@ -709,10 +709,10 @@ VNTWIFIvSet11h ( pMgmt->b11hEnable = b11hEnable; } -BOOL +bool VNTWIFIbMeasureReport( void *pMgmtObject, - BOOL bEndOfReport, + bool bEndOfReport, void *pvMeasureEID, unsigned char byReportMode, unsigned char byBasicMap, @@ -769,7 +769,7 @@ VNTWIFIbMeasureReport( } -BOOL +bool VNTWIFIbChannelSwitch( void *pMgmtObject, unsigned char byNewChannel @@ -785,7 +785,7 @@ VNTWIFIbChannelSwitch( } /* -BOOL +bool VNTWIFIbRadarPresent( void *pMgmtObject, 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 ( ); -BOOL +bool VNTWIFIbConfigPhyMode( void *pMgmtHandle, CARD_PHY_TYPE ePhyType @@ -224,7 +224,7 @@ void VNTWIFIvUpdateNodeTxCounter( void *pMgmtHandle, unsigned char *pbyDestAddress, - BOOL bTxOk, + bool bTxOk, unsigned short wRate, unsigned char *pbyTxFailCount ); @@ -240,7 +240,7 @@ VNTWIFIvGetTxRate( unsigned char *pbyOFDMBasicRate ); /* -BOOL +bool VNTWIFIbInit( void *pAdapterHandler, void **pMgmtHandler @@ -250,20 +250,20 @@ VNTWIFIbInit( unsigned char VNTWIFIbyGetKeyCypher( void *pMgmtHandle, - BOOL bGroupKey + bool bGroupKey ); -BOOL +bool VNTWIFIbSetPMKIDCache ( void *pMgmtObject, unsigned long ulCount, void *pPMKIDInfo ); -BOOL +bool VNTWIFIbCommandRunning ( void *pMgmtObject ); @@ -277,13 +277,13 @@ VNTWIFIwGetMaxSupportRate( void VNTWIFIvSet11h ( void *pMgmtObject, - BOOL b11hEnable + bool b11hEnable ); -BOOL +bool VNTWIFIbMeasureReport( void *pMgmtObject, - BOOL bEndOfReport, + bool bEndOfReport, void *pvMeasureEID, unsigned char byReportMode, unsigned char byBasicMap, @@ -291,13 +291,13 @@ VNTWIFIbMeasureReport( unsigned char *pbyRPIs ); -BOOL +bool VNTWIFIbChannelSwitch( void *pMgmtObject, unsigned char byNewChannel ); /* -BOOL +bool VNTWIFIbRadarPresent( void *pMgmtObject, 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( static -BOOL +bool s_bCommandComplete ( PSDevice pDevice ); @@ -117,7 +117,7 @@ vAdHocBeaconStop(PSDevice pDevice) { PSMgmtObject pMgmt = &(pDevice->sMgmtObj); - BOOL bStop; + bool bStop; /* * temporarily stop Beacon packet for AdHoc Server @@ -897,15 +897,15 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS static -BOOL +bool s_bCommandComplete ( PSDevice pDevice ) { PWLAN_IE_SSID pSSID; - BOOL bRadioCmd = false; + bool bRadioCmd = false; //unsigned short wDeAuthenReason = 0; - BOOL bForceSCAN = true; + bool bForceSCAN = true; PSMgmtObject pMgmt = pDevice->pMgmt; @@ -980,7 +980,7 @@ s_bCommandComplete ( -BOOL bScheduleCommand ( +bool bScheduleCommand ( void *hDeviceContext, CMD_CODE eCommand, unsigned char *pbyItem0 @@ -1061,7 +1061,7 @@ BOOL bScheduleCommand ( * Return Value: true if success; otherwise false * */ -BOOL bClearBSSID_SCAN ( +bool bClearBSSID_SCAN ( void *hDeviceContext ) { 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 { typedef struct tagCMD_ITEM { CMD_CODE eCmd; unsigned char abyCmdDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; - BOOL bNeedRadioOFF; + bool bNeedRadioOFF; unsigned short wDeAuthenReason; - BOOL bRadioCmd; - BOOL bForceSCAN; + bool bRadioCmd; + bool bForceSCAN; } CMD_ITEM, *PCMD_ITEM; // Command state @@ -119,11 +119,11 @@ vCommandTimer ( void *hDeviceContext ); -BOOL bClearBSSID_SCAN( +bool bClearBSSID_SCAN( void *hDeviceContext ); -BOOL +bool bScheduleCommand( void *hDeviceContext, 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 @@ * */ -BOOL WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader) +bool WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader) { unsigned int uIndex; unsigned int ii; @@ -175,7 +175,7 @@ unsigned int ii; * Return Value: true if it is valid fragment packet and we have resource to defragment; otherwise false * */ -BOOL WCTLbHandleFragment (PSDevice pDevice, PS802_11Header pMACHeader, unsigned int cbFrameLength, BOOL bWEP, BOOL bExtIV) +bool WCTLbHandleFragment (PSDevice pDevice, PS802_11Header pMACHeader, unsigned int cbFrameLength, bool bWEP, bool bExtIV) { unsigned int uHeaderSize; 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 @@ /*--------------------- Export Functions --------------------------*/ -BOOL WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader); -BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, - unsigned int cbFrameLength, BOOL bWEP, BOOL bExtIV); +bool WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader); +bool WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, + unsigned int cbFrameLength, bool bWEP, bool bExtIV); unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader); unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader); 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; /*--------------------- Static Functions --------------------------*/ //2008-8-4 <add> by chester -static BOOL ChannelExceedZoneType( +static bool ChannelExceedZoneType( PSDevice pDevice, unsigned char byCurrChannel ); @@ -141,7 +141,7 @@ s_vMgrRxAssocResponse( PSDevice pDevice, PSMgmtObject pMgmt, PSRxMgmtPacket pRxPacket, - BOOL bReAssocType + bool bReAssocType ); static @@ -226,7 +226,7 @@ s_vMgrRxBeacon( PSDevice pDevice, PSMgmtObject pMgmt, PSRxMgmtPacket pRxPacket, - BOOL bInScan + bool bInScan ); static @@ -317,7 +317,7 @@ s_vMgrSynchBSS ( ); -static BOOL +static bool s_bCipherMatch ( PKnownBSS pBSSNode, NDIS_802_11_ENCRYPTION_STATUS EncStatus, @@ -996,7 +996,7 @@ s_vMgrRxAssocResponse( PSDevice pDevice, PSMgmtObject pMgmt, PSRxMgmtPacket pRxPacket, - BOOL bReAssocType + bool bReAssocType ) { WLAN_FR_ASSOCRESP sFrame; @@ -1826,13 +1826,13 @@ s_vMgrRxDeauthentication( * True:exceed; * False:normal case -*/ -static BOOL +static bool ChannelExceedZoneType( PSDevice pDevice, unsigned char byCurrChannel ) { - BOOL exceed=false; + bool exceed=false; switch(pDevice->byZoneType) { case 0x00: //USA:1~11 @@ -1869,20 +1869,20 @@ s_vMgrRxBeacon( PSDevice pDevice, PSMgmtObject pMgmt, PSRxMgmtPacket pRxPacket, - BOOL bInScan + bool bInScan ) { PKnownBSS pBSSList; WLAN_FR_BEACON sFrame; QWORD qwTSFOffset; - BOOL bIsBSSIDEqual = false; - BOOL bIsSSIDEqual = false; - BOOL bTSFLargeDiff = false; - BOOL bTSFOffsetPostive = false; - BOOL bUpdateTSF = false; - BOOL bIsAPBeacon = false; - BOOL bIsChannelEqual = false; + bool bIsBSSIDEqual = false; + bool bIsSSIDEqual = false; + bool bTSFLargeDiff = false; + bool bTSFOffsetPostive = false; + bool bUpdateTSF = false; + bool bIsAPBeacon = false; + bool bIsChannelEqual = false; unsigned int uLocateByteIndex; unsigned char byTIMBitOn = 0; unsigned short wAIDNumber = 0; @@ -1894,8 +1894,8 @@ s_vMgrRxBeacon( unsigned char byCurrChannel = pRxPacket->byRxChannel; ERPObject sERP; unsigned int uRateLen = WLAN_RATES_MAXLEN; - BOOL bChannelHit = false; - BOOL bUpdatePhyParameter = false; + bool bChannelHit = false; + bool bUpdatePhyParameter = false; unsigned char byIEChannel = 0; @@ -2803,7 +2803,7 @@ vMgrJoinBSSBegin( // Add current BSS to Candidate list // This should only works for WPA2 BSS, and WPA2 BSS check must be done before. if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2) { - BOOL bResult = bAdd_PMKID_Candidate((void *)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj); + bool bResult = bAdd_PMKID_Candidate((void *)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate: 1(%d)\n", bResult); if (bResult == false) { vFlush_PMKID_Candidate((void *)pDevice); @@ -3155,8 +3155,8 @@ s_vMgrFormatTIM( unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; unsigned char byMap; unsigned int ii, jj; - BOOL bStartFound = false; - BOOL bMulticast = false; + bool bStartFound = false; + bool bMulticast = false; unsigned short wStartIndex = 0; unsigned short wEndIndex = 0; @@ -4326,7 +4326,7 @@ s_vMgrRxProbeResponse( unsigned char byCurrChannel = pRxPacket->byRxChannel; ERPObject sERP; unsigned char byIEChannel = 0; - BOOL bChannelHit = true; + bool bChannelHit = true; memset(&sFrame, 0, sizeof(WLAN_FR_PROBERESP)); @@ -4543,7 +4543,7 @@ vMgrRxManagePacket( ) { PSDevice pDevice = (PSDevice)hDeviceContext; - BOOL bInScan = false; + bool bInScan = false; unsigned int uNodeIndex = 0; NODE_STATE eNodeState = 0; CMD_STATUS Status; @@ -4684,7 +4684,7 @@ vMgrRxManagePacket( * true if success; false if failed. * -*/ -BOOL +bool bMgrPrepareBeaconToSend( void *hDeviceContext, PSMgmtObject pMgmt @@ -4808,7 +4808,7 @@ s_vMgrLogStatus( * Return Value: none. * -*/ -BOOL +bool bAdd_PMKID_Candidate ( void *hDeviceContext, unsigned char *pbyBSSID, @@ -4882,7 +4882,7 @@ vFlush_PMKID_Candidate ( memset(&pDevice->gsPMKIDCandidate, 0, sizeof(SPMKIDCandidateEvent)); } -static BOOL +static bool s_bCipherMatch ( PKnownBSS pBSSNode, 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 unsigned short wCurrAID; unsigned short wCurrATIMWindow; unsigned short wCurrBeaconPeriod; - BOOL bIsDS; + bool bIsDS; unsigned char byERPContext; CMD_STATE eCommandState; @@ -301,7 +301,7 @@ typedef struct tagSMgmtObject unsigned short wWPAIELen; unsigned int uAssocCount; - BOOL bMoreData; + bool bMoreData; // Scan state vars WMAC_SCAN_STATE eScanState; @@ -317,13 +317,13 @@ typedef struct tagSMgmtObject // Privacy WMAC_AUTHENTICATION_MODE eAuthenMode; WMAC_ENCRYPTION_MODE eEncryptionMode; - BOOL bShareKeyAlgorithm; + bool bShareKeyAlgorithm; unsigned char abyChallenge[WLAN_CHALLENGE_LEN]; - BOOL bPrivacyInvoked; + bool bPrivacyInvoked; // Received beacon state vars - BOOL bInTIM; - BOOL bMulticastTIM; + bool bInTIM; + bool bMulticastTIM; unsigned char byDTIMCount; unsigned char byDTIMPeriod; @@ -331,10 +331,10 @@ typedef struct tagSMgmtObject WMAC_POWER_MODE ePSMode; unsigned short wListenInterval; unsigned short wCountToWakeUp; - BOOL bInTIMWake; + bool bInTIMWake; unsigned char *pbyPSPacketPool; unsigned char byPSPacketPool[sizeof(STxMgmtPacket) + WLAN_NULLDATA_FR_MAXLEN]; - BOOL bRxBeaconInTBTTWake; + bool bRxBeaconInTBTTWake; unsigned char abyPSTxMap[MAX_NODE_NUM + 1]; // management command related @@ -366,7 +366,7 @@ typedef struct tagSMgmtObject // WPA2 PMKID Cache SPMKIDCache gsPMKIDCache; - BOOL bRoaming; + bool bRoaming; // rate fall back vars @@ -377,8 +377,8 @@ typedef struct tagSMgmtObject // for 802.11h - BOOL b11hEnable; - BOOL bSwitchChannel; + bool b11hEnable; + bool bSwitchChannel; unsigned char byNewChannel; PWLAN_IE_MEASURE_REP pCurrMeasureEIDRep; unsigned int uLengthOfRepEIDs; @@ -480,14 +480,14 @@ vMgrDeAuthenBeginSta( PCMD_STATUS pStatus ); -BOOL +bool bMgrPrepareBeaconToSend( void *hDeviceContext, PSMgmtObject pMgmt ); -BOOL +bool bAdd_PMKID_Candidate ( void *hDeviceContext, 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 ( * Return Value: none. * -*/ -BOOL +bool WPA_SearchRSN ( unsigned char byCmd, unsigned char byEncrypt, @@ -297,7 +297,7 @@ WPA_SearchRSN ( * Return Value: none. * -*/ -BOOL +bool WPAb_Is_RSN ( PWLAN_IE_RSN_EXT pRSN ) 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( PWLAN_IE_RSN_EXT pRSN ); -BOOL +bool WPA_SearchRSN( unsigned char byCmd, unsigned char byEncrypt, PKnownBSS pBSSList ); -BOOL +bool WPAb_Is_RSN( PWLAN_IE_RSN_EXT pRSN ); 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 ( int i, j; unsigned short m = 0, n = 0; unsigned char *pbyOUI; - BOOL bUseGK = false; + bool bUseGK = false; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"WPA2_ParseRSN: [%d]\n", pRSN->len); 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) * */ - int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel) + int wpa_set_keys(PSDevice pDevice, void *ctx, bool fcpfkernel) { struct viawget_wpa_param *param=ctx; PSMgmtObject pMgmt = pDevice->pMgmt; @@ -755,7 +755,7 @@ static int wpa_set_associate(PSDevice pDevice, unsigned char abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; unsigned char abyWPAIE[64]; int ret = 0; - BOOL bWepEnabled=false; + bool bWepEnabled=false; // set key type & algorithm 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; int wpa_set_wpadev(PSDevice pDevice, int val); int wpa_ioctl(PSDevice pDevice, struct iw_point *p); -int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel); +int wpa_set_keys(PSDevice pDevice, void *ctx, bool fcpfkernel); #endif // __WPACL_H__ 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; * Return Value: true if packet duplicate; otherwise false * */ -BOOL ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex) +bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex) { PSMgmtObject pMgmt = pDevice->pMgmt; PSTxDesc pHeadTD, pLastTD; unsigned int cbFrameBodySize; unsigned int uMACfragNum; unsigned char byPktType; - BOOL bNeedEncryption = false; + bool bNeedEncryption = false; SKeyItem STempKey; PSKeyItem pTransmitKey = NULL; 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 @@ /*--------------------- Export Functions --------------------------*/ -BOOL ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex); +bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex); #endif // __WROUTE_H__ |