diff --git a/core/rtw_beamforming.c b/core/rtw_beamforming.c index 91a1fce..1082497 100644 --- a/core/rtw_beamforming.c +++ b/core/rtw_beamforming.c @@ -2058,7 +2058,7 @@ struct beamforming_entry *beamforming_add_entry(PADAPTER adapter, u8 *ra, u16 ai return NULL; } -BOOLEAN beamforming_remove_entry(struct mlme_priv *pmlmepriv, u8 *ra, u8 *idx) +bool beamforming_remove_entry(struct mlme_priv *pmlmepriv, u8 *ra, u8 *idx) { struct beamforming_entry *pEntry = beamforming_get_entry_by_addr(pmlmepriv, ra, idx); @@ -2090,7 +2090,7 @@ void beamforming_dym_ndpa_rate(PADAPTER adapter) void beamforming_dym_period(PADAPTER Adapter) { u8 Idx; - BOOLEAN bChangePeriod = _FALSE; + bool bChangePeriod = _FALSE; u16 SoundPeriod_SW, SoundPeriod_FW; PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(Adapter); @@ -2130,7 +2130,7 @@ void beamforming_dym_period(PADAPTER Adapter) rtw_hal_set_hwreg(Adapter, HW_VAR_SOUNDING_FW_NDPA, (u8 *)&Idx); } -BOOLEAN issue_ht_sw_ndpa_packet(PADAPTER Adapter, u8 *ra, CHANNEL_WIDTH bw, u8 qidx) +bool issue_ht_sw_ndpa_packet(PADAPTER Adapter, u8 *ra, CHANNEL_WIDTH bw, u8 qidx) { struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; @@ -2209,7 +2209,7 @@ BOOLEAN issue_ht_sw_ndpa_packet(PADAPTER Adapter, u8 *ra, CHANNEL_WIDTH bw, u8 q } -BOOLEAN issue_ht_ndpa_packet(PADAPTER Adapter, u8 *ra, CHANNEL_WIDTH bw, u8 qidx) +bool issue_ht_ndpa_packet(PADAPTER Adapter, u8 *ra, CHANNEL_WIDTH bw, u8 qidx) { struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; @@ -2284,11 +2284,11 @@ BOOLEAN issue_ht_ndpa_packet(PADAPTER Adapter, u8 *ra, CHANNEL_WIDTH bw, u8 qidx return _TRUE; } -BOOLEAN beamforming_send_ht_ndpa_packet(PADAPTER Adapter, u8 *ra, CHANNEL_WIDTH bw, u8 qidx) +bool beamforming_send_ht_ndpa_packet(PADAPTER Adapter, u8 *ra, CHANNEL_WIDTH bw, u8 qidx) { return issue_ht_ndpa_packet(Adapter, ra, bw, qidx); } -BOOLEAN issue_vht_sw_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, CHANNEL_WIDTH bw, u8 qidx) +bool issue_vht_sw_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, CHANNEL_WIDTH bw, u8 qidx) { struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; @@ -2382,7 +2382,7 @@ BOOLEAN issue_vht_sw_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, CHANNEL_WIDT return _TRUE; } -BOOLEAN issue_vht_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, CHANNEL_WIDTH bw, u8 qidx) +bool issue_vht_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, CHANNEL_WIDTH bw, u8 qidx) { struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; @@ -2468,14 +2468,14 @@ BOOLEAN issue_vht_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, CHANNEL_WIDTH b return _TRUE; } -BOOLEAN beamforming_send_vht_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, CHANNEL_WIDTH bw, u8 qidx) +bool beamforming_send_vht_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, CHANNEL_WIDTH bw, u8 qidx) { return issue_vht_ndpa_packet(Adapter, ra, aid, bw, qidx); } -BOOLEAN beamfomring_bSounding(struct beamforming_info *pBeamInfo) +bool beamfomring_bSounding(struct beamforming_info *pBeamInfo) { - BOOLEAN bSounding = _FALSE; + bool bSounding = _FALSE; if ((beamforming_get_beamform_cap(pBeamInfo) & BEAMFORMER_CAP) == 0) bSounding = _FALSE; @@ -2536,7 +2536,7 @@ CHANNEL_WIDTH beamforming_sounding_bw(struct beamforming_info *pBeamInfo, SOUNDI return sounding_bw; } -BOOLEAN beamforming_select_beam_entry(struct beamforming_info *pBeamInfo) +bool beamforming_select_beam_entry(struct beamforming_info *pBeamInfo) { struct sounding_info *pSoundInfo = &(pBeamInfo->sounding_info); @@ -2556,11 +2556,11 @@ BOOLEAN beamforming_select_beam_entry(struct beamforming_info *pBeamInfo) } } -BOOLEAN beamforming_start_fw(PADAPTER adapter, u8 idx) +bool beamforming_start_fw(PADAPTER adapter, u8 idx) { u8 *RA = NULL; struct beamforming_entry *pEntry; - BOOLEAN ret = _TRUE; + bool ret = _TRUE; struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct beamforming_info *pBeamInfo = GET_BEAMFORM_INFO(pmlmepriv); @@ -2586,9 +2586,9 @@ void beamforming_end_fw(PADAPTER adapter) RTW_INFO("%s\n", __func__); } -BOOLEAN beamforming_start_period(PADAPTER adapter) +bool beamforming_start_period(PADAPTER adapter) { - BOOLEAN ret = _TRUE; + bool ret = _TRUE; struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct beamforming_info *pBeamInfo = GET_BEAMFORM_INFO(pmlmepriv); struct sounding_info *pSoundInfo = &(pBeamInfo->sounding_info); @@ -2623,7 +2623,7 @@ void beamforming_end_period(PADAPTER adapter) void beamforming_notify(PADAPTER adapter) { - BOOLEAN bSounding = _FALSE; + bool bSounding = _FALSE; struct beamforming_info *pBeamInfo = GET_BEAMFORM_INFO(&(adapter->mlmepriv)); bSounding = beamfomring_bSounding(pBeamInfo); @@ -2652,7 +2652,7 @@ void beamforming_notify(PADAPTER adapter) RTW_INFO("%s BeamformState %d bSounding %d\n", __func__, pBeamInfo->beamforming_state, bSounding); } -BOOLEAN beamforming_init_entry(PADAPTER adapter, struct sta_info *psta, u8 *idx) +bool beamforming_init_entry(PADAPTER adapter, struct sta_info *psta, u8 *idx) { struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct ht_priv *phtpriv = &(pmlmepriv->htpriv); @@ -2764,7 +2764,7 @@ void beamforming_sounding_fail(PADAPTER Adapter) beamforming_deinit_entry(Adapter, pEntry->mac_addr); } -void beamforming_check_sounding_success(PADAPTER Adapter, BOOLEAN status) +void beamforming_check_sounding_success(PADAPTER Adapter, bool status) { struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); struct beamforming_info *pBeamInfo = GET_BEAMFORM_INFO(pmlmepriv); @@ -2808,8 +2808,8 @@ void beamforming_leave(PADAPTER adapter, u8 *ra) BEAMFORMING_CAP beamforming_get_beamform_cap(struct beamforming_info *pBeamInfo) { u8 i; - BOOLEAN bSelfBeamformer = _FALSE; - BOOLEAN bSelfBeamformee = _FALSE; + bool bSelfBeamformer = _FALSE; + bool bSelfBeamformee = _FALSE; struct beamforming_entry beamforming_entry; BEAMFORMING_CAP beamform_cap = BEAMFORMING_CAP_NONE; diff --git a/core/rtw_debug.c b/core/rtw_debug.c index 636038e..d11c851 100644 --- a/core/rtw_debug.c +++ b/core/rtw_debug.c @@ -3608,7 +3608,7 @@ static int proc_tdls_display_tdls_function_info(struct seq_file *m) struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; u8 SpaceBtwnItemAndValue = TDLS_DBG_INFO_SPACE_BTWN_ITEM_AND_VALUE; u8 SpaceBtwnItemAndValueTmp = 0; - BOOLEAN FirstMatchFound = _FALSE; + bool FirstMatchFound = _FALSE; int j = 0; RTW_PRINT_SEL(m, "============[TDLS Function Info]============\n"); @@ -3812,7 +3812,7 @@ static int proc_tdls_display_tdls_sta_info(struct seq_file *m) u8 SpaceBtwnItemAndValue = TDLS_DBG_INFO_SPACE_BTWN_ITEM_AND_VALUE; u8 SpaceBtwnItemAndValueTmp = 0; u8 NumOfTdlsStaToShow = 0; - BOOLEAN FirstMatchFound = _FALSE; + bool FirstMatchFound = _FALSE; /* Search for TDLS sta info to display */ _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); @@ -3984,7 +3984,7 @@ int proc_get_tdls_info(struct seq_file *m, void *v) u8 SpaceBtwnItemAndValue = 41; u8 SpaceBtwnItemAndValueTmp = 0; u8 NumOfTdlsStaToShow = 0; - BOOLEAN FirstMatchFound = _FALSE; + bool FirstMatchFound = _FALSE; if (hal_chk_wl_func(padapter, WL_FUNC_TDLS) == _FALSE) { RTW_PRINT_SEL(m, "No tdls info can be shown since hal doesn't support tdls\n"); diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index 1af51d6..5ebe3a6 100644 --- a/core/rtw_efuse.c +++ b/core/rtw_efuse.c @@ -43,7 +43,7 @@ u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN] = {0}; u8 maskfileBuffer[64]; /*------------------------Define local variable------------------------------*/ -static BOOLEAN rtw_file_efuse_IsMasked(PADAPTER pAdapter, u16 Offset) +static bool rtw_file_efuse_IsMasked(PADAPTER pAdapter, u16 Offset) { int r = Offset / 16; int c = (Offset % 16) / 2; @@ -60,7 +60,7 @@ static BOOLEAN rtw_file_efuse_IsMasked(PADAPTER pAdapter, u16 Offset) return (result > 0) ? 0 : 1; } -static BOOLEAN efuse_IsMasked(PADAPTER pAdapter, u16 Offset) +static bool efuse_IsMasked(PADAPTER pAdapter, u16 Offset) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(pAdapter); @@ -193,7 +193,7 @@ u16 efuse_bt_GetMaxSize(PADAPTER adapter) return EFUSE_BT_REAL_CONTENT_LEN; } -void EFUSE_GetEfuseDefinition(PADAPTER adapter, u8 efusetype, u8 type, void *out, BOOLEAN test) +void EFUSE_GetEfuseDefinition(PADAPTER adapter, u8 efusetype, u8 type, void *out, bool test) { struct dvobj_priv *d; u32 v32 = 0; @@ -434,12 +434,12 @@ u8 rtw_efuse_map_write(PADAPTER adapter, u16 addr, u16 cnts, u8 *data) return _SUCCESS; } -int Efuse_PgPacketRead(PADAPTER adapter, u8 offset, u8 *data, BOOLEAN test) +int Efuse_PgPacketRead(PADAPTER adapter, u8 offset, u8 *data, bool test) { return _FALSE; } -int Efuse_PgPacketWrite(PADAPTER adapter, u8 offset, u8 word_en, u8 *data, BOOLEAN test) +int Efuse_PgPacketWrite(PADAPTER adapter, u8 offset, u8 word_en, u8 *data, bool test) { return _FALSE; } @@ -982,7 +982,7 @@ efuse_OneByteRead( PADAPTER pAdapter, u16 addr, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { u32 tmpidx = 0; u8 bResult; @@ -1178,12 +1178,12 @@ static void efuse_PostUpdateAction( } -BOOLEAN +bool Efuse_Read1ByteFromFakeContent( PADAPTER pAdapter, u16 Offset, u8 *Value); -BOOLEAN +bool Efuse_Read1ByteFromFakeContent( PADAPTER pAdapter, u16 Offset, @@ -1199,12 +1199,12 @@ Efuse_Read1ByteFromFakeContent( return _TRUE; } -BOOLEAN +bool Efuse_Write1ByteToFakeContent( PADAPTER pAdapter, u16 Offset, u8 Value); -BOOLEAN +bool Efuse_Write1ByteToFakeContent( PADAPTER pAdapter, u16 Offset, @@ -1276,7 +1276,7 @@ u16 Efuse_GetCurrentSize( PADAPTER pAdapter, u8 efuseType, - BOOLEAN bPseudoTest) + bool bPseudoTest) { u16 ret = 0; @@ -1301,7 +1301,7 @@ ReadEFuseByte( PADAPTER Adapter, u16 _offset, u8 *pbuf, - BOOLEAN bPseudoTest) + bool bPseudoTest) { u32 value32; u8 readbyte; @@ -1367,7 +1367,7 @@ efuse_ReadEFuse( u16 _offset, u16 _size_byte, u8 *pbuf, - BOOLEAN bPseudoTest + bool bPseudoTest ); void efuse_ReadEFuse( @@ -1376,7 +1376,7 @@ efuse_ReadEFuse( u16 _offset, u16 _size_byte, u8 *pbuf, - BOOLEAN bPseudoTest + bool bPseudoTest ) { Adapter->hal_func.ReadEFuse(Adapter, efuseType, _offset, _size_byte, pbuf, bPseudoTest); @@ -1388,7 +1388,7 @@ EFUSE_GetEfuseDefinition( u8 efuseType, u8 type, void *pOut, - BOOLEAN bPseudoTest + bool bPseudoTest ) { pAdapter->hal_func.EFUSEGetEfuseDefinition(pAdapter, efuseType, type, pOut, bPseudoTest); @@ -1401,7 +1401,7 @@ efuse_OneByteRead( PADAPTER pAdapter, u16 addr, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { u32 tmpidx = 0; u8 bResult; @@ -1458,7 +1458,7 @@ efuse_OneByteWrite( PADAPTER pAdapter, u16 addr, u8 data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { u8 tmpidx = 0; u8 bResult = _FALSE; @@ -1525,7 +1525,7 @@ int Efuse_PgPacketRead(PADAPTER pAdapter, u8 offset, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { int ret = 0; @@ -1539,7 +1539,7 @@ Efuse_PgPacketWrite(PADAPTER pAdapter, u8 offset, u8 word_en, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { int ret; @@ -1554,7 +1554,7 @@ Efuse_PgPacketWrite_BT(PADAPTER pAdapter, u8 offset, u8 word_en, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { int ret; @@ -1569,7 +1569,7 @@ Efuse_WordEnableDataWrite(PADAPTER pAdapter, u16 efuse_addr, u8 word_en, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { u8 ret = 0; @@ -1945,13 +1945,13 @@ Efuse_ReadAllMap( PADAPTER pAdapter, u8 efuseType, u8 *Efuse, - BOOLEAN bPseudoTest); + bool bPseudoTest); void Efuse_ReadAllMap( PADAPTER pAdapter, u8 efuseType, u8 *Efuse, - BOOLEAN bPseudoTest) + bool bPseudoTest) { u16 mapLen = 0; @@ -2267,7 +2267,7 @@ efuse_WordEnableDataRead(u8 word_en, void EFUSE_ShadowMapUpdate( PADAPTER pAdapter, u8 efuseType, - BOOLEAN bPseudoTest) + bool bPseudoTest) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(pAdapter); u16 mapLen = 0; diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 5c179cd..e60607a 100644 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -3708,9 +3708,9 @@ void rtw_ht_use_default_setting(_adapter *padapter) struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct ht_priv *phtpriv = &pmlmepriv->htpriv; struct registry_priv *pregistrypriv = &padapter->registrypriv; - BOOLEAN bHwLDPCSupport = _FALSE, bHwSTBCSupport = _FALSE; + bool bHwLDPCSupport = _FALSE, bHwSTBCSupport = _FALSE; #ifdef CONFIG_BEAMFORMING - BOOLEAN bHwSupportBeamformer = _FALSE, bHwSupportBeamformee = _FALSE; + bool bHwSupportBeamformer = _FALSE, bHwSupportBeamformee = _FALSE; #endif /* CONFIG_BEAMFORMING */ if (pregistrypriv->wifi_spec) diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 9528e52..329d5d2 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -10333,7 +10333,7 @@ Following are some utitity fuctions for WiFi MLME *****************************************************************************/ -BOOLEAN IsLegal5GChannel( +bool IsLegal5GChannel( PADAPTER Adapter, u8 channel) { diff --git a/core/rtw_mp.c b/core/rtw_mp.c index a89b45d..d1c26b1 100644 --- a/core/rtw_mp.c +++ b/core/rtw_mp.c @@ -282,7 +282,7 @@ void free_mp_priv(struct mp_priv *pmp_priv) static void PHY_IQCalibrate_default( PADAPTER pAdapter, - BOOLEAN bReCovery + bool bReCovery ) { RTW_INFO("%s\n", __func__); @@ -297,7 +297,7 @@ static void PHY_LCCalibrate_default( static void PHY_SetRFPathSwitch_default( PADAPTER pAdapter, - BOOLEAN bMain + bool bMain ) { RTW_INFO("%s\n", __func__); @@ -329,7 +329,7 @@ static u8 PHY_QueryRFPathSwitch(PADAPTER padapter) return 0; } -static void PHY_SetRFPathSwitch(PADAPTER padapter , BOOLEAN bMain) { +static void PHY_SetRFPathSwitch(PADAPTER padapter , bool bMain) { if (IS_HARDWARE_TYPE_8188E(padapter)) phy_set_rf_path_switch_8188e(padapter, bMain); @@ -744,7 +744,7 @@ static void mpt_SwitchRfSetting(PADAPTER pAdapter) /*---------------------------hal\rtl8192c\MPT_Phy.c---------------------------*/ /*---------------------------hal\rtl8192c\MPT_HelperFunc.c---------------------------*/ -static void MPT_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14) +static void MPT_CCKTxPowerAdjust(PADAPTER Adapter, bool bInCH14) { hal_mpt_CCKTxPowerAdjust(Adapter, bInCH14); } @@ -802,7 +802,7 @@ void SetDataRate(PADAPTER pAdapter) hal_mpt_SetDataRate(pAdapter); } -void MP_PHY_SetRFPathSwitch(PADAPTER pAdapter , BOOLEAN bMain) +void MP_PHY_SetRFPathSwitch(PADAPTER pAdapter , bool bMain) { PHY_SetRFPathSwitch(pAdapter, bMain); diff --git a/core/rtw_odm.c b/core/rtw_odm.c index a1e3e1c..e40033b 100644 --- a/core/rtw_odm.c +++ b/core/rtw_odm.c @@ -246,7 +246,7 @@ inline void rtw_odm_radar_detect_enable(_adapter *adapter) phydm_radar_detect_enable(GET_ODM(adapter)); } -inline BOOLEAN rtw_odm_radar_detect(_adapter *adapter) +inline bool rtw_odm_radar_detect(_adapter *adapter) { return phydm_radar_detect(GET_ODM(adapter)); } diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index 4e63e3f..f3c6dc9 100644 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -2774,7 +2774,7 @@ void update_capinfo(PADAPTER 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/HalEfuseMask8188E_USB.c b/hal/HalEfuseMask8188E_USB.c index c3ad26a..08e628c 100644 --- a/hal/HalEfuseMask8188E_USB.c +++ b/hal/HalEfuseMask8188E_USB.c @@ -82,7 +82,7 @@ EFUSE_GetMaskArray_MP_8188E_MUSB( for (i = 0; i < len; ++i) Array[i] = Array_MP_8188E_MUSB[i]; } -BOOLEAN +bool EFUSE_IsAddressMasked_MP_8188E_MUSB( u2Byte Offset ) diff --git a/hal/HalEfuseMask8188E_USB.h b/hal/HalEfuseMask8188E_USB.h index 7b2d540..e7da366 100644 --- a/hal/HalEfuseMask8188E_USB.h +++ b/hal/HalEfuseMask8188E_USB.h @@ -33,7 +33,7 @@ EFUSE_GetMaskArray_MP_8188E_MUSB( pu1Byte Array ); -BOOLEAN +bool EFUSE_IsAddressMasked_MP_8188E_MUSB(/* TC: Test Chip, MP: MP Chip */ u2Byte Offset ); diff --git a/hal/btc/halbtcoutsrc.h b/hal/btc/halbtcoutsrc.h index 15e7fab..f9aebdd 100644 --- a/hal/btc/halbtcoutsrc.h +++ b/hal/btc/halbtcoutsrc.h @@ -109,15 +109,15 @@ struct btc_board_info { u8 btdm_ant_num_by_ant_det; /* ant number for btdm after antenna detection */ u8 btdm_ant_pos; /* Bryant Add to indicate Antenna Position for (pg_ant_num = 2) && (btdm_ant_num =1) (DPDT+1Ant case) */ u8 single_ant_path; /* current used for 8723b only, 1=>s0, 0=>s1 */ - boolean tfbga_package; /* for Antenna detect threshold */ - boolean btdm_ant_det_finish; - boolean btdm_ant_det_already_init_phydm; + bool tfbga_package; /* for Antenna detect threshold */ + bool btdm_ant_det_finish; + bool btdm_ant_det_already_init_phydm; u8 ant_type; u8 rfe_type; u8 ant_div_cfg; - boolean btdm_ant_det_complete_fail; + bool btdm_ant_det_complete_fail; u8 ant_det_result; - boolean ant_det_result_five_complete; + bool ant_det_result_five_complete; u32 antdetval; }; @@ -232,7 +232,7 @@ typedef enum _BTC_VENDOR { /* defined for BFP_BTC_GET */ typedef enum _BTC_GET_TYPE { - /* type BOOLEAN */ + /* type bool */ BTC_GET_BL_HS_OPERATION, BTC_GET_BL_HS_CONNECTING, BTC_GET_BL_WIFI_FW_READY, @@ -285,7 +285,7 @@ typedef enum _BTC_GET_TYPE { /* defined for BFP_BTC_SET */ typedef enum _BTC_SET_TYPE { - /* type BOOLEAN */ + /* type bool */ BTC_SET_BL_BT_DISABLE, BTC_SET_BL_BT_ENABLE_DISABLE_CHANGE, BTC_SET_BL_BT_TRAFFIC_BUSY, @@ -306,7 +306,7 @@ typedef enum _BTC_SET_TYPE { BTC_SET_ACT_AGGREGATE_CTRL, BTC_SET_ACT_ANTPOSREGRISTRY_CTRL, /*===== for 1Ant ======*/ - /* type BOOLEAN */ + /* type bool */ /* type u1Byte */ BTC_SET_U1_RSSI_ADJ_VAL_FOR_1ANT_COEX_TYPE, @@ -586,14 +586,14 @@ typedef void pu1Byte pCmdBuffer ); -typedef BOOLEAN +typedef bool (*BFP_BTC_GET)( void * pBtCoexist, u1Byte getType, void * pOutBuf ); -typedef BOOLEAN +typedef bool (*BFP_BTC_SET)( void * pBtCoexist, u1Byte setType, @@ -606,14 +606,14 @@ typedef u2Byte u4Byte offset, u4Byte value ); -typedef BOOLEAN +typedef bool (*BFP_BTC_SET_BT_ANT_DETECTION)( void * pBtcContext, u1Byte txTime, u1Byte btChnl ); -typedef BOOLEAN +typedef bool (*BFP_BTC_SET_BT_TRX_MASK)( void * pBtcContext, u1Byte bt_trx_mask @@ -685,7 +685,7 @@ typedef u4Byte u1Byte scanType ); -typedef BOOLEAN +typedef bool (*BFP_BTC_GET_BT_AFH_MAP_FROM_BT)( void * pBtcContext, u1Byte mapType, @@ -693,65 +693,65 @@ typedef BOOLEAN ); struct btc_bt_info { - boolean bt_disabled; - boolean bt_enable_disable_change; + bool bt_disabled; + bool bt_enable_disable_change; u8 rssi_adjust_for_agc_table_on; u8 rssi_adjust_for_1ant_coex_type; - boolean pre_bt_ctrl_agg_buf_size; - boolean bt_ctrl_agg_buf_size; - boolean pre_reject_agg_pkt; - boolean reject_agg_pkt; - boolean increase_scan_dev_num; - boolean bt_tx_rx_mask; + bool pre_bt_ctrl_agg_buf_size; + bool bt_ctrl_agg_buf_size; + bool pre_reject_agg_pkt; + bool reject_agg_pkt; + bool increase_scan_dev_num; + bool bt_tx_rx_mask; u8 pre_agg_buf_size; u8 agg_buf_size; - boolean bt_busy; - boolean limited_dig; + bool bt_busy; + bool limited_dig; u16 bt_hci_ver; u16 bt_real_fw_ver; u8 bt_fw_ver; u32 get_bt_fw_ver_cnt; u32 bt_get_fw_ver; - boolean miracast_plus_bt; + bool miracast_plus_bt; - boolean bt_disable_low_pwr; + bool bt_disable_low_pwr; - boolean bt_ctrl_lps; - boolean bt_lps_on; - boolean force_to_roam; /* for 1Ant solution */ + bool bt_ctrl_lps; + bool bt_lps_on; + bool force_to_roam; /* for 1Ant solution */ u8 lps_val; u8 rpwm_val; u32 ra_mask; }; struct btc_stack_info { - boolean profile_notified; + bool profile_notified; u16 hci_version; /* stack hci version */ u8 num_of_link; - boolean bt_link_exist; - boolean sco_exist; - boolean acl_exist; - boolean a2dp_exist; - boolean hid_exist; + bool bt_link_exist; + bool sco_exist; + bool acl_exist; + bool a2dp_exist; + bool hid_exist; u8 num_of_hid; - boolean pan_exist; - boolean unknown_acl_exist; + bool pan_exist; + bool unknown_acl_exist; s8 min_bt_rssi; }; struct btc_bt_link_info { - boolean bt_link_exist; - boolean bt_hi_pri_link_exist; - boolean sco_exist; - boolean sco_only; - boolean a2dp_exist; - boolean a2dp_only; - boolean hid_exist; - boolean hid_only; - boolean pan_exist; - boolean pan_only; - boolean slave_role; - boolean acl_busy; + bool bt_link_exist; + bool bt_hi_pri_link_exist; + bool sco_exist; + bool sco_only; + bool a2dp_exist; + bool a2dp_only; + bool hid_exist; + bool hid_only; + bool pan_exist; + bool pan_only; + bool slave_role; + bool acl_busy; }; struct btc_statistics { @@ -775,7 +775,7 @@ struct btc_statistics { }; struct btc_coexist { - BOOLEAN bBinded; /*make sure only one adapter can bind the data context*/ + bool bBinded; /*make sure only one adapter can bind the data context*/ void * Adapter; /*default adapter*/ struct btc_board_info board_info; struct btc_bt_info bt_info; /*some bt info referenced by non-bt module*/ @@ -784,10 +784,10 @@ struct btc_coexist { BTC_CHIP_INTERFACE chip_interface; void * odm_priv; - BOOLEAN initilized; - BOOLEAN stop_coex_dm; - BOOLEAN manual_control; - BOOLEAN bdontenterLPS; + bool initilized; + bool stop_coex_dm; + bool manual_control; + bool bdontenterLPS; pu1Byte cli_buf; struct btc_statistics statistics; u1Byte pwrModeVal[10]; @@ -839,7 +839,7 @@ typedef struct btc_coexist *PBTC_COEXIST; extern struct btc_coexist GLBtCoexist; -BOOLEAN +bool EXhalbtcoutsrc_InitlizeVariables( void * Adapter ); @@ -854,7 +854,7 @@ EXhalbtcoutsrc_PreLoadFirmware( void EXhalbtcoutsrc_InitHwConfig( PBTC_COEXIST pBtCoexist, - BOOLEAN bWifiOnly + bool bWifiOnly ); void EXhalbtcoutsrc_InitCoexDm( diff --git a/hal/hal_btcoex.c b/hal/hal_btcoex.c index f21c040..dc507ff 100644 --- a/hal/hal_btcoex.c +++ b/hal/hal_btcoex.c @@ -410,7 +410,7 @@ void halbtcoutsrc_DisableLowPower(PBTC_COEXIST pBtCoexist, u8 bLowPwrDisable) void halbtcoutsrc_AggregationCheck(PBTC_COEXIST pBtCoexist) { PADAPTER padapter; - BOOLEAN bNeedToAct = _FALSE; + bool bNeedToAct = _FALSE; static u32 preTime = 0; u32 curTime = 0; @@ -1286,10 +1286,10 @@ void halbtcoutsrc_DisplayWifiStatus(PBTC_COEXIST pBtCoexist) struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); u8 *cliBuf = pBtCoexist->cli_buf; s32 wifiRssi = 0, btHsRssi = 0; - BOOLEAN bScan = _FALSE, bLink = _FALSE, bRoam = _FALSE, bWifiBusy = _FALSE, bWifiUnderBMode = _FALSE; + bool bScan = _FALSE, bLink = _FALSE, bRoam = _FALSE, bWifiBusy = _FALSE, bWifiUnderBMode = _FALSE; u32 wifiBw = BTC_WIFI_BW_HT20, wifiTrafficDir = BTC_WIFI_TRAFFIC_TX, wifiFreq = BTC_FREQ_2_4G; u32 wifiLinkStatus = 0x0; - BOOLEAN bBtHsOn = _FALSE, bLowPower = _FALSE; + bool bBtHsOn = _FALSE, bLowPower = _FALSE; u8 wifiChnl = 0, wifiP2PChnl = 0, nScanAPNum = 0, FwPSState; u32 iqk_cnt_total = 0, iqk_cnt_ok = 0, iqk_cnt_fail = 0; @@ -1582,7 +1582,7 @@ u8 halbtcoutsrc_SetBtAntDetection(void *pBtcContext, u8 txTime, u8 btChnl) return _FALSE; } -BOOLEAN +bool halbtcoutsrc_SetBtTRXMASK( IN void * pBtcContext, IN u1Byte bt_trx_mask diff --git a/hal/hal_com.c b/hal/hal_com.c index c022009..1fdcd4c 100644 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -244,7 +244,7 @@ u8 hal_com_config_channel_plan( char *sw_alpha2, u8 sw_chplan, u8 def_chplan, - BOOLEAN AutoLoadFail + bool AutoLoadFail ) { PHAL_DATA_TYPE pHalData; @@ -326,13 +326,13 @@ done: return chplan; } -BOOLEAN +bool HAL_IsLegalChannel( PADAPTER Adapter, u32 Channel ) { - BOOLEAN bLegalChannel = _TRUE; + bool bLegalChannel = _TRUE; if (Channel > 14) { if (is_supported_5g(Adapter->registrypriv.wireless_mode) == _FALSE) { @@ -960,7 +960,7 @@ _OneOutPipeMapping( static void _TwoOutPipeMapping( PADAPTER pAdapter, - BOOLEAN bWIFICfg + bool bWIFICfg ) { struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); @@ -1004,7 +1004,7 @@ _TwoOutPipeMapping( static void _ThreeOutPipeMapping( PADAPTER pAdapter, - BOOLEAN bWIFICfg + bool bWIFICfg ) { struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); @@ -1046,7 +1046,7 @@ static void _ThreeOutPipeMapping( } static void _FourOutPipeMapping( PADAPTER pAdapter, - BOOLEAN bWIFICfg + bool bWIFICfg ) { struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); @@ -1086,7 +1086,7 @@ static void _FourOutPipeMapping( } } -BOOLEAN +bool Hal_MappingOutPipe( PADAPTER pAdapter, u8 NumOutPipe @@ -1094,9 +1094,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) { case 2: @@ -5634,7 +5634,7 @@ void rtw_hal_construct_NullFunctionData( } static void rtw_hal_construct_ProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLength, - u8 *StaAddr, BOOLEAN bHideSSID) + u8 *StaAddr, bool bHideSSID) { struct rtw_ieee80211_hdr *pwlanhdr; __le16 *fctrl; @@ -8399,7 +8399,7 @@ void SetHalODMVar( PADAPTER Adapter, HAL_ODM_VARIABLE eVariable, void * pValue1, - BOOLEAN bSet) + bool bSet) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); struct PHY_DM_STRUCT *podmpriv = &pHalData->odmpriv; @@ -8649,7 +8649,7 @@ u32 rtw_phydm_ability_ops(_adapter *adapter, HAL_PHYDM_OPS ops, u32 ability) } -BOOLEAN +bool eqNByte( u8 *str1, u8 *str2, @@ -8691,7 +8691,7 @@ MapCharToHexDigit( * Description: * Parse hex number from the string pucStr. * */ -BOOLEAN +bool GetHexValueFromString( char *szStr, u32 *pu4bVal, @@ -8740,7 +8740,7 @@ GetHexValueFromString( return _TRUE; } -BOOLEAN +bool GetFractionValueFromString( char *szStr, u8 *pInteger, @@ -8791,7 +8791,7 @@ GetFractionValueFromString( * Description: * Return TRUE if szStr is comment out with leading " */ /* ". * */ -BOOLEAN +bool IsCommentString( char *szStr ) @@ -8802,7 +8802,7 @@ IsCommentString( return _FALSE; } -BOOLEAN +bool GetU1ByteIntegerFromStringInDecimal( char *Str, u8 *pInt @@ -8826,7 +8826,7 @@ GetU1ByteIntegerFromStringInDecimal( /* <20121004, Kordan> For example, * ParseQualifiedString(inString, 0, outString, '[', ']') gets "Kordan" from a string "Hello [Kordan]". * If RightQualifier does not exist, it will hang on in the while loop */ -BOOLEAN +bool ParseQualifiedString( char *In, u32 *Start, @@ -8850,7 +8850,7 @@ ParseQualifiedString( return _TRUE; } -BOOLEAN +bool isAllSpaceOrTab( u8 *data, u8 size diff --git a/hal/hal_com_phycfg.c b/hal/hal_com_phycfg.c index 2fa4fdc..029433d 100644 --- a/hal/hal_com_phycfg.c +++ b/hal/hal_com_phycfg.c @@ -701,7 +701,7 @@ static void hal_load_pg_txpwr_info( TxPowerInfo24G *pwr_info_2g, TxPowerInfo5G *pwr_info_5g, u8 *pg_data, - BOOLEAN AutoLoadFail + bool AutoLoadFail ) { struct hal_spec_t *hal_spec = GET_HAL_SPEC(adapter); @@ -1204,7 +1204,7 @@ phy_SetTxPowerByRateBase( pHalData->TxPwrByRateBase5G[RfPath][TxNum][RateSection - 1] = Value; } -static inline BOOLEAN phy_is_txpwr_by_rate_undefined_of_band_path(_adapter *adapter, u8 band, u8 path) +static inline bool phy_is_txpwr_by_rate_undefined_of_band_path(_adapter *adapter, u8 band, u8 path) { struct hal_spec_t *hal_spec = GET_HAL_SPEC(adapter); HAL_DATA_TYPE *hal_data = GET_HAL_DATA(adapter); @@ -1949,10 +1949,10 @@ exit: return; } -static BOOLEAN phy_GetChnlIndex(u8 Channel, u8 *ChannelIdx) +static bool phy_GetChnlIndex(u8 Channel, u8 *ChannelIdx) { u8 i = 0; - BOOLEAN bIn24G = _TRUE; + bool bIn24G = _TRUE; if (Channel <= 14) { bIn24G = _TRUE; @@ -1978,7 +1978,7 @@ PHY_GetTxPowerIndexBase( u8 Rate, CHANNEL_WIDTH BandWidth, u8 Channel, - PBOOLEAN bIn24G + bool * bIn24G ) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(pAdapter); @@ -2562,7 +2562,7 @@ phy_set_tx_power_level_by_path( ) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); - BOOLEAN bIsIn24G = (pHalData->current_band_type == BAND_ON_2_4G); + bool bIsIn24G = (pHalData->current_band_type == BAND_ON_2_4G); /* if ( pMgntInfo->RegNByteAccess == 0 ) */ { @@ -2651,7 +2651,7 @@ static s8 _phy_get_txpwr_lmt( u8 RfPath, u8 DataRate, u8 Channel, - BOOLEAN no_sc + bool no_sc ) { struct dvobj_priv *dvobj = adapter_to_dvobj(Adapter); @@ -2816,7 +2816,7 @@ PHY_GetTxPowerLimit( u8 Channel ) { - BOOLEAN no_sc = _FALSE; + bool no_sc = _FALSE; /* MP mode channel don't use secondary channel */ if (rtw_mi_mp_mode_check(Adapter) == _TRUE) @@ -4157,7 +4157,7 @@ static int phy_ParseBBPgParaFile(PADAPTER Adapter, char *buffer) char *szLine, *ptmp; u32 u4bRegOffset, u4bRegMask, u4bRegValue; u32 u4bMove; - BOOLEAN firstLine = _TRUE; + bool firstLine = _TRUE; u8 tx_num = 0; u8 band = 0, rf_path = 0; diff --git a/hal/hal_intf.c b/hal/hal_intf.c index abb5fcf..3f29b6a 100644 --- a/hal/hal_intf.c +++ b/hal/hal_intf.c @@ -277,7 +277,7 @@ u8 rtw_hal_get_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pV return padapter->hal_func.get_hal_def_var_handler(padapter, eVariable, pValue); } -void rtw_hal_set_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1, BOOLEAN bSet) +void rtw_hal_set_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1, bool bSet) { padapter->hal_func.SetHalODMVarHandler(padapter, eVariable, pValue1, bSet); } diff --git a/hal/hal_mp.c b/hal/hal_mp.c index a6b6421..5615dd9 100644 --- a/hal/hal_mp.c +++ b/hal/hal_mp.c @@ -95,7 +95,7 @@ void hal_mpt_GetPowerTracking(PADAPTER padapter, u8 *enable) } -void hal_mpt_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14) +void hal_mpt_CCKTxPowerAdjust(PADAPTER Adapter, bool bInCH14) { u32 TempVal = 0, TempVal2 = 0, TempVal3 = 0; u32 CurrCCKSwingVal = 0, CCKSwingIndex = 12; diff --git a/hal/hal_phy.c b/hal/hal_phy.c index c4219ab..555acbd 100644 --- a/hal/hal_phy.c +++ b/hal/hal_phy.c @@ -106,7 +106,7 @@ PHY_RFShadowWrite( } /* PHY_RFShadowWrite */ -BOOLEAN +bool PHY_RFShadowCompare( PADAPTER Adapter, u8 eRFPath, diff --git a/hal/hal_usb_led.c b/hal/hal_usb_led.c index c69bdbe..62a8669 100644 --- a/hal/hal_usb_led.c +++ b/hal/hal_usb_led.c @@ -808,7 +808,7 @@ SwLedBlink7( { PADAPTER Adapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); - BOOLEAN bStopBlinking = _FALSE; + bool bStopBlinking = _FALSE; /* Change LED according to BlinkingLedState specified. */ if (pLed->BlinkingLedState == RTW_LED_ON) { @@ -915,7 +915,7 @@ SwLedBlink9( { PADAPTER Adapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); - BOOLEAN bStopBlinking = _FALSE; + bool bStopBlinking = _FALSE; /* Change LED according to BlinkingLedState specified. */ if (pLed->BlinkingLedState == RTW_LED_ON) { @@ -1142,7 +1142,7 @@ SwLedBlink10( { PADAPTER Adapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); - BOOLEAN bStopBlinking = _FALSE; + bool bStopBlinking = _FALSE; /* Change LED according to BlinkingLedState specified. */ if (pLed->BlinkingLedState == RTW_LED_ON) { @@ -1331,7 +1331,7 @@ SwLedBlink11( { PADAPTER Adapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); - BOOLEAN bStopBlinking = _FALSE; + bool bStopBlinking = _FALSE; /* Change LED according to BlinkingLedState specified. */ if (pLed->BlinkingLedState == RTW_LED_ON) { @@ -1402,7 +1402,7 @@ SwLedBlink12( { PADAPTER Adapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); - BOOLEAN bStopBlinking = _FALSE; + bool bStopBlinking = _FALSE; /* Change LED according to BlinkingLedState specified. */ if (pLed->BlinkingLedState == RTW_LED_ON) { @@ -1470,7 +1470,7 @@ SwLedBlink13( { PADAPTER Adapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); - BOOLEAN bStopBlinking = _FALSE; + bool bStopBlinking = _FALSE; static u8 LinkBlinkCnt = 0; /* Change LED according to BlinkingLedState specified. */ @@ -1531,7 +1531,7 @@ SwLedBlink14( { PADAPTER Adapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); - BOOLEAN bStopBlinking = _FALSE; + bool bStopBlinking = _FALSE; static u8 LinkBlinkCnt = 0; /* Change LED according to BlinkingLedState specified. */ @@ -1582,7 +1582,7 @@ SwLedBlink15( { PADAPTER Adapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); - BOOLEAN bStopBlinking = _FALSE; + bool bStopBlinking = _FALSE; static u8 LinkBlinkCnt = 0; /* Change LED according to BlinkingLedState specified. */ @@ -1617,7 +1617,7 @@ SwLedBlink15( break; case LED_BLINK_NO_LINK: { - static BOOLEAN bLedOn = _TRUE; + static bool bLedOn = _TRUE; if (bLedOn) { bLedOn = _FALSE; pLed->BlinkingLedState = RTW_LED_OFF; @@ -1631,7 +1631,7 @@ SwLedBlink15( break; case LED_BLINK_LINK_IDEL: { - static BOOLEAN bLedOn = _TRUE; + static bool bLedOn = _TRUE; if (bLedOn) { bLedOn = _FALSE; pLed->BlinkingLedState = RTW_LED_OFF; @@ -3075,7 +3075,7 @@ SwLedControlMode9( PLED_USB pLed = &(ledpriv->SwLed0); PLED_USB pLed1 = &(ledpriv->SwLed1); PLED_USB pLed2 = &(ledpriv->SwLed2); - BOOLEAN bWPSOverLap = _FALSE; + bool bWPSOverLap = _FALSE; /* RTW_INFO("LedAction=%d\n", LedAction); */ switch (LedAction) { case LED_CTL_START_TO_LINK: diff --git a/hal/phydm/phydm.h b/hal/phydm/phydm.h index 88e321e..ecad6c1 100644 --- a/hal/phydm/phydm.h +++ b/hal/phydm/phydm.h @@ -399,8 +399,7 @@ enum phy_reg_pg_type { /*2011/09/22 MH Copy from SD4 defined structure. We use to support PHY DM integration.*/ - struct PHY_DM_STRUCT -{ +struct PHY_DM_STRUCT { /*Add for different team use temporarily*/ struct _ADAPTER *adapter; /*For CE/NIC team*/ struct rtl8192cd_priv *priv; /*For AP/ADSL team*/ diff --git a/hal/phydm/phydm_antdiv.c b/hal/phydm/phydm_antdiv.c index ef16a33..b6cd44b 100644 --- a/hal/phydm/phydm_antdiv.c +++ b/hal/phydm/phydm_antdiv.c @@ -1646,7 +1646,7 @@ void odm_fast_ant_training_callback(struct timer_list *t) #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) struct PHY_DM_STRUCT *p_dm_odm = (struct PHY_DM_STRUCT *)p_dm_void; #else - struct PHY_DM_STRUCT *p_dm_odm = from_timer(p_gm_odm, t, fast_ant_training_timer); + struct PHY_DM_STRUCT *p_dm_odm = from_timer(p_dm_odm, t, fast_ant_training_timer); #endif struct _ADAPTER *padapter = p_dm_odm->adapter; diff --git a/hal/phydm/phydm_iqk.h b/hal/phydm/phydm_iqk.h index 006b554..a66b95f 100644 --- a/hal/phydm/phydm_iqk.h +++ b/hal/phydm/phydm_iqk.h @@ -37,8 +37,8 @@ /*---------------------------End Define Parameters-------------------------------*/ struct _IQK_INFORMATION { - boolean LOK_fail[NUM]; - boolean IQK_fail[2][NUM]; + bool LOK_fail[NUM]; + bool IQK_fail[2][NUM]; u32 iqc_matrix[2][NUM]; u8 iqk_times; u32 rf_reg18; @@ -48,7 +48,7 @@ struct _IQK_INFORMATION { u8 kcount; u32 iqk_channel[2]; - boolean IQK_fail_report[2][4][2]; /*channel/path/TRX(TX:0, RX:1) */ + bool IQK_fail_report[2][4][2]; /*channel/path/TRX(TX:0, RX:1) */ u32 IQK_CFIR_real[2][4][2][8]; /*channel / path / TRX(TX:0, RX:1) / CFIR_real*/ u32 IQK_CFIR_imag[2][4][2][8]; /*channel / path / TRX(TX:0, RX:1) / CFIR_imag*/ u8 retry_count[2][4][3]; /* channel / path / (TXK:0, RXK1:1, RXK2:2) */ @@ -58,8 +58,8 @@ struct _IQK_INFORMATION { u16 RXIQK_AGC[2][4]; /*channel / path*/ u32 bypass_iqk[2][4]; /*channel / 0xc94/0xe94*/ u32 tmp_GNTWL; - boolean is_BTG; - boolean isbnd; + bool is_BTG; + bool isbnd; }; #endif diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index 4e716a4..b91b1d7 100644 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -575,8 +575,8 @@ void rtl8188e_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus) struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct sta_info *psta = NULL; #endif - 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 b87a764..db62987 100644 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -212,8 +212,8 @@ rtl8188e_HalDmWatchDog( PADAPTER Adapter ) { - BOOLEAN bFwCurrentInPSMode = _FALSE; - BOOLEAN bFwPSAwake = _TRUE; + bool bFwCurrentInPSMode = _FALSE; + bool bFwPSAwake = _TRUE; PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); struct PHY_DM_STRUCT *pDM_Odm = &(pHalData->odmpriv); diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c index d94b3e5..652d30a 100644 --- a/hal/rtl8188e_hal_init.c +++ b/hal/rtl8188e_hal_init.c @@ -490,7 +490,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter, int data_len) static void _FWDownloadEnable_8188E( PADAPTER padapter, - BOOLEAN enable + bool enable ) { u8 tmp; @@ -771,7 +771,7 @@ exit: * Download 8192C firmware code. * * */ -s32 rtl8188e_FirmwareDownload(PADAPTER padapter, BOOLEAN bUsedWoWLANFw) +s32 rtl8188e_FirmwareDownload(PADAPTER padapter, bool bUsedWoWLANFw) { s32 rtStatus = _SUCCESS; u8 write_fw = 0; @@ -970,27 +970,27 @@ enum { LDOE25_SHIFT = 28 , }; -static BOOLEAN +static bool hal_EfusePgPacketWrite2ByteHeader( PADAPTER pAdapter, u8 efuseType, u16 *pAddr, PPGPKT_STRUCT pTargetPkt, - BOOLEAN bPseudoTest); -static BOOLEAN + bool bPseudoTest); +static bool hal_EfusePgPacketWrite1ByteHeader( PADAPTER pAdapter, u8 efuseType, u16 *pAddr, PPGPKT_STRUCT pTargetPkt, - BOOLEAN bPseudoTest); -static BOOLEAN + bool bPseudoTest); +static bool hal_EfusePgPacketWriteData( PADAPTER pAdapter, u8 efuseType, u16 *pAddr, PPGPKT_STRUCT pTargetPkt, - BOOLEAN bPseudoTest); + bool bPseudoTest); static void hal_EfusePowerSwitch_RTL8188E( @@ -1094,7 +1094,7 @@ Hal_EfuseReadEFuse88E( u16 _offset, u16 _size_byte, u8 *pbuf, - BOOLEAN bPseudoTest + bool bPseudoTest ) { /* u8 efuseTbl[EFUSE_MAP_LEN_88E]; */ @@ -1275,14 +1275,14 @@ exit: } -static BOOLEAN +static bool Hal_EfuseSwitchToBank( PADAPTER pAdapter, u8 bank, - BOOLEAN bPseudoTest + bool bPseudoTest ) { - BOOLEAN bRet = _FALSE; + bool bRet = _FALSE; u32 value32 = 0; /* RTPRINT(FEEPROM, EFUSE_PG, ("Efuse switch bank to %d\n", bank)); */ @@ -1303,7 +1303,7 @@ ReadEFuseByIC( u16 _offset, u16 _size_byte, u8 *pbuf, - BOOLEAN bPseudoTest + bool bPseudoTest ) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); @@ -1359,7 +1359,7 @@ ReadEFuse_Pseudo( u16 _offset, u16 _size_byte, u8 *pbuf, - BOOLEAN bPseudoTest + bool bPseudoTest ) { Hal_EfuseReadEFuse88E(Adapter, _offset, _size_byte, pbuf, bPseudoTest); @@ -1372,7 +1372,7 @@ rtl8188e_ReadEFuse( u16 _offset, u16 _size_byte, u8 *pbuf, - BOOLEAN bPseudoTest + bool bPseudoTest ) { if (bPseudoTest) @@ -1509,7 +1509,7 @@ rtl8188e_EFUSE_GetEfuseDefinition( u8 efuseType, u8 type, void *pOut, - BOOLEAN bPseudoTest + bool bPseudoTest ) { if (bPseudoTest) @@ -1523,7 +1523,7 @@ Hal_EfuseWordEnableDataWrite(PADAPTER pAdapter, u16 efuse_addr, u8 word_en, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { u16 tmpaddr = 0; u16 start_addr = efuse_addr; @@ -1592,7 +1592,7 @@ Hal_EfuseWordEnableDataWrite_Pseudo(PADAPTER pAdapter, u16 efuse_addr, u8 word_en, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { u8 ret = 0; @@ -1606,7 +1606,7 @@ rtl8188e_Efuse_WordEnableDataWrite(PADAPTER pAdapter, u16 efuse_addr, u8 word_en, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { u8 ret = 0; @@ -1621,7 +1621,7 @@ rtl8188e_Efuse_WordEnableDataWrite(PADAPTER pAdapter, static u16 hal_EfuseGetCurrentSize_8188e(PADAPTER pAdapter, - BOOLEAN bPseudoTest) + bool bPseudoTest) { int bContinual = _TRUE; @@ -1674,7 +1674,7 @@ hal_EfuseGetCurrentSize_8188e(PADAPTER pAdapter, static u16 Hal_EfuseGetCurrentSize_Pseudo(PADAPTER pAdapter, - BOOLEAN bPseudoTest) + bool bPseudoTest) { u16 ret = 0; @@ -1688,7 +1688,7 @@ static u16 rtl8188e_EfuseGetCurrentSize( PADAPTER pAdapter, u8 efuseType, - BOOLEAN bPseudoTest) + bool bPseudoTest) { u16 ret = 0; @@ -1707,7 +1707,7 @@ hal_EfusePgPacketRead_8188e( PADAPTER pAdapter, u8 offset, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { u8 ReadState = PG_STATE_HEADER; @@ -1804,7 +1804,7 @@ static int Hal_EfusePgPacketRead(PADAPTER pAdapter, u8 offset, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { int ret = 0; @@ -1818,7 +1818,7 @@ static int Hal_EfusePgPacketRead_Pseudo(PADAPTER pAdapter, u8 offset, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { int ret = 0; @@ -1831,7 +1831,7 @@ static int rtl8188e_Efuse_PgPacketRead(PADAPTER pAdapter, u8 offset, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { int ret = 0; @@ -1843,13 +1843,13 @@ rtl8188e_Efuse_PgPacketRead(PADAPTER pAdapter, return ret; } -static BOOLEAN +static bool hal_EfuseFixHeaderProcess( PADAPTER pAdapter, u8 efuseType, PPGPKT_STRUCT pFixPkt, u16 *pAddr, - BOOLEAN bPseudoTest + bool bPseudoTest ) { u8 originaldata[8], badworden = 0; @@ -1877,15 +1877,15 @@ hal_EfuseFixHeaderProcess( return _TRUE; } -static BOOLEAN +static bool hal_EfusePgPacketWrite2ByteHeader( PADAPTER pAdapter, u8 efuseType, u16 *pAddr, PPGPKT_STRUCT pTargetPkt, - BOOLEAN bPseudoTest) + 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; @@ -1960,15 +1960,15 @@ hal_EfusePgPacketWrite2ByteHeader( return bRet; } -static BOOLEAN +static bool hal_EfusePgPacketWrite1ByteHeader( PADAPTER pAdapter, u8 efuseType, u16 *pAddr, PPGPKT_STRUCT pTargetPkt, - BOOLEAN bPseudoTest) + bool bPseudoTest) { - BOOLEAN bRet = _FALSE; + bool bRet = _FALSE; u8 pg_header = 0, tmp_header = 0; u16 efuse_addr = *pAddr; u8 repeatcnt = 0; @@ -2006,15 +2006,15 @@ hal_EfusePgPacketWrite1ByteHeader( return bRet; } -static BOOLEAN +static bool hal_EfusePgPacketWriteData( PADAPTER pAdapter, u8 efuseType, u16 *pAddr, PPGPKT_STRUCT pTargetPkt, - BOOLEAN bPseudoTest) + bool bPseudoTest) { - BOOLEAN bRet = _FALSE; + bool bRet = _FALSE; u16 efuse_addr = *pAddr; u8 badworden = 0; u32 PgWriteSuccess = 0; @@ -2040,15 +2040,15 @@ hal_EfusePgPacketWriteData( return bRet; } -static BOOLEAN +static bool hal_EfusePgPacketWriteHeader( PADAPTER pAdapter, u8 efuseType, u16 *pAddr, PPGPKT_STRUCT pTargetPkt, - BOOLEAN bPseudoTest) + bool bPseudoTest) { - BOOLEAN bRet = _FALSE; + bool bRet = _FALSE; if (pTargetPkt->offset >= EFUSE_MAX_SECTION_BASE) bRet = hal_EfusePgPacketWrite2ByteHeader(pAdapter, efuseType, pAddr, pTargetPkt, bPseudoTest); @@ -2058,7 +2058,7 @@ hal_EfusePgPacketWriteHeader( return bRet; } -static BOOLEAN +static bool wordEnMatched( PPGPKT_STRUCT pTargetPkt, PPGPKT_STRUCT pCurPkt, @@ -2094,15 +2094,15 @@ wordEnMatched( return _FALSE; } -static BOOLEAN +static bool hal_EfuseCheckIfDatafollowed( PADAPTER pAdapter, u8 word_cnts, u16 startAddr, - BOOLEAN bPseudoTest + bool bPseudoTest ) { - BOOLEAN bRet = _FALSE; + bool bRet = _FALSE; u8 i, efuse_data; for (i = 0; i < (word_cnts * 2) ; i++) { @@ -2113,16 +2113,16 @@ hal_EfuseCheckIfDatafollowed( return bRet; } -static BOOLEAN +static bool hal_EfusePartialWriteCheck( PADAPTER pAdapter, u8 efuseType, u16 *pAddr, PPGPKT_STRUCT pTargetPkt, - BOOLEAN bPseudoTest + 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; @@ -2212,11 +2212,11 @@ hal_EfusePartialWriteCheck( return bRet; } -static BOOLEAN +static bool hal_EfusePgCheckAvailableAddr( PADAPTER pAdapter, u8 efuseType, - BOOLEAN bPseudoTest + bool bPseudoTest ) { u16 efuse_max_available_len = 0; @@ -2252,13 +2252,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( PADAPTER pAdapter, u8 offset, u8 word_en, u8 *pData, - BOOLEAN bPseudoTest + bool bPseudoTest ) { PGPKT_STRUCT targetPkt; @@ -2282,13 +2282,13 @@ hal_EfusePgPacketWrite_BT( return _TRUE; } -static BOOLEAN +static bool hal_EfusePgPacketWrite_8188e( PADAPTER pAdapter, u8 offset, u8 word_en, u8 *pData, - BOOLEAN bPseudoTest + bool bPseudoTest ) { PGPKT_STRUCT targetPkt; @@ -2318,7 +2318,7 @@ Hal_EfusePgPacketWrite_Pseudo(PADAPTER pAdapter, u8 offset, u8 word_en, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { int ret; @@ -2332,7 +2332,7 @@ Hal_EfusePgPacketWrite(PADAPTER pAdapter, u8 offset, u8 word_en, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { int ret = 0; ret = hal_EfusePgPacketWrite_8188e(pAdapter, offset, word_en, data, bPseudoTest); @@ -2346,7 +2346,7 @@ rtl8188e_Efuse_PgPacketWrite(PADAPTER pAdapter, u8 offset, u8 word_en, u8 *data, - BOOLEAN bPseudoTest) + bool bPseudoTest) { int ret; @@ -2705,7 +2705,7 @@ Hal_EfuseParseIDCode88E( void Hal_ReadPowerSavingMode88E( PADAPTER padapter, u8 *hwinfo, - BOOLEAN AutoLoadFail + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -2741,7 +2741,7 @@ void Hal_ReadTxPowerInfo88E( PADAPTER padapter, u8 *PROMContent, - BOOLEAN AutoLoadFail + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -2769,7 +2769,7 @@ void Hal_EfuseParseXtal_8188E( PADAPTER pAdapter, u8 *hwinfo, - BOOLEAN AutoLoadFail + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -2787,7 +2787,7 @@ void Hal_ReadPAType_8188E( PADAPTER Adapter, u8 *PROMContent, - BOOLEAN AutoloadFail + bool AutoloadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2846,7 +2846,7 @@ void Hal_ReadAmplifierType_8188E( PADAPTER Adapter, pu1Byte PROMContent, - BOOLEAN AutoloadFail + bool AutoloadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2884,7 +2884,7 @@ void Hal_ReadRFEType_8188E( PADAPTER Adapter, pu1Byte PROMContent, - BOOLEAN AutoloadFail + bool AutoloadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2930,7 +2930,7 @@ void Hal_EfuseParseBoardType88E( PADAPTER pAdapter, u8 *hwinfo, - BOOLEAN AutoLoadFail + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -2948,7 +2948,7 @@ void Hal_EfuseParseEEPROMVer88E( PADAPTER padapter, u8 *hwinfo, - BOOLEAN AutoLoadFail + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -2965,7 +2965,7 @@ void rtl8188e_EfuseParseChnlPlan( PADAPTER padapter, u8 *hwinfo, - BOOLEAN AutoLoadFail + bool AutoLoadFail ) { padapter->mlmepriv.ChannelPlan = hal_com_config_channel_plan( @@ -2983,7 +2983,7 @@ void Hal_EfuseParseCustomerID88E( PADAPTER padapter, u8 *hwinfo, - BOOLEAN AutoLoadFail + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -3004,7 +3004,7 @@ void Hal_ReadAntennaDiversity88E( PADAPTER pAdapter, u8 *PROMContent, - BOOLEAN AutoLoadFail + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -3041,7 +3041,7 @@ void Hal_ReadThermalMeter_88E( PADAPTER Adapter, u8 *PROMContent, - BOOLEAN AutoloadFail + bool AutoloadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -3070,7 +3070,7 @@ Hal_ReadThermalMeter_88E( void Hal_ReadRFGainOffset( PADAPTER Adapter, u8 *PROMContent, - BOOLEAN AutoloadFail) + bool AutoloadFail) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u8 thermal_offset = 0; @@ -3128,7 +3128,7 @@ void Hal_ReadRFGainOffset( #endif /*CONFIG_RF_POWER_TRIM*/ -BOOLEAN HalDetectPwrDownMode88E(PADAPTER Adapter) +bool HalDetectPwrDownMode88E(PADAPTER Adapter) { u8 tmpvalue = 0; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -3954,7 +3954,7 @@ void SetHwReg8188E(_adapter *adapter, u8 variable, u8 *val) break; 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; rtw_write8(adapter, REG_RRSR + 2, regTmp); diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c index a0d3485..db2d12c 100644 --- a/hal/rtl8188e_phycfg.c +++ b/hal/rtl8188e_phycfg.c @@ -49,12 +49,12 @@ * */ #if (SIC_ENABLE == 1) -static BOOLEAN +static bool sic_IsSICReady( PADAPTER Adapter ) { - BOOLEAN bRet = _FALSE; + bool bRet = _FALSE; u32 retryCnt = 0; u8 sic_cmd = 0xff; @@ -264,7 +264,7 @@ SIC_Init( #endif } -static BOOLEAN +static bool SIC_LedOff( PADAPTER Adapter ) @@ -1237,7 +1237,7 @@ PHY_GetTxPowerIndex_8188E( u8 base_idx = 0, power_idx = 0; s8 by_rate_diff = 0, limit = 0, tpt_offset = 0, extra_bias = 0; u8 txNum = phy_GetCurrentTxNum_8188E(pAdapter, Rate); - BOOLEAN bIn24G = _FALSE; + bool bIn24G = _FALSE; base_idx = PHY_GetTxPowerIndexBase(pAdapter, RFPath, Rate, BandWidth, Channel, &bIn24G); @@ -1274,7 +1274,7 @@ PHY_GetTxPowerIndex_8188E( * A mode. * By Bruce, 2008-02-04. * */ -BOOLEAN +bool PHY_UpdateTxPowerDbm8188E( PADAPTER Adapter, int powerInDbm @@ -1545,7 +1545,7 @@ PHY_SwChnl8188E(/* Call after initialization */ { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u8 tmpchannel = pHalData->current_channel; - BOOLEAN bResult = _TRUE; + bool bResult = _TRUE; if (pHalData->rf_chip == RF_PSEUDO_11N) return; /* return immediately if it is peudo-phy */ @@ -1607,8 +1607,8 @@ PHY_SetSwChnlBWMode8188E( static void _PHY_SetRFPathSwitch( PADAPTER pAdapter, - BOOLEAN bMain, - BOOLEAN is2T + bool bMain, + bool is2T ) { u8 u1bTmp; @@ -1637,9 +1637,9 @@ static void _PHY_SetRFPathSwitch( /* return value TRUE => Main; FALSE => Aux */ -static BOOLEAN _PHY_QueryRFPathSwitch( +static bool _PHY_QueryRFPathSwitch( PADAPTER pAdapter, - BOOLEAN is2T + bool is2T ) { /* if(is2T) diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index 4bf9e53..3181529 100644 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -52,14 +52,14 @@ _ConfigNormalChipOutEP_8188E( } -static BOOLEAN HalUsbSetQueuePipeMapping8188EUsb( +static bool HalUsbSetQueuePipeMapping8188EUsb( PADAPTER pAdapter, u8 NumInPipe, u8 NumOutPipe ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); - BOOLEAN result = _FALSE; + bool result = _FALSE; _ConfigNormalChipOutEP_8188E(pAdapter, NumOutPipe); @@ -303,7 +303,7 @@ _InitQueueReservedPage( u32 numPubQ = 0x00; u32 value32; u8 value8; - BOOLEAN bWiFiConfig = pregistrypriv->wifi_spec; + bool bWiFiConfig = pregistrypriv->wifi_spec; if (bWiFiConfig || pregistrypriv->qos_opt_enable) { if (pHalData->OutEpQueueSel & TX_SELE_HQ) @@ -669,7 +669,7 @@ _InitEDCA( static void _InitBeaconMaxError( PADAPTER Adapter, - BOOLEAN InfraMode + bool InfraMode ) { @@ -872,7 +872,7 @@ InitUsbAggregationSetting( static void HalRxAggr8188EUsb( PADAPTER Adapter, - BOOLEAN Value + bool Value ) { } @@ -966,8 +966,8 @@ _InitRFType( static void _BeaconFunctionEnable( PADAPTER Adapter, - BOOLEAN Enable, - BOOLEAN Linked + bool Enable, + bool Linked ) { rtw_write8(Adapter, REG_BCN_CTRL, (BIT4 | BIT3 | BIT1)); @@ -1682,7 +1682,7 @@ static void _ReadLEDSetting( PADAPTER Adapter, u8 *PROMContent, - BOOLEAN AutoloadFail + bool AutoloadFail ) { struct led_priv *pledpriv = &(Adapter->ledpriv); @@ -1705,7 +1705,7 @@ static void _ReadRFSetting( PADAPTER Adapter, u8 *PROMContent, - BOOLEAN AutoloadFail + bool AutoloadFail ) { } @@ -1721,7 +1721,7 @@ static void Hal_EfuseParsePIDVID_8188EU( PADAPTER pAdapter, u8 *hwinfo, - BOOLEAN AutoLoadFail + bool AutoLoadFail ) { diff --git a/include/Hal8188EPhyCfg.h b/include/Hal8188EPhyCfg.h index 8267714..8033a5d 100644 --- a/include/Hal8188EPhyCfg.h +++ b/include/Hal8188EPhyCfg.h @@ -91,7 +91,7 @@ int rtl8188e_PHY_ConfigRFWithParaFile(PADAPTER Adapter, u8 *pFileName, u8 eRFPat /* * RF Power setting */ -/* extern BOOLEAN PHY_SetRFPowerState(PADAPTER Adapter, +/* extern bool PHY_SetRFPowerState(PADAPTER Adapter, * RT_RF_POWER_STATE eRFPowerState); */ /* @@ -101,7 +101,7 @@ void PHY_GetTxPowerLevel8188E(PADAPTER Adapter, s32 *powerlevel); void PHY_SetTxPowerLevel8188E(PADAPTER Adapter, u8 channel); -BOOLEAN PHY_UpdateTxPowerDbm8188E(PADAPTER Adapter, +bool PHY_UpdateTxPowerDbm8188E(PADAPTER Adapter, int powerInDbm); void @@ -133,7 +133,7 @@ void PHY_SetBWMode8188E(PADAPTER pAdapter, /* * Set FW CMD IO for 8192S. */ -/* extern BOOLEAN HalSetIO8192C(PADAPTER Adapter, +/* extern bool HalSetIO8192C(PADAPTER Adapter, * IO_TYPE IOType); */ /* @@ -179,7 +179,7 @@ PHY_EnableHostClkReq( PADAPTER Adapter ); -BOOLEAN +bool SetAntennaConfig92C( PADAPTER Adapter, u8 DefaultAnt diff --git a/include/basic_types.h b/include/basic_types.h index 32ecad1..bd2d7b9 100644 --- a/include/basic_types.h +++ b/include/basic_types.h @@ -52,10 +52,6 @@ #define UINT u32 #define ULONG u32 - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) - typedef _Bool bool; - #endif - typedef void (*proc_t)(void *); typedef __kernel_size_t SIZE_T; @@ -278,8 +274,6 @@ /* 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, boolean; - #define TEST_FLAG(__Flag, __testFlag) (((__Flag) & (__testFlag)) != 0) #define SET_FLAG(__Flag, __setFlag) ((__Flag) |= __setFlag) #define CLEAR_FLAG(__Flag, __clearFlag) ((__Flag) &= ~(__clearFlag)) diff --git a/include/drv_types.h b/include/drv_types.h index 46cb432..5b9b0af 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -257,7 +257,7 @@ struct registry_priv { u8 bt_ampdu; u8 ant_num; #endif - BOOLEAN bAcceptAddbaReq; + bool bAcceptAddbaReq; u8 antdiv_cfg; u8 antdiv_type; @@ -343,7 +343,7 @@ struct registry_priv { s8 adaptivity_th_edcca_hl_diff; u8 boffefusemask; - BOOLEAN bFileMaskEfuse; + bool bFileMaskEfuse; #ifdef CONFIG_AUTO_CHNL_SEL_NHM u8 acs_mode; u8 acs_auto_scan; diff --git a/include/hal_com.h b/include/hal_com.h index d10a917..77b1876 100644 --- a/include/hal_com.h +++ b/include/hal_com.h @@ -354,12 +354,12 @@ u8 hal_com_config_channel_plan( char *sw_alpha2, u8 sw_chplan, u8 def_chplan, - BOOLEAN AutoLoadFail + bool AutoLoadFail ); int hal_config_macaddr(_adapter *adapter, bool autoload_fail); -BOOLEAN +bool HAL_IsLegalChannel( PADAPTER Adapter, u32 Channel @@ -374,7 +374,7 @@ void HalSetBrateCfg( u8 *mBratesOS, u16 *pBrateCfg); -BOOLEAN +bool Hal_MappingOutPipe( PADAPTER pAdapter, u8 NumOutPipe @@ -424,7 +424,7 @@ void rtw_hal_reqtxrpt(_adapter *padapter, u8 macid); u8 SetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value); u8 GetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value); -BOOLEAN +bool eqNByte( u8 *str1, u8 *str2, @@ -436,14 +436,14 @@ MapCharToHexDigit( char chTmp ); -BOOLEAN +bool GetHexValueFromString( char *szStr, u32 *pu4bVal, u32 *pu4bMove ); -BOOLEAN +bool GetFractionValueFromString( char *szStr, u8 *pInteger, @@ -451,12 +451,12 @@ GetFractionValueFromString( u32 *pu4bMove ); -BOOLEAN +bool IsCommentString( char *szStr ); -BOOLEAN +bool ParseQualifiedString( char *In, u32 *Start, @@ -465,13 +465,13 @@ ParseQualifiedString( char RightQualifier ); -BOOLEAN +bool GetU1ByteIntegerFromStringInDecimal( char *Str, u8 *pInt ); -BOOLEAN +bool isAllSpaceOrTab( u8 *data, u8 size @@ -514,7 +514,7 @@ void SetHalODMVar( PADAPTER Adapter, HAL_ODM_VARIABLE eVariable, void * pValue1, - BOOLEAN bSet); + bool bSet); #ifdef CONFIG_BACKGROUND_NOISE_MONITOR struct noise_info { diff --git a/include/hal_com_led.h b/include/hal_com_led.h index 6ef4974..377e7d3 100644 --- a/include/hal_com_led.h +++ b/include/hal_com_led.h @@ -192,17 +192,17 @@ typedef struct _LED_USB { LED_PIN LedPin; /* Identify how to implement this SW led. */ LED_STATE CurrLedState; /* Current LED state. */ - BOOLEAN bLedOn; /* TRUE if LED is ON, FALSE if LED is OFF. */ + bool bLedOn; /* TRUE if LED is ON, FALSE if LED is OFF. */ - BOOLEAN bSWLedCtrl; + bool bSWLedCtrl; - BOOLEAN bLedBlinkInProgress; /* TRUE if it is blinking, FALSE o.w.. */ + bool bLedBlinkInProgress; /* TRUE if it is blinking, FALSE o.w.. */ /* ALPHA, added by chiyoko, 20090106 */ - BOOLEAN bLedNoLinkBlinkInProgress; - BOOLEAN bLedLinkBlinkInProgress; - BOOLEAN bLedStartToLinkBlinkInProgress; - BOOLEAN bLedScanBlinkInProgress; - BOOLEAN bLedWPSBlinkInProgress; + bool bLedNoLinkBlinkInProgress; + bool bLedLinkBlinkInProgress; + bool bLedStartToLinkBlinkInProgress; + bool bLedScanBlinkInProgress; + bool bLedWPSBlinkInProgress; u32 BlinkTimes; /* Number of times to toggle led state for blinking. */ u8 BlinkCounter; /* Added for turn off overlap led after blinking a while, by page, 20120821 */ diff --git a/include/hal_com_phycfg.h b/include/hal_com_phycfg.h index 1522fa4..e0c5242 100644 --- a/include/hal_com_phycfg.h +++ b/include/hal_com_phycfg.h @@ -191,7 +191,7 @@ PHY_GetTxPowerIndexBase( u8 Rate, CHANNEL_WIDTH BandWidth, u8 Channel, - PBOOLEAN bIn24G + bool * bIn24G ); s8 diff --git a/include/hal_data.h b/include/hal_data.h index 95cf694..7e98760 100755 --- a/include/hal_data.h +++ b/include/hal_data.h @@ -266,16 +266,16 @@ typedef struct hal_com_data { u8 CurrentCenterFrequencyIndex1; u8 nCur40MhzPrimeSC; /* Control channel sub-carrier */ u8 nCur80MhzPrimeSC; /* used for primary 40MHz of 80MHz mode */ - BOOLEAN bSwChnlAndSetBWInProgress; + bool bSwChnlAndSetBWInProgress; u8 bDisableSWChannelPlan; /* flag of disable software change channel plan */ u16 BasicRateSet; u32 ReceiveConfig; u8 rx_tsf_addr_filter_config; /* for 8822B/8821C USE */ - BOOLEAN bSwChnl; - BOOLEAN bSetChnlBW; - BOOLEAN bSWToBW40M; - BOOLEAN bSWToBW80M; - BOOLEAN bChnlBWInitialized; + bool bSwChnl; + bool bSetChnlBW; + bool bSWToBW40M; + bool bSWToBW80M; + bool bChnlBWInitialized; u32 BackUp_BB_REG_4_2nd_CCA[3]; #ifdef CONFIG_AUTO_CHNL_SEL_NHM struct auto_chan_sel acs; @@ -455,7 +455,7 @@ typedef struct hal_com_data { u32 RfRegChnlVal[MAX_RF_PATH]; /* RDG enable */ - BOOLEAN bRDGEnable; + bool bRDGEnable; u8 RegTxPause; /* Beacon function related global variable. */ @@ -494,7 +494,7 @@ typedef struct hal_com_data { /* 2010/08/09 MH Add CU power down mode. */ - BOOLEAN pwrdown; + bool pwrdown; /* Add for dual MAC 0--Mac0 1--Mac1 */ u32 interfaceIndex; @@ -524,10 +524,10 @@ typedef struct hal_com_data { /* 2010/12/10 MH Add for USB aggreation mode dynamic shceme. */ - BOOLEAN UsbRxHighSpeedMode; - BOOLEAN UsbTxVeryHighSpeedMode; + bool UsbRxHighSpeedMode; + bool UsbTxVeryHighSpeedMode; u32 UsbBulkOutSize; - BOOLEAN bSupportUSB3; + bool bSupportUSB3; u8 usb_intf_start; /* Interrupt relatd register information. */ @@ -587,7 +587,7 @@ typedef struct hal_com_data { #endif u8 RfKFreeEnable; u8 RfKFree_ch_group; - BOOLEAN bCCKinCH14; + bool bCCKinCH14; BB_INIT_REGISTER RegForRecover[5]; u32 RxGainOffset[4]; /*{2G, 5G_Low, 5G_Middle, G_High}*/ diff --git a/include/hal_intf.h b/include/hal_intf.h index a228492..0278020 100644 --- a/include/hal_intf.h +++ b/include/hal_intf.h @@ -342,7 +342,7 @@ struct hal_ops { u8(*SetHalDefVarHandler)(_adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); void (*GetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1, void * pValue2); - void (*SetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1, BOOLEAN bSet); + void (*SetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1, bool bSet); void (*update_ra_mask_handler)(_adapter *padapter, struct sta_info *psta, struct macid_cfg *h2c_macid_cfg); void (*SetBeaconRelatedRegistersHandler)(_adapter *padapter); @@ -360,13 +360,13 @@ struct hal_ops { void (*EfusePowerSwitch)(_adapter *padapter, u8 bWrite, u8 PwrState); void (*BTEfusePowerSwitch)(_adapter *padapter, u8 bWrite, u8 PwrState); - void (*ReadEFuse)(_adapter *padapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, BOOLEAN bPseudoTest); - void (*EFUSEGetEfuseDefinition)(_adapter *padapter, u8 efuseType, u8 type, void *pOut, BOOLEAN bPseudoTest); - u16(*EfuseGetCurrentSize)(_adapter *padapter, u8 efuseType, BOOLEAN bPseudoTest); - int (*Efuse_PgPacketRead)(_adapter *padapter, u8 offset, u8 *data, BOOLEAN bPseudoTest); - int (*Efuse_PgPacketWrite)(_adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); - u8(*Efuse_WordEnableDataWrite)(_adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, BOOLEAN bPseudoTest); - BOOLEAN(*Efuse_PgPacketWrite_BT)(_adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); + void (*ReadEFuse)(_adapter *padapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, bool bPseudoTest); + void (*EFUSEGetEfuseDefinition)(_adapter *padapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest); + u16(*EfuseGetCurrentSize)(_adapter *padapter, u8 efuseType, bool bPseudoTest); + int (*Efuse_PgPacketRead)(_adapter *padapter, u8 offset, u8 *data, bool bPseudoTest); + int (*Efuse_PgPacketWrite)(_adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest); + u8(*Efuse_WordEnableDataWrite)(_adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest); + bool(*Efuse_PgPacketWrite_BT)(_adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest); #ifdef DBG_CONFIG_ERROR_DETECT void (*sreset_init_value)(_adapter *padapter); @@ -392,7 +392,7 @@ struct hal_ops { s32(*fill_h2c_cmd)(PADAPTER, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer); void (*fill_fake_txdesc)(PADAPTER, u8 *pDesc, u32 BufferLen, u8 IsPsPoll, u8 IsBTQosNull, u8 bDataFrame); - s32(*fw_dl)(_adapter *adapter, u8 wowlan); + s32(*fw_dl)(_adapter *adapter, bool wowlan); #if defined(CONFIG_WOWLAN) || defined(CONFIG_AP_WOWLAN) void (*clear_interrupt)(_adapter *padapter); @@ -519,7 +519,7 @@ void rtw_hal_read_chip_version(_adapter *padapter); u8 rtw_hal_set_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); u8 rtw_hal_get_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); -void rtw_hal_set_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1, BOOLEAN bSet); +void rtw_hal_set_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1, bool bSet); void rtw_hal_get_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1, void * pValue2); void rtw_hal_enable_interrupt(_adapter *padapter); diff --git a/include/hal_phy.h b/include/hal_phy.h index 37bc4d2..3bece6c 100644 --- a/include/hal_phy.h +++ b/include/hal_phy.h @@ -194,7 +194,7 @@ PHY_RFShadowWrite( u32 Offset, u32 Data); -BOOLEAN +bool PHY_RFShadowCompare( PADAPTER Adapter, u8 eRFPath, diff --git a/include/osdep_service.h b/include/osdep_service.h index 2606818..93399ac 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -599,11 +599,11 @@ u8 map_read8(const struct map_t *map, u16 offset); /* String handler */ -BOOLEAN is_null(char c); -BOOLEAN is_eol(char c); -BOOLEAN is_space(char c); -BOOLEAN IsHexDigit(char chTmp); -BOOLEAN is_alpha(char chTmp); +bool is_null(char c); +bool is_eol(char c); +bool is_space(char c); +bool IsHexDigit(char chTmp); +bool is_alpha(char chTmp); char alpha_to_upper(char c); /* diff --git a/include/rtl8188e_hal.h b/include/rtl8188e_hal.h index dcadf32..f88133a 100644 --- a/include/rtl8188e_hal.h +++ b/include/rtl8188e_hal.h @@ -225,7 +225,7 @@ Total page numbers : 176(0xB0) / 256(0x100) /* rtl8188e_hal_init.c */ -s32 rtl8188e_FirmwareDownload(PADAPTER padapter, BOOLEAN bUsedWoWLANFw); +s32 rtl8188e_FirmwareDownload(PADAPTER padapter, bool bUsedWoWLANFw); void _8051Reset88E(PADAPTER padapter); void rtl8188e_InitializeFirmwareVars(PADAPTER padapter); @@ -236,21 +236,21 @@ s32 InitLLTTable(PADAPTER padapter, u8 txpktbuf_bndy); u8 GetEEPROMSize8188E(PADAPTER padapter); void Hal_InitPGData88E(PADAPTER padapter); void Hal_EfuseParseIDCode88E(PADAPTER padapter, u8 *hwinfo); -void Hal_ReadTxPowerInfo88E(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); +void Hal_ReadTxPowerInfo88E(PADAPTER padapter, u8 *hwinfo, bool AutoLoadFail); -void Hal_EfuseParseEEPROMVer88E(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void rtl8188e_EfuseParseChnlPlan(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void Hal_EfuseParseCustomerID88E(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void Hal_ReadAntennaDiversity88E(PADAPTER pAdapter, u8 *PROMContent, BOOLEAN AutoLoadFail); -void Hal_ReadThermalMeter_88E(PADAPTER Adapter, u8 *PROMContent, BOOLEAN AutoloadFail); -void Hal_EfuseParseXtal_8188E(PADAPTER pAdapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void Hal_EfuseParseBoardType88E(PADAPTER pAdapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void Hal_ReadPowerSavingMode88E(PADAPTER pAdapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void Hal_ReadPAType_8188E(PADAPTER Adapter, u8 *PROMContent, BOOLEAN AutoloadFail); -void Hal_ReadAmplifierType_8188E(PADAPTER Adapter, u8 *PROMContent, BOOLEAN AutoloadFail); -void Hal_ReadRFEType_8188E(PADAPTER Adapter, u8 *PROMContent, BOOLEAN AutoloadFail); +void Hal_EfuseParseEEPROMVer88E(PADAPTER padapter, u8 *hwinfo, bool AutoLoadFail); +void rtl8188e_EfuseParseChnlPlan(PADAPTER padapter, u8 *hwinfo, bool AutoLoadFail); +void Hal_EfuseParseCustomerID88E(PADAPTER padapter, u8 *hwinfo, bool AutoLoadFail); +void Hal_ReadAntennaDiversity88E(PADAPTER pAdapter, u8 *PROMContent, bool AutoLoadFail); +void Hal_ReadThermalMeter_88E(PADAPTER Adapter, u8 *PROMContent, bool AutoloadFail); +void Hal_EfuseParseXtal_8188E(PADAPTER pAdapter, u8 *hwinfo, bool AutoLoadFail); +void Hal_EfuseParseBoardType88E(PADAPTER pAdapter, u8 *hwinfo, bool AutoLoadFail); +void Hal_ReadPowerSavingMode88E(PADAPTER pAdapter, u8 *hwinfo, bool AutoLoadFail); +void Hal_ReadPAType_8188E(PADAPTER Adapter, u8 *PROMContent, bool AutoloadFail); +void Hal_ReadAmplifierType_8188E(PADAPTER Adapter, u8 *PROMContent, bool AutoloadFail); +void Hal_ReadRFEType_8188E(PADAPTER Adapter, u8 *PROMContent, bool AutoloadFail); -BOOLEAN HalDetectPwrDownMode88E(PADAPTER Adapter); +bool HalDetectPwrDownMode88E(PADAPTER Adapter); #if defined(CONFIG_WOWLAN) || defined(CONFIG_AP_WOWLAN) void Hal_DetectWoWMode(PADAPTER pAdapter); @@ -258,7 +258,7 @@ BOOLEAN HalDetectPwrDownMode88E(PADAPTER Adapter); #ifdef CONFIG_RF_POWER_TRIM - void Hal_ReadRFGainOffset(PADAPTER pAdapter, u8 *hwinfo, BOOLEAN AutoLoadFail); + void Hal_ReadRFGainOffset(PADAPTER pAdapter, u8 *hwinfo, bool AutoLoadFail); #endif /*CONFIG_RF_POWER_TRIM*/ void rtl8188e_init_default_value(_adapter *adapter); diff --git a/include/rtw_beamforming.h b/include/rtw_beamforming.h index 8206cc4..0923897 100644 --- a/include/rtw_beamforming.h +++ b/include/rtw_beamforming.h @@ -310,8 +310,8 @@ typedef enum _SOUNDING_MODE { } SOUNDING_MODE, *PSOUNDING_MODE; struct beamforming_entry { - BOOLEAN bUsed; - BOOLEAN bSound; + bool bUsed; + bool bSound; u16 aid; /* Used to construct AID field of NDPA packet. */ u16 mac_id; /* Used to Set Reg42C in IBSS mode. */ u16 p_aid; /* Used to fill Reg42C & Reg714 to compare with P_AID of Tx DESC. */ @@ -330,7 +330,7 @@ struct beamforming_entry { u8 LogStatusFailCnt; u8 PreCsiReport[327]; u8 DefaultCsiCnt; - BOOLEAN bDefaultCSI; + bool bDefaultCSI; }; struct sounding_info { @@ -360,10 +360,10 @@ BEAMFORMING_CAP beamforming_get_entry_beam_cap_by_mac_id(void * pmlmepriv , u8 m void beamforming_notify(PADAPTER adapter); BEAMFORMING_CAP beamforming_get_beamform_cap(struct beamforming_info *pBeamInfo); -BOOLEAN beamforming_send_ht_ndpa_packet(PADAPTER Adapter, u8 *ra, CHANNEL_WIDTH bw, u8 qidx); -BOOLEAN beamforming_send_vht_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, CHANNEL_WIDTH bw, u8 qidx); +bool beamforming_send_ht_ndpa_packet(PADAPTER Adapter, u8 *ra, CHANNEL_WIDTH bw, u8 qidx); +bool beamforming_send_vht_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, CHANNEL_WIDTH bw, u8 qidx); -void beamforming_check_sounding_success(PADAPTER Adapter, BOOLEAN status); +void beamforming_check_sounding_success(PADAPTER Adapter, bool status); void beamforming_watchdog(PADAPTER Adapter); #endif /*#if (BEAMFORMING_SUPPORT ==0)- for diver defined beamforming*/ diff --git a/include/rtw_btcoex.h b/include/rtw_btcoex.h index e2d6ec5..08eb8c8 100644 --- a/include/rtw_btcoex.h +++ b/include/rtw_btcoex.h @@ -117,7 +117,7 @@ typedef struct _HCI_EXT_CONFIG { u1Byte CurrentBTStatus; u2Byte HCIExtensionVer; - BOOLEAN bEnableWifiScanNotify; + bool bEnableWifiScanNotify; } HCI_EXT_CONFIG, *PHCI_EXT_CONFIG; typedef struct _HCI_PHY_LINK_BSS_INFO { @@ -314,10 +314,10 @@ typedef enum _HCI_EXT_BT_OPERATION { } HCI_EXT_BT_OPERATION, *PHCI_EXT_BT_OPERATION; typedef struct _BT_MGNT { - BOOLEAN bBTConnectInProgress; - BOOLEAN bLogLinkInProgress; - BOOLEAN bPhyLinkInProgress; - BOOLEAN bPhyLinkInProgressStartLL; + bool bBTConnectInProgress; + bool bLogLinkInProgress; + bool bPhyLinkInProgress; + bool bPhyLinkInProgressStartLL; u1Byte BtCurrentPhyLinkhandle; u2Byte BtCurrentLogLinkhandle; u1Byte CurrentConnectEntryNum; @@ -327,21 +327,21 @@ typedef struct _BT_MGNT { BT_CONNECT_TYPE BTReceiveConnectPkt; u1Byte BTAuthCount; u1Byte BTAsocCount; - BOOLEAN bStartSendSupervisionPkt; - BOOLEAN BtOperationOn; - BOOLEAN BTNeedAMPStatusChg; - BOOLEAN JoinerNeedSendAuth; + bool bStartSendSupervisionPkt; + bool BtOperationOn; + bool BTNeedAMPStatusChg; + bool JoinerNeedSendAuth; HCI_PHY_LINK_BSS_INFO bssDesc; HCI_EXT_CONFIG ExtConfig; - BOOLEAN bNeedNotifyAMPNoCap; - BOOLEAN bCreateSpportQos; - BOOLEAN bSupportProfile; + bool bNeedNotifyAMPNoCap; + bool bCreateSpportQos; + bool bSupportProfile; u1Byte BTChannel; - BOOLEAN CheckChnlIsSuit; - BOOLEAN bBtScan; - BOOLEAN btLogoTest; - BOOLEAN bRfStatusNotified; - BOOLEAN bBtRsvedPageDownload; + bool CheckChnlIsSuit; + bool bBtScan; + bool btLogoTest; + bool bRfStatusNotified; + bool bBtRsvedPageDownload; } BT_MGNT, *PBT_MGNT; struct bt_coex_info { diff --git a/include/rtw_efuse.h b/include/rtw_efuse.h index bfe732d..c73c488 100644 --- a/include/rtw_efuse.h +++ b/include/rtw_efuse.h @@ -193,20 +193,20 @@ u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data); u8 rtw_BT_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data); u8 rtw_BT_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data); -u16 Efuse_GetCurrentSize(PADAPTER pAdapter, u8 efuseType, BOOLEAN bPseudoTest); +u16 Efuse_GetCurrentSize(PADAPTER pAdapter, u8 efuseType, bool bPseudoTest); u8 Efuse_CalculateWordCnts(u8 word_en); -void ReadEFuseByte(PADAPTER Adapter, u16 _offset, u8 *pbuf, BOOLEAN bPseudoTest) ; -void EFUSE_GetEfuseDefinition(PADAPTER pAdapter, u8 efuseType, u8 type, void *pOut, BOOLEAN bPseudoTest); -u8 efuse_OneByteRead(PADAPTER pAdapter, u16 addr, u8 *data, BOOLEAN bPseudoTest); -u8 efuse_OneByteWrite(PADAPTER pAdapter, u16 addr, u8 data, BOOLEAN bPseudoTest); +void ReadEFuseByte(PADAPTER Adapter, u16 _offset, u8 *pbuf, bool bPseudoTest) ; +void EFUSE_GetEfuseDefinition(PADAPTER pAdapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest); +u8 efuse_OneByteRead(PADAPTER pAdapter, u16 addr, u8 *data, bool bPseudoTest); +u8 efuse_OneByteWrite(PADAPTER pAdapter, u16 addr, u8 data, bool bPseudoTest); void BTEfuse_PowerSwitch(PADAPTER pAdapter, u8 bWrite, u8 PwrState); void Efuse_PowerSwitch(PADAPTER pAdapter, u8 bWrite, u8 PwrState); -int Efuse_PgPacketRead(PADAPTER pAdapter, u8 offset, u8 *data, BOOLEAN bPseudoTest); -int Efuse_PgPacketWrite(PADAPTER pAdapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); +int Efuse_PgPacketRead(PADAPTER pAdapter, u8 offset, u8 *data, bool bPseudoTest); +int Efuse_PgPacketWrite(PADAPTER pAdapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest); void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata); -u8 Efuse_WordEnableDataWrite(PADAPTER pAdapter, u16 efuse_addr, u8 word_en, u8 *data, BOOLEAN bPseudoTest); -void EFUSE_ShadowMapUpdate(PADAPTER pAdapter, u8 efuseType, BOOLEAN bPseudoTest); +u8 Efuse_WordEnableDataWrite(PADAPTER pAdapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest); +void EFUSE_ShadowMapUpdate(PADAPTER pAdapter, u8 efuseType, bool bPseudoTest); void EFUSE_ShadowRead(PADAPTER pAdapter, u8 Type, u16 Offset, u32 *Value); void hal_ReadEFuse_BT_logic_map( diff --git a/include/rtw_mlme.h b/include/rtw_mlme.h index 0113fb2..33091bf 100644 --- a/include/rtw_mlme.h +++ b/include/rtw_mlme.h @@ -209,12 +209,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. */ /* u8 TrafficBusyState; */ u8 TrafficTransitionCount; u32 LowPowerTransitionCount; diff --git a/include/rtw_mlme_ext.h b/include/rtw_mlme_ext.h index 8907325..ae3d0a4 100644 --- a/include/rtw_mlme_ext.h +++ b/include/rtw_mlme_ext.h @@ -470,7 +470,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; u8 VHT_enable; @@ -782,7 +782,7 @@ void CAM_empty_entry(PADAPTER Adapter, u8 ucIndex); void flush_all_cam_entry(_adapter *padapter); -BOOLEAN IsLegal5GChannel(PADAPTER Adapter, u8 channel); +bool IsLegal5GChannel(PADAPTER Adapter, u8 channel); void site_survey(_adapter *padapter, u8 survey_channel, RT_SCAN_TYPE ScanType); u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSID_EX *bssid); diff --git a/include/rtw_mp.h b/include/rtw_mp.h index f8ce3a2..da233ed 100644 --- a/include/rtw_mp.h +++ b/include/rtw_mp.h @@ -156,18 +156,18 @@ typedef struct _RT_PMAC_TX_INFO { typedef void (*MPT_WORK_ITEM_HANDLER)(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; struct timer_list 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. */ @@ -178,7 +178,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; @@ -215,30 +215,30 @@ 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. */ + bool bCckContTx; /* TRUE if we are in CCK Continuous Tx test. */ + bool bOfdmContTx; /* TRUE if we are in OFDM Continuous Tx test. */ /* TRUE if we have start Continuous Tx test. */ - BOOLEAN is_start_cont_tx; + bool is_start_cont_tx; /* TRUE if we are in Single Carrier Tx test. */ - BOOLEAN bSingleCarrier; + bool bSingleCarrier; /* TRUE if we are in Carrier Suppression Tx Test. */ - BOOLEAN is_carrier_suppression; + bool is_carrier_suppression; /* TRUE if we are in Single Tone Tx test. */ - BOOLEAN is_single_tone; + bool is_single_tone; /* 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 ~~~! */ @@ -247,7 +247,7 @@ typedef struct _MPT_CONTEXT { /* s4Byte RfReadLine[2]; */ u8 APK_bound[2]; /* for APK path A/path B */ - BOOLEAN bMptIndexEven; + bool bMptIndexEven; u8 backup0xc50; u8 backup0xc58; @@ -268,8 +268,8 @@ typedef struct _MPT_CONTEXT { RT_PMAC_PKT_INFO PMacPktInfo; u8 HWTxmode; - BOOLEAN bldpc; - BOOLEAN bstbc; + bool bldpc; + bool bstbc; } MPT_CONTEXT, *PMPT_CONTEXT; /* #endif */ @@ -358,7 +358,7 @@ struct mp_priv { u32 rx_pktcount_filter_out; u32 rx_crcerrpktcount; u32 rx_pktloss; - BOOLEAN rx_bindicatePkt; + bool rx_bindicatePkt; struct recv_stat rxstat; /* RF/BB relative */ @@ -391,11 +391,11 @@ struct mp_priv { u8 *pmp_xmtframe_buf; _queue free_mp_xmitqueue; u32 free_mp_xmitframe_cnt; - BOOLEAN bSetRxBssid; - BOOLEAN bTxBufCkFail; - BOOLEAN bRTWSmbCfg; - BOOLEAN bloopback; - BOOLEAN bloadefusemap; + bool bSetRxBssid; + bool bTxBufCkFail; + bool bRTWSmbCfg; + bool bloopback; + bool bloadefusemap; MPT_CONTEXT mpt_ctx; @@ -689,7 +689,7 @@ void rtw_mp_trigger_lck(PADAPTER padapter); void hal_mpt_SwitchRfSetting(PADAPTER pAdapter); s32 hal_mpt_SetPowerTracking(PADAPTER padapter, u8 enable); void hal_mpt_GetPowerTracking(PADAPTER padapter, u8 *enable); -void hal_mpt_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14); +void hal_mpt_CCKTxPowerAdjust(PADAPTER Adapter, bool bInCH14); void hal_mpt_SetChannel(PADAPTER pAdapter); void hal_mpt_SetBandwidth(PADAPTER pAdapter); void hal_mpt_SetTxPower(PADAPTER pAdapter); @@ -704,7 +704,7 @@ void hal_mpt_SetSingleCarrierTx(PADAPTER pAdapter, u8 bStart); void hal_mpt_SetSingleToneTx(PADAPTER pAdapter, u8 bStart); void hal_mpt_SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart); void mpt_ProSetPMacTx(PADAPTER Adapter); -void MP_PHY_SetRFPathSwitch(PADAPTER pAdapter , BOOLEAN bMain); +void MP_PHY_SetRFPathSwitch(PADAPTER pAdapter , bool bMain); u8 MP_PHY_QueryRFPathSwitch(PADAPTER pAdapter); ULONG mpt_ProQueryCalTxPower(PADAPTER pAdapter, u8 RfPath); void MPT_PwrCtlDM(PADAPTER padapter, u32 bstart); diff --git a/include/rtw_mp_ioctl.h b/include/rtw_mp_ioctl.h index 8eb0469..a30b499 100644 --- a/include/rtw_mp_ioctl.h +++ b/include/rtw_mp_ioctl.h @@ -70,7 +70,7 @@ typedef struct _DR_VARIABLE_STRUCT_ { /* int mp_start_joinbss(_adapter *padapter, NDIS_802_11_SSID *pssid); */ -/* void _irqlevel_changed_(_irqL *irqlevel, BOOLEANunsigned char bLower); */ +/* void _irqlevel_changed_(_irqL *irqlevel, boolunsigned char bLower); */ #define _irqlevel_changed_(a, b) /* oid_rtl_seg_81_80_00 */ diff --git a/include/rtw_odm.h b/include/rtw_odm.h index e0b26f2..d329a16 100644 --- a/include/rtw_odm.h +++ b/include/rtw_odm.h @@ -47,7 +47,7 @@ u8 rtw_odm_dfs_domain_unknown(_adapter *adapter); void rtw_odm_radar_detect_reset(_adapter *adapter); void rtw_odm_radar_detect_disable(_adapter *adapter); void rtw_odm_radar_detect_enable(_adapter *adapter); -BOOLEAN rtw_odm_radar_detect(_adapter *adapter); +bool rtw_odm_radar_detect(_adapter *adapter); #endif /* CONFIG_DFS_MASTER */ void rtw_odm_parse_rx_phy_status_chinfo(union recv_frame *rframe, u8 *phys); diff --git a/include/rtw_recv.h b/include/rtw_recv.h index ea67896..725847d 100644 --- a/include/rtw_recv.h +++ b/include/rtw_recv.h @@ -331,7 +331,7 @@ struct recv_priv { #endif /* CONFIG_NEW_SIGNAL_STAT_PROCESS */ u16 sink_udpport, pre_rtp_rxseq, cur_rtp_rxseq; - BOOLEAN store_law_data_flag; + bool store_law_data_flag; }; #ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS diff --git a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c index 59ee57d..7ba550c 100644 --- a/os_dep/ioctl_cfg80211.c +++ b/os_dep/ioctl_cfg80211.c @@ -3773,7 +3773,7 @@ static int enum nl80211_iftype type, #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) u32 *flags, - #endif +#endif struct vif_params *params) { int ret = 0; diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index f016c68..5e6e8af 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -1797,7 +1797,7 @@ exit: * Return TRUE if c is null character * FALSE otherwise. */ -inline BOOLEAN is_null(char c) +inline bool is_null(char c) { if (c == '\0') return _TRUE; @@ -1811,7 +1811,7 @@ inline BOOLEAN is_null(char c) * Return TRUE if c is represent for EOL (end of line) * FALSE otherwise. */ -inline BOOLEAN is_eol(char c) +inline bool is_eol(char c) { if (c == '\r' || c == '\n') return _TRUE; @@ -1825,7 +1825,7 @@ inline BOOLEAN is_eol(char c) * Return TRUE if c is represent for space * FALSE otherwise. */ -inline BOOLEAN is_space(char c) +inline bool is_space(char c) { if (c == ' ' || c == '\t') return _TRUE; @@ -1839,7 +1839,7 @@ inline BOOLEAN is_space(char c) * Return TRUE if chTmp is represent for hex digit * FALSE otherwise. */ -inline BOOLEAN IsHexDigit(char chTmp) +inline bool IsHexDigit(char chTmp) { if ((chTmp >= '0' && chTmp <= '9') || (chTmp >= 'a' && chTmp <= 'f') || @@ -1855,7 +1855,7 @@ inline BOOLEAN IsHexDigit(char chTmp) * Return TRUE if chTmp is represent for alphabet * FALSE otherwise. */ -inline BOOLEAN is_alpha(char chTmp) +inline bool is_alpha(char chTmp) { if ((chTmp >= 'a' && chTmp <= 'z') || (chTmp >= 'A' && chTmp <= 'Z')) diff --git a/os_dep/rtw_proc.c b/os_dep/rtw_proc.c index 6c2990d..c0b5c9c 100644 --- a/os_dep/rtw_proc.c +++ b/os_dep/rtw_proc.c @@ -585,9 +585,9 @@ static ssize_t proc_set_rx_info_msg(struct file *file, const char __user *buffer if (buffer && !copy_from_user(tmp, buffer, count)) { int num = sscanf(tmp, "%d", &phy_info_flag); - precvpriv->store_law_data_flag = (BOOLEAN) phy_info_flag; + precvpriv->store_law_data_flag = (bool) phy_info_flag; - /*RTW_INFO("precvpriv->store_law_data_flag = %d\n",( BOOLEAN )(precvpriv->store_law_data_flag));*/ + /*RTW_INFO("precvpriv->store_law_data_flag = %d\n",( bool )(precvpriv->store_law_data_flag));*/ } return count; }