From 0b5c6eb35b22dc6d7d7af9bc76d1f9044f6e5c82 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 2 Mar 2015 17:21:23 -0600 Subject: [PATCH] rtl8188eu: Change BOOLEAN to bool Signed-off-by: Larry Finger --- core/rtw_efuse.c | 36 +++++----- core/rtw_mlme_ext.c | 2 +- core/rtw_wlan_util.c | 2 +- hal/HalHWImg8188E_BB.c | 8 +-- hal/HalHWImg8188E_BB.h | 2 +- hal/HalHWImg8188E_MAC.c | 4 +- hal/HalHWImg8188E_MAC.h | 2 +- hal/HalHWImg8188E_RF.c | 4 +- hal/HalHWImg8188E_RF.h | 2 +- hal/HalPhyRf_8188e.c | 54 +++++++-------- hal/HalPhyRf_8188e.h | 6 +- hal/hal_com.c | 12 ++-- hal/hal_intf.c | 4 +- hal/odm.c | 72 +++++++++---------- hal/odm.h | 146 +++++++++++++++++++-------------------- hal/odm_HWConfig.c | 6 +- hal/odm_HWConfig.h | 6 +- hal/odm_RTL8188E.c | 12 ++-- hal/odm_RTL8188E.h | 2 +- hal/rtl8188e_cmd.c | 6 +- hal/rtl8188e_dm.c | 4 +- hal/rtl8188e_hal_init.c | 136 ++++++++++++++++++------------------ hal/rtl8188e_phycfg.c | 28 ++++---- hal/rtl8188e_rf6052.c | 4 +- hal/usb_halinit.c | 40 +++++------ include/Hal8188EPhyCfg.h | 14 ++-- include/Hal8192CPhyCfg.h | 14 ++-- include/Hal8192DPhyCfg.h | 20 +++--- include/basic_types.h | 2 - include/drv_types.h | 2 +- include/drv_types_ce.h | 2 +- include/drv_types_xp.h | 2 +- include/hal_com.h | 4 +- include/hal_intf.h | 22 +++--- include/rtl8188e_hal.h | 30 ++++---- include/rtl8192c_hal.h | 14 ++-- include/rtw_efuse.h | 18 ++--- include/rtw_mlme.h | 12 ++-- include/rtw_mlme_ext.h | 4 +- include/rtw_mp.h | 36 +++++----- include/rtw_mp_ioctl.h | 2 +- include/usb_vendor_req.h | 8 +-- 42 files changed, 402 insertions(+), 404 deletions(-) diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index 08756a5..69a77bb 100755 --- a/core/rtw_efuse.c +++ b/core/rtw_efuse.c @@ -50,12 +50,12 @@ u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN]={0}; #define EFUSE_CTRL REG_EFUSE_CTRL /* E-Fuse Control. */ /* */ -BOOLEAN +bool Efuse_Read1ByteFromFakeContent( IN struct adapter *pAdapter, IN u16 Offset, IN OUT u8 *Value ); -BOOLEAN +bool Efuse_Read1ByteFromFakeContent( IN struct adapter *pAdapter, IN u16 Offset, @@ -73,12 +73,12 @@ Efuse_Read1ByteFromFakeContent( return true; } -BOOLEAN +bool Efuse_Write1ByteToFakeContent( IN struct adapter *pAdapter, IN u16 Offset, IN u8 Value ); -BOOLEAN +bool Efuse_Write1ByteToFakeContent( IN struct adapter *pAdapter, IN u16 Offset, @@ -144,7 +144,7 @@ u16 Efuse_GetCurrentSize( IN struct adapter * pAdapter, IN u8 efuseType, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { u16 ret=0; @@ -181,7 +181,7 @@ ReadEFuseByte( struct adapter *Adapter, u16 _offset, u8 *pbuf, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { u32 value32; u8 readbyte; @@ -251,7 +251,7 @@ efuse_ReadEFuse( u16 _offset, u16 _size_byte, u8 *pbuf, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ); void efuse_ReadEFuse( @@ -260,7 +260,7 @@ efuse_ReadEFuse( u16 _offset, u16 _size_byte, u8 *pbuf, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ) { Adapter->HalFunc.ReadEFuse(Adapter, efuseType, _offset, _size_byte, pbuf, bPseudoTest); @@ -272,7 +272,7 @@ EFUSE_GetEfuseDefinition( IN u8 efuseType, IN u8 type, OUT void *pOut, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ) { pAdapter->HalFunc.EFUSEGetEfuseDefinition(pAdapter, efuseType, type, pOut, bPseudoTest); @@ -417,7 +417,7 @@ efuse_OneByteRead( IN struct adapter *pAdapter, IN u16 addr, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { u8 tmpidx = 0; u8 bResult; @@ -458,7 +458,7 @@ efuse_OneByteWrite( IN struct adapter *pAdapter, IN u16 addr, IN u8 data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { u8 tmpidx = 0; u8 bResult; @@ -501,7 +501,7 @@ int Efuse_PgPacketRead( IN struct adapter *pAdapter, IN u8 offset, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { int ret=0; @@ -515,7 +515,7 @@ Efuse_PgPacketWrite(IN struct adapter *pAdapter, IN u8 offset, IN u8 word_en, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { int ret; @@ -530,7 +530,7 @@ Efuse_PgPacketWrite_BT(IN struct adapter *pAdapter, IN u8 offset, IN u8 word_en, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { int ret; @@ -589,7 +589,7 @@ Efuse_WordEnableDataWrite( IN struct adapter *pAdapter, IN u16 efuse_addr, IN u8 word_en, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { u8 ret=0; @@ -919,13 +919,13 @@ Efuse_ReadAllMap( IN struct adapter *pAdapter, IN u8 efuseType, IN OUT u8 *Efuse, - IN BOOLEAN bPseudoTest); + IN bool bPseudoTest); void Efuse_ReadAllMap( IN struct adapter *pAdapter, IN u8 efuseType, IN OUT u8 *Efuse, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { u16 mapLen=0; @@ -1085,7 +1085,7 @@ efuse_ShadowWrite4Byte( void EFUSE_ShadowMapUpdate( IN struct adapter *pAdapter, IN u8 efuseType, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); u16 mapLen=0; diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 5c36035..5a7e053 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -8065,7 +8065,7 @@ Following are some utitity fuctions for WiFi MLME *****************************************************************************/ -BOOLEAN IsLegal5GChannel( +bool IsLegal5GChannel( IN struct adapter * Adapter, IN u8 channel) { diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index 46eae97..0a53369 100755 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -1925,7 +1925,7 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap) { struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - BOOLEAN ShortPreamble; + bool ShortPreamble; /* Check preamble mode, 2005.01.06, by rcnjko. */ /* Mark to update preamble value forever, 2008.03.18 by lanhsin */ diff --git a/hal/HalHWImg8188E_BB.c b/hal/HalHWImg8188E_BB.c index 1e566a0..68ae5d8 100755 --- a/hal/HalHWImg8188E_BB.c +++ b/hal/HalHWImg8188E_BB.c @@ -20,7 +20,7 @@ #include "odm_precomp.h" -static BOOLEAN +static bool CheckCondition( const u32 Condition, const u32 Hex @@ -339,7 +339,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E( u8 board = pDM_Odm->BoardType; u32 ArrayLen = sizeof(Array_AGC_TAB_1T_8188E)/sizeof(u32); u32 * Array = Array_AGC_TAB_1T_8188E; - BOOLEAN biol = FALSE; + bool biol = FALSE; HAL_STATUS rst =HAL_STATUS_SUCCESS; hex += board; @@ -838,7 +838,7 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E( u8 board = pDM_Odm->BoardType; u32 ArrayLen = sizeof(Array_PHY_REG_1T_8188E)/sizeof(u32); u32 * Array = Array_PHY_REG_1T_8188E; - BOOLEAN biol = FALSE; + bool biol = FALSE; HAL_STATUS rst =HAL_STATUS_SUCCESS; hex += board; hex += interfaceValue << 8; @@ -1190,7 +1190,7 @@ ODM_ReadAndConfig_PHY_REG_PG_8188E( u8 board = pDM_Odm->BoardType; u32 ArrayLen = sizeof(Array_PHY_REG_PG_8188E)/sizeof(u32); u32 * Array = Array_PHY_REG_PG_8188E; - BOOLEAN biol = FALSE; + bool biol = FALSE; hex += board; hex += interfaceValue << 8; diff --git a/hal/HalHWImg8188E_BB.h b/hal/HalHWImg8188E_BB.h index dc8fcb2..34af089 100755 --- a/hal/HalHWImg8188E_BB.h +++ b/hal/HalHWImg8188E_BB.h @@ -21,7 +21,7 @@ #ifndef __INC_BB_8188E_HW_IMG_H #define __INC_BB_8188E_HW_IMG_H -/* static BOOLEAN CheckCondition(const u32 Condition, const u32 Hex); */ +/* static bool CheckCondition(const u32 Condition, const u32 Hex); */ /****************************************************************************** * AGC_TAB_1T.TXT diff --git a/hal/HalHWImg8188E_MAC.c b/hal/HalHWImg8188E_MAC.c index 852ec02..6f16115 100755 --- a/hal/HalHWImg8188E_MAC.c +++ b/hal/HalHWImg8188E_MAC.c @@ -20,7 +20,7 @@ #include "odm_precomp.h" -static BOOLEAN +static bool CheckCondition( const u32 Condition, const u32 Hex @@ -169,7 +169,7 @@ ODM_ReadAndConfig_MAC_REG_8188E( u8 board = pDM_Odm->BoardType; u32 ArrayLen = sizeof(Array_MAC_REG_8188E)/sizeof(u32); u32 * Array = Array_MAC_REG_8188E; - BOOLEAN biol = FALSE; + bool biol = FALSE; HAL_STATUS rst =HAL_STATUS_SUCCESS; hex += board; hex += interfaceValue << 8; diff --git a/hal/HalHWImg8188E_MAC.h b/hal/HalHWImg8188E_MAC.h index 4a2f38d..49c206d 100755 --- a/hal/HalHWImg8188E_MAC.h +++ b/hal/HalHWImg8188E_MAC.h @@ -21,7 +21,7 @@ #ifndef __INC_MAC_8188E_HW_IMG_H #define __INC_MAC_8188E_HW_IMG_H -/* static BOOLEAN CheckCondition(const u32 Condition, const u32 Hex); */ +/* static bool CheckCondition(const u32 Condition, const u32 Hex); */ /****************************************************************************** * MAC_REG.TXT diff --git a/hal/HalHWImg8188E_RF.c b/hal/HalHWImg8188E_RF.c index 5a71e3d..ea29a52 100755 --- a/hal/HalHWImg8188E_RF.c +++ b/hal/HalHWImg8188E_RF.c @@ -20,7 +20,7 @@ #include "odm_precomp.h" -static BOOLEAN +static bool CheckCondition( const u32 Condition, const u32 Hex @@ -188,7 +188,7 @@ ODM_ReadAndConfig_RadioA_1T_8188E( u8 board = pDM_Odm->BoardType; u32 ArrayLen = sizeof(Array_RadioA_1T_8188E)/sizeof(u32); u32 * Array = Array_RadioA_1T_8188E; - BOOLEAN biol = FALSE; + bool biol = FALSE; HAL_STATUS rst =HAL_STATUS_SUCCESS; hex += board; diff --git a/hal/HalHWImg8188E_RF.h b/hal/HalHWImg8188E_RF.h index 25d209f..60ea2b6 100755 --- a/hal/HalHWImg8188E_RF.h +++ b/hal/HalHWImg8188E_RF.h @@ -21,7 +21,7 @@ #ifndef __INC_RF_8188E_HW_IMG_H #define __INC_RF_8188E_HW_IMG_H -/* static BOOLEAN CheckCondition(const u32 Condition, const u32 Hex); */ +/* static bool CheckCondition(const u32 Condition, const u32 Hex); */ /****************************************************************************** * RadioA_1T.TXT diff --git a/hal/HalPhyRf_8188e.c b/hal/HalPhyRf_8188e.c index 10b15ae..e16fb93 100755 --- a/hal/HalPhyRf_8188e.c +++ b/hal/HalPhyRf_8188e.c @@ -353,8 +353,8 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( s8 OFDM_index[2], CCK_index=0, OFDM_index_old[2]={0,0}, CCK_index_old=0, index; s8 deltaPowerIndex = 0; u32 i = 0, j = 0; - BOOLEAN is2T = FALSE; - BOOLEAN bInteralPA = FALSE; + bool is2T = FALSE; + bool bInteralPA = FALSE; u8 OFDM_min_index = 6, rf = (is2T) ? 2 : 1; /* OFDM BB Swing should be less than +3.0dB, which is required by Arthur */ u8 Indexforchannel = 0;/*GetRightChnlPlaceforIQK(pHalData->CurrentChannel)*/ @@ -569,7 +569,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( static u8 /* bit0 = 1 => Tx OK, bit1 = 1 => Rx OK */ phy_PathA_IQK_8188E( IN struct adapter *pAdapter, - IN BOOLEAN configPathB + IN bool configPathB ) { u32 regEAC, regE94, regE9C, regEA4; @@ -622,7 +622,7 @@ phy_PathA_IQK_8188E( static u8 /* bit0 = 1 => Tx OK, bit1 = 1 => Rx OK */ phy_PathA_RxIQK( IN struct adapter *pAdapter, - IN BOOLEAN configPathB + IN bool configPathB ) { u32 regEAC, regE94, regE9C, regEA4, u4tmp; @@ -811,10 +811,10 @@ phy_PathB_IQK_8188E( static void _PHY_PathAFillIQKMatrix( IN struct adapter *pAdapter, - IN BOOLEAN bIQKOK, + IN bool bIQKOK, IN s32 result[][8], IN u8 final_candidate, - IN BOOLEAN bTxOnly + IN bool bTxOnly ) { u32 Oldval_0, X, TX0_A, reg; @@ -871,10 +871,10 @@ _PHY_PathAFillIQKMatrix( static void _PHY_PathBFillIQKMatrix( IN struct adapter *pAdapter, - IN BOOLEAN bIQKOK, + IN bool bIQKOK, IN s32 result[][8], IN u8 final_candidate, - IN BOOLEAN bTxOnly /* do Tx only */ + IN bool bTxOnly /* do Tx only */ ) { u32 Oldval_1, X, TX1_A, reg; @@ -928,7 +928,7 @@ _PHY_PathBFillIQKMatrix( /* 2011/07/26 MH Add an API for testing IQK fail case. */ /* */ /* MP Already declare in odm.c */ -static BOOLEAN +static bool ODM_CheckPowerStatus( IN struct adapter * Adapter) { @@ -1018,8 +1018,8 @@ void _PHY_PathADDAOn( IN struct adapter *pAdapter, IN u32 * ADDAReg, - IN BOOLEAN isPathAOn, - IN BOOLEAN is2T + IN bool isPathAOn, + IN bool is2T ) { u32 pathOn; @@ -1084,7 +1084,7 @@ _PHY_PathAStandBy( static void _PHY_PIModeSwitch( IN struct adapter *pAdapter, - IN BOOLEAN PIMode + IN bool PIMode ) { u32 mode; @@ -1098,7 +1098,7 @@ _PHY_PIModeSwitch( ODM_SetBBReg(pDM_Odm, rFPGA0_XB_HSSIParameter1, bMaskDWord, mode); } -static BOOLEAN +static bool phy_SimularityCompare_8188E( IN struct adapter *pAdapter, IN s32 result[][8], @@ -1110,8 +1110,8 @@ phy_SimularityCompare_8188E( HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); PDM_ODM_T pDM_Odm = &pHalData->odmpriv; u8 final_candidate[2] = {0xFF, 0xFF}; /* for path A and path B */ - BOOLEAN bResult = TRUE; - BOOLEAN is2T; + bool bResult = TRUE; + bool is2T; s32 tmp1 = 0,tmp2 = 0; if( (pDM_Odm->RFType ==ODM_2T2R )||(pDM_Odm->RFType ==ODM_2T3R )||(pDM_Odm->RFType ==ODM_2T4R )) @@ -1225,7 +1225,7 @@ phy_IQCalibrate_8188E( IN struct adapter *pAdapter, IN s32 result[][8], IN u8 t, - IN BOOLEAN is2T + IN bool is2T ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -1417,7 +1417,7 @@ else static void phy_LCCalibrate_8188E( IN struct adapter *pAdapter, - IN BOOLEAN is2T + IN bool is2T ) { u8 tmpReg; @@ -1487,7 +1487,7 @@ static void phy_APCalibrate_8188E( IN struct adapter *pAdapter, IN s8 delta, - IN BOOLEAN is2T + IN bool is2T ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -1927,7 +1927,7 @@ if (*(pDM_Odm->mp_mode) != 1) void PHY_IQCalibrate_8188E( IN struct adapter *pAdapter, - IN BOOLEAN bReCovery + IN bool bReCovery ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -1941,17 +1941,17 @@ PHY_IQCalibrate_8188E( s32 result[4][8]; /* last is final result */ u8 i, final_candidate, Indexforchannel; u8 channelToIQK = 7; - BOOLEAN bPathAOK, bPathBOK; + bool bPathAOK, bPathBOK; s32 RegE94, RegE9C, RegEA4, RegEAC, RegEB4, RegEBC, RegEC4, RegECC, RegTmp = 0; - BOOLEAN is12simular, is13simular, is23simular; - BOOLEAN bStartContTx = FALSE, bSingleTone = FALSE, bCarrierSuppression = FALSE; + bool is12simular, is13simular, is23simular; + bool bStartContTx = FALSE, bSingleTone = FALSE, bCarrierSuppression = FALSE; u32 IQK_BB_REG_92C[IQK_BB_REG_NUM] = { rOFDM0_XARxIQImbalance, rOFDM0_XBRxIQImbalance, rOFDM0_ECCAThreshold, rOFDM0_AGCRSSITable, rOFDM0_XATxIQImbalance, rOFDM0_XBTxIQImbalance, rOFDM0_XCTxAFE, rOFDM0_XDTxAFE, rOFDM0_RxIQExtAnta}; - BOOLEAN is2T; + bool is2T; is2T = (pDM_Odm->RFType == ODM_2T2R)?TRUE:FALSE; if (ODM_CheckPowerStatus(pAdapter) == FALSE) @@ -2114,7 +2114,7 @@ PHY_LCCalibrate_8188E( IN struct adapter *pAdapter ) { - BOOLEAN bStartContTx = FALSE, bSingleTone = FALSE, bCarrierSuppression = FALSE; + bool bStartContTx = FALSE, bSingleTone = FALSE, bCarrierSuppression = FALSE; u32 timeout = 2000, timecount = 0; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); PDM_ODM_T pDM_Odm = &pHalData->odmpriv; @@ -2207,8 +2207,8 @@ PHY_APCalibrate_8188E( static void phy_SetRFPathSwitch_8188E( IN struct adapter *pAdapter, - IN BOOLEAN bMain, - IN BOOLEAN is2T + IN bool bMain, + IN bool is2T ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -2240,7 +2240,7 @@ static void phy_SetRFPathSwitch_8188E( } void PHY_SetRFPathSwitch_8188E( IN struct adapter *pAdapter, - IN BOOLEAN bMain + IN bool bMain ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); diff --git a/hal/HalPhyRf_8188e.h b/hal/HalPhyRf_8188e.h index 735144b..5e84f34 100755 --- a/hal/HalPhyRf_8188e.h +++ b/hal/HalPhyRf_8188e.h @@ -53,7 +53,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( void PHY_IQCalibrate_8188E( IN struct adapter * Adapter, - IN BOOLEAN bReCovery); + IN bool bReCovery); /* */ @@ -88,8 +88,8 @@ void _PHY_PathADDAOn( IN struct adapter * pAdapter, IN u32 * ADDAReg, - IN BOOLEAN isPathAOn, - IN BOOLEAN is2T + IN bool isPathAOn, + IN bool is2T ); void diff --git a/hal/hal_com.c b/hal/hal_com.c index 1e1d9b3..2de9e5a 100755 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -77,7 +77,7 @@ hal_com_get_channel_plan( IN u8 hw_channel_plan, /* channel plan from HW (efuse/eeprom) */ IN u8 sw_channel_plan, /* channel plan from SW (registry/module param) */ IN u8 def_channel_plan, /* channel plan used when the former two is invalid */ - IN BOOLEAN AutoLoadFail + IN bool AutoLoadFail ) { u8 swConfig; @@ -193,7 +193,7 @@ _OneOutPipeMapping( static void _TwoOutPipeMapping( IN struct adapter *pAdapter, - IN BOOLEAN bWIFICfg + IN bool bWIFICfg ) { struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); @@ -238,7 +238,7 @@ _TwoOutPipeMapping( static void _ThreeOutPipeMapping( IN struct adapter *pAdapter, - IN BOOLEAN bWIFICfg + IN bool bWIFICfg ) { struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); @@ -280,7 +280,7 @@ static void _ThreeOutPipeMapping( } -BOOLEAN +bool Hal_MappingOutPipe( IN struct adapter *pAdapter, IN u8 NumOutPipe @@ -288,9 +288,9 @@ Hal_MappingOutPipe( { struct registry_priv *pregistrypriv = &pAdapter->registrypriv; - BOOLEAN bWIFICfg = (pregistrypriv->wifi_spec) ?true:false; + bool bWIFICfg = (pregistrypriv->wifi_spec) ?true:false; - BOOLEAN result = true; + bool result = true; switch(NumOutPipe) { diff --git a/hal/hal_intf.c b/hal/hal_intf.c index 033d614..e89cb18 100755 --- a/hal/hal_intf.c +++ b/hal/hal_intf.c @@ -184,12 +184,12 @@ u8 rtw_hal_get_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, voi return _FAIL; } -void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet) +void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet) { if(padapter->HalFunc.SetHalODMVarHandler) padapter->HalFunc.SetHalODMVarHandler(padapter,eVariable,pValue1,bSet); } -void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet) +void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet) { if(padapter->HalFunc.GetHalODMVarHandler) padapter->HalFunc.GetHalODMVarHandler(padapter,eVariable,pValue1,bSet); diff --git a/hal/odm.c b/hal/odm.c index 0bed022..02f7af2 100755 --- a/hal/odm.c +++ b/hal/odm.c @@ -501,7 +501,7 @@ odm_InitHybridAntDiv( IN PDM_ODM_T pDM_Odm ); -BOOLEAN +bool odm_StaDefAntSel( IN PDM_ODM_T pDM_Odm, IN u32 OFDM_Ant1_Cnt, @@ -515,7 +515,7 @@ void odm_SetRxIdleAnt( IN PDM_ODM_T pDM_Odm, IN u8 Ant, - IN BOOLEAN bDualPath + IN bool bDualPath ); @@ -722,14 +722,14 @@ ODM_CmnInfoInit( pDM_Odm->PatchID = (u8)Value; break; case ODM_CMNINFO_BINHCT_TEST: - pDM_Odm->bInHctTest = (BOOLEAN)Value; + pDM_Odm->bInHctTest = (bool)Value; break; case ODM_CMNINFO_BWIFI_TEST: - pDM_Odm->bWIFITest = (BOOLEAN)Value; + pDM_Odm->bWIFITest = (bool)Value; break; case ODM_CMNINFO_SMART_CONCURRENT: - pDM_Odm->bDualMacSmartConcurrent = (BOOLEAN )Value; + pDM_Odm->bDualMacSmartConcurrent = (bool )Value; break; /* To remove the compiler warning, must add an empty default statement to handle the other values. */ @@ -795,7 +795,7 @@ ODM_CmnInfoHook( break; case ODM_CMNINFO_DMSP_GET_VALUE: - pDM_Odm->pbGetValueFromOtherMac = (BOOLEAN *)pValue; + pDM_Odm->pbGetValueFromOtherMac = (bool *)pValue; break; case ODM_CMNINFO_BUDDY_ADAPTOR: @@ -803,15 +803,15 @@ ODM_CmnInfoHook( break; case ODM_CMNINFO_DMSP_IS_MASTER: - pDM_Odm->pbMasterOfDMSP = (BOOLEAN *)pValue; + pDM_Odm->pbMasterOfDMSP = (bool *)pValue; break; case ODM_CMNINFO_SCAN: - pDM_Odm->pbScanInProcess = (BOOLEAN *)pValue; + pDM_Odm->pbScanInProcess = (bool *)pValue; break; case ODM_CMNINFO_POWER_SAVING: - pDM_Odm->pbPowerSaving = (BOOLEAN *)pValue; + pDM_Odm->pbPowerSaving = (bool *)pValue; break; case ODM_CMNINFO_ONE_PATH_CCA: @@ -819,15 +819,15 @@ ODM_CmnInfoHook( break; case ODM_CMNINFO_DRV_STOP: - pDM_Odm->pbDriverStopped = (BOOLEAN *)pValue; + pDM_Odm->pbDriverStopped = (bool *)pValue; break; case ODM_CMNINFO_PNP_IN: - pDM_Odm->pbDriverIsGoingToPnpSetPowerSleep = (BOOLEAN *)pValue; + pDM_Odm->pbDriverIsGoingToPnpSetPowerSleep = (bool *)pValue; break; case ODM_CMNINFO_INIT_ON: - pDM_Odm->pinit_adpt_in_progress = (BOOLEAN *)pValue; + pDM_Odm->pinit_adpt_in_progress = (bool *)pValue; break; case ODM_CMNINFO_ANT_TEST: @@ -835,14 +835,14 @@ ODM_CmnInfoHook( break; case ODM_CMNINFO_NET_CLOSED: - pDM_Odm->pbNet_closed = (BOOLEAN *)pValue; + pDM_Odm->pbNet_closed = (bool *)pValue; break; case ODM_CMNINFO_MP_MODE: pDM_Odm->mp_mode = (u8 *)pValue; break; /* case ODM_CMNINFO_BT_COEXIST: */ - /* pDM_Odm->BTCoexist = (BOOLEAN *)pValue; */ + /* pDM_Odm->BTCoexist = (bool *)pValue; */ /* case ODM_CMNINFO_STA_STATUS: */ /* pDM_Odm->pODM_StaInfo[] = (PSTA_INFO_T)pValue; */ @@ -917,18 +917,18 @@ ODM_CmnInfoUpdate( break; case ODM_CMNINFO_WIFI_DIRECT: - pDM_Odm->bWIFI_Direct = (BOOLEAN)Value; + pDM_Odm->bWIFI_Direct = (bool)Value; break; case ODM_CMNINFO_WIFI_DISPLAY: - pDM_Odm->bWIFI_Display = (BOOLEAN)Value; + pDM_Odm->bWIFI_Display = (bool)Value; break; case ODM_CMNINFO_LINK: - pDM_Odm->bLinked = (BOOLEAN)Value; + pDM_Odm->bLinked = (bool)Value; break; case ODM_CMNINFO_STATION_STATE: - pDM_Odm->bsta_state = (BOOLEAN)Value; + pDM_Odm->bsta_state = (bool)Value; break; case ODM_CMNINFO_RSSI_MIN: pDM_Odm->RSSI_Min= (u8)Value; @@ -951,11 +951,11 @@ ODM_CmnInfoUpdate( #if(BT_30_SUPPORT == 1) /* The following is for BT HS mode and BT coexist mechanism. */ case ODM_CMNINFO_BT_DISABLED: - pDM_Odm->bBtDisabled = (BOOLEAN)Value; + pDM_Odm->bBtDisabled = (bool)Value; break; case ODM_CMNINFO_BT_OPERATION: - pDM_Odm->bBtHsOperation = (BOOLEAN)Value; + pDM_Odm->bBtHsOperation = (bool)Value; break; case ODM_CMNINFO_BT_DIG: @@ -963,11 +963,11 @@ ODM_CmnInfoUpdate( break; case ODM_CMNINFO_BT_BUSY: - pDM_Odm->bBtBusy = (BOOLEAN)Value; + pDM_Odm->bBtBusy = (bool)Value; break; case ODM_CMNINFO_BT_DISABLE_EDCA: - pDM_Odm->bBtDisableEdcaTurbo = (BOOLEAN)Value; + pDM_Odm->bBtDisableEdcaTurbo = (bool)Value; break; #endif @@ -981,7 +981,7 @@ odm_CommonInfoSelfInit( IN PDM_ODM_T pDM_Odm ) { - pDM_Odm->bCckHighPower = (BOOLEAN) ODM_GetBBReg(pDM_Odm, 0x824, BIT9); + pDM_Odm->bCckHighPower = (bool) ODM_GetBBReg(pDM_Odm, 0x824, BIT9); pDM_Odm->RFPathRxEnable = (u8) ODM_GetBBReg(pDM_Odm, 0xc04, 0x0F); if(pDM_Odm->SupportICType & (ODM_RTL8192C|ODM_RTL8192D)) pDM_Odm->AntDivType = CG_TRX_HW_ANTDIV; @@ -1294,7 +1294,7 @@ odm_Adaptivity( s8 TH_L2H_dmc, TH_H2L_dmc; s8 TH_L2H, TH_H2L, Diff, IGI_target; u32 value32; - BOOLEAN EDCCA_State = 0; + bool EDCCA_State = 0; if(!(pDM_Odm->SupportAbility & ODM_BB_ADAPTIVITY)) { ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("Go to odm_DynamicEDCCA() \n")); @@ -1434,7 +1434,7 @@ odm_DIG( pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; u8 DIG_Dynamic_MIN; u8 DIG_MaxOfMin; - BOOLEAN FirstConnect, FirstDisConnect; + bool FirstConnect, FirstDisConnect; u8 dm_dig_max, dm_dig_min, offset; u8 CurrentIGI = pDM_DigTable->CurIGValue; u8 Adap_IGI_Upper = pDM_Odm->IGI_target + 30 + (u8) pDM_Odm->TH_L2H_ini -(u8) pDM_Odm->TH_EDCCA_HL_diff; @@ -1882,7 +1882,7 @@ odm_DIG( } -static BOOLEAN +static bool odm_DigAbort( IN PDM_ODM_T pDM_Odm ) @@ -1944,7 +1944,7 @@ odm_DIG( pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; u8 DIG_Dynamic_MIN; u8 DIG_MaxOfMin; - BOOLEAN FirstConnect, FirstDisConnect; + bool FirstConnect, FirstDisConnect; u8 dm_dig_max, dm_dig_min; u8 CurrentIGI = pDM_DigTable->CurIGValue; @@ -2857,13 +2857,13 @@ odm_RefreshRateAdaptiveMaskAPADSL( { } -/* Return Value: BOOLEAN */ +/* Return Value: bool */ /* - TRUE: RATRState is changed. */ -BOOLEAN +bool ODM_RAStateCheck( IN PDM_ODM_T pDM_Odm, IN s32 RSSI, - IN BOOLEAN bForceUpdate, + IN bool bForceUpdate, OUT u8 * pRATRState ) { @@ -3516,7 +3516,7 @@ odm_InitHybridAntDiv( } -BOOLEAN +bool odm_StaDefAntSel( IN PDM_ODM_T pDM_Odm, IN u32 OFDM_Ant1_Cnt, @@ -3581,7 +3581,7 @@ void odm_SetRxIdleAnt( IN PDM_ODM_T pDM_Odm, IN u8 Ant, - IN BOOLEAN bDualPath + IN bool bDualPath ) { SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; @@ -3616,7 +3616,7 @@ ODM_AntselStatistics_88C( IN PDM_ODM_T pDM_Odm, IN u8 MacId, IN u32 PWDBAll, - IN BOOLEAN isCCKrate + IN bool isCCKrate ) { SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; @@ -3660,7 +3660,7 @@ odm_HwAntDiv_92C_92D( SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; u32 RSSI_Min=0xFF, RSSI, RSSI_Ant1, RSSI_Ant2; u8 RxIdleAnt, i; - BOOLEAN bRet=FALSE; + bool bRet=FALSE; PSTA_INFO_T pEntry; ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV,ODM_DBG_LOUD,("odm_HwAntDiv==============>\n")); @@ -4036,7 +4036,7 @@ odm_PHY_ReloadAFERegisters( /* */ /* Added by Roger, 2011.12.15 */ /* */ -BOOLEAN +bool ODM_SingleDualAntennaDetection( IN PDM_ODM_T pDM_Odm, IN u8 mode @@ -4052,7 +4052,7 @@ ODM_SingleDualAntennaDetection( u8 initial_gain = 0x5a; u32 PSD_report_tmp; u32 AntA_report = 0x0, AntB_report = 0x0,AntO_report=0x0; - BOOLEAN bResult = TRUE; + bool bResult = TRUE; u32 AFE_Backup[16]; u32 AFE_REG_8723A[16] = { rRx_Wait_CCA, rTx_CCK_RFON, diff --git a/hal/odm.h b/hal/odm.h index eb8aa3a..62f39b5 100755 --- a/hal/odm.h +++ b/hal/odm.h @@ -164,8 +164,8 @@ typedef struct _Dynamic_Initial_Gain_Threshold_ u8 DIG_Dynamic_MIN_0; u8 DIG_Dynamic_MIN_1; - BOOLEAN bMediaConnect_0; - BOOLEAN bMediaConnect_1; + bool bMediaConnect_0; + bool bMediaConnect_1; u32 AntDiv_RSSI_max; u32 RSSI_max; @@ -220,8 +220,8 @@ typedef struct _RX_High_Power_ u8 Cur_IGI; u8 Pre_pw_th; u8 Cur_pw_th; - BOOLEAN First_time_enter; - BOOLEAN RXHP_enable; + bool First_time_enter; + bool RXHP_enable; u8 TP_Mode; RT_TIMER PSDTimer; }RXHP_T, *pRXHP_T; @@ -256,8 +256,8 @@ typedef struct _SW_Antenna_Switch_ /* Before link Antenna Switch check */ u8 SWAS_NoLink_State; u32 SWAS_NoLink_BK_Reg860; - BOOLEAN ANTA_ON; /* To indicate Ant A is or not */ - BOOLEAN ANTB_ON; /* To indicate Ant B is on or not */ + bool ANTA_ON; /* To indicate Ant A is or not */ + bool ANTB_ON; /* To indicate Ant B is on or not */ s32 RSSI_sum_A; s32 RSSI_sum_B; @@ -286,8 +286,8 @@ typedef struct _SW_Antenna_Switch_ }SWAT_T, *pSWAT_T; typedef struct _EDCA_TURBO_ { - BOOLEAN bCurrentTurboEDCA; - BOOLEAN bIsCurRDLState; + bool bCurrentTurboEDCA; + bool bIsCurRDLState; u32 prv_traffic_idx; /* edca turbo */ }EDCA_T,*pEDCA_T; @@ -355,9 +355,9 @@ typedef struct _ODM_Per_Pkt_Info_ { u8 Rate; u8 StationID; - BOOLEAN bPacketMatchBSSID; - BOOLEAN bPacketToSelf; - BOOLEAN bPacketBeacon; + bool bPacketMatchBSSID; + bool bPacketToSelf; + bool bPacketBeacon; }ODM_PACKET_INFO_T,*PODM_PACKET_INFO_T; typedef struct _ODM_Mac_Status_Info_ @@ -390,7 +390,7 @@ typedef enum tag_Dynamic_ODM_Support_Ability_Type /* */ typedef struct _ODM_STA_INFO{ /* Driver Write */ - BOOLEAN bUsed; /* record the sta status link or not? */ + bool bUsed; /* record the sta status link or not? */ u8 IOTPeer; /* Enum value. HT_IOT_PEER_E */ /* ODM Write */ @@ -779,7 +779,7 @@ typedef struct _ODM_RA_Info_ } ODM_RA_INFO_T,*PODM_RA_INFO_T; typedef struct _IQK_MATRIX_REGS_SETTING{ - BOOLEAN bIQKDone; + bool bIQKDone; s32 Value[1][IQK_Matrix_REG_NUM]; }IQK_MATRIX_REGS_SETTING,*PIQK_MATRIX_REGS_SETTING; @@ -795,8 +795,8 @@ typedef struct ODM_RF_Calibration_Structure /* u8 bTXPowerTracking; */ u8 TXPowercount; - BOOLEAN bTXPowerTrackingInit; - BOOLEAN bTXPowerTracking; + bool bTXPowerTrackingInit; + bool bTXPowerTracking; u8 TxPowerTrackControl; /* for mp mode, turn off txpwrtracking as default */ u8 TM_Trigger; u8 InternalPA5G[2]; /* pathA / pathB */ @@ -812,21 +812,21 @@ typedef struct ODM_RF_Calibration_Structure u8 ThermalValue_Crystal; u8 ThermalValue_DPKstore; u8 ThermalValue_DPKtrack; - BOOLEAN TxPowerTrackingInProgress; - BOOLEAN bDPKenable; + bool TxPowerTrackingInProgress; + bool bDPKenable; - BOOLEAN bReloadtxpowerindex; + bool bReloadtxpowerindex; u8 bRfPiEnable; u32 TXPowerTrackingCallbackCnt; /* cosa add for debug */ u8 bCCKinCH14; u8 CCK_index; u8 OFDM_index[2]; - BOOLEAN bDoneTxpower; + bool bDoneTxpower; s8 PowerIndexOffset; s8 DeltaPowerIndex; s8 DeltaPowerIndexLast; - BOOLEAN bTxPowerChanged; + bool bTxPowerChanged; u8 ThermalValue_HP[HP_THERMAL_NUM]; u8 ThermalValue_HP_index; @@ -845,9 +845,9 @@ typedef struct ODM_RF_Calibration_Structure u32 Reg860; u32 Reg864; - BOOLEAN bIQKInitialized; - BOOLEAN bLCKInProgress; - BOOLEAN bAntennaDetected; + bool bIQKInitialized; + bool bLCKInProgress; + bool bAntennaDetected; u32 ADDA_backup[IQK_ADDA_REG_NUM]; u32 IQK_MAC_backup[IQK_MAC_REG_NUM]; u32 IQK_BB_backup_recover[9]; @@ -884,7 +884,7 @@ typedef struct _FAST_ANTENNA_TRAINNING_ u32 MainAnt_Cnt[ODM_ASSOCIATE_ENTRY_NUM]; u32 AuxAnt_Cnt[ODM_ASSOCIATE_ENTRY_NUM]; u8 RxIdleAnt; - BOOLEAN bBecomeLinked; + bool bBecomeLinked; }FAT_T,*pFAT_T; @@ -929,27 +929,27 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure struct adapter * Adapter; /* For CE/NIC team */ prtl8192cd_priv priv; /* For AP/ADSL team */ /* WHen you use Adapter or priv pointer, you must make sure the pointer is ready. */ - BOOLEAN odm_ready; + bool odm_ready; rtl8192cd_priv fake_priv; u64 DebugComponents; u32 DebugLevel; /* ODM HANDLE, DRIVER NEEDS NOT TO HOOK------ */ - BOOLEAN bCckHighPower; + bool bCckHighPower; u8 RFPathRxEnable; /* ODM_CMNINFO_RFPATH_ENABLE */ u8 ControlChannel; /* ODM HANDLE, DRIVER NEEDS NOT TO HOOK------ */ /* REMOVED COMMON INFO---------- */ /* u8 PseudoMacPhyMode; */ - /* BOOLEAN *BTCoexist; */ - /* BOOLEAN PseudoBtCoexist; */ + /* bool *BTCoexist; */ + /* bool PseudoBtCoexist; */ /* u8 OPMode; */ - /* BOOLEAN bAPMode; */ - /* BOOLEAN bClientMode; */ - /* BOOLEAN bAdHocMode; */ - /* BOOLEAN bSlaveOfDMSP; */ + /* bool bAPMode; */ + /* bool bClientMode; */ + /* bool bAdHocMode; */ + /* bool bSlaveOfDMSP; */ /* REMOVED COMMON INFO---------- */ @@ -982,10 +982,10 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure /* with external TRSW NO/Yes = 0/1 */ u8 ExtTRSW; u8 PatchID; /* Customer ID */ - BOOLEAN bInHctTest; - BOOLEAN bWIFITest; + bool bInHctTest; + bool bWIFITest; - BOOLEAN bDualMacSmartConcurrent; + bool bDualMacSmartConcurrent; u32 BK_SupportAbility; u8 AntDivType; /* HOOK BEFORE REG INIT----------- */ @@ -996,7 +996,7 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure /* POINTER REFERENCE----------- */ u8 u8_temp; - BOOLEAN BOOLEAN_temp; + bool bool_temp; struct adapter *_temp; /* MAC PHY Mode SMSP/DMSP/DMDP = 0/1/2 */ @@ -1019,37 +1019,37 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure u8 *pChannel; /* central channel number */ /* Common info for 92D DMSP */ - BOOLEAN *pbGetValueFromOtherMac; + bool *pbGetValueFromOtherMac; struct adapter * *pBuddyAdapter; - BOOLEAN *pbMasterOfDMSP; /* MAC0: master, MAC1: slave */ + bool *pbMasterOfDMSP; /* MAC0: master, MAC1: slave */ /* Common info for Status */ - BOOLEAN *pbScanInProcess; - BOOLEAN *pbPowerSaving; + bool *pbScanInProcess; + bool *pbPowerSaving; /* CCA Path 2-path/path-A/path-B = 0/1/2; using ODM_CCA_PATH_E. */ u8 *pOnePathCCA; /* pMgntInfo->AntennaTest */ u8 *pAntennaTest; - BOOLEAN *pbNet_closed; + bool *pbNet_closed; /* POINTER REFERENCE----------- */ /* */ /* CALL BY VALUE------------- */ - BOOLEAN bLinkInProcess; - BOOLEAN bWIFI_Direct; - BOOLEAN bWIFI_Display; - BOOLEAN bLinked; - BOOLEAN bsta_state; + bool bLinkInProcess; + bool bWIFI_Direct; + bool bWIFI_Display; + bool bLinked; + bool bsta_state; u8 RSSI_Min; u8 InterfaceIndex; /* Add for 92D dual MAC: 0--Mac0 1--Mac1 */ - BOOLEAN bIsMPChip; - BOOLEAN bOneEntryOnly; + bool bIsMPChip; + bool bOneEntryOnly; /* Common info for BTDM */ - BOOLEAN bBtDisabled; /* BT is disabled */ - BOOLEAN bBtConnectProcess; /* BT HS is under connection progress. */ + bool bBtDisabled; /* BT is disabled */ + bool bBtConnectProcess; /* BT HS is under connection progress. */ u8 btHsRssi; /* BT HS mode wifi rssi value. */ - BOOLEAN bBtHsOperation; /* BT HS mode is under progress */ + bool bBtHsOperation; /* BT HS mode is under progress */ u8 btHsDigVal; /* use BT rssi to decide the DIG value */ - BOOLEAN bBtDisableEdcaTurbo; /* Under some condition, don't enable the EDCA Turbo */ - BOOLEAN bBtLimitedDig; /* BT is busy. */ + bool bBtDisableEdcaTurbo; /* Under some condition, don't enable the EDCA Turbo */ + bool bBtLimitedDig; /* BT is busy. */ /* CALL BY VALUE------------- */ u8 RSSI_A; u8 RSSI_B; @@ -1059,25 +1059,25 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure u64 RSSI_TRSW_iso; u8 RxRate; - BOOLEAN StopDIG; + bool StopDIG; u8 TxRate; u8 LinkedInterval; u8 preChannel; u32 TxagcOffsetValueA; - BOOLEAN IsTxagcOffsetPositiveA; + bool IsTxagcOffsetPositiveA; u32 TxagcOffsetValueB; - BOOLEAN IsTxagcOffsetPositiveB; + bool IsTxagcOffsetPositiveB; u64 lastTxOkCnt; u64 lastRxOkCnt; u32 BbSwingOffsetA; - BOOLEAN IsBbSwingOffsetPositiveA; + bool IsBbSwingOffsetPositiveA; u32 BbSwingOffsetB; - BOOLEAN IsBbSwingOffsetPositiveB; + bool IsBbSwingOffsetPositiveB; s8 TH_L2H_ini; s8 TH_EDCCA_HL_diff; u32 IGI_Base; u32 IGI_target; - BOOLEAN ForceEDCCA; + bool ForceEDCCA; u8 AdapEn_RSSI; u8 AntType; u8 antdiv_rssi; @@ -1099,7 +1099,7 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure /* 2012/02/14 MH Add to share 88E ra with other SW team. */ /* We need to colelct all support abilit to a proper area. */ /* */ - BOOLEAN RaSupport88E; + bool RaSupport88E; /* Define ........... */ @@ -1129,7 +1129,7 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure FALSE_ALARM_STATISTICS FalseAlmCnt; FALSE_ALARM_STATISTICS FlaseAlmCntBuddyAdapter; SWAT_T DM_SWAT_Table; - BOOLEAN RSSI_test; + bool RSSI_test; EDCA_T DM_EDCA_Table; u32 WMMEDCA_BE; @@ -1138,16 +1138,16 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure /* ================================================== */ /* */ - BOOLEAN *pbDriverStopped; - BOOLEAN *pbDriverIsGoingToPnpSetPowerSleep; - BOOLEAN *pinit_adpt_in_progress; + bool *pbDriverStopped; + bool *pbDriverIsGoingToPnpSetPowerSleep; + bool *pinit_adpt_in_progress; /* PSD */ - BOOLEAN bUserAssignLevel; + bool bUserAssignLevel; RT_TIMER PSDTimer; u8 RSSI_BT; /* come from BT */ - BOOLEAN bPSDinProcess; - BOOLEAN bDMInitialGainEnable; + bool bPSDinProcess; + bool bDMInitialGainEnable; /* for rate adaptive, in fact, 88c/92c fw will handle this */ u8 bUseRAMask; @@ -1163,13 +1163,13 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure u8 BbSwingIdxOfdm; u8 BbSwingIdxOfdmCurrent; u8 BbSwingIdxOfdmBase; - BOOLEAN BbSwingFlagOfdm; + bool BbSwingFlagOfdm; u8 BbSwingIdxCck; u8 BbSwingIdxCckCurrent; u8 BbSwingIdxCckBase; u8 DefaultOfdmIndex; u8 DefaultCckIndex; - BOOLEAN BbSwingFlagCck; + bool BbSwingFlagCck; u8 *mp_mode; @@ -1440,11 +1440,11 @@ ODM_TXPowerTrackingCheck( PDM_ODM_T pDM_Odm ); -BOOLEAN +bool ODM_RAStateCheck( PDM_ODM_T pDM_Odm, s32 RSSI, - BOOLEAN bForceUpdate, + bool bForceUpdate, OUT u8 * pRATRState ); @@ -1535,7 +1535,7 @@ ODM_AntselStatistics_88C( PDM_ODM_T pDM_Odm, u8 MacId, u32 PWDBAll, - BOOLEAN isCCKrate + bool isCCKrate ); void @@ -1543,7 +1543,7 @@ ODM_SingleDualAntennaDefaultSetting( PDM_ODM_T pDM_Odm ); -BOOLEAN +bool ODM_SingleDualAntennaDetection( PDM_ODM_T pDM_Odm, u8 mode diff --git a/hal/odm_HWConfig.c b/hal/odm_HWConfig.c index c33a188..4d7c4ae 100755 --- a/hal/odm_HWConfig.c +++ b/hal/odm_HWConfig.c @@ -834,9 +834,9 @@ ODM_MacStatusQuery( IN OUT PDM_ODM_T pDM_Odm, IN u8 * pMacStatus, IN u8 MacID, - IN BOOLEAN bPacketMatchBSSID, - IN BOOLEAN bPacketToSelf, - IN BOOLEAN bPacketBeacon + IN bool bPacketMatchBSSID, + IN bool bPacketToSelf, + IN bool bPacketBeacon ) { /* 2011/10/19 Driver team will handle in the future. */ diff --git a/hal/odm_HWConfig.h b/hal/odm_HWConfig.h index 7937aee..6e1d22c 100755 --- a/hal/odm_HWConfig.h +++ b/hal/odm_HWConfig.h @@ -166,9 +166,9 @@ ODM_MacStatusQuery( PDM_ODM_T pDM_Odm, u8 * pMacStatus, u8 MacID, - BOOLEAN bPacketMatchBSSID, - BOOLEAN bPacketToSelf, - BOOLEAN bPacketBeacon + bool bPacketMatchBSSID, + bool bPacketToSelf, + bool bPacketBeacon ); HAL_STATUS ODM_ConfigRFWithHeaderFile( diff --git a/hal/odm_RTL8188E.c b/hal/odm_RTL8188E.c index faed849..6262357 100755 --- a/hal/odm_RTL8188E.c +++ b/hal/odm_RTL8188E.c @@ -391,8 +391,8 @@ odm_HWAntDiv( u8 RxIdleAnt=0, TargetAnt=7; pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; - BOOLEAN bMatchBSSID; - BOOLEAN bPktFilterMacth = FALSE; + bool bMatchBSSID; + bool bPktFilterMacth = FALSE; PSTA_INFO_T pEntry; for (i=0; iPriCCA_flag = 0; } -BOOLEAN +bool ODM_DynamicPrimaryCCA_DupRTS( IN PDM_ODM_T pDM_Odm ) @@ -563,9 +563,9 @@ odm_DynamicPrimaryCCA( HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); PFALSE_ALARM_STATISTICS FalseAlmCnt = &(pDM_Odm->FalseAlmCnt); pPri_CCA_T PrimaryCCA = &(pDM_Odm->DM_PriCCA); - BOOLEAN Is40MHz; - BOOLEAN Client_40MHz = FALSE, Client_tmp = FALSE; /* connected client BW */ - BOOLEAN bConnected = FALSE; /* connected or not */ + bool Is40MHz; + bool Client_40MHz = FALSE, Client_tmp = FALSE; /* connected client BW */ + bool bConnected = FALSE; /* connected or not */ static u8 Client_40MHz_pre = 0; static u64 lastTxOkCnt = 0; static u64 lastRxOkCnt = 0; diff --git a/hal/odm_RTL8188E.h b/hal/odm_RTL8188E.h index 46b5545..20a696b 100755 --- a/hal/odm_RTL8188E.h +++ b/hal/odm_RTL8188E.h @@ -47,7 +47,7 @@ void odm_FastAntTrainingCallback(PDM_ODM_T pDM_Odm); void odm_FastAntTrainingWorkItemCallback(PDM_ODM_T pDM_Odm); void odm_PrimaryCCA_Init(PDM_ODM_T pDM_Odm); -BOOLEAN ODM_DynamicPrimaryCCA_DupRTS(PDM_ODM_T pDM_Odm); +bool ODM_DynamicPrimaryCCA_DupRTS(PDM_ODM_T pDM_Odm); void odm_DynamicPrimaryCCA(PDM_ODM_T pDM_Odm); diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index 088de12..cc0d8a0 100755 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -581,7 +581,7 @@ CheckFwRsvdPageContent( /* TRUE: At the second time, we should send the first packet (default:beacon) */ /* to Hw again and set the lengh in descriptor to the real beacon lengh. */ /* 2009.10.15 by tynli. */ -static void SetFwRsvdPagePkt(struct adapter *padapter, BOOLEAN bDLFinished) +static void SetFwRsvdPagePkt(struct adapter *padapter, bool bDLFinished) { PHAL_DATA_TYPE pHalData; struct xmit_frame *pmgntframe; @@ -701,8 +701,8 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - BOOLEAN bSendBeacon=false; - BOOLEAN bcn_valid = false; + bool bSendBeacon=false; + bool bcn_valid = false; u8 DLBcnCount=0; u32 poll = 0; diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index 883e969..559680b 100755 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -292,8 +292,8 @@ rtl8188e_HalDmWatchDog( IN struct adapter *Adapter ) { - BOOLEAN bFwCurrentInPSMode = false; - BOOLEAN bFwPSAwake = true; + bool bFwCurrentInPSMode = false; + bool bFwPSAwake = true; u8 hw_init_completed = false; PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c index 7e41053..d6dd3bd 100755 --- a/hal/rtl8188e_hal_init.c +++ b/hal/rtl8188e_hal_init.c @@ -517,7 +517,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter,int data_len) static void _FWDownloadEnable( IN struct adapter * padapter, - IN BOOLEAN enable + IN bool enable ) { u8 tmp; @@ -934,27 +934,27 @@ enum{ LDOE25_SHIFT = 28 , }; -static BOOLEAN +static bool hal_EfusePgPacketWrite2ByteHeader( IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, - IN BOOLEAN bPseudoTest); -static BOOLEAN + IN bool bPseudoTest); +static bool hal_EfusePgPacketWrite1ByteHeader( IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, - IN BOOLEAN bPseudoTest); -static BOOLEAN + IN bool bPseudoTest); +static bool hal_EfusePgPacketWriteData( IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, - IN BOOLEAN bPseudoTest); + IN bool bPseudoTest); static void hal_EfusePowerSwitch_RTL8188E( @@ -1068,7 +1068,7 @@ Hal_EfuseReadEFuse88E( u16 _offset, u16 _size_byte, u8 *pbuf, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ) { /* u8 efuseTbl[EFUSE_MAP_LEN_88E]; */ @@ -1257,14 +1257,14 @@ exit: } -static BOOLEAN +static bool Hal_EfuseSwitchToBank( IN struct adapter *pAdapter, IN u8 bank, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ) { - BOOLEAN bRet = false; + bool bRet = false; u32 value32=0; /* RTPRINT(FEEPROM, EFUSE_PG, ("Efuse switch bank to %d\n", bank)); */ @@ -1316,7 +1316,7 @@ ReadEFuseByIC( u16 _offset, u16 _size_byte, u8 *pbuf, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ) { #ifdef DBG_IOL_READ_EFUSE_MAP @@ -1373,7 +1373,7 @@ ReadEFuse_Pseudo( u16 _offset, u16 _size_byte, u8 *pbuf, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ) { Hal_EfuseReadEFuse88E(Adapter, _offset, _size_byte, pbuf, bPseudoTest); @@ -1386,7 +1386,7 @@ rtl8188e_ReadEFuse( u16 _offset, u16 _size_byte, u8 *pbuf, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ) { if(bPseudoTest) @@ -1542,7 +1542,7 @@ rtl8188e_EFUSE_GetEfuseDefinition( IN u8 efuseType, IN u8 type, OUT void *pOut, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ) { if(bPseudoTest) @@ -1560,7 +1560,7 @@ Hal_EfuseWordEnableDataWrite( IN struct adapter *pAdapter, IN u16 efuse_addr, IN u8 word_en, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { u16 tmpaddr = 0; u16 start_addr = efuse_addr; @@ -1626,7 +1626,7 @@ Hal_EfuseWordEnableDataWrite_Pseudo( IN struct adapter *pAdapter, IN u16 efuse_addr, IN u8 word_en, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { u8 ret=0; @@ -1640,7 +1640,7 @@ rtl8188e_Efuse_WordEnableDataWrite( IN struct adapter *pAdapter, IN u16 efuse_addr, IN u8 word_en, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { u8 ret=0; @@ -1659,7 +1659,7 @@ rtl8188e_Efuse_WordEnableDataWrite( IN struct adapter *pAdapter, static u16 hal_EfuseGetCurrentSize_8188e(IN struct adapter *pAdapter, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { int bContinual = true; @@ -1730,7 +1730,7 @@ hal_EfuseGetCurrentSize_8188e(IN struct adapter *pAdapter, static u16 Hal_EfuseGetCurrentSize_Pseudo(IN struct adapter *pAdapter, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { u16 ret=0; @@ -1744,7 +1744,7 @@ static u16 rtl8188e_EfuseGetCurrentSize( IN struct adapter *pAdapter, IN u8 efuseType, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { u16 ret=0; @@ -1767,7 +1767,7 @@ hal_EfusePgPacketRead_8188e( IN struct adapter *pAdapter, IN u8 offset, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { u8 ReadState = PG_STATE_HEADER; @@ -1882,7 +1882,7 @@ static int Hal_EfusePgPacketRead( IN struct adapter *pAdapter, IN u8 offset, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { int ret=0; @@ -1896,7 +1896,7 @@ static int Hal_EfusePgPacketRead_Pseudo( IN struct adapter *pAdapter, IN u8 offset, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { int ret=0; @@ -1909,7 +1909,7 @@ static int rtl8188e_Efuse_PgPacketRead( IN struct adapter *pAdapter, IN u8 offset, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { int ret=0; @@ -1925,13 +1925,13 @@ rtl8188e_Efuse_PgPacketRead( IN struct adapter *pAdapter, return ret; } -static BOOLEAN +static bool hal_EfuseFixHeaderProcess( IN struct adapter * pAdapter, IN u8 efuseType, IN PPGPKT_STRUCT pFixPkt, IN u16 *pAddr, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ) { u8 originaldata[8], badworden=0; @@ -1966,15 +1966,15 @@ hal_EfuseFixHeaderProcess( return true; } -static BOOLEAN +static bool hal_EfusePgPacketWrite2ByteHeader( IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { - BOOLEAN bRet=false, bContinual=true; + bool bRet=false, bContinual=true; u16 efuse_addr=*pAddr, efuse_max_available_len=0; u8 pg_header=0, tmp_header=0, pg_header_temp=0; u8 repeatcnt=0; @@ -2063,15 +2063,15 @@ hal_EfusePgPacketWrite2ByteHeader( return bRet; } -static BOOLEAN +static bool hal_EfusePgPacketWrite1ByteHeader( IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { - BOOLEAN bRet=false; + bool bRet=false; u8 pg_header=0, tmp_header=0; u16 efuse_addr=*pAddr; u8 repeatcnt=0; @@ -2111,15 +2111,15 @@ hal_EfusePgPacketWrite1ByteHeader( return bRet; } -static BOOLEAN +static bool hal_EfusePgPacketWriteData( IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { - BOOLEAN bRet=false; + bool bRet=false; u16 efuse_addr=*pAddr; u8 badworden=0; u32 PgWriteSuccess=0; @@ -2148,15 +2148,15 @@ hal_EfusePgPacketWriteData( return bRet; } -static BOOLEAN +static bool hal_EfusePgPacketWriteHeader( IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { - BOOLEAN bRet=false; + bool bRet=false; if(pTargetPkt->offset >= EFUSE_MAX_SECTION_BASE) { @@ -2170,7 +2170,7 @@ hal_EfusePgPacketWriteHeader( return bRet; } -static BOOLEAN +static bool wordEnMatched( IN PPGPKT_STRUCT pTargetPkt, IN PPGPKT_STRUCT pCurPkt, @@ -2210,15 +2210,15 @@ wordEnMatched( return false; } -static BOOLEAN +static bool hal_EfuseCheckIfDatafollowed( IN struct adapter * pAdapter, IN u8 word_cnts, IN u16 startAddr, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ) { - BOOLEAN bRet=false; + bool bRet=false; u8 i, efuse_data; for(i=0; i<(word_cnts*2) ; i++) @@ -2230,16 +2230,16 @@ hal_EfuseCheckIfDatafollowed( return bRet; } -static BOOLEAN +static bool hal_EfusePartialWriteCheck( IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ) { - BOOLEAN bRet=false; + bool bRet=false; u8 i, efuse_data=0, cur_header=0; u8 new_wden=0, matched_wden=0, badworden=0; u16 startAddr=0, efuse_max_available_len=0, efuse_max=0; @@ -2355,11 +2355,11 @@ hal_EfusePartialWriteCheck( return bRet; } -static BOOLEAN +static bool hal_EfusePgCheckAvailableAddr( IN struct adapter *pAdapter, IN u8 efuseType, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ) { u16 efuse_max_available_len=0; @@ -2396,13 +2396,13 @@ hal_EfuseConstructPGPkt( /* RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfuseConstructPGPkt(), targetPkt, offset=%d, word_en=0x%x, word_cnts=%d\n", pTargetPkt->offset, pTargetPkt->word_en, pTargetPkt->word_cnts)); */ } -static BOOLEAN +static bool hal_EfusePgPacketWrite_BT( IN struct adapter *pAdapter, IN u8 offset, IN u8 word_en, IN u8 *pData, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ) { PGPKT_STRUCT targetPkt; @@ -2426,13 +2426,13 @@ hal_EfusePgPacketWrite_BT( return true; } -static BOOLEAN +static bool hal_EfusePgPacketWrite_8188e( IN struct adapter * pAdapter, IN u8 offset, IN u8 word_en, IN u8 *pData, - IN BOOLEAN bPseudoTest + IN bool bPseudoTest ) { PGPKT_STRUCT targetPkt; @@ -2462,7 +2462,7 @@ Hal_EfusePgPacketWrite_Pseudo(IN struct adapter *pAdapter, IN u8 offset, IN u8 word_en, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { int ret; @@ -2476,7 +2476,7 @@ Hal_EfusePgPacketWrite(IN struct adapter *pAdapter, IN u8 offset, IN u8 word_en, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { int ret=0; ret = hal_EfusePgPacketWrite_8188e(pAdapter, offset, word_en, data, bPseudoTest); @@ -2490,7 +2490,7 @@ rtl8188e_Efuse_PgPacketWrite(IN struct adapter *pAdapter, IN u8 offset, IN u8 word_en, IN u8 *data, - IN BOOLEAN bPseudoTest) + IN bool bPseudoTest) { int ret; @@ -2566,7 +2566,7 @@ static void rtl8188e_GetHalODMVar( struct adapter * Adapter, HAL_ODM_VARIABLE eVariable, void * pValue1, - BOOLEAN bSet) + bool bSet) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); PDM_ODM_T podmpriv = &pHalData->odmpriv; @@ -2582,7 +2582,7 @@ static void rtl8188e_SetHalODMVar( struct adapter * Adapter, HAL_ODM_VARIABLE eVariable, void * pValue1, - BOOLEAN bSet) + bool bSet) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); PDM_ODM_T podmpriv = &pHalData->odmpriv; @@ -2914,7 +2914,7 @@ Hal_ReadPowerValueFromPROM_8188E( IN struct adapter * padapter, IN PTxPowerInfo24G pwrInfo24G, IN u8* PROMContent, - IN BOOLEAN AutoLoadFail + IN bool AutoLoadFail ) { u32 rfPath, eeAddr=EEPROM_TX_PWR_INX_88E, group,TxCount=0; @@ -3137,7 +3137,7 @@ Hal_GetChnlGroup88E( void Hal_ReadPowerSavingMode88E( struct adapter * padapter, IN u8* hwinfo, - IN BOOLEAN AutoLoadFail + IN bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -3176,7 +3176,7 @@ void Hal_ReadTxPowerInfo88E( IN struct adapter * padapter, IN u8* PROMContent, - IN BOOLEAN AutoLoadFail + IN bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -3257,7 +3257,7 @@ void Hal_EfuseParseXtal_8188E( IN struct adapter * pAdapter, IN u8* hwinfo, - IN BOOLEAN AutoLoadFail + IN bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -3279,7 +3279,7 @@ void Hal_EfuseParseBoardType88E( IN struct adapter * pAdapter, IN u8* hwinfo, - IN BOOLEAN AutoLoadFail + IN bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -3295,7 +3295,7 @@ void Hal_EfuseParseEEPROMVer88E( IN struct adapter * padapter, IN u8* hwinfo, - IN BOOLEAN AutoLoadFail + IN bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -3316,7 +3316,7 @@ void rtl8188e_EfuseParseChnlPlan( IN struct adapter * padapter, IN u8* hwinfo, - IN BOOLEAN AutoLoadFail + IN bool AutoLoadFail ) { padapter->mlmepriv.ChannelPlan = hal_com_get_channel_plan( @@ -3334,7 +3334,7 @@ void Hal_EfuseParseCustomerID88E( IN struct adapter * padapter, IN u8* hwinfo, - IN BOOLEAN AutoLoadFail + IN bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -3358,7 +3358,7 @@ void Hal_ReadAntennaDiversity88E( IN struct adapter * pAdapter, IN u8* PROMContent, - IN BOOLEAN AutoLoadFail + IN bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -3406,7 +3406,7 @@ void Hal_ReadThermalMeter_88E( IN struct adapter *Adapter, IN u8* PROMContent, - IN BOOLEAN AutoloadFail + IN bool AutoloadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -3439,7 +3439,7 @@ Hal_InitChannelPlan( { } -BOOLEAN HalDetectPwrDownMode88E(struct adapter *Adapter) +bool HalDetectPwrDownMode88E(struct adapter *Adapter) { u8 tmpvalue = 0; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c index 32003e4..7f6f28e 100755 --- a/hal/rtl8188e_phycfg.c +++ b/hal/rtl8188e_phycfg.c @@ -78,12 +78,12 @@ phy_CalculateBitShift( } #if(SIC_ENABLE == 1) -static BOOLEAN +static bool sic_IsSICReady( IN struct adapter *Adapter ) { - BOOLEAN bRet=false; + bool bRet=false; u32 retryCnt=0; u8 sic_cmd=0xff; @@ -269,7 +269,7 @@ SIC_Init( #endif } -static BOOLEAN +static bool SIC_LedOff( IN struct adapter *Adapter ) @@ -1698,7 +1698,7 @@ PHY_SetTxPowerLevel8188E( /* A mode. */ /* By Bruce, 2008-02-04. */ /* */ -BOOLEAN +bool PHY_UpdateTxPowerDbm8188E( IN struct adapter *Adapter, IN int powerInDbm @@ -1990,7 +1990,7 @@ PHY_SwChnl8188E( /* Call after initialization */ /* struct adapter *Adapter = ADJUST_TO_ADAPTIVE_ADAPTER(pAdapter, true); */ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u8 tmpchannel = pHalData->CurrentChannel; - BOOLEAN bResult = true; + bool bResult = true; if(pHalData->rf_chip == RF_PSEUDO_11N) { @@ -2068,7 +2068,7 @@ PHY_SwChnl8188E( /* Call after initialization */ } -static BOOLEAN +static bool phy_SwChnlStepByStep( IN struct adapter *Adapter, IN u8 channel, @@ -2081,7 +2081,7 @@ phy_SwChnlStepByStep( } -static BOOLEAN +static bool phy_SetSwChnlCmdArray( SwChnlCmd* CmdTable, u32 CmdTableIdx, @@ -2183,7 +2183,7 @@ PHY_SwChnlPhy8192C( /* Only called during initialize */ void PHY_SetMonitorMode8192C( IN struct adapter * pAdapter, - IN BOOLEAN bEnableMonitorMode + IN bool bEnableMonitorMode ) { } @@ -2206,12 +2206,12 @@ PHY_SetMonitorMode8192C( * 11/15/2007 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -BOOLEAN +bool PHY_CheckIsLegalRfPath8192C( IN struct adapter *pAdapter, IN u32 eRFPath) { - BOOLEAN rtValue = true; + bool rtValue = true; /* NOt check RF Path now.! */ return rtValue; @@ -2220,8 +2220,8 @@ PHY_CheckIsLegalRfPath8192C( static void _PHY_SetRFPathSwitch( IN struct adapter *pAdapter, - IN BOOLEAN bMain, - IN BOOLEAN is2T + IN bool bMain, + IN bool is2T ) { u8 u1bTmp; @@ -2254,9 +2254,9 @@ static void _PHY_SetRFPathSwitch( /* return value TRUE => Main; FALSE => Aux */ -static BOOLEAN _PHY_QueryRFPathSwitch( +static bool _PHY_QueryRFPathSwitch( IN struct adapter *pAdapter, - IN BOOLEAN is2T + IN bool is2T ) { /* if(is2T) */ diff --git a/hal/rtl8188e_rf6052.c b/hal/rtl8188e_rf6052.c index 47eac11..517474d 100755 --- a/hal/rtl8188e_rf6052.c +++ b/hal/rtl8188e_rf6052.c @@ -166,7 +166,7 @@ rtl8188e_PHY_RF6052SetCckTxPower( struct dm_priv *pdmpriv = &pHalData->dmpriv; struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; u32 TxAGC[2]={0, 0}, tmpval=0,pwrtrac_value; - BOOLEAN TurboScanOff = false; + bool TurboScanOff = false; u8 idx1, idx2; u8* ptr; u8 direction; @@ -811,7 +811,7 @@ PHY_RFShadowWrite( } /* PHY_RFShadowWrite */ -static BOOLEAN +static bool PHY_RFShadowCompare( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index 3e605a2..face428 100755 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -71,14 +71,14 @@ _ConfigNormalChipOutEP_8188E( } -static BOOLEAN HalUsbSetQueuePipeMapping8188EUsb( +static bool HalUsbSetQueuePipeMapping8188EUsb( IN struct adapter *pAdapter, IN u8 NumInPipe, IN u8 NumOutPipe ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); - BOOLEAN result = false; + bool result = false; _ConfigNormalChipOutEP_8188E(pAdapter, NumOutPipe); @@ -185,7 +185,7 @@ static void _InitPABias(struct adapter *padapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); u8 pa_setting; - BOOLEAN is92C = IS_92C_SERIAL(pHalData->VersionID); + bool is92C = IS_92C_SERIAL(pHalData->VersionID); /* FIXED PA current issue */ /* efuse_one_byte_read(padapter, 0x1FA, &pa_setting); */ @@ -355,7 +355,7 @@ _InitQueueReservedPage( u32 numPubQ; u32 value32; u8 value8; - BOOLEAN bWiFiConfig = pregistrypriv->wifi_spec; + bool bWiFiConfig = pregistrypriv->wifi_spec; if((bWiFiConfig)|| (pregistrypriv->qos_opt_enable)) { @@ -742,7 +742,7 @@ _InitEDCA( static void _InitBeaconMaxError( IN struct adapter *Adapter, - IN BOOLEAN InfraMode + IN bool InfraMode ) { @@ -935,7 +935,7 @@ InitUsbAggregationSetting( } static void HalRxAggr8188EUsb( IN struct adapter *Adapter, - IN BOOLEAN Value + IN bool Value ) { } @@ -1005,7 +1005,7 @@ _InitRFType( { struct registry_priv *pregpriv = &Adapter->registrypriv; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); - BOOLEAN is92CU = IS_92C_SERIAL(pHalData->VersionID); + bool is92CU = IS_92C_SERIAL(pHalData->VersionID); #if DISABLE_BB_RF pHalData->rf_chip = RF_PSEUDO_11N; @@ -1031,8 +1031,8 @@ _InitRFType( static void _BeaconFunctionEnable( IN struct adapter * Adapter, - IN BOOLEAN Enable, - IN BOOLEAN Linked + IN bool Enable, + IN bool Linked ) { rtw_write8(Adapter, REG_BCN_CTRL, (BIT4 | BIT3 | BIT1)); @@ -1788,7 +1788,7 @@ static void _ReadIDs( IN struct adapter *Adapter, IN u8* PROMContent, - IN BOOLEAN AutoloadFail + IN bool AutoloadFail ) { } @@ -1798,7 +1798,7 @@ static void _ReadMACAddress( IN struct adapter *Adapter, IN u8* PROMContent, - IN BOOLEAN AutoloadFail + IN bool AutoloadFail ) { } @@ -1807,7 +1807,7 @@ static void _ReadBoardType( IN struct adapter *Adapter, IN u8* PROMContent, - IN BOOLEAN AutoloadFail + IN bool AutoloadFail ) { @@ -1818,7 +1818,7 @@ static void _ReadLEDSetting( IN struct adapter *Adapter, IN u8* PROMContent, - IN BOOLEAN AutoloadFail + IN bool AutoloadFail ) { struct led_priv *pledpriv = &(Adapter->ledpriv); @@ -1842,7 +1842,7 @@ static void _ReadThermalMeter( IN struct adapter *Adapter, IN u8* PROMContent, - IN BOOLEAN AutoloadFail + IN bool AutoloadFail ) { } @@ -1851,7 +1851,7 @@ static void _ReadRFSetting( IN struct adapter *Adapter, IN u8* PROMContent, - IN BOOLEAN AutoloadFail + IN bool AutoloadFail ) { } @@ -1860,7 +1860,7 @@ static void _ReadPROMVersion( IN struct adapter *Adapter, IN u8* PROMContent, - IN BOOLEAN AutoloadFail + IN bool AutoloadFail ) { } @@ -1869,7 +1869,7 @@ static void readAntennaDiversity( IN struct adapter *pAdapter, IN u8 *hwinfo, - IN BOOLEAN AutoLoadFail + IN bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -1889,7 +1889,7 @@ static void Hal_EfuseParsePIDVID_8188EU( IN struct adapter * pAdapter, IN u8* hwinfo, - IN BOOLEAN AutoLoadFail + IN bool AutoLoadFail ) { @@ -1921,7 +1921,7 @@ static void Hal_EfuseParseMACAddr_8188EU( IN struct adapter * padapter, IN u8* hwinfo, - IN BOOLEAN AutoLoadFail + IN bool AutoLoadFail ) { u16 i, usValue; @@ -2548,7 +2548,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) case HW_VAR_ACK_PREAMBLE: { u8 regTmp; - u8 bShortPreamble = *( (PBOOLEAN)val ); + u8 bShortPreamble = *( (bool *)val ); /* Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporarily) */ regTmp = (pHalData->nCur40MhzPrimeSC)<<5; /* regTmp = 0; */ diff --git a/include/Hal8188EPhyCfg.h b/include/Hal8188EPhyCfg.h index b932649..70389d3 100755 --- a/include/Hal8188EPhyCfg.h +++ b/include/Hal8188EPhyCfg.h @@ -247,7 +247,7 @@ void rtl8192c_PHY_GetHWRegOriginalValue( IN struct adapter * Adapter ); // // RF Power setting // -//extern BOOLEAN PHY_SetRFPowerState(IN struct adapter * Adapter, +//extern bool PHY_SetRFPowerState(IN struct adapter * Adapter, // IN RT_RF_POWER_STATE eRFPowerState); // @@ -257,7 +257,7 @@ void PHY_GetTxPowerLevel8188E( IN struct adapter * Adapter, OUT u32* powerlevel ); void PHY_SetTxPowerLevel8188E( IN struct adapter * Adapter, IN u8 channel ); -BOOLEAN PHY_UpdateTxPowerDbm8188E( IN struct adapter *Adapter, +bool PHY_UpdateTxPowerDbm8188E( IN struct adapter *Adapter, IN int powerInDbm ); // @@ -276,7 +276,7 @@ void PHY_SetBWMode8188E( IN struct adapter * pAdapter, // // Set FW CMD IO for 8192S. // -//extern BOOLEAN HalSetIO8192C( IN struct adapter * Adapter, +//extern bool HalSetIO8192C( IN struct adapter * Adapter, // IN IO_TYPE IOType); // @@ -303,12 +303,12 @@ void ChkFwCmdIoDone( IN struct adapter *Adapter); // BB/MAC/RF other monitor API // void PHY_SetMonitorMode8192C(IN struct adapter *pAdapter, - IN BOOLEAN bEnableMonitorMode ); + IN bool bEnableMonitorMode ); -BOOLEAN PHY_CheckIsLegalRfPath8192C(IN struct adapter *pAdapter, +bool PHY_CheckIsLegalRfPath8192C(IN struct adapter *pAdapter, IN u32 eRFPath ); -void PHY_SetRFPathSwitch_8188E(IN struct adapter *pAdapter, IN BOOLEAN bMain); +void PHY_SetRFPathSwitch_8188E(IN struct adapter *pAdapter, IN bool bMain); extern void PHY_SwitchEphyParameter( @@ -320,7 +320,7 @@ PHY_EnableHostClkReq( IN struct adapter * Adapter ); -BOOLEAN +bool SetAntennaConfig92C( IN struct adapter *Adapter, IN u8 DefaultAnt diff --git a/include/Hal8192CPhyCfg.h b/include/Hal8192CPhyCfg.h index 3cf4f7c..3b8a718 100755 --- a/include/Hal8192CPhyCfg.h +++ b/include/Hal8192CPhyCfg.h @@ -264,7 +264,7 @@ void rtl8192c_PHY_GetHWRegOriginalValue( IN struct adapter * Adapter ); // // RF Power setting // -//extern BOOLEAN PHY_SetRFPowerState(IN struct adapter * Adapter, +//extern bool PHY_SetRFPowerState(IN struct adapter * Adapter, // IN RT_RF_POWER_STATE eRFPowerState); // @@ -274,7 +274,7 @@ void PHY_GetTxPowerLevel8192C( IN struct adapter * Adapter, OUT u32* powerlevel ); void PHY_SetTxPowerLevel8192C( IN struct adapter * Adapter, IN u8 channel ); -BOOLEAN PHY_UpdateTxPowerDbm8192C( IN struct adapter *Adapter, +bool PHY_UpdateTxPowerDbm8192C( IN struct adapter *Adapter, IN int powerInDbm ); // @@ -293,7 +293,7 @@ void PHY_SetBWMode8192C( IN struct adapter * pAdapter, // // Set FW CMD IO for 8192S. // -//extern BOOLEAN HalSetIO8192C( IN struct adapter * Adapter, +//extern bool HalSetIO8192C( IN struct adapter * Adapter, // IN IO_TYPE IOType); // @@ -320,13 +320,13 @@ void ChkFwCmdIoDone( IN struct adapter *Adapter); // BB/MAC/RF other monitor API // void PHY_SetMonitorMode8192C(IN struct adapter *pAdapter, - IN BOOLEAN bEnableMonitorMode ); + IN bool bEnableMonitorMode ); -BOOLEAN PHY_CheckIsLegalRfPath8192C(IN struct adapter *pAdapter, +bool PHY_CheckIsLegalRfPath8192C(IN struct adapter *pAdapter, IN u32 eRFPath ); -void rtl8192c_PHY_SetRFPathSwitch(IN struct adapter *pAdapter, IN BOOLEAN bMain); +void rtl8192c_PHY_SetRFPathSwitch(IN struct adapter *pAdapter, IN bool bMain); // // Modify the value of the hw register when beacon interval be changed. @@ -346,7 +346,7 @@ PHY_EnableHostClkReq( IN struct adapter * Adapter ); -BOOLEAN +bool SetAntennaConfig92C( IN struct adapter *Adapter, IN u8 DefaultAnt diff --git a/include/Hal8192DPhyCfg.h b/include/Hal8192DPhyCfg.h index a52a4d4..d012b77 100755 --- a/include/Hal8192DPhyCfg.h +++ b/include/Hal8192DPhyCfg.h @@ -321,7 +321,7 @@ void rtl8192d_PHY_GetHWRegOriginalValue( IN struct adapter * Adapter ); // // RF Power setting // -//extern BOOLEAN PHY_SetRFPowerState(IN struct adapter * Adapter, +//extern bool PHY_SetRFPowerState(IN struct adapter * Adapter, // IN RT_RF_POWER_STATE eRFPowerState); // @@ -331,7 +331,7 @@ void PHY_GetTxPowerLevel8192D( IN struct adapter * Adapter, OUT u32* powerlevel ); void PHY_SetTxPowerLevel8192D( IN struct adapter * Adapter, IN u8 channel ); -BOOLEAN PHY_UpdateTxPowerDbm8192D( IN struct adapter *Adapter, +bool PHY_UpdateTxPowerDbm8192D( IN struct adapter *Adapter, IN int powerInDbm ); // @@ -350,7 +350,7 @@ void PHY_SetBWMode8192D( IN struct adapter * pAdapter, // // Set FW CMD IO for 8192S. // -//extern BOOLEAN HalSetIO8192C( IN struct adapter * Adapter, +//extern bool HalSetIO8192C( IN struct adapter * Adapter, // IN IO_TYPE IOType); // @@ -378,9 +378,9 @@ extern void ChkFwCmdIoDone( IN struct adapter *Adapter); // BB/MAC/RF other monitor API // void PHY_SetMonitorMode8192D(IN struct adapter *pAdapter, - IN BOOLEAN bEnableMonitorMode ); + IN bool bEnableMonitorMode ); -BOOLEAN PHY_CheckIsLegalRfPath8192D(IN struct adapter *pAdapter, +bool PHY_CheckIsLegalRfPath8192D(IN struct adapter *pAdapter, IN u32 eRFPath ); @@ -402,7 +402,7 @@ PHY_EnableHostClkReq( IN struct adapter * Adapter ); -BOOLEAN +bool SetAntennaConfig92C( IN struct adapter *Adapter, IN u8 DefaultAnt @@ -411,12 +411,12 @@ SetAntennaConfig92C( void PHY_UpdateBBRFConfiguration8192D( IN struct adapter *Adapter, - IN BOOLEAN bisBandSwitch + IN bool bisBandSwitch ); void PHY_ReadMacPhyMode92D( IN struct adapter *Adapter, - IN BOOLEAN AutoloadFail + IN bool AutoloadFail ); void PHY_ConfigMacPhyMode92D( @@ -438,12 +438,12 @@ rtl8192d_PHY_InitRxSetting( void -rtl8192d_PHY_SetRFPathSwitch(IN struct adapter *pAdapter, IN BOOLEAN bMain); +rtl8192d_PHY_SetRFPathSwitch(IN struct adapter *pAdapter, IN bool bMain); void HalChangeCCKStatus8192D( IN struct adapter *Adapter, - IN BOOLEAN bCCKDisable + IN bool bCCKDisable ); void diff --git a/include/basic_types.h b/include/basic_types.h index fcfa1d9..0aefbfa 100755 --- a/include/basic_types.h +++ b/include/basic_types.h @@ -195,6 +195,4 @@ value to host byte ordering.*/ // Get the N-bytes aligment offset from the current length #define N_BYTE_ALIGMENT(__Value, __Aligment) ((__Aligment == 1) ? (__Value) : (((__Value + __Aligment - 1) / __Aligment) * __Aligment)) -typedef unsigned char BOOLEAN,*PBOOLEAN; - #endif //__BASIC_TYPES_H__ diff --git a/include/drv_types.h b/include/drv_types.h index 60b1d80..a33911a 100755 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -153,7 +153,7 @@ struct registry_priv u8 bt_sco; u8 bt_ampdu; #endif - BOOLEAN bAcceptAddbaReq; + bool bAcceptAddbaReq; u8 antdiv_cfg; u8 antdiv_type; diff --git a/include/drv_types_ce.h b/include/drv_types_ce.h index 5e1bb0d..9d2c84b 100755 --- a/include/drv_types_ce.h +++ b/include/drv_types_ce.h @@ -44,7 +44,7 @@ typedef struct _MP_REG_ENTRY { NDIS_STRING RegName; // variable name text - BOOLEAN bRequired; // 1 -> required, 0 -> optional + bool bRequired; // 1 -> required, 0 -> optional u8 Type; // NdisParameterInteger/NdisParameterHexInteger/NdisParameterStringle/NdisParameterMultiString uint FieldOffset; // offset to MP_ADAPTER field diff --git a/include/drv_types_xp.h b/include/drv_types_xp.h index 1d735d6..7571ce1 100755 --- a/include/drv_types_xp.h +++ b/include/drv_types_xp.h @@ -65,7 +65,7 @@ typedef struct _MP_REG_ENTRY { NDIS_STRING RegName; // variable name text - BOOLEAN bRequired; // 1 -> required, 0 -> optional + bool bRequired; // 1 -> required, 0 -> optional u8 Type; // NdisParameterInteger/NdisParameterHexInteger/NdisParameterStringle/NdisParameterMultiString uint FieldOffset; // offset to MP_ADAPTER field diff --git a/include/hal_com.h b/include/hal_com.h index 947687f..52699d0 100755 --- a/include/hal_com.h +++ b/include/hal_com.h @@ -157,7 +157,7 @@ hal_com_get_channel_plan( IN u8 hw_channel_plan, //channel plan from HW (efuse/eeprom) IN u8 sw_channel_plan, //channel plan from SW (registry/module param) IN u8 def_channel_plan, //channel plan used when the former two is invalid - IN BOOLEAN AutoLoadFail + IN bool AutoLoadFail ); u8 MRateToHwRate(u8 rate); @@ -167,7 +167,7 @@ void HalSetBrateCfg( IN u8 *mBratesOS, OUT u16 *pBrateCfg); -BOOLEAN +bool Hal_MappingOutPipe( IN struct adapter *pAdapter, IN u8 NumOutPipe diff --git a/include/hal_intf.h b/include/hal_intf.h index 4b73600..cbfbd7d 100755 --- a/include/hal_intf.h +++ b/include/hal_intf.h @@ -197,8 +197,8 @@ struct hal_ops { u8 (*GetHalDefVarHandler)(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); u8 (*SetHalDefVarHandler)(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); - void (*GetHalODMVarHandler)(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet); - void (*SetHalODMVarHandler)(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet); + void (*GetHalODMVarHandler)(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet); + void (*SetHalODMVarHandler)(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet); void (*UpdateRAMaskHandler)(struct adapter *padapter, u32 mac_id, u8 rssi_level); void (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter); @@ -226,13 +226,13 @@ struct hal_ops { #endif void (*EfusePowerSwitch)(struct adapter *padapter, u8 bWrite, u8 PwrState); - void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, BOOLEAN bPseudoTest); - void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, u8 type, void *pOut, BOOLEAN bPseudoTest); - u16 (*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType, BOOLEAN bPseudoTest); - int (*Efuse_PgPacketRead)(struct adapter *padapter, u8 offset, u8 *data, BOOLEAN bPseudoTest); - int (*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); - u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, BOOLEAN bPseudoTest); - BOOLEAN (*Efuse_PgPacketWrite_BT)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); + void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, bool bPseudoTest); + void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest); + u16 (*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType, bool bPseudoTest); + int (*Efuse_PgPacketRead)(struct adapter *padapter, u8 offset, u8 *data, bool bPseudoTest); + int (*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest); + u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest); + bool (*Efuse_PgPacketWrite_BT)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest); #ifdef DBG_CONFIG_ERROR_DETECT void (*sreset_init_value)(struct adapter *padapter); @@ -361,8 +361,8 @@ void rtw_hal_read_chip_version(struct adapter *padapter); u8 rtw_hal_set_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); u8 rtw_hal_get_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); -void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet); -void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet); +void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet); +void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet); void rtw_hal_enable_interrupt(struct adapter *padapter); void rtw_hal_disable_interrupt(struct adapter *padapter); diff --git a/include/rtl8188e_hal.h b/include/rtl8188e_hal.h index c2128c1..3c63f30 100755 --- a/include/rtl8188e_hal.h +++ b/include/rtl8188e_hal.h @@ -338,7 +338,7 @@ typedef struct hal_data_8188e u8 EEPROMThermalMeter; u8 bAPKThermalMeterIgnore; - BOOLEAN EepromOrEfuse; + bool EepromOrEfuse; u8 EfuseMap[2][HWSET_MAX_SIZE_512]; //92C:256bytes, 88E:512bytes, we use union set (512bytes) u8 EfuseUsedPercentage; EFUSE_HAL EfuseHal; @@ -401,7 +401,7 @@ typedef struct hal_data_8188e u32 RfRegChnlVal[2]; //RDG enable - BOOLEAN bRDGEnable; + bool bRDGEnable; //for host message to fw u8 LastHMEBoxNum; @@ -435,7 +435,7 @@ typedef struct hal_data_8188e u8 FwRsvdPageStartOffset; //2010.06.23. Added by tynli. Reserve page start offset except beacon in TxQ. // 2010/08/09 MH Add CU power down mode. - BOOLEAN pwrdown; + bool pwrdown; // Add for dual MAC 0--Mac0 1--Mac1 u32 interfaceIndex; @@ -444,11 +444,11 @@ typedef struct hal_data_8188e u8 OutEpNumber; // 2010/12/10 MH Add for USB aggreation mode dynamic shceme. - BOOLEAN UsbRxHighSpeedMode; + bool UsbRxHighSpeedMode; // 2010/11/22 MH Add for slim combo debug mode selective. // This is used for fix the drawback of CU TSMC-A/UMC-A cut. HW auto suspend ability. Close BT clock. - BOOLEAN SlimComboDbg; + bool SlimComboDbg; u16 EfuseUsedBytes; @@ -499,18 +499,18 @@ void Read_LLT_Tab(struct adapter *padapter); u8 GetEEPROMSize8188E(struct adapter *padapter); void Hal_InitPGData88E(struct adapter *padapter); void Hal_EfuseParseIDCode88E(struct adapter *padapter, u8 *hwinfo); -void Hal_ReadTxPowerInfo88E(struct adapter *padapter,u8* hwinfo,BOOLEAN AutoLoadFail); +void Hal_ReadTxPowerInfo88E(struct adapter *padapter,u8* hwinfo,bool AutoLoadFail); -void Hal_EfuseParseEEPROMVer88E(struct adapter *padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void rtl8188e_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void Hal_EfuseParseCustomerID88E(struct adapter *padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void Hal_ReadAntennaDiversity88E (struct adapter *pAdapter,u8*PROMContent,BOOLEAN AutoLoadFail); -void Hal_ReadThermalMeter_88E(struct adapter *Adapter,u8* PROMContent,BOOLEAN AutoloadFail); -void Hal_EfuseParseXtal_8188E(struct adapter *pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); -void Hal_EfuseParseBoardType88E(struct adapter *pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); -void Hal_ReadPowerSavingMode88E(struct adapter *pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); +void Hal_EfuseParseEEPROMVer88E(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail); +void rtl8188e_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail); +void Hal_EfuseParseCustomerID88E(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail); +void Hal_ReadAntennaDiversity88E (struct adapter *pAdapter,u8*PROMContent,bool AutoLoadFail); +void Hal_ReadThermalMeter_88E(struct adapter *Adapter,u8* PROMContent,bool AutoloadFail); +void Hal_EfuseParseXtal_8188E(struct adapter *pAdapter,u8* hwinfo,bool AutoLoadFail); +void Hal_EfuseParseBoardType88E(struct adapter *pAdapter,u8* hwinfo,bool AutoLoadFail); +void Hal_ReadPowerSavingMode88E(struct adapter *pAdapter,u8* hwinfo,bool AutoLoadFail); -BOOLEAN HalDetectPwrDownMode88E(struct adapter *Adapter); +bool HalDetectPwrDownMode88E(struct adapter *Adapter); void Hal_InitChannelPlan(struct adapter *padapter); diff --git a/include/rtl8192c_hal.h b/include/rtl8192c_hal.h index aa7fb76..b380512 100755 --- a/include/rtl8192c_hal.h +++ b/include/rtl8192c_hal.h @@ -429,7 +429,7 @@ struct hal_data_8192cu u32 RfRegChnlVal[2]; //RDG enable - BOOLEAN bRDGEnable; + bool bRDGEnable; //for host message to fw u8 LastHMEBoxNum; @@ -459,7 +459,7 @@ struct hal_data_8192cu u8 FwRsvdPageStartOffset; //2010.06.23. Added by tynli. Reserve page start offset except beacon in TxQ. // 2010/08/09 MH Add CU power down mode. - BOOLEAN pwrdown; + bool pwrdown; // For 92C USB endpoint setting // @@ -484,15 +484,15 @@ struct hal_data_8192cu u8 UsbRxAggPageTimeout; // 2010/12/10 MH Add for USB aggreation mode dynamic shceme. - BOOLEAN UsbRxHighSpeedMode; + bool UsbRxHighSpeedMode; // 2010/11/22 MH Add for slim combo debug mode selective. // This is used for fix the drawback of CU TSMC-A/UMC-A cut. HW auto suspend ability. Close BT clock. - BOOLEAN SlimComboDbg; + bool SlimComboDbg; u16 EfuseUsedBytes; - BOOLEAN EepromOrEfuse; + bool EepromOrEfuse; u8 EfuseMap[2][HWSET_MAX_SIZE_512]; //92C:256bytes, 88E:512bytes, we use union set (512bytes) u8 EfuseUsedPercentage; EFUSE_HAL EfuseHal; @@ -515,10 +515,10 @@ void rtl8192c_FirmwareSelfReset(IN struct adapter *Adapter); int FirmwareDownload92C(IN struct adapter *Adapter); void InitializeFirmwareVars92C(struct adapter *Adapter); u8 GetEEPROMSize8192C(struct adapter *Adapter); -void rtl8192c_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); +void rtl8192c_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail); HAL_VERSION rtl8192c_ReadChipVersion(IN struct adapter *Adapter); -void rtl8192c_ReadBluetoothCoexistInfo(struct adapter *Adapter, u8 *PROMContent, BOOLEAN AutoloadFail); +void rtl8192c_ReadBluetoothCoexistInfo(struct adapter *Adapter, u8 *PROMContent, bool AutoloadFail); //void rtl8192c_free_hal_data(struct adapter * padapter); void rtl8192c_EfuseParseIDCode(struct adapter *pAdapter, u8 *hwinfo); void rtl8192c_set_hal_ops(struct hal_ops *pHalFunc); diff --git a/include/rtw_efuse.h b/include/rtw_efuse.h index 80e4554..f11dc80 100755 --- a/include/rtw_efuse.h +++ b/include/rtw_efuse.h @@ -131,21 +131,21 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data); u8 rtw_BT_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data); u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data); -u16 Efuse_GetCurrentSize(struct adapter *pAdapter, u8 efuseType, BOOLEAN bPseudoTest); +u16 Efuse_GetCurrentSize(struct adapter *pAdapter, u8 efuseType, bool bPseudoTest); u8 Efuse_CalculateWordCnts(u8 word_en); -void ReadEFuseByte(struct adapter *Adapter, u16 _offset, u8 *pbuf, BOOLEAN bPseudoTest) ; -void EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut, BOOLEAN bPseudoTest); -u8 efuse_OneByteRead(struct adapter *pAdapter, u16 addr, u8 *data, BOOLEAN bPseudoTest); -u8 efuse_OneByteWrite(struct adapter *pAdapter, u16 addr, u8 data, BOOLEAN bPseudoTest); +void ReadEFuseByte(struct adapter *Adapter, u16 _offset, u8 *pbuf, bool bPseudoTest) ; +void EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest); +u8 efuse_OneByteRead(struct adapter *pAdapter, u16 addr, u8 *data, bool bPseudoTest); +u8 efuse_OneByteWrite(struct adapter *pAdapter, u16 addr, u8 data, bool bPseudoTest); void Efuse_PowerSwitch(struct adapter *pAdapter,u8 bWrite,u8 PwrState); -int Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data, BOOLEAN bPseudoTest); -int Efuse_PgPacketWrite(struct adapter *pAdapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); +int Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data, bool bPseudoTest); +int Efuse_PgPacketWrite(struct adapter *pAdapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest); void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata); -u8 Efuse_WordEnableDataWrite(struct adapter *pAdapter, u16 efuse_addr, u8 word_en, u8 *data, BOOLEAN bPseudoTest); +u8 Efuse_WordEnableDataWrite(struct adapter *pAdapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest); u8 EFUSE_Read1Byte(struct adapter *pAdapter, u16 Address); -void EFUSE_ShadowMapUpdate(struct adapter *pAdapter, u8 efuseType, BOOLEAN bPseudoTest); +void EFUSE_ShadowMapUpdate(struct adapter *pAdapter, u8 efuseType, bool bPseudoTest); void EFUSE_ShadowRead(struct adapter *pAdapter, u8 Type, u16 Offset, u32 *Value); #endif diff --git a/include/rtw_mlme.h b/include/rtw_mlme.h index 85bb9a2..c0d22a1 100755 --- a/include/rtw_mlme.h +++ b/include/rtw_mlme.h @@ -159,12 +159,12 @@ typedef struct _RT_LINK_DETECT_T{ u32 NumTxOkInPeriod; u32 NumRxOkInPeriod; u32 NumRxUnicastOkInPeriod; - BOOLEAN bBusyTraffic; - BOOLEAN bTxBusyTraffic; - BOOLEAN bRxBusyTraffic; - BOOLEAN bHigherBusyTraffic; // For interrupt migration purpose. - BOOLEAN bHigherBusyRxTraffic; // We may disable Tx interrupt according as Rx traffic. - BOOLEAN bHigherBusyTxTraffic; // We may disable Tx interrupt according as Tx traffic. + bool bBusyTraffic; + bool bTxBusyTraffic; + bool bRxBusyTraffic; + bool bHigherBusyTraffic; // For interrupt migration purpose. + bool bHigherBusyRxTraffic; // We may disable Tx interrupt according as Rx traffic. + bool bHigherBusyTxTraffic; // We may disable Tx interrupt according as Tx traffic. }RT_LINK_DETECT_T, *PRT_LINK_DETECT_T; struct profile_info { diff --git a/include/rtw_mlme_ext.h b/include/rtw_mlme_ext.h index 1d4ea63..a69f15b 100755 --- a/include/rtw_mlme_ext.h +++ b/include/rtw_mlme_ext.h @@ -415,7 +415,7 @@ struct mlme_ext_info { u8 candidate_tid_bitmap; u8 dialogToken; // Accept ADDBA Request - BOOLEAN bAcceptAddbaReq; + bool bAcceptAddbaReq; u8 bwmode_updated; u8 hidden_ssid_mode; @@ -587,7 +587,7 @@ void CAM_empty_entry(struct adapter *Adapter, u8 ucIndex); int allocate_fw_sta_entry(struct adapter *padapter); void flush_all_cam_entry(struct adapter *padapter); -BOOLEAN IsLegal5GChannel(struct adapter *Adapter, u8 channel); +bool IsLegal5GChannel(struct adapter *Adapter, u8 channel); void site_survey(struct adapter *padapter); u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLAN_BSSID_EX *bssid); diff --git a/include/rtw_mp.h b/include/rtw_mp.h index cdfa506..268a75d 100755 --- a/include/rtw_mp.h +++ b/include/rtw_mp.h @@ -169,18 +169,18 @@ typedef void (*MPT_WORK_ITEM_HANDLER)(IN void * Adapter); typedef struct _MPT_CONTEXT { // Indicate if we have started Mass Production Test. - BOOLEAN bMassProdTest; + bool bMassProdTest; // Indicate if the driver is unloading or unloaded. - BOOLEAN bMptDrvUnload; + bool bMptDrvUnload; _sema MPh2c_Sema; _timer MPh2c_timeout_timer; // Event used to sync H2c for BT control - BOOLEAN MptH2cRspEvent; - BOOLEAN MptBtC2hEvent; - BOOLEAN bMPh2c_timeout; + bool MptH2cRspEvent; + bool MptBtC2hEvent; + bool bMPh2c_timeout; /* 8190 PCI does not support NDIS_WORK_ITEM. */ // Work Item for Mass Production Test. @@ -191,7 +191,7 @@ typedef struct _MPT_CONTEXT // To protect the following variables. // NDIS_SPIN_LOCK MptWorkItemSpinLock; // Indicate a MptWorkItem is scheduled and not yet finished. - BOOLEAN bMptWorkItemInProgress; + bool bMptWorkItemInProgress; // An instance which implements function and context of MptWorkItem. MPT_WORK_ITEM_HANDLER CurrMptAct; @@ -224,24 +224,24 @@ typedef struct _MPT_CONTEXT // Content of RCR Regsiter for Mass Production Test. ULONG MptRCR; // TRUE if we only receive packets with specific pattern. - BOOLEAN bMptFilterPattern; + bool bMptFilterPattern; // Rx OK count, statistics used in Mass Production Test. ULONG MptRxOkCnt; // Rx CRC32 error count, statistics used in Mass Production Test. ULONG MptRxCrcErrCnt; - BOOLEAN bCckContTx; // TRUE if we are in CCK Continuous Tx test. - BOOLEAN bOfdmContTx; // TRUE if we are in OFDM Continuous Tx test. - BOOLEAN bStartContTx; // TRUE if we have start Continuous Tx test. + bool bCckContTx; // TRUE if we are in CCK Continuous Tx test. + bool bOfdmContTx; // TRUE if we are in OFDM Continuous Tx test. + bool bStartContTx; // TRUE if we have start Continuous Tx test. // TRUE if we are in Single Carrier Tx test. - BOOLEAN bSingleCarrier; + bool bSingleCarrier; // TRUE if we are in Carrier Suppression Tx Test. - BOOLEAN bCarrierSuppression; + bool bCarrierSuppression; //TRUE if we are in Single Tone Tx test. - BOOLEAN bSingleTone; + bool bSingleTone; // ACK counter asked by K.Y.. - BOOLEAN bMptEnableAckCounter; + bool bMptEnableAckCounter; ULONG MptAckCounter; // SD3 Willis For 8192S to save 1T/2T RF table for ACUT Only fro ACUT delete later ~~~! @@ -250,7 +250,7 @@ typedef struct _MPT_CONTEXT //s32 RfReadLine[2]; u8 APK_bound[2]; //for APK path A/path B - BOOLEAN bMptIndexEven; + bool bMptIndexEven; u8 backup0xc50; u8 backup0xc58; @@ -544,8 +544,8 @@ s32 Hal_SetPowerTracking(struct adapter *padapter, u8 enable); void Hal_GetPowerTracking(struct adapter *padapter, u8 * enable); void Hal_GetThermalMeter(struct adapter *pAdapter, u8 *value); void Hal_mpt_SwitchRfSetting(struct adapter *pAdapter); -void Hal_MPT_CCKTxPowerAdjust(struct adapter *Adapter, BOOLEAN bInCH14); -void Hal_MPT_CCKTxPowerAdjustbyIndex(struct adapter *pAdapter, BOOLEAN beven); +void Hal_MPT_CCKTxPowerAdjust(struct adapter *Adapter, bool bInCH14); +void Hal_MPT_CCKTxPowerAdjustbyIndex(struct adapter *pAdapter, bool beven); void Hal_SetCCKTxPower(struct adapter *pAdapter, u8 * TxPower); void Hal_SetOFDMTxPower(struct adapter *pAdapter, u8 * TxPower); void Hal_TriggerRFThermalMeter(struct adapter *pAdapter); @@ -556,7 +556,7 @@ void SetOFDMContinuousTx(struct adapter *pAdapter, u8 bStart); void Hal_SetOFDMContinuousTx(struct adapter *pAdapter, u8 bStart); void Hal_ProSetCrystalCap (struct adapter *pAdapter , u32 CrystalCapVal); void _rtw_mp_xmit_priv(struct xmit_priv *pxmitpriv); -void MP_PHY_SetRFPathSwitch(struct adapter *pAdapter ,BOOLEAN bMain); +void MP_PHY_SetRFPathSwitch(struct adapter *pAdapter ,bool bMain); void MPT_PwrCtlDM(struct adapter *padapter, u32 bstart); #endif //_RTW_MP_H_ diff --git a/include/rtw_mp_ioctl.h b/include/rtw_mp_ioctl.h index 55f8d77..3d4d430 100755 --- a/include/rtw_mp_ioctl.h +++ b/include/rtw_mp_ioctl.h @@ -76,7 +76,7 @@ typedef struct _DR_VARIABLE_STRUCT_ { //int mp_start_joinbss(struct adapter *padapter, NDIS_802_11_SSID *pssid); -//void _irqlevel_changed_(_irqL *irqlevel, /*BOOLEAN*/unsigned char bLower); +//void _irqlevel_changed_(_irqL *irqlevel, /*bool*/unsigned char bLower); #ifdef PLATFORM_OS_XP static void _irqlevel_changed_(_irqL *irqlevel, u8 bLower) { diff --git a/include/usb_vendor_req.h b/include/usb_vendor_req.h index 3b7c867..255a098 100755 --- a/include/usb_vendor_req.h +++ b/include/usb_vendor_req.h @@ -51,9 +51,9 @@ typedef enum _RT_USB_WVALUE { } RT_USB_WVALUE; -//BOOLEAN usbvendorrequest(PCE_USB_DEVICE CEdevice, RT_USB_BREQUEST bRequest, RT_USB_WVALUE wValue, u8 wIndex, void * Data, u8 DataLength, BOOLEAN isDirectionIn); -//BOOLEAN CEusbGetStatusRequest(PCE_USB_DEVICE CEdevice, IN u16 Op, IN u16 Index, void * Data); -//BOOLEAN CEusbFeatureRequest(PCE_USB_DEVICE CEdevice, IN u16 Op, IN u16 FeatureSelector, IN u16 Index); -//BOOLEAN CEusbGetDescriptorRequest(PCE_USB_DEVICE CEdevice, IN short urbLength, IN u8 DescriptorType, IN u8 Index, IN u16 LanguageId, IN void * TransferBuffer, IN ULONG TransferBufferLength); +//bool usbvendorrequest(PCE_USB_DEVICE CEdevice, RT_USB_BREQUEST bRequest, RT_USB_WVALUE wValue, u8 wIndex, void * Data, u8 DataLength, bool isDirectionIn); +//bool CEusbGetStatusRequest(PCE_USB_DEVICE CEdevice, IN u16 Op, IN u16 Index, void * Data); +//bool CEusbFeatureRequest(PCE_USB_DEVICE CEdevice, IN u16 Op, IN u16 FeatureSelector, IN u16 Index); +//bool CEusbGetDescriptorRequest(PCE_USB_DEVICE CEdevice, IN short urbLength, IN u8 DescriptorType, IN u8 Index, IN u16 LanguageId, IN void * TransferBuffer, IN ULONG TransferBufferLength); #endif