From 06334102cdb934ca42ffc36ef9d97559d62f2e8a Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sun, 28 Dec 2014 20:13:24 -0600 Subject: [PATCH] rtl8188eu: Replace _FALSE and _TRUE Signed-off-by: Larry Finger --- core/rtw_ap.c | 244 ++++++++++---------- core/rtw_cmd.c | 112 +++++----- core/rtw_debug.c | 2 +- core/rtw_eeprom.c | 60 ++--- core/rtw_efuse.c | 82 +++---- core/rtw_ieee80211.c | 84 +++---- core/rtw_io.c | 20 +- core/rtw_ioctl_rtl.c | 10 +- core/rtw_ioctl_set.c | 228 +++++++++---------- core/rtw_iol.c | 10 +- core/rtw_led.c | 468 +++++++++++++++++++-------------------- core/rtw_mlme.c | 278 +++++++++++------------ core/rtw_mlme_ext.c | 436 ++++++++++++++++++------------------ core/rtw_mp_ioctl.c | 22 +- core/rtw_p2p.c | 192 ++++++++-------- core/rtw_pwrctrl.c | 214 +++++++++--------- core/rtw_recv.c | 166 +++++++------- core/rtw_security.c | 14 +- core/rtw_sreset.c | 20 +- core/rtw_sta_mgt.c | 34 +-- core/rtw_tdls.c | 64 +++--- core/rtw_wlan_util.c | 130 +++++------ core/rtw_xmit.c | 180 +++++++-------- hal/HalPhyRf_8188e.c | 2 +- hal/HalPwrSeqCmd.c | 12 +- hal/hal_com.c | 14 +- hal/hal_intf.c | 36 +-- hal/odm.c | 66 +++--- hal/odm.h | 6 +- hal/odm_RTL8188E.c | 4 +- hal/odm_types.h | 12 +- hal/rtl8188e_cmd.c | 64 +++--- hal/rtl8188e_dm.c | 44 ++-- hal/rtl8188e_hal_init.c | 184 +++++++-------- hal/rtl8188e_phycfg.c | 48 ++-- hal/rtl8188e_rf6052.c | 34 +-- hal/rtl8188e_rxdesc.c | 12 +- hal/rtl8188e_xmit.c | 6 +- hal/rtl8188eu_led.c | 10 +- hal/rtl8188eu_xmit.c | 58 ++--- hal/usb_halinit.c | 160 ++++++------- hal/usb_ops_linux.c | 68 +++--- include/Hal8188EPhyCfg.h | 2 +- include/HalVerDef.h | 4 +- include/autoconf.h | 2 +- include/basic_types.h | 12 - include/ieee80211.h | 12 +- include/mp_custom_oid.h | 2 +- include/osdep_service.h | 9 +- include/rtl8188e_spec.h | 10 +- include/rtl8192c_spec.h | 10 +- include/rtl8192d_spec.h | 10 +- include/rtw_mlme.h | 14 +- include/rtw_mp.h | 4 +- include/rtw_pwrctrl.h | 6 +- include/rtw_security.h | 2 +- include/usb_ops.h | 8 +- include/wifi.h | 8 +- os_dep/ioctl_cfg80211.c | 286 ++++++++++++------------ os_dep/ioctl_linux.c | 444 ++++++++++++++++++------------------- os_dep/mlme_linux.c | 4 +- os_dep/os_intfs.c | 124 +++++------ os_dep/osdep_service.c | 28 +-- os_dep/recv_linux.c | 16 +- os_dep/rtw_android.c | 12 +- os_dep/usb_intf.c | 146 ++++++------ os_dep/usb_ops_linux.c | 18 +- os_dep/xmit_linux.c | 22 +- 68 files changed, 2553 insertions(+), 2572 deletions(-) diff --git a/core/rtw_ap.c b/core/rtw_ap.c index d3d11f2..52b8071 100755 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -46,7 +46,7 @@ void init_mlme_ap_info(struct adapter *padapter) //for ACL _rtw_init_queue(&pacl_list->acl_node_q); - //pmlmeext->bstart_bss = _FALSE; + //pmlmeext->bstart_bss = false; start_ap_mode(padapter); } @@ -62,8 +62,8 @@ void free_mlme_ap_info(struct adapter *padapter) //stop_ap_mode(padapter); - pmlmepriv->update_bcn = _FALSE; - pmlmeext->bstart_bss = _FALSE; + pmlmepriv->update_bcn = false; + pmlmeext->bstart_bss = false; rtw_sta_flush(padapter); @@ -93,7 +93,7 @@ static void update_BCNTIM(struct adapter *padapter) //update TIM IE //if(pstapriv->tim_bitmap) - if(_TRUE) + if(true) { u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; u16 tim_bitmap_le; @@ -202,7 +202,7 @@ static void update_BCNTIM(struct adapter *padapter) void rtw_add_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len) { PNDIS_802_11_VARIABLE_IEs pIE; - u8 bmatch = _FALSE; + u8 bmatch = false; u8 *pie = pnetwork->IEs; u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; u32 i, offset, ielen, ie_offset, remainder_ielen = 0; @@ -219,7 +219,7 @@ void rtw_add_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, { p = (u8 *)pIE; ielen = pIE->Length; - bmatch = _TRUE; + bmatch = true; break; } @@ -315,7 +315,7 @@ void rtw_remove_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 ind u8 chk_sta_is_alive(struct sta_info *psta); u8 chk_sta_is_alive(struct sta_info *psta) { - u8 ret = _FALSE; + u8 ret = false; #ifdef DBG_EXPIRATION_CHK DBG_871X("sta:"MAC_FMT", rssi:%d, rx:"STA_PKTS_FMT", expire_to:%u, %s%ssq_len:%u\n" , MAC_ARG(psta->hwaddr) @@ -335,7 +335,7 @@ u8 chk_sta_is_alive(struct sta_info *psta) } else { - ret = _TRUE; + ret = true; } sta_update_last_rx_pkts(psta); @@ -361,19 +361,19 @@ void expire_timeout_chk(struct adapter *padapter) //check auth_queue #ifdef DBG_EXPIRATION_CHK - if (rtw_end_of_queue_search(phead, plist) == _FALSE) { + if (rtw_end_of_queue_search(phead, plist) == false) { DBG_871X(FUNC_NDEV_FMT" auth_list, cnt:%u\n" , FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->auth_list_cnt); } #endif - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info, auth_list); plist = get_next(plist); #ifdef CONFIG_ATMEL_RC_PATCH - if (_TRUE == _rtw_memcmp((void *)(pstapriv->atmel_rc_pattern), (void *)(psta->hwaddr), ETH_ALEN)) + if (true == _rtw_memcmp((void *)(pstapriv->atmel_rc_pattern), (void *)(psta->hwaddr), ETH_ALEN)) continue; if (psta->flag_atmel_rc) continue; @@ -413,19 +413,19 @@ void expire_timeout_chk(struct adapter *padapter) //check asoc_queue #ifdef DBG_EXPIRATION_CHK - if (rtw_end_of_queue_search(phead, plist) == _FALSE) { + if (rtw_end_of_queue_search(phead, plist) == false) { DBG_871X(FUNC_NDEV_FMT" asoc_list, cnt:%u\n" , FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->asoc_list_cnt); } #endif - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); plist = get_next(plist); #ifdef CONFIG_ATMEL_RC_PATCH DBG_871X("%s:%d psta=%p, %02x,%02x||%02x,%02x \n\n", __func__, __LINE__, psta,pstapriv->atmel_rc_pattern[0], pstapriv->atmel_rc_pattern[5], psta->hwaddr[0], psta->hwaddr[5]); - if (_TRUE == _rtw_memcmp((void *)pstapriv->atmel_rc_pattern, (void *)(psta->hwaddr), ETH_ALEN)) + if (true == _rtw_memcmp((void *)pstapriv->atmel_rc_pattern, (void *)(psta->hwaddr), ETH_ALEN)) continue; if (psta->flag_atmel_rc) continue; @@ -487,7 +487,7 @@ void expire_timeout_chk(struct adapter *padapter) //to update bcn with tim_bitmap for this station pstapriv->tim_bitmap |= BIT(psta->aid); - update_beacon(padapter, _TIM_IE_, NULL, _FALSE); + update_beacon(padapter, _TIM_IE_, NULL, false); if(!pmlmeext->active_keep_alive_check) continue; @@ -510,7 +510,7 @@ void expire_timeout_chk(struct adapter *padapter) pstapriv->asoc_list_cnt--; DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state); - updated = ap_free_sta(padapter, psta, _FALSE, WLAN_REASON_DEAUTH_LEAVING); + updated = ap_free_sta(padapter, psta, false, WLAN_REASON_DEAUTH_LEAVING); } else { @@ -546,7 +546,7 @@ if (chk_alive_num) { psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]); #ifdef CONFIG_ATMEL_RC_PATCH - if (_TRUE == _rtw_memcmp( pstapriv->atmel_rc_pattern, psta->hwaddr, ETH_ALEN)) + if (true == _rtw_memcmp( pstapriv->atmel_rc_pattern, psta->hwaddr, ETH_ALEN)) continue; if (psta->flag_atmel_rc) continue; @@ -578,10 +578,10 @@ if (chk_alive_num) { DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state); _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); - if (rtw_is_list_empty(&psta->asoc_list)==_FALSE) { + if (rtw_is_list_empty(&psta->asoc_list)==false) { rtw_list_delete(&psta->asoc_list); pstapriv->asoc_list_cnt--; - updated = ap_free_sta(padapter, psta, _FALSE, WLAN_REASON_DEAUTH_LEAVING); + updated = ap_free_sta(padapter, psta, false, WLAN_REASON_DEAUTH_LEAVING); } _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); @@ -600,7 +600,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) int i; u8 rf_type; u32 init_rate=0; - unsigned char sta_band = 0, raid, shortGIrate = _FALSE; + unsigned char sta_band = 0, raid, shortGIrate = false; unsigned char limit; unsigned int tx_ra_bitmap=0; struct ht_priv *psta_ht = NULL; @@ -675,7 +675,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) arg |= BIT(7);//support entry 2~31 - if (shortGIrate==_TRUE) + if (shortGIrate==true) arg |= BIT(5); tx_ra_bitmap |= ((raid<<28)&0xf0000000); @@ -690,7 +690,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) rtw_hal_add_ra_tid(padapter, tx_ra_bitmap, arg, rssi_level); - if (shortGIrate==_TRUE) + if (shortGIrate==true) init_rate |= BIT(6); //set ra_id, init_rate @@ -724,7 +724,7 @@ void update_bmc_sta(struct adapter *padapter) psta->qos_option = 0; #ifdef CONFIG_80211N_HT - psta->htpriv.ht_option = _FALSE; + psta->htpriv.ht_option = false; #endif //CONFIG_80211N_HT psta->ieee8021x_blocked = 0; @@ -766,9 +766,9 @@ void update_bmc_sta(struct adapter *padapter) //DBG_871X("Add id %d val %08x to ratr for bmc sta\n", psta->aid, tx_ra_bitmap); //ap mode - rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, _TRUE); + rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true); - //if(pHalData->fw_ractrl == _TRUE) + //if(pHalData->fw_ractrl == true) { u8 arg = 0; @@ -776,7 +776,7 @@ void update_bmc_sta(struct adapter *padapter) arg |= BIT(7); - //if (shortGIrate==_TRUE) + //if (shortGIrate==true) // arg |= BIT(5); tx_ra_bitmap |= ((raid<<28)&0xf0000000); @@ -834,12 +834,12 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta) DBG_871X("%s\n",__FUNCTION__); //ap mode - rtw_hal_set_odm_var(padapter,HAL_ODM_STA_INFO,psta,_TRUE); + rtw_hal_set_odm_var(padapter,HAL_ODM_STA_INFO,psta,true); if(psecuritypriv->dot11AuthAlgrthm==dot11AuthAlgrthm_8021X) - psta->ieee8021x_blocked = _TRUE; + psta->ieee8021x_blocked = true; else - psta->ieee8021x_blocked = _FALSE; + psta->ieee8021x_blocked = false; //update sta's cap @@ -856,7 +856,7 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta) //check if sta support s Short GI if((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SGI_20|IEEE80211_HT_CAP_SGI_40)) { - phtpriv_sta->sgi = _TRUE; + phtpriv_sta->sgi = true; } // bwmode @@ -868,14 +868,14 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta) } - psta->qos_option = _TRUE; + psta->qos_option = true; } else { - phtpriv_sta->ampdu_enable = _FALSE; + phtpriv_sta->ampdu_enable = false; - phtpriv_sta->sgi = _FALSE; + phtpriv_sta->sgi = false; phtpriv_sta->bwmode = HT_CHANNEL_WIDTH_20; phtpriv_sta->ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; } @@ -983,28 +983,28 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) //and at first time the security ie ( RSN/WPA IE) will not include in beacon. if(NULL == rtw_get_wps_ie(pnetwork->IEs+_FIXED_IE_LENGTH_, pnetwork->IELength-_FIXED_IE_LENGTH_, NULL, NULL)) { - pmlmeext->bstart_bss = _TRUE; + pmlmeext->bstart_bss = true; } //todo: update wmm, ht cap //pmlmeinfo->WMM_enable; //pmlmeinfo->HT_enable; if(pmlmepriv->qospriv.qos_option) - pmlmeinfo->WMM_enable = _TRUE; + pmlmeinfo->WMM_enable = true; #ifdef CONFIG_80211N_HT if(pmlmepriv->htpriv.ht_option) { - pmlmeinfo->WMM_enable = _TRUE; - pmlmeinfo->HT_enable = _TRUE; - //pmlmeinfo->HT_info_enable = _TRUE; - //pmlmeinfo->HT_caps_enable = _TRUE; + pmlmeinfo->WMM_enable = true; + pmlmeinfo->HT_enable = true; + //pmlmeinfo->HT_info_enable = true; + //pmlmeinfo->HT_caps_enable = true; update_hw_ht_param(padapter); } #endif //#CONFIG_80211N_HT - if(pmlmepriv->cur_network.join_res != _TRUE) //setting only at first time + if(pmlmepriv->cur_network.join_res != true) //setting only at first time { //WEP Key will be set before this function, do not clear CAM. if ((psecuritypriv->dot11PrivacyAlgrthm != _WEP40_) && (psecuritypriv->dot11PrivacyAlgrthm != _WEP104_)) @@ -1043,7 +1043,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) UpdateBrateTbl(padapter, pnetwork->SupportedRates); rtw_hal_set_hwreg(padapter, HW_VAR_BASIC_RATE, pnetwork->SupportedRates); - if(pmlmepriv->cur_network.join_res != _TRUE) //setting only at first time + if(pmlmepriv->cur_network.join_res != true) //setting only at first time { //u32 initialgain; @@ -1052,7 +1052,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) //disable dynamic functions, such as high power, DIG //Save_DM_Func_Flag(padapter); - //Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, _FALSE); + //Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false); #ifdef CONFIG_CONCURRENT_MODE if(padapter->adapter_type > PRIMARY_ADAPTER) @@ -1062,7 +1062,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; //turn on all dynamic functions on PRIMARY_ADAPTER, dynamic functions only runs at PRIMARY_ADAPTER - Switch_DM_Func(pbuddy_adapter, DYNAMIC_ALL_FUNC_ENABLE, _TRUE); + Switch_DM_Func(pbuddy_adapter, DYNAMIC_ALL_FUNC_ENABLE, true); //rtw_hal_set_hwreg(pbuddy_adapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); } @@ -1071,7 +1071,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) #endif { //turn on all dynamic functions - Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, _TRUE); + Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true); //rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); } @@ -1121,7 +1121,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) { set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode); } - else if(check_buddy_fwstate(padapter, _FW_LINKED)==_TRUE)//only second adapter can enter AP Mode + else if(check_buddy_fwstate(padapter, _FW_LINKED)==true)//only second adapter can enter AP Mode { struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; @@ -1223,9 +1223,9 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) pwdinfo->p2p_group_ssid_len = pnetwork->Ssid.SsidLength; #endif //CONFIG_P2P - if(_TRUE == pmlmeext->bstart_bss) + if(true == pmlmeext->bstart_bss) { - update_beacon(padapter, _TIM_IE_, NULL, _FALSE); + update_beacon(padapter, _TIM_IE_, NULL, false); #ifndef CONFIG_INTERRUPT_BASED_TXBCN //other case will tx beacon when bcn interrupt coming in. //issue beacon frame @@ -1239,7 +1239,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) //update bc/mc sta_info update_bmc_sta(padapter); - //pmlmeext->bstart_bss = _TRUE; + //pmlmeext->bstart_bss = true; } @@ -1250,7 +1250,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) u8 *pHT_caps_ie=NULL; u8 *pHT_info_ie=NULL; struct sta_info *psta = NULL; - u16 cap, ht_cap=_FALSE; + u16 cap, ht_cap=false; uint ie_len = 0; int group_cipher, pairwise_cipher; u8 channel, network_type, supportRate[NDIS_802_11_LENGTH_RATES_EX]; @@ -1279,7 +1279,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) DBG_871X("%s, len=%d\n", __FUNCTION__, len); - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != true) return _FAIL; @@ -1462,7 +1462,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) pHT_caps_ie=p; - ht_cap = _TRUE; + ht_cap = true; network_type |= WIRELESS_11_24N; @@ -1519,24 +1519,24 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) pmlmepriv->cur_network.network_type = network_type; #ifdef CONFIG_80211N_HT - pmlmepriv->htpriv.ht_option = _FALSE; + pmlmepriv->htpriv.ht_option = false; if( (psecuritypriv->wpa2_pairwise_cipher&WPA_CIPHER_TKIP) || (psecuritypriv->wpa_pairwise_cipher&WPA_CIPHER_TKIP)) { //todo: - //ht_cap = _FALSE; + //ht_cap = false; } //ht_cap - if(pregistrypriv->ht_enable && ht_cap==_TRUE) + if(pregistrypriv->ht_enable && ht_cap==true) { - pmlmepriv->htpriv.ht_option = _TRUE; + pmlmepriv->htpriv.ht_option = true; pmlmepriv->qospriv.qos_option = 1; if(pregistrypriv->ampdu_enable==1) { - pmlmepriv->htpriv.ampdu_enable = _TRUE; + pmlmepriv->htpriv.ampdu_enable = true; } HT_caps_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)pHT_caps_ie); @@ -1565,7 +1565,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) psta->state |= WIFI_AP_STATE; //Aries, add,fix bug of flush_cam_entry at STOP AP mode , 0724 rtw_indicate_connect( padapter); - pmlmepriv->cur_network.join_res = _TRUE;//for check if already set beacon + pmlmepriv->cur_network.join_res = true;//for check if already set beacon //update bc/mc sta_info //update_bmc_sta(padapter); @@ -1588,7 +1588,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) { _irqL irqL; _list *plist, *phead; - u8 added = _FALSE; + u8 added = false; int i, ret=0; struct rtw_wlan_acl_node *paclnode; struct sta_priv *pstapriv = &padapter->stapriv; @@ -1606,16 +1606,16 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) phead = get_list_head(pacl_node_q); plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); plist = get_next(plist); if(_rtw_memcmp(paclnode->addr, addr, ETH_ALEN)) { - if(paclnode->valid == _TRUE) + if(paclnode->valid == true) { - added = _TRUE; + added = true; DBG_871X("%s, sta has been added\n", __func__); break; } @@ -1625,7 +1625,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) _exit_critical_bh(&(pacl_node_q->lock), &irqL); - if(added == _TRUE) + if(added == true) return ret; @@ -1635,13 +1635,13 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) { paclnode = &pacl_list->aclnode[i]; - if(paclnode->valid == _FALSE) + if(paclnode->valid == false) { _rtw_init_listhead(&paclnode->list); _rtw_memcpy(paclnode->addr, addr, ETH_ALEN); - paclnode->valid = _TRUE; + paclnode->valid = true; rtw_list_insert_tail(&paclnode->list, get_list_head(pacl_node_q)); @@ -1675,16 +1675,16 @@ int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr) phead = get_list_head(pacl_node_q); plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); plist = get_next(plist); if(_rtw_memcmp(paclnode->addr, addr, ETH_ALEN)) { - if(paclnode->valid == _TRUE) + if(paclnode->valid == true) { - paclnode->valid = _FALSE; + paclnode->valid = false; rtw_list_delete(&paclnode->list); @@ -1879,7 +1879,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx) pmlmeext = &(padapter->mlmeextpriv); //pmlmeinfo = &(pmlmeext->mlmext_info); - if(_FALSE == pmlmeext->bstart_bss) + if(false == pmlmeext->bstart_bss) return; _enter_critical_bh(&pmlmepriv->bcn_update_lock, &irqL); @@ -1932,7 +1932,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx) break; } - pmlmepriv->update_bcn = _TRUE; + pmlmepriv->update_bcn = true; _exit_critical_bh(&pmlmepriv->bcn_update_lock, &irqL); @@ -1966,7 +1966,7 @@ static int rtw_ht_operation_update(struct adapter *padapter) struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv; - if(pmlmepriv->htpriv.ht_option == _TRUE) + if(pmlmepriv->htpriv.ht_option == true) return 0; //if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed) @@ -2035,7 +2035,7 @@ static int rtw_ht_operation_update(struct adapter *padapter) void associated_clients_update(struct adapter *padapter, u8 updated) { //update associcated stations cap. - if(updated == _TRUE) + if(updated == true) { _irqL irqL; _list *phead, *plist; @@ -2048,7 +2048,7 @@ void associated_clients_update(struct adapter *padapter, u8 updated) plist = get_next(phead); //check asoc_queue - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); @@ -2066,7 +2066,7 @@ void associated_clients_update(struct adapter *padapter, u8 updated) /* called > TSR LEVEL for USB or SDIO Interface*/ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) { - u8 beacon_updated = _FALSE; + u8 beacon_updated = false; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); @@ -2078,8 +2078,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && (pmlmepriv->num_sta_no_short_preamble == 1)) { - beacon_updated = _TRUE; - update_beacon(padapter, 0xFF, NULL, _TRUE); + beacon_updated = true; + update_beacon(padapter, 0xFF, NULL, true); } } @@ -2091,8 +2091,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && (pmlmepriv->num_sta_no_short_preamble == 0)) { - beacon_updated = _TRUE; - update_beacon(padapter, 0xFF, NULL, _TRUE); + beacon_updated = true; + update_beacon(padapter, 0xFF, NULL, true); } } } @@ -2104,8 +2104,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) pmlmepriv->num_sta_non_erp++; if (pmlmepriv->num_sta_non_erp == 1) { - beacon_updated = _TRUE; - update_beacon(padapter, _ERPINFO_IE_, NULL, _TRUE); + beacon_updated = true; + update_beacon(padapter, _ERPINFO_IE_, NULL, true); } } } else { @@ -2115,8 +2115,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) pmlmepriv->num_sta_non_erp--; if (pmlmepriv->num_sta_non_erp == 0) { - beacon_updated = _TRUE; - update_beacon(padapter, _ERPINFO_IE_, NULL, _TRUE); + beacon_updated = true; + update_beacon(padapter, _ERPINFO_IE_, NULL, true); } } @@ -2133,8 +2133,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && (pmlmepriv->num_sta_no_short_slot_time == 1)) { - beacon_updated = _TRUE; - update_beacon(padapter, 0xFF, NULL, _TRUE); + beacon_updated = true; + update_beacon(padapter, 0xFF, NULL, true); } } @@ -2150,8 +2150,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && (pmlmepriv->num_sta_no_short_slot_time == 0)) { - beacon_updated = _TRUE; - update_beacon(padapter, 0xFF, NULL, _TRUE); + beacon_updated = true; + update_beacon(padapter, 0xFF, NULL, true); } } } @@ -2199,7 +2199,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) psta->no_ht_set = 1; pmlmepriv->num_sta_no_ht++; } - if(pmlmepriv->htpriv.ht_option == _TRUE) { + if(pmlmepriv->htpriv.ht_option == true) { DBG_871X("%s STA " MAC_FMT " - no HT, num of non-HT stations %d\n", __FUNCTION__, MAC_ARG(psta->hwaddr), @@ -2209,8 +2209,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) if (rtw_ht_operation_update(padapter) > 0) { - update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, _FALSE); - update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, _TRUE); + update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, false); + update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true); } #endif /* CONFIG_80211N_HT */ @@ -2224,7 +2224,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) { - u8 beacon_updated = _FALSE; + u8 beacon_updated = false; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); @@ -2237,8 +2237,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) if (pmlmeext->cur_wireless_mode > WIRELESS_11B && pmlmepriv->num_sta_no_short_preamble == 0) { - beacon_updated = _TRUE; - update_beacon(padapter, 0xFF, NULL, _TRUE); + beacon_updated = true; + update_beacon(padapter, 0xFF, NULL, true); } } @@ -2247,8 +2247,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) pmlmepriv->num_sta_non_erp--; if (pmlmepriv->num_sta_non_erp == 0) { - beacon_updated = _TRUE; - update_beacon(padapter, _ERPINFO_IE_, NULL, _TRUE); + beacon_updated = true; + update_beacon(padapter, _ERPINFO_IE_, NULL, true); } } @@ -2258,8 +2258,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) if (pmlmeext->cur_wireless_mode > WIRELESS_11B && pmlmepriv->num_sta_no_short_slot_time == 0) { - beacon_updated = _TRUE; - update_beacon(padapter, 0xFF, NULL, _TRUE); + beacon_updated = true; + update_beacon(padapter, 0xFF, NULL, true); } } @@ -2282,8 +2282,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) if (rtw_ht_operation_update(padapter) > 0) { - update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, _FALSE); - update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, _TRUE); + update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, false); + update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true); } #endif /* CONFIG_80211N_HT */ @@ -2300,7 +2300,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16 reason) { _irqL irqL; - u8 beacon_updated = _FALSE; + u8 beacon_updated = false; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct sta_priv *pstapriv = &padapter->stapriv; @@ -2308,7 +2308,7 @@ u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16 if(!psta) return beacon_updated; - if (active == _TRUE) + if (active == true) { #ifdef CONFIG_80211N_HT //tear down Rx AMPDU @@ -2330,7 +2330,7 @@ u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16 //clear cam entry / key //clear_cam_entry(padapter, (psta->mac_id + 3)); - rtw_clearstakey_cmd(padapter, (u8*)psta, (u8)(psta->mac_id + 3), _TRUE); + rtw_clearstakey_cmd(padapter, (u8*)psta, (u8)(psta->mac_id + 3), true); _enter_critical_bh(&psta->lock, &irqL); @@ -2387,7 +2387,7 @@ int rtw_ap_inform_ch_switch(struct adapter *padapter, u8 new_ch, u8 ch_offset) plist = get_next(phead); /* for each sta in asoc_queue */ - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); plist = get_next(plist); @@ -2425,7 +2425,7 @@ int rtw_sta_flush(struct adapter *padapter) phead = &pstapriv->asoc_list; plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) { + while ((rtw_end_of_queue_search(phead, plist)) == false) { int stainfo_offset; psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); @@ -2447,12 +2447,12 @@ int rtw_sta_flush(struct adapter *padapter) /* For each sta in chk_alive_list, call ap_free_sta */ for (i = 0; i < chk_alive_num; i++) { psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]); - ap_free_sta(padapter, psta, _TRUE, WLAN_REASON_DEAUTH_LEAVING); + ap_free_sta(padapter, psta, true, WLAN_REASON_DEAUTH_LEAVING); } issue_deauth(padapter, bc_addr, WLAN_REASON_DEAUTH_LEAVING); - associated_clients_update(padapter, _TRUE); + associated_clients_update(padapter, true); return ret; @@ -2479,16 +2479,16 @@ void sta_info_update(struct adapter *padapter, struct sta_info *psta) //update 802.11n ht cap. if(WLAN_STA_HT&flags) { - psta->htpriv.ht_option = _TRUE; + psta->htpriv.ht_option = true; psta->qos_option = 1; } else { - psta->htpriv.ht_option = _FALSE; + psta->htpriv.ht_option = false; } - if(pmlmepriv->htpriv.ht_option == _FALSE) - psta->htpriv.ht_option = _FALSE; + if(pmlmepriv->htpriv.ht_option == false) + psta->htpriv.ht_option = false; #endif @@ -2521,7 +2521,7 @@ void rtw_ap_restore_network(struct adapter *padapter) char chk_alive_list[NUM_STA]; int i; - rtw_setopmode_cmd(padapter, Ndis802_11APMode,_FALSE); + rtw_setopmode_cmd(padapter, Ndis802_11APMode,false); set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); @@ -2531,7 +2531,7 @@ void rtw_ap_restore_network(struct adapter *padapter) (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) { /* restore group key, WEP keys is restored in ips_leave() */ - rtw_set_key(padapter, psecuritypriv, psecuritypriv->dot118021XGrpKeyid, 0,_FALSE); + rtw_set_key(padapter, psecuritypriv, psecuritypriv->dot118021XGrpKeyid, 0,false); } _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); @@ -2539,7 +2539,7 @@ void rtw_ap_restore_network(struct adapter *padapter) phead = &pstapriv->asoc_list; plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) { + while ((rtw_end_of_queue_search(phead, plist)) == false) { int stainfo_offset; psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); @@ -2567,7 +2567,7 @@ void rtw_ap_restore_network(struct adapter *padapter) if( (padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) || (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) { - rtw_setstakey_cmd(padapter, (unsigned char *)psta, _TRUE,_FALSE); + rtw_setstakey_cmd(padapter, (unsigned char *)psta, true,false); } } } @@ -2582,10 +2582,10 @@ void start_ap_mode(struct adapter *padapter) struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; - pmlmepriv->update_bcn = _FALSE; + pmlmepriv->update_bcn = false; //init_mlme_ap_info(padapter); - pmlmeext->bstart_bss = _FALSE; + pmlmeext->bstart_bss = false; pmlmepriv->num_sta_non_erp = 0; @@ -2599,9 +2599,9 @@ void start_ap_mode(struct adapter *padapter) #endif //CONFIG_80211N_HT pmlmepriv->num_sta_ht_20mhz = 0; - pmlmepriv->olbc = _FALSE; + pmlmepriv->olbc = false; - pmlmepriv->olbc_ht = _FALSE; + pmlmepriv->olbc_ht = false; #ifdef CONFIG_80211N_HT pmlmepriv->ht_op_mode = 0; @@ -2625,7 +2625,7 @@ void start_ap_mode(struct adapter *padapter) for(i = 0; i < NUM_ACL; i++) { _rtw_init_listhead(&pacl_list->aclnode[i].list); - pacl_list->aclnode[i].valid = _FALSE; + pacl_list->aclnode[i].valid = false; } } @@ -2642,8 +2642,8 @@ void stop_ap_mode(struct adapter *padapter) struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; _queue *pacl_node_q =&pacl_list->acl_node_q; - pmlmepriv->update_bcn = _FALSE; - pmlmeext->bstart_bss = _FALSE; + pmlmepriv->update_bcn = false; + pmlmeext->bstart_bss = false; //_rtw_spinlock_free(&pmlmepriv->bcn_update_lock); //reset and init security priv , this can refine with rtw_reset_securitypriv @@ -2655,14 +2655,14 @@ void stop_ap_mode(struct adapter *padapter) _enter_critical_bh(&(pacl_node_q->lock), &irqL); phead = get_list_head(pacl_node_q); plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); plist = get_next(plist); - if(paclnode->valid == _TRUE) + if(paclnode->valid == true) { - paclnode->valid = _FALSE; + paclnode->valid = false; rtw_list_delete(&paclnode->list); diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 44a71ec..f6466e4 100755 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -124,7 +124,7 @@ exit: #ifdef CONFIG_C2H_WK _init_workitem(&pevtpriv->c2h_wk, c2h_wk_callback, NULL); - pevtpriv->c2h_wk_alive = _FALSE; + pevtpriv->c2h_wk_alive = false; pevtpriv->c2h_queue = rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN+1); #endif @@ -284,7 +284,7 @@ _func_exit_; int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj); int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) { - u8 bAllow = _FALSE; //set to _TRUE to allow enqueuing cmd when hw_init_completed is _FALSE + u8 bAllow = false; //set to true to allow enqueuing cmd when hw_init_completed is false #ifdef SUPPORT_HW_RFOFF_DETECTED //To decide allow or not @@ -298,17 +298,17 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) if(pdrvextra_cmd_parm->ec_id == POWER_SAVING_CTRL_WK_CID) { //DBG_871X("==>enqueue POWER_SAVING_CTRL_WK_CID\n"); - bAllow = _TRUE; + bAllow = true; } } } #endif if(cmd_obj->cmdcode == GEN_CMD_CODE(_SetChannelPlan)) - bAllow = _TRUE; + bAllow = true; - if( (pcmdpriv->padapter->hw_init_completed ==_FALSE && bAllow == _FALSE) - || pcmdpriv->cmdthd_running== _FALSE //com_thread not running + if( (pcmdpriv->padapter->hw_init_completed ==false && bAllow == false) + || pcmdpriv->cmdthd_running== false //com_thread not running ) { //DBG_871X("%s:%s: drop cmdcode:%u, hw_init_completed:%u, cmdthd_running:%u\n", caller_func, __FUNCTION__, @@ -408,7 +408,7 @@ _func_exit_; void rtw_stop_cmd_thread(struct adapter *adapter) { - if(adapter->cmdThread && adapter->cmdpriv.cmdthd_running == _TRUE + if(adapter->cmdThread && adapter->cmdpriv.cmdthd_running == true && adapter->cmdpriv.stop_req == 0) { adapter->cmdpriv.stop_req = 1; @@ -435,7 +435,7 @@ _func_enter_; prspbuf = pcmdpriv->rsp_buf; pcmdpriv->stop_req = 0; - pcmdpriv->cmdthd_running=_TRUE; + pcmdpriv->cmdthd_running=true; _rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema); RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("start r871x rtw_cmd_thread !!!!\n")); @@ -447,7 +447,7 @@ _func_enter_; break; } - if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved == _TRUE)) + if ((padapter->bDriverStopped == true)||(padapter->bSurpriseRemoved == true)) { DBG_871X_LEVEL(_drv_always_, "%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n", __FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__); @@ -475,7 +475,7 @@ _func_enter_; #endif _next: - if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE)) + if ((padapter->bDriverStopped == true)||(padapter->bSurpriseRemoved== true)) { DBG_871X_LEVEL(_drv_always_, "%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n", __FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__); @@ -548,7 +548,7 @@ post_process: goto _next; } - pcmdpriv->cmdthd_running=_FALSE; + pcmdpriv->cmdthd_running=false; // free all cmd_obj resources @@ -711,13 +711,13 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, NDIS_802_11_SSID *ssid, int ssi _func_enter_; #ifdef CONFIG_LPS - if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE){ + if(check_fwstate(pmlmepriv, _FW_LINKED) == true){ rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1); } #endif #ifdef CONFIG_P2P_PS - if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { + if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { p2p_ps_wk_cmd(padapter, P2P_PS_SCAN, 1); } #endif //CONFIG_P2P_PS @@ -732,7 +732,7 @@ _func_enter_; return _FAIL; } - rtw_free_network_queue(padapter, _FALSE); + rtw_free_network_queue(padapter, false); RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("%s: flush network queue\n", __FUNCTION__)); @@ -1190,7 +1190,7 @@ _func_enter_; //for hidden ap to set fw_state here - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != _TRUE) + if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != true) { switch(ndis_network_mode) { @@ -1242,7 +1242,7 @@ _func_enter_; // If not, we have to copy the connecting AP's MAC address to it so that // the driver just has the bssid information for PMKIDList searching. - if ( pmlmepriv->assoc_by_bssid == _FALSE ) + if ( pmlmepriv->assoc_by_bssid == false ) { _rtw_memcpy( &pmlmepriv->assoc_bssid[ 0 ], &pnetwork->network.MacAddress[ 0 ], ETH_ALEN ); } @@ -1270,7 +1270,7 @@ _func_enter_; } #ifdef CONFIG_80211N_HT - phtpriv->ht_option = _FALSE; + phtpriv->ht_option = false; if(pregistrypriv->ht_enable) { // Added by Albert 2010/06/23 @@ -1426,10 +1426,10 @@ _func_enter_; #endif //CONFIG_TDLS psetstakey_para->algorithm =(unsigned char) psecuritypriv->dot11PrivacyAlgrthm; }else{ - GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, _FALSE); + GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, false); } - if (unicast_key == _TRUE) { + if (unicast_key == true) { #ifdef CONFIG_TDLS if((sta->tdls_sta_state&TDLS_LINKED_STATE)==TDLS_LINKED_STATE) _rtw_memcpy(&psetstakey_para->key, sta->tpk.tk, 16); @@ -1442,7 +1442,7 @@ _func_enter_; } //jeff: set this becasue at least sw key is ready - padapter->securitypriv.busetkipkey=_TRUE; + padapter->securitypriv.busetkipkey=true; if(enqueue) { @@ -2108,8 +2108,8 @@ static void traffic_status_watchdog(struct adapter *padapter) u8 bEnterPS; #endif u16 BusyThreshold = 200;// 100; - u8 bBusyTraffic = _FALSE, bTxBusyTraffic = _FALSE, bRxBusyTraffic = _FALSE; - u8 bHigherBusyTraffic = _FALSE, bHigherBusyRxTraffic = _FALSE, bHigherBusyTxTraffic = _FALSE; + u8 bBusyTraffic = false, bTxBusyTraffic = false, bRxBusyTraffic = false; + u8 bHigherBusyTraffic = false, bHigherBusyRxTraffic = false, bHigherBusyTxTraffic = false; #ifdef CONFIG_FTP_PROTECT u16 bPktCount = 0; #endif @@ -2123,7 +2123,7 @@ static void traffic_status_watchdog(struct adapter *padapter) // // Determine if our traffic is busy now // - if((check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) + if((check_fwstate(pmlmepriv, _FW_LINKED)== true) /*&& !MgntInitAdapterInProgress(pMgntInfo)*/) { // if we raise bBusyTraffic in last watchdog, using lower threshold. @@ -2132,24 +2132,24 @@ static void traffic_status_watchdog(struct adapter *padapter) if( pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold || pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold ) { - bBusyTraffic = _TRUE; + bBusyTraffic = true; if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) - bRxBusyTraffic = _TRUE; + bRxBusyTraffic = true; else - bTxBusyTraffic = _TRUE; + bTxBusyTraffic = true; } // Higher Tx/Rx data. if( pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 4000 || pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 4000 ) { - bHigherBusyTraffic = _TRUE; + bHigherBusyTraffic = true; if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) - bHigherBusyRxTraffic = _TRUE; + bHigherBusyRxTraffic = true; else - bHigherBusyTxTraffic = _TRUE; + bHigherBusyTxTraffic = true; } #ifdef CONFIG_FTP_PROTECT @@ -2196,7 +2196,7 @@ static void traffic_status_watchdog(struct adapter *padapter) #ifdef CONFIG_LPS #ifdef CONFIG_BT_COEXIST - if (BT_1Ant(padapter) == _FALSE) + if (BT_1Ant(padapter) == false) #endif { // check traffic for powersaving. @@ -2204,11 +2204,11 @@ static void traffic_status_watchdog(struct adapter *padapter) (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) ) { //DBG_871X("Tx = %d, Rx = %d \n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod); - bEnterPS= _FALSE; + bEnterPS= false; } else { - bEnterPS= _TRUE; + bEnterPS= true; } // LeisurePS only work in infra mode. @@ -2251,7 +2251,7 @@ void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz) #ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK #ifdef CONFIG_AP_MODE - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { expire_timeout_chk(padapter); } @@ -2262,7 +2262,7 @@ void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz) rtw_hal_sreset_xmit_status_check(padapter); #endif - //if(check_fwstate(pmlmepriv, _FW_UNDER_LINKING|_FW_UNDER_SURVEY)==_FALSE) + //if(check_fwstate(pmlmepriv, _FW_UNDER_LINKING|_FW_UNDER_SURVEY)==false) { linked_status_chk(padapter); traffic_status_watchdog(padapter); @@ -2291,8 +2291,8 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) _func_enter_; - if((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) - || (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE)) + if((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) + || (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true)) { return; } @@ -2302,11 +2302,11 @@ _func_enter_; case LPS_CTRL_SCAN: //DBG_871X("LPS_CTRL_SCAN \n"); #ifdef CONFIG_BT_COEXIST - BT_WifiScanNotify(padapter, _TRUE); - if (BT_1Ant(padapter) == _FALSE) + BT_WifiScanNotify(padapter, true); + if (BT_1Ant(padapter) == false) #endif { - if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) + if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { //connect LPS_Leave(padapter); } @@ -2331,7 +2331,7 @@ _func_enter_; mstatus = 0;//disconnect #ifdef CONFIG_BT_COEXIST BT_WifiMediaStatusNotify(padapter, mstatus); - if (BT_1Ant(padapter) == _FALSE) + if (BT_1Ant(padapter) == false) #endif { LPS_Leave(padapter); @@ -2343,7 +2343,7 @@ _func_enter_; pwrpriv->DelayLPSLastTimeStamp = rtw_get_current_time(); #ifdef CONFIG_BT_COEXIST BT_SpecialPacketNotify(padapter); - if (BT_1Ant(padapter) == _FALSE) + if (BT_1Ant(padapter) == false) #endif { LPS_Leave(padapter); @@ -2353,7 +2353,7 @@ _func_enter_; //DBG_871X("LPS_CTRL_LEAVE \n"); #ifdef CONFIG_BT_COEXIST BT_LpsLeave(padapter); - if (BT_1Ant(padapter) == _FALSE) + if (BT_1Ant(padapter) == false) #endif { LPS_Leave(padapter); @@ -2477,14 +2477,14 @@ u8 rtw_antenna_select_cmd(struct adapter*padapter, u8 antenna,u8 enqueue) struct cmd_obj *ph2c; struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; - u8 bSupportAntDiv = _FALSE; + u8 bSupportAntDiv = false; u8 res = _SUCCESS; _func_enter_; rtw_hal_get_def_var(padapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &(bSupportAntDiv)); - if(_FALSE == bSupportAntDiv ) return res; + if(false == bSupportAntDiv ) return res; - if(_TRUE == enqueue) + if(true == enqueue) { ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); if(ph2c==NULL){ @@ -2643,7 +2643,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter) rtw_hal_get_hwreg(padapter, HW_VAR_CHK_HI_QUEUE_EMPTY, &val); - while(_FALSE == val) + while(false == val) { rtw_msleep_os(100); @@ -2660,7 +2660,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter) pstapriv->tim_bitmap &= ~BIT(0); pstapriv->sta_dz_bitmap &= ~BIT(0); - update_beacon(padapter, _TIM_IE_, NULL, _FALSE); + update_beacon(padapter, _TIM_IE_, NULL, false); } else //re check again { @@ -2749,14 +2749,14 @@ s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_fil if (c2h_evt_read(adapter, buf) == _SUCCESS) { c2h_evt = (struct c2h_evt_hdr *)buf; - if (filter && filter(c2h_evt->id) == _FALSE) + if (filter && filter(c2h_evt->id) == false) goto exit; ret = rtw_hal_c2h_handler(adapter, c2h_evt); } } else { - if (filter && filter(c2h_evt->id) == _FALSE) + if (filter && filter(c2h_evt->id) == false) goto exit; ret = rtw_hal_c2h_handler(adapter, c2h_evt); @@ -2773,7 +2773,7 @@ static void c2h_wk_callback(_workitem *work) struct c2h_evt_hdr *c2h_evt; c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(adapter); - evtpriv->c2h_wk_alive = _TRUE; + evtpriv->c2h_wk_alive = true; while (!rtw_cbuf_empty(evtpriv->c2h_queue)) { if ((c2h_evt = (struct c2h_evt_hdr *)rtw_cbuf_pop(evtpriv->c2h_queue)) != NULL) { @@ -2794,7 +2794,7 @@ static void c2h_wk_callback(_workitem *work) continue; } - if (ccx_id_filter(c2h_evt->id) == _TRUE) { + if (ccx_id_filter(c2h_evt->id) == true) { /* Handle CCX report here */ rtw_hal_c2h_handler(adapter, c2h_evt); rtw_mfree((u8*)c2h_evt, 16); @@ -2804,7 +2804,7 @@ static void c2h_wk_callback(_workitem *work) } } - evtpriv->c2h_wk_alive = _FALSE; + evtpriv->c2h_wk_alive = false; } #endif @@ -2828,7 +2828,7 @@ void event_polling_hdl(struct adapter *padapter, u8 *pbuf, int sz) { c2h_evt_clear(padapter); } - else if (ccx_id_filter(check_ccx & 0x0F) == _FALSE) + else if (ccx_id_filter(check_ccx & 0x0F) == false) { if ((c2h_evt = (struct c2h_evt_hdr *)rtw_zmalloc(16)) != NULL) { if (c2h_evt_read(padapter, (u8 *)c2h_evt) == _SUCCESS) { @@ -2844,7 +2844,7 @@ void event_polling_hdl(struct adapter *padapter, u8 *pbuf, int sz) } else { - if (padapter->xmitpriv.ack_tx == _FALSE) + if (padapter->xmitpriv.ack_tx == false) { c2h_evt_clear(padapter); } @@ -3089,7 +3089,7 @@ _func_enter_; pnetwork->Length = get_WLAN_BSSID_EX_sz(pnetwork); _rtw_memcpy(&(pwlan->network), pnetwork, pnetwork->Length); - //pwlan->fixed = _TRUE; + //pwlan->fixed = true; //rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue); @@ -3163,7 +3163,7 @@ _func_enter_; _enter_critical_bh(&pmlmepriv->lock, &irqL); - if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) && (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE)) + if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true) && (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true)) _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); set_fwstate(pmlmepriv, _FW_LINKED); diff --git a/core/rtw_debug.c b/core/rtw_debug.c index 221d628..4cbcdbf 100755 --- a/core/rtw_debug.c +++ b/core/rtw_debug.c @@ -1002,7 +1002,7 @@ int proc_get_all_sta_info(char *page, char **start, phead = &(pstapriv->sta_hash[i]); plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); diff --git a/core/rtw_eeprom.c b/core/rtw_eeprom.c index 23a2f12..04f460c 100755 --- a/core/rtw_eeprom.c +++ b/core/rtw_eeprom.c @@ -48,8 +48,8 @@ void shift_out_bits(_adapter * padapter, u16 data, u16 count) u16 x,mask; _func_enter_; - if(padapter->bSurpriseRemoved==_TRUE){ - RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); + if(padapter->bSurpriseRemoved==true){ + RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); goto out; } mask = 0x01 << (count - 1); @@ -62,8 +62,8 @@ _func_enter_; x &= ~_EEDI; if(data & mask) x |= _EEDI; - if(padapter->bSurpriseRemoved==_TRUE){ - RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); + if(padapter->bSurpriseRemoved==true){ + RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); goto out; } rtw_write8(padapter, EE_9346CR, (u8)x); @@ -72,8 +72,8 @@ _func_enter_; down_clk(padapter, &x); mask = mask >> 1; } while(mask); - if(padapter->bSurpriseRemoved==_TRUE){ - RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); + if(padapter->bSurpriseRemoved==true){ + RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); goto out; } x &= ~_EEDI; @@ -86,8 +86,8 @@ u16 shift_in_bits (_adapter * padapter) { u16 x,d=0,i; _func_enter_; - if(padapter->bSurpriseRemoved==_TRUE){ - RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); + if(padapter->bSurpriseRemoved==true){ + RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); goto out; } x = rtw_read8(padapter, EE_9346CR); @@ -99,8 +99,8 @@ _func_enter_; { d = d << 1; up_clk(padapter, &x); - if(padapter->bSurpriseRemoved==_TRUE){ - RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); + if(padapter->bSurpriseRemoved==true){ + RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); goto out; } x = rtw_read8(padapter, EE_9346CR); @@ -136,14 +136,14 @@ _func_exit_; u16 wait_eeprom_cmd_done(_adapter* padapter) { u8 x; - u16 i,res=_FALSE; + u16 i,res=false; _func_enter_; standby(padapter ); for (i=0; i<200; i++) { x = rtw_read8(padapter, EE_9346CR); if (x & _EEDO){ - res=_TRUE; + res=true; goto exit; } rtw_udelay_os(CLOCK_RATE); @@ -157,24 +157,24 @@ void eeprom_clean(_adapter * padapter) { u16 x; _func_enter_; - if(padapter->bSurpriseRemoved==_TRUE){ - RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); + if(padapter->bSurpriseRemoved==true){ + RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); goto out; } x = rtw_read8(padapter, EE_9346CR); - if(padapter->bSurpriseRemoved==_TRUE){ - RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); + if(padapter->bSurpriseRemoved==true){ + RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); goto out; } x &= ~(_EECS | _EEDI); rtw_write8(padapter, EE_9346CR, (u8)x); - if(padapter->bSurpriseRemoved==_TRUE){ - RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); + if(padapter->bSurpriseRemoved==true){ + RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); goto out; } up_clk(padapter, &x); - if(padapter->bSurpriseRemoved==_TRUE){ - RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); + if(padapter->bSurpriseRemoved==true){ + RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); goto out; } down_clk(padapter, &x); @@ -227,7 +227,7 @@ _func_enter_; // write the data to the selected EEPROM word. shift_out_bits(padapter, data, 16); - if (wait_eeprom_cmd_done(padapter ) == _FALSE) + if (wait_eeprom_cmd_done(padapter ) == false) { goto exit; @@ -251,15 +251,15 @@ u16 eeprom_read16(_adapter * padapter, u16 reg) //ReadEEprom u16 data=0; _func_enter_; - if(padapter->bSurpriseRemoved==_TRUE){ - RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); + if(padapter->bSurpriseRemoved==true){ + RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); goto out; } // select EEPROM, reset bits, set _EECS x = rtw_read8(padapter, EE_9346CR); - if(padapter->bSurpriseRemoved==_TRUE){ - RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); + if(padapter->bSurpriseRemoved==true){ + RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); goto out; } @@ -291,15 +291,15 @@ void eeprom_read_sz(_adapter * padapter, u16 reg, u8* data, u32 sz) u16 x, data16; u32 i; _func_enter_; - if(padapter->bSurpriseRemoved==_TRUE){ - RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); + if(padapter->bSurpriseRemoved==true){ + RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); goto out; } // select EEPROM, reset bits, set _EECS x = rtw_read8(padapter, EE_9346CR); - if(padapter->bSurpriseRemoved==_TRUE){ - RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); + if(padapter->bSurpriseRemoved==true){ + RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); goto out; } @@ -361,7 +361,7 @@ _func_enter_; rbuf[idx] = (u8)(stmp & 0xff); } _func_exit_; - return _TRUE; + return true; } diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index 20e5c95..08bcf54 100755 --- a/core/rtw_efuse.c +++ b/core/rtw_efuse.c @@ -63,14 +63,14 @@ Efuse_Read1ByteFromFakeContent( { if(Offset >= EFUSE_MAX_HW_SIZE) { - return _FALSE; + return false; } //DbgPrint("Read fake content, offset = %d\n", Offset); if(fakeEfuseBank == 0) *Value = fakeEfuseContent[Offset]; else *Value = fakeBTEfuseContent[fakeEfuseBank-1][Offset]; - return _TRUE; + return true; } BOOLEAN @@ -86,7 +86,7 @@ Efuse_Write1ByteToFakeContent( { if(Offset >= EFUSE_MAX_HW_SIZE) { - return _FALSE; + return false; } if(fakeEfuseBank == 0) fakeEfuseContent[Offset] = Value; @@ -94,7 +94,7 @@ Efuse_Write1ByteToFakeContent( { fakeBTEfuseContent[fakeEfuseBank-1][Offset] = Value; } - return _TRUE; + return true; } /*----------------------------------------------------------------------------- @@ -305,7 +305,7 @@ EFUSE_Read1Byte( u32 k=0; u16 contentLen=0; - EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI , TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&contentLen, _FALSE); + EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI , TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&contentLen, false); if (Address < contentLen) //E-fuse 512Byte { @@ -376,7 +376,7 @@ EFUSE_Write1Byte( u16 contentLen=0; //RT_TRACE(COMP_EFUSE, DBG_LOUD, ("Addr=%x Data =%x\n", Address, Value)); - EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI , TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&contentLen, _FALSE); + EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI , TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&contentLen, false); if( Address < contentLen) //E-fuse 512Byte { @@ -442,12 +442,12 @@ efuse_OneByteRead( if(tmpidx<100) { *data=rtw_read8(pAdapter, EFUSE_CTRL); - bResult = _TRUE; + bResult = true; } else { *data = 0xff; - bResult = _FALSE; + bResult = false; } return bResult; } @@ -487,11 +487,11 @@ efuse_OneByteWrite( if(tmpidx<100) { - bResult = _TRUE; + bResult = true; } else { - bResult = _FALSE; + bResult = false; } return bResult; @@ -600,12 +600,12 @@ Efuse_WordEnableDataWrite( IN struct adapter *pAdapter, static u8 efuse_read8(struct adapter *padapter, u16 address, u8 *value) { - return efuse_OneByteRead(padapter,address, value, _FALSE); + return efuse_OneByteRead(padapter,address, value, false); } static u8 efuse_write8(struct adapter *padapter, u16 address, u8 *value) { - return efuse_OneByteWrite(padapter,address, *value, _FALSE); + return efuse_OneByteWrite(padapter,address, *value, false); } /* @@ -618,20 +618,20 @@ u8 rtw_efuse_access(struct adapter *padapter, u8 bWrite, u16 start_addr, u16 cnt u8 res = _FAIL ; u8 (*rw8)(struct adapter *, u16, u8*); - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&real_content_len, _FALSE); - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&real_content_len, false); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false); if (start_addr > real_content_len) return _FAIL; - if (_TRUE == bWrite) { + if (true == bWrite) { if ((start_addr + cnts) > max_available_size) return _FAIL; rw8 = &efuse_write8; } else rw8 = &efuse_read8; - Efuse_PowerSwitch(padapter, bWrite, _TRUE); + Efuse_PowerSwitch(padapter, bWrite, true); // e-fuse one byte read / write for (i = 0; i < cnts; i++) { @@ -644,7 +644,7 @@ u8 rtw_efuse_access(struct adapter *padapter, u8 bWrite, u16 start_addr, u16 cnt if (_FAIL == res) break; } - Efuse_PowerSwitch(padapter, bWrite, _FALSE); + Efuse_PowerSwitch(padapter, bWrite, false); return res; } @@ -652,15 +652,15 @@ u8 rtw_efuse_access(struct adapter *padapter, u8 bWrite, u16 start_addr, u16 cnt u16 efuse_GetMaxSize(struct adapter *padapter) { u16 max_size; - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_size, false); return max_size; } //------------------------------------------------------------------------------ u8 efuse_GetCurrentSize(struct adapter *padapter, u16 *size) { - Efuse_PowerSwitch(padapter, _FALSE, _TRUE); - *size = Efuse_GetCurrentSize(padapter, EFUSE_WIFI, _FALSE); - Efuse_PowerSwitch(padapter, _FALSE, _FALSE); + Efuse_PowerSwitch(padapter, false, true); + *size = Efuse_GetCurrentSize(padapter, EFUSE_WIFI, false); + Efuse_PowerSwitch(padapter, false, false); return _SUCCESS; } @@ -669,16 +669,16 @@ u8 rtw_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) { u16 mapLen=0; - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false); if ((addr + cnts) > mapLen) return _FAIL; - Efuse_PowerSwitch(padapter, _FALSE, _TRUE); + Efuse_PowerSwitch(padapter, false, true); - efuse_ReadEFuse(padapter, EFUSE_WIFI, addr, cnts, data, _FALSE); + efuse_ReadEFuse(padapter, EFUSE_WIFI, addr, cnts, data, false); - Efuse_PowerSwitch(padapter, _FALSE, _FALSE); + Efuse_PowerSwitch(padapter, false, false); return _SUCCESS; } @@ -687,16 +687,16 @@ u8 rtw_BT_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) { u16 mapLen=0; - EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false); if ((addr + cnts) > mapLen) return _FAIL; - Efuse_PowerSwitch(padapter, _FALSE, _TRUE); + Efuse_PowerSwitch(padapter, false, true); - efuse_ReadEFuse(padapter, EFUSE_BT, addr, cnts, data, _FALSE); + efuse_ReadEFuse(padapter, EFUSE_BT, addr, cnts, data, false); - Efuse_PowerSwitch(padapter, _FALSE, _FALSE); + Efuse_PowerSwitch(padapter, false, false); return _SUCCESS; } @@ -710,7 +710,7 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) u8 ret = _SUCCESS; u16 mapLen=0; - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false); if ((addr + cnts) > mapLen) return _FAIL; @@ -723,7 +723,7 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) ret = rtw_efuse_map_read(padapter, 0, mapLen, map); if (ret == _FAIL) goto exit; - Efuse_PowerSwitch(padapter, _TRUE, _TRUE); + Efuse_PowerSwitch(padapter, true, true); offset = (addr >> 3); word_en = 0xF; @@ -768,7 +768,7 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) } if (word_en != 0xF) { - ret = Efuse_PgPacketWrite(padapter, offset, word_en, newdata, _FALSE); + ret = Efuse_PgPacketWrite(padapter, offset, word_en, newdata, false); DBG_871X("offset=%x \n",offset); DBG_871X("word_en=%x \n",word_en); @@ -788,7 +788,7 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) _rtw_memset(newdata, 0xFF, PGPKT_DATA_SIZE); } while (1); - Efuse_PowerSwitch(padapter, _TRUE, _FALSE); + Efuse_PowerSwitch(padapter, true, false); exit: @@ -808,7 +808,7 @@ u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data u8 ret = _SUCCESS; u16 mapLen=0; - EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false); if ((addr + cnts) > mapLen) return _FAIL; @@ -821,7 +821,7 @@ u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data ret = rtw_BT_efuse_map_read(padapter, 0, mapLen, map); if (ret == _FAIL) goto exit; - Efuse_PowerSwitch(padapter, _TRUE, _TRUE); + Efuse_PowerSwitch(padapter, true, true); offset = (addr >> 3); word_en = 0xF; @@ -876,7 +876,7 @@ u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data } DBG_871X("\n"); - ret = Efuse_PgPacketWrite_BT(padapter, offset, word_en, newdata, _FALSE); + ret = Efuse_PgPacketWrite_BT(padapter, offset, word_en, newdata, false); if (ret == _FAIL) break; } @@ -889,7 +889,7 @@ u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data _rtw_memset(newdata, 0xFF, PGPKT_DATA_SIZE); } while (1); - Efuse_PowerSwitch(padapter, _TRUE, _FALSE); + Efuse_PowerSwitch(padapter, true, false); exit: @@ -929,13 +929,13 @@ Efuse_ReadAllMap( { u16 mapLen=0; - Efuse_PowerSwitch(pAdapter,_FALSE, _TRUE); + Efuse_PowerSwitch(pAdapter,false, true); EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, bPseudoTest); efuse_ReadEFuse(pAdapter, efuseType, 0, mapLen, Efuse, bPseudoTest); - Efuse_PowerSwitch(pAdapter,_FALSE, _FALSE); + Efuse_PowerSwitch(pAdapter,false, false); } /*----------------------------------------------------------------------------- @@ -1092,7 +1092,7 @@ void EFUSE_ShadowMapUpdate( EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, bPseudoTest); - if (pEEPROM->bautoload_fail_flag == _TRUE) + if (pEEPROM->bautoload_fail_flag == true) { _rtw_memset(pEEPROM->efuse_eeprom_data, 0xFF, mapLen); } @@ -1227,7 +1227,7 @@ Efuse_InitSomeVar( int isAdaptorInfoFileValid(void) { - return _TRUE; + return true; } int storeAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv) diff --git a/core/rtw_ieee80211.c b/core/rtw_ieee80211.c index 16c68a6..42c593c 100755 --- a/core/rtw_ieee80211.c +++ b/core/rtw_ieee80211.c @@ -88,11 +88,11 @@ uint rtw_is_cckrates_included(u8 *rate) { if ( (((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) || (((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22) ) - return _TRUE; + return true; i++; } - return _FALSE; + return false; } uint rtw_is_cckratesonly_included(u8 *rate) @@ -105,12 +105,12 @@ uint rtw_is_cckratesonly_included(u8 *rate) if ( (((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) && (((rate[i]) & 0x7f) != 11) && (((rate[i]) & 0x7f) != 22) ) - return _FALSE; + return false; i++; } - return _TRUE; + return true; } @@ -118,16 +118,16 @@ int rtw_check_network_type(unsigned char *rate, int ratelen, int channel) { if (channel > 14) { - if ((rtw_is_cckrates_included(rate)) == _TRUE) + if ((rtw_is_cckrates_included(rate)) == true) return WIRELESS_INVALID; else return WIRELESS_11A; } else // could be pure B, pure G, or B/G { - if ((rtw_is_cckratesonly_included(rate)) == _TRUE) + if ((rtw_is_cckratesonly_included(rate)) == true) return WIRELESS_11B; - else if((rtw_is_cckrates_included(rate)) == _TRUE) + else if((rtw_is_cckrates_included(rate)) == true) return WIRELESS_11BG; else return WIRELESS_11G; @@ -285,7 +285,7 @@ u8 *rtw_get_ie_ex(u8 *in_ie, uint in_len, u8 eid, u8 *oui, u8 oui_len, u8 *ie, u while(cntwireless_mode&WIRELESS_11_5N)||(pregistrypriv->wireless_mode&WIRELESS_11_24N)) - && (pregistrypriv->ht_enable==_TRUE)) + && (pregistrypriv->ht_enable==true)) { //todo: } @@ -512,7 +512,7 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit) if (pbuf) { //check if oui matches... - if (_rtw_memcmp((pbuf + 2), wpa_oui_type, sizeof (wpa_oui_type)) == _FALSE) { + if (_rtw_memcmp((pbuf + 2), wpa_oui_type, sizeof (wpa_oui_type)) == false) { goto check_next_ie; } @@ -561,15 +561,15 @@ unsigned char *rtw_get_wpa2_ie(unsigned char *pie, int *rsn_ie_len, int limit) int rtw_get_wpa_cipher_suite(u8 *s) { - if (_rtw_memcmp(s, WPA_CIPHER_SUITE_NONE, WPA_SELECTOR_LEN) == _TRUE) + if (_rtw_memcmp(s, WPA_CIPHER_SUITE_NONE, WPA_SELECTOR_LEN) == true) return WPA_CIPHER_NONE; - if (_rtw_memcmp(s, WPA_CIPHER_SUITE_WEP40, WPA_SELECTOR_LEN) == _TRUE) + if (_rtw_memcmp(s, WPA_CIPHER_SUITE_WEP40, WPA_SELECTOR_LEN) == true) return WPA_CIPHER_WEP40; - if (_rtw_memcmp(s, WPA_CIPHER_SUITE_TKIP, WPA_SELECTOR_LEN) == _TRUE) + if (_rtw_memcmp(s, WPA_CIPHER_SUITE_TKIP, WPA_SELECTOR_LEN) == true) return WPA_CIPHER_TKIP; - if (_rtw_memcmp(s, WPA_CIPHER_SUITE_CCMP, WPA_SELECTOR_LEN) == _TRUE) + if (_rtw_memcmp(s, WPA_CIPHER_SUITE_CCMP, WPA_SELECTOR_LEN) == true) return WPA_CIPHER_CCMP; - if (_rtw_memcmp(s, WPA_CIPHER_SUITE_WEP104, WPA_SELECTOR_LEN) == _TRUE) + if (_rtw_memcmp(s, WPA_CIPHER_SUITE_WEP104, WPA_SELECTOR_LEN) == true) return WPA_CIPHER_WEP104; return 0; @@ -577,15 +577,15 @@ int rtw_get_wpa_cipher_suite(u8 *s) int rtw_get_wpa2_cipher_suite(u8 *s) { - if (_rtw_memcmp(s, RSN_CIPHER_SUITE_NONE, RSN_SELECTOR_LEN) == _TRUE) + if (_rtw_memcmp(s, RSN_CIPHER_SUITE_NONE, RSN_SELECTOR_LEN) == true) return WPA_CIPHER_NONE; - if (_rtw_memcmp(s, RSN_CIPHER_SUITE_WEP40, RSN_SELECTOR_LEN) == _TRUE) + if (_rtw_memcmp(s, RSN_CIPHER_SUITE_WEP40, RSN_SELECTOR_LEN) == true) return WPA_CIPHER_WEP40; - if (_rtw_memcmp(s, RSN_CIPHER_SUITE_TKIP, RSN_SELECTOR_LEN) == _TRUE) + if (_rtw_memcmp(s, RSN_CIPHER_SUITE_TKIP, RSN_SELECTOR_LEN) == true) return WPA_CIPHER_TKIP; - if (_rtw_memcmp(s, RSN_CIPHER_SUITE_CCMP, RSN_SELECTOR_LEN) == _TRUE) + if (_rtw_memcmp(s, RSN_CIPHER_SUITE_CCMP, RSN_SELECTOR_LEN) == true) return WPA_CIPHER_CCMP; - if (_rtw_memcmp(s, RSN_CIPHER_SUITE_WEP104, RSN_SELECTOR_LEN) == _TRUE) + if (_rtw_memcmp(s, RSN_CIPHER_SUITE_WEP104, RSN_SELECTOR_LEN) == true) return WPA_CIPHER_WEP104; return 0; @@ -606,7 +606,7 @@ int rtw_parse_wpa_ie(u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis if ((*wpa_ie != _WPA_IE_ID_) || (*(wpa_ie+1) != (u8)(wpa_ie_len - 2)) || - (_rtw_memcmp(wpa_ie+2, RTW_WPA_OUI_TYPE, WPA_SELECTOR_LEN) != _TRUE) ) + (_rtw_memcmp(wpa_ie+2, RTW_WPA_OUI_TYPE, WPA_SELECTOR_LEN) != true) ) { return _FAIL; } @@ -771,8 +771,8 @@ _func_enter_; authmode=in_ie[cnt]; //if(authmode==_WAPI_IE_) - if(authmode==_WAPI_IE_ && (_rtw_memcmp(&in_ie[cnt+6], wapi_oui1,4)==_TRUE || - _rtw_memcmp(&in_ie[cnt+6], wapi_oui2,4)==_TRUE)) + if(authmode==_WAPI_IE_ && (_rtw_memcmp(&in_ie[cnt+6], wapi_oui1,4)==true || + _rtw_memcmp(&in_ie[cnt+6], wapi_oui2,4)==true)) { if (wapi_ie) { _rtw_memcpy(wapi_ie, &in_ie[cnt],in_ie[cnt+1]+2); @@ -818,7 +818,7 @@ _func_enter_; { authmode=in_ie[cnt]; - if((authmode==_WPA_IE_ID_)&&(_rtw_memcmp(&in_ie[cnt+2], &wpa_oui[0],4)==_TRUE)) + if((authmode==_WPA_IE_ID_)&&(_rtw_memcmp(&in_ie[cnt+2], &wpa_oui[0],4)==true)) { RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n rtw_get_wpa_ie: sec_idx=%d in_ie[cnt+1]+2=%d\n",sec_idx,in_ie[cnt+1]+2)); @@ -870,18 +870,18 @@ _func_exit_; u8 rtw_is_wps_ie(u8 *ie_ptr, uint *wps_ielen) { - u8 match = _FALSE; + u8 match = false; u8 eid, wps_oui[4]={0x0,0x50,0xf2,0x04}; if(ie_ptr == NULL) return match; eid = ie_ptr[0]; - if((eid==_WPA_IE_ID_)&&(_rtw_memcmp(&ie_ptr[2], wps_oui, 4)==_TRUE)) + if((eid==_WPA_IE_ID_)&&(_rtw_memcmp(&ie_ptr[2], wps_oui, 4)==true)) { //DBG_8192C("==> found WPS_IE.....\n"); *wps_ielen = ie_ptr[1]+2; - match=_TRUE; + match=true; } return match; } @@ -935,7 +935,7 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen) { eid = in_ie[cnt]; - if((eid==_WPA_IE_ID_)&&(_rtw_memcmp(&in_ie[cnt+2], wps_oui, 4)==_TRUE)) + if((eid==_WPA_IE_ID_)&&(_rtw_memcmp(&in_ie[cnt+2], wps_oui, 4)==true)) { wpsie_ptr = &in_ie[cnt]; @@ -979,7 +979,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id ,u8 *buf_att *len_attr = 0; if ( ( wps_ie[0] != _VENDOR_SPECIFIC_IE_ ) || - ( _rtw_memcmp( wps_ie + 2, wps_oui , 4 ) != _TRUE ) ) + ( _rtw_memcmp( wps_ie + 2, wps_oui , 4 ) != true ) ) { return attr_ptr; } @@ -1540,7 +1540,7 @@ u8 *rtw_get_p2p_ie(u8 *in_ie, int in_len, u8 *p2p_ie, uint *p2p_ielen) dump_stack(); return NULL; } - if( ( eid == _VENDOR_SPECIFIC_IE_ ) && ( _rtw_memcmp( &in_ie[cnt+2], p2p_oui, 4) == _TRUE ) ) + if( ( eid == _VENDOR_SPECIFIC_IE_ ) && ( _rtw_memcmp( &in_ie[cnt+2], p2p_oui, 4) == true ) ) { p2p_ie_ptr = in_ie + cnt; @@ -1589,7 +1589,7 @@ u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *buf_attr *len_attr = 0; if ( !p2p_ie || ( p2p_ie[0] != _VENDOR_SPECIFIC_IE_ ) || - ( _rtw_memcmp( p2p_ie + 2, p2p_oui , 4 ) != _TRUE ) ) + ( _rtw_memcmp( p2p_ie + 2, p2p_oui , 4 ) != true ) ) { return attr_ptr; } @@ -1741,7 +1741,7 @@ void dump_wfd_ie(u8 *ie, u32 ie_len) u8 *wfd_ie; uint wfd_ielen; - if(rtw_get_wfd_ie(ie, ie_len, NULL, &wfd_ielen) == _FALSE) + if(rtw_get_wfd_ie(ie, ie_len, NULL, &wfd_ielen) == false) return; pos+=6; @@ -1762,7 +1762,7 @@ int rtw_get_wfd_ie(u8 *in_ie, int in_len, u8 *wfd_ie, uint *wfd_ielen) u8 eid, wfd_oui[4]={0x50,0x6F,0x9A,0x0A}; - match=_FALSE; + match=false; if ( in_len < 0 ) { @@ -1773,7 +1773,7 @@ int rtw_get_wfd_ie(u8 *in_ie, int in_len, u8 *wfd_ie, uint *wfd_ielen) { eid = in_ie[cnt]; - if( ( eid == _VENDOR_SPECIFIC_IE_ ) && ( _rtw_memcmp( &in_ie[cnt+2], wfd_oui, 4) == _TRUE ) ) + if( ( eid == _VENDOR_SPECIFIC_IE_ ) && ( _rtw_memcmp( &in_ie[cnt+2], wfd_oui, 4) == true ) ) { if ( wfd_ie != NULL ) { @@ -1795,7 +1795,7 @@ int rtw_get_wfd_ie(u8 *in_ie, int in_len, u8 *wfd_ie, uint *wfd_ielen) cnt += in_ie[ cnt + 1 ] + 2; - match = _TRUE; + match = true; break; } else @@ -1805,7 +1805,7 @@ int rtw_get_wfd_ie(u8 *in_ie, int in_len, u8 *wfd_ie, uint *wfd_ielen) } - if ( match == _TRUE ) + if ( match == true ) { match = cnt; } @@ -1818,7 +1818,7 @@ int rtw_get_wfd_ie_from_scan_queue(u8 *in_ie, int in_len, u8 *wfd_ie, uint *wfd_ { int match; - match=_FALSE; + match=false; DBG_871X( "[%s] frame_type = %d\n", __FUNCTION__, frame_type ); switch( frame_type ) @@ -1847,10 +1847,10 @@ int rtw_get_wfd_attr_content(u8 *wfd_ie, uint wfd_ielen, u8 target_attr_id ,u8 * u8 attr_id, wfd_oui[4]={0x50,0x6F,0x9A,0x0A}; - match=_FALSE; + match=false; if ( ( wfd_ie[ 0 ] != _VENDOR_SPECIFIC_IE_ ) || - ( _rtw_memcmp( wfd_ie + 2, wfd_oui , 4 ) != _TRUE ) ) + ( _rtw_memcmp( wfd_ie + 2, wfd_oui , 4 ) != true ) ) { return( match ); } @@ -1873,7 +1873,7 @@ int rtw_get_wfd_attr_content(u8 *wfd_ie, uint wfd_ielen, u8 target_attr_id ,u8 * cnt += attrlen + 3; - match = _TRUE; + match = true; break; } else @@ -2111,7 +2111,7 @@ int rtw_action_frame_parse(const u8 *frame, u32 frame_len, u8* category, u8 *act != (RTW_IEEE80211_FTYPE_MGMT|RTW_IEEE80211_STYPE_ACTION) ) { - return _FALSE; + return false; } c = frame_body[0]; @@ -2128,7 +2128,7 @@ int rtw_action_frame_parse(const u8 *frame, u32 frame_len, u8* category, u8 *act if (action) *action = a; - return _TRUE; + return true; } static const char *_action_public_str[] = { diff --git a/core/rtw_io.c b/core/rtw_io.c index da2176d..c97642d 100755 --- a/core/rtw_io.c +++ b/core/rtw_io.c @@ -216,7 +216,7 @@ void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) _func_enter_; - if( (adapter->bDriverStopped ==_TRUE) || (adapter->bSurpriseRemoved == _TRUE)) + if( (adapter->bDriverStopped ==true) || (adapter->bSurpriseRemoved == true)) { RT_TRACE(_module_rtl871x_io_c_, _drv_info_, ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)", adapter->bDriverStopped, adapter->bSurpriseRemoved)); return; @@ -256,7 +256,7 @@ void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) _func_enter_; - if( (adapter->bDriverStopped ==_TRUE) || (adapter->bSurpriseRemoved == _TRUE)) + if( (adapter->bDriverStopped ==true) || (adapter->bSurpriseRemoved == true)) { RT_TRACE(_module_rtl871x_io_c_, _drv_info_, ("rtw_read_port:bDriverStopped(%d) OR bSurpriseRemoved(%d)", adapter->bDriverStopped, adapter->bSurpriseRemoved)); return; @@ -351,16 +351,16 @@ int rtw_init_io_priv(struct adapter *padapter, void (*set_intf_ops)(struct _io_o /* * Increase and check if the continual_io_error of this @param dvobjprive is larger than MAX_CONTINUAL_IO_ERR -* @return _TRUE: -* @return _FALSE: +* @return true: +* @return false: */ int rtw_inc_and_chk_continual_io_error(struct dvobj_priv *dvobj) { - int ret = _FALSE; + int ret = false; int value; if( (value=ATOMIC_INC_RETURN(&dvobj->continual_io_error)) > MAX_CONTINUAL_IO_ERR) { DBG_871X("[dvobj:%p][ERROR] continual_io_error:%d > %d\n", dvobj, value, MAX_CONTINUAL_IO_ERR); - ret = _TRUE; + ret = true; } else { //DBG_871X("[dvobj:%p] continual_io_error:%d\n", dvobj, value); } @@ -394,10 +394,10 @@ bool match_read_sniff_ranges(u16 addr, u16 len) int i; for (i = 0; i read_sniff_ranges[i][0] && addr <= read_sniff_ranges[i][1]) - return _TRUE; + return true; } - return _FALSE; + return false; } bool match_write_sniff_ranges(u16 addr, u16 len) @@ -405,10 +405,10 @@ bool match_write_sniff_ranges(u16 addr, u16 len) int i; for (i = 0; i write_sniff_ranges[i][0] && addr <= write_sniff_ranges[i][1]) - return _TRUE; + return true; } - return _FALSE; + return false; } u8 dbg_rtw_read8(struct adapter *adapter, u32 addr, const char *caller, const int line) diff --git a/core/rtw_ioctl_rtl.c b/core/rtw_ioctl_rtl.c index 56c982e..28dddb0 100755 --- a/core/rtw_ioctl_rtl.c +++ b/core/rtw_ioctl_rtl.c @@ -604,8 +604,8 @@ NDIS_STATUS oid_rt_get_channel_hdl(struct oid_par_priv* poid_par_priv) return status; } - if ( (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) + if ( (check_fwstate(pmlmepriv, _FW_LINKED) == true) || + (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) pnic_Config = &pmlmepriv->cur_network.network.Configuration; else pnic_Config = &padapter->registrypriv.dev_network.Configuration; @@ -860,11 +860,11 @@ NDIS_STATUS oid_rt_get_connect_state_hdl(struct oid_par_priv* poid_par_priv) // nStatus==2 AdHocMode // nStatus==3 NotAssociated - if(check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) + if(check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true) ulInfo = CHECKINGSTATUS; - else if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) + else if(check_fwstate(pmlmepriv, _FW_LINKED) == true) ulInfo = ASSOCIATED; - else if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)== _TRUE) + else if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)== true) ulInfo = ADHOCMODE; else ulInfo = NOTASSOCIATED ; diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c index 0be92c0..74e7e9a 100755 --- a/core/rtw_ioctl_set.c +++ b/core/rtw_ioctl_set.c @@ -34,18 +34,18 @@ void indicate_wx_scan_complete_event(struct adapter *padapter); ( \ ( (addr[0] == 0xff) && (addr[1] == 0xff) && \ (addr[2] == 0xff) && (addr[3] == 0xff) && \ - (addr[4] == 0xff) && (addr[5] == 0xff) ) ? _TRUE : _FALSE \ + (addr[4] == 0xff) && (addr[5] == 0xff) ) ? true : false \ ) u8 rtw_validate_bssid(u8 *bssid) { - u8 ret = _TRUE; + u8 ret = true; if (is_zero_mac_addr(bssid) || is_broadcast_mac_addr(bssid) || is_multicast_mac_addr(bssid) ) { - ret = _FALSE; + ret = false; } return ret; @@ -54,13 +54,13 @@ u8 rtw_validate_bssid(u8 *bssid) u8 rtw_validate_ssid(NDIS_802_11_SSID *ssid) { u8 i; - u8 ret=_TRUE; + u8 ret=true; _func_enter_; if (ssid->SsidLength > 32) { RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid length >32\n")); - ret= _FALSE; + ret= false; goto exit; } @@ -70,7 +70,7 @@ _func_enter_; //wifi, printable ascii code must be supported if(!( (ssid->Ssid[i] >= 0x20) && (ssid->Ssid[i] <= 0x7e) )){ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid has nonprintabl ascii\n")); - ret= _FALSE; + ret= false; break; } } @@ -107,9 +107,9 @@ _func_enter_; pmlmepriv->pscanned = plist; - pmlmepriv->to_join = _TRUE; + pmlmepriv->to_join = true; - if(_rtw_queue_empty(queue)== _TRUE) + if(_rtw_queue_empty(queue)== true) { _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); @@ -117,20 +117,20 @@ _func_enter_; //when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empty //we try to issue sitesurvey firstly - if (pmlmepriv->LinkDetectInfo.bBusyTraffic ==_FALSE + if (pmlmepriv->LinkDetectInfo.bBusyTraffic ==false || rtw_to_roaming(padapter) > 0 ) { RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_do_join(): site survey if scanned_queue is empty\n.")); // submit site_survey_cmd if(_SUCCESS!=(ret=rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)) ) { - pmlmepriv->to_join = _FALSE; + pmlmepriv->to_join = false; RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_do_join(): site survey return error\n.")); } } else { - pmlmepriv->to_join = _FALSE; + pmlmepriv->to_join = false; ret = _FAIL; } @@ -142,12 +142,12 @@ _func_enter_; _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); if((select_ret=rtw_select_and_join_from_scanned_queue(pmlmepriv))==_SUCCESS) { - pmlmepriv->to_join = _FALSE; + pmlmepriv->to_join = false; _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); } else { - if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE) + if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==true) { // submit createbss_cmd to change to a ADHOC_MASTER @@ -168,11 +168,11 @@ _func_enter_; if(rtw_createbss_cmd(padapter)!=_SUCCESS) { RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>do_goin: rtw_createbss_cmd status FAIL*** \n ")); - ret = _FALSE; + ret = false; goto exit; } - pmlmepriv->to_join = _FALSE; + pmlmepriv->to_join = false; RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("***Error=> rtw_select_and_join_from_scanned_queue FAIL under STA_Mode*** \n ")); @@ -182,20 +182,20 @@ _func_enter_; //when set_ssid/set_bssid for rtw_do_join(), but there are no desired bss in scanning queue //we try to issue sitesurvey firstly - if(pmlmepriv->LinkDetectInfo.bBusyTraffic==_FALSE + if(pmlmepriv->LinkDetectInfo.bBusyTraffic==false || rtw_to_roaming(padapter) > 0 ) { //DBG_871X("rtw_do_join() when no desired bss in scanning queue \n"); if( _SUCCESS!=(ret=rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)) ){ - pmlmepriv->to_join = _FALSE; + pmlmepriv->to_join = false; RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("do_join(): site survey return error\n.")); } } else { ret = _FAIL; - pmlmepriv->to_join = _FALSE; + pmlmepriv->to_join = false; } } @@ -233,33 +233,33 @@ _func_enter_; DBG_871X("Set BSSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv)); - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) { goto handle_tkip_countermeasure; - } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) { + } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true) { goto release_mlme_lock; } - if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == _TRUE) + if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == true) { RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n")); - if (_rtw_memcmp(&pmlmepriv->cur_network.network.MacAddress, bssid, ETH_ALEN) == _TRUE) + if (_rtw_memcmp(&pmlmepriv->cur_network.network.MacAddress, bssid, ETH_ALEN) == true) { - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _FALSE) + if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == false) goto release_mlme_lock;//it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. } else { RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("Set BSSID not the same bssid\n")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("set_bssid="MAC_FMT"\n", MAC_ARG(bssid) )); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("cur_bssid="MAC_FMT"\n", MAC_ARG(pmlmepriv->cur_network.network.MacAddress) )); - rtw_disassoc_cmd(padapter, 0, _TRUE); + rtw_disassoc_cmd(padapter, 0, true); - if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) + if (check_fwstate(pmlmepriv, _FW_LINKED) == true) rtw_indicate_disconnect(padapter); rtw_free_assoc_resources(padapter, 1); - if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) { + if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) { _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE); set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); } @@ -273,10 +273,10 @@ handle_tkip_countermeasure: } _rtw_memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN); - pmlmepriv->assoc_by_bssid=_TRUE; + pmlmepriv->assoc_by_bssid=true; - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { - pmlmepriv->to_join = _TRUE; + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) { + pmlmepriv->to_join = true; } else { status = rtw_do_join(padapter); @@ -308,9 +308,9 @@ _func_enter_; DBG_871X_LEVEL(_drv_always_, "set ssid [%s] fw_state=0x%08x\n", ssid->Ssid, get_fwstate(pmlmepriv)); - if(padapter->hw_init_completed==_FALSE){ + if(padapter->hw_init_completed==false){ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, - ("set_ssid: hw_init_completed==_FALSE=>exit!!!\n")); + ("set_ssid: hw_init_completed==false=>exit!!!\n")); status = _FAIL; goto exit; } @@ -318,37 +318,37 @@ _func_enter_; _enter_critical_bh(&pmlmepriv->lock, &irqL); DBG_871X("Set SSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv)); - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) { goto handle_tkip_countermeasure; - } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) { + } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true) { goto release_mlme_lock; } - if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == _TRUE) + if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == true) { RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_ssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n")); if ((pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength) && - (_rtw_memcmp(&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength) == _TRUE)) + (_rtw_memcmp(&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength) == true)) { - if((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _FALSE)) + if((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == false)) { RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("Set SSID is the same ssid, fw_state=0x%08x\n", get_fwstate(pmlmepriv))); - if(rtw_is_same_ibss(padapter, pnetwork) == _FALSE) + if(rtw_is_same_ibss(padapter, pnetwork) == false) { //if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again - rtw_disassoc_cmd(padapter, 0, _TRUE); + rtw_disassoc_cmd(padapter, 0, true); - if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) + if (check_fwstate(pmlmepriv, _FW_LINKED) == true) rtw_indicate_disconnect(padapter); rtw_free_assoc_resources(padapter, 1); - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) { + if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) { _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE); set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); } @@ -370,14 +370,14 @@ _func_enter_; RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("set_ssid=[%s] len=0x%x\n", ssid->Ssid, (unsigned int)ssid->SsidLength)); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("assoc_ssid=[%s] len=0x%x\n", pmlmepriv->assoc_ssid.Ssid, (unsigned int)pmlmepriv->assoc_ssid.SsidLength)); - rtw_disassoc_cmd(padapter, 0, _TRUE); + rtw_disassoc_cmd(padapter, 0, true); - if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) + if (check_fwstate(pmlmepriv, _FW_LINKED) == true) rtw_indicate_disconnect(padapter); rtw_free_assoc_resources(padapter, 1); - if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) { + if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) { _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE); set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); } @@ -390,16 +390,16 @@ handle_tkip_countermeasure: goto release_mlme_lock; } - if (rtw_validate_ssid(ssid) == _FALSE) { + if (rtw_validate_ssid(ssid) == false) { status = _FAIL; goto release_mlme_lock; } _rtw_memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID)); - pmlmepriv->assoc_by_bssid=_FALSE; + pmlmepriv->assoc_by_bssid=false; - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { - pmlmepriv->to_join = _TRUE; + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) { + pmlmepriv->to_join = true; } else { status = rtw_do_join(padapter); @@ -423,28 +423,28 @@ u8 rtw_set_802_11_connect(struct adapter* padapter, u8 *bssid, NDIS_802_11_SSID _irqL irqL; u8 status = _SUCCESS; u32 cur_time = 0; - bool bssid_valid = _TRUE; - bool ssid_valid = _TRUE; + bool bssid_valid = true; + bool ssid_valid = true; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _func_enter_; - if (!ssid || rtw_validate_ssid(ssid) == _FALSE) - ssid_valid = _FALSE; + if (!ssid || rtw_validate_ssid(ssid) == false) + ssid_valid = false; - if (!bssid || rtw_validate_bssid(bssid) == _FALSE) - bssid_valid = _FALSE; + if (!bssid || rtw_validate_bssid(bssid) == false) + bssid_valid = false; - if (ssid_valid == _FALSE && bssid_valid == _FALSE) { + if (ssid_valid == false && bssid_valid == false) { DBG_871X(FUNC_ADPT_FMT" ssid:%p, ssid_valid:%d, bssid:%p, bssid_valid:%d\n", FUNC_ADPT_ARG(padapter), ssid, ssid_valid, bssid, bssid_valid); status = _FAIL; goto exit; } - if(padapter->hw_init_completed==_FALSE){ + if(padapter->hw_init_completed==false){ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, - ("set_ssid: hw_init_completed==_FALSE=>exit!!!\n")); + ("set_ssid: hw_init_completed==false=>exit!!!\n")); status = _FAIL; goto exit; } @@ -454,9 +454,9 @@ _func_enter_; DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" fw_state=0x%08x\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv)); - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) { goto handle_tkip_countermeasure; - } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) { + } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true) { goto release_mlme_lock; } @@ -471,11 +471,11 @@ handle_tkip_countermeasure: if (bssid && bssid_valid) { _rtw_memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN); - pmlmepriv->assoc_by_bssid = _TRUE; + pmlmepriv->assoc_by_bssid = true; } - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { - pmlmepriv->to_join = _TRUE; + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) { + pmlmepriv->to_join = true; } else { status = rtw_do_join(padapter); @@ -522,16 +522,16 @@ _func_enter_; #endif } - if((check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) ||(*pold_state==Ndis802_11IBSS)) - rtw_disassoc_cmd(padapter, 0, _TRUE); + if((check_fwstate(pmlmepriv, _FW_LINKED)== true) ||(*pold_state==Ndis802_11IBSS)) + rtw_disassoc_cmd(padapter, 0, true); - if((check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)== _TRUE) ) + if((check_fwstate(pmlmepriv, _FW_LINKED)== true) || + (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)== true) ) rtw_free_assoc_resources(padapter, 1); if((*pold_state == Ndis802_11Infrastructure) ||(*pold_state == Ndis802_11IBSS)) { - if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) + if(check_fwstate(pmlmepriv, _FW_LINKED) == true) { rtw_indicate_disconnect(padapter); //will clr Linked_state; before this function, we must have chked whether issue dis-assoc_cmd or not } @@ -575,7 +575,7 @@ _func_enter_; _func_exit_; - return _TRUE; + return true; } @@ -588,11 +588,11 @@ _func_enter_; _enter_critical_bh(&pmlmepriv->lock, &irqL); - if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) + if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("MgntActrtw_set_802_11_disassociate: rtw_indicate_disconnect\n")); - rtw_disassoc_cmd(padapter, 0, _TRUE); + rtw_disassoc_cmd(padapter, 0, true); rtw_indicate_disconnect(padapter); //modify for CONFIG_IEEE80211W, none 11w can use it rtw_free_assoc_resources_cmd(padapter); @@ -603,40 +603,40 @@ _func_enter_; _func_exit_; - return _TRUE; + return true; } u8 rtw_set_802_11_bssid_list_scan(struct adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num) { _irqL irqL; struct mlme_priv *pmlmepriv= &padapter->mlmepriv; - u8 res=_TRUE; + u8 res=true; _func_enter_; RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("+rtw_set_802_11_bssid_list_scan(), fw_state=%x\n", get_fwstate(pmlmepriv))); if (padapter == NULL) { - res=_FALSE; + res=false; goto exit; } - if (padapter->hw_init_completed==_FALSE){ - res = _FALSE; - RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n===rtw_set_802_11_bssid_list_scan:hw_init_completed==_FALSE===\n")); + if (padapter->hw_init_completed==false){ + res = false; + RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n===rtw_set_802_11_bssid_list_scan:hw_init_completed==false===\n")); goto exit; } - if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) || - (pmlmepriv->LinkDetectInfo.bBusyTraffic == _TRUE)) + if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) || + (pmlmepriv->LinkDetectInfo.bBusyTraffic == true)) { // Scan or linking is in progress, do nothing. RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_set_802_11_bssid_list_scan fail since fw_state = %x\n", get_fwstate(pmlmepriv))); - res = _TRUE; + res = true; - if(check_fwstate(pmlmepriv, (_FW_UNDER_SURVEY|_FW_UNDER_LINKING))== _TRUE){ + if(check_fwstate(pmlmepriv, (_FW_UNDER_SURVEY|_FW_UNDER_LINKING))== true){ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n###_FW_UNDER_SURVEY|_FW_UNDER_LINKING\n\n")); } else { - RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n###pmlmepriv->sitesurveyctrl.traffic_busy==_TRUE\n\n")); + RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n###pmlmepriv->sitesurveyctrl.traffic_busy==true\n\n")); } } else { if (rtw_is_scan_deny(padapter)) { @@ -683,9 +683,9 @@ _func_enter_; res=rtw_set_auth(padapter,psecuritypriv); if(res==_SUCCESS) - ret=_TRUE; + ret=true; else - ret=_FALSE; + ret=false; _func_exit_; @@ -702,14 +702,14 @@ u8 rtw_set_802_11_add_wep(struct adapter* padapter, NDIS_802_11_WEP *wep){ _func_enter_; - bdefaultkey=(wep->KeyIndex & 0x40000000) > 0 ? _FALSE : _TRUE; //for ??? - btransmitkey= (wep->KeyIndex & 0x80000000) > 0 ? _TRUE : _FALSE; //for ??? + bdefaultkey=(wep->KeyIndex & 0x40000000) > 0 ? false : true; //for ??? + btransmitkey= (wep->KeyIndex & 0x80000000) > 0 ? true : false; //for ??? keyid=wep->KeyIndex & 0x3fffffff; if(keyid>4) { RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("MgntActrtw_set_802_11_add_wep:keyid>4=>fail\n")); - ret=_FALSE; + ret=false; goto exit; } @@ -744,10 +744,10 @@ _func_enter_; psecuritypriv->dot11DefKey[keyid].skey[9],psecuritypriv->dot11DefKey[keyid].skey[10],psecuritypriv->dot11DefKey[keyid].skey[11], psecuritypriv->dot11DefKey[keyid].skey[12])); - res=rtw_set_key(padapter,psecuritypriv, keyid, 1,_TRUE); + res=rtw_set_key(padapter,psecuritypriv, keyid, 1,true); if(res==_FAIL) - ret= _FALSE; + ret= false; exit: _func_exit_; @@ -764,7 +764,7 @@ _func_enter_; if (keyindex >= 0x80000000 || padapter == NULL){ - ret=_FALSE; + ret=false; goto exit; } @@ -776,7 +776,7 @@ _func_enter_; _rtw_memset(&psecuritypriv->dot11DefKey[keyindex], 0, 16); - res=rtw_set_key(padapter,psecuritypriv,keyindex, 0,_TRUE); + res=rtw_set_key(padapter,psecuritypriv,keyindex, 0,true); psecuritypriv->dot11DefKeylen[keyindex]=0; @@ -804,8 +804,8 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, NDIS_802_11_KEY *key){ uint encryptionalgo; u8 * pbssid; struct sta_info *stainfo; - u8 bgroup = _FALSE; - u8 bgrouptkey = _FALSE;//can be remove later + u8 bgroup = false; + u8 bgrouptkey = false;//can be remove later u8 ret=_SUCCESS; _func_enter_; @@ -857,10 +857,10 @@ _func_enter_; } // check BSSID - if (IS_MAC_ADDRESS_BROADCAST(key->BSSID) == _TRUE){ + if (IS_MAC_ADDRESS_BROADCAST(key->BSSID) == true){ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("MacAddr_isBcst(key->BSSID)\n")); - ret= _FALSE; + ret= false; goto exit; } @@ -891,7 +891,7 @@ _func_enter_; goto exit; } - bgroup = _FALSE; + bgroup = false; // Check the pairwise key. Added by Annie, 2005-07-06. RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n")); @@ -941,7 +941,7 @@ _func_enter_; } - if((check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE)==_TRUE) && (IS_MAC_ADDRESS_BROADCAST(key->BSSID) == _FALSE)) { + if((check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE)==true) && (IS_MAC_ADDRESS_BROADCAST(key->BSSID) == false)) { RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,(" IBSS but BSSID is not Broadcast Address.\n")); ret= _FAIL; goto exit; @@ -970,15 +970,15 @@ _func_enter_; } if(key->KeyIndex & 0x8000000) {//error ??? 0x8000_0000 - bgrouptkey = _TRUE; + bgrouptkey = true; } - if((check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE)==_TRUE)&&(check_fwstate(&padapter->mlmepriv, _FW_LINKED)==_TRUE)) + if((check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE)==true)&&(check_fwstate(&padapter->mlmepriv, _FW_LINKED)==true)) { - bgrouptkey = _TRUE; + bgrouptkey = true; } - bgroup = _TRUE; + bgroup = true; RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n") ); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("[Group Key set]\n") ); @@ -1021,7 +1021,7 @@ _func_enter_; if(key->KeyIndex & 0x20000000){ // SetRSC RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ SetRSC+++++\n")); - if(bgroup == _TRUE) + if(bgroup == true) { NDIS_802_11_KEY_RSC keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL; _rtw_memcpy(&padapter->securitypriv.dot11Grprxpn, &keysrc, 8); @@ -1036,11 +1036,11 @@ _func_enter_; // Indicate this key idx is used for TX // Save the key in KeyMaterial - if(bgroup == _TRUE) // Group transmit key + if(bgroup == true) // Group transmit key { int res; - if(bgrouptkey == _TRUE) + if(bgrouptkey == true) { padapter->securitypriv.dot118021XGrpKeyid=(u8)key->KeyIndex; } @@ -1086,13 +1086,13 @@ _func_enter_; key->KeyIndex=key->KeyIndex & 0x03; - padapter->securitypriv.binstallGrpkey=_TRUE; + padapter->securitypriv.binstallGrpkey=true; - padapter->securitypriv.bcheck_grpkey=_FALSE; + padapter->securitypriv.bcheck_grpkey=false; RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("reset group key")); - res=rtw_set_key(padapter,&padapter->securitypriv, key->KeyIndex, 1,_TRUE); + res=rtw_set_key(padapter,&padapter->securitypriv, key->KeyIndex, 1,true); if(res==_FAIL) ret= _FAIL; @@ -1115,7 +1115,7 @@ _func_enter_; if(encryptionalgo== _TKIP_) { - padapter->securitypriv.busetkipkey=_FALSE; + padapter->securitypriv.busetkipkey=false; //_set_timer(&padapter->securitypriv.tkip_timer, 50); @@ -1142,15 +1142,15 @@ _func_enter_; //Set key to CAM through H2C command if(bgrouptkey)//never go to here { - res=rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, _FALSE, _TRUE); + res=rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, false, true); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(group)\n")); } else{ - res=rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, _TRUE, _TRUE); + res=rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, true, true); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(unicast)\n")); } - if(res ==_FALSE) + if(res ==false) ret= _FAIL; } @@ -1169,7 +1169,7 @@ u8 rtw_set_802_11_remove_key(struct adapter* padapter, NDIS_802_11_REMOVE_KEY *k uint encryptionalgo; u8 * pbssid; struct sta_info *stainfo; - u8 bgroup = (key->KeyIndex & 0x4000000) > 0 ? _FALSE: _TRUE; + u8 bgroup = (key->KeyIndex & 0x4000000) > 0 ? false: true; u8 keyIndex = (u8)key->KeyIndex & 0x03; u8 ret=_SUCCESS; @@ -1180,7 +1180,7 @@ _func_enter_; goto exit; } - if (bgroup == _TRUE) { + if (bgroup == true) { encryptionalgo= padapter->securitypriv.dot118021XGrpPrivacy; // clear group key by index //NdisZeroMemory(Adapter->MgntInfo.SecurityInfo.KeyBuf[keyIndex], MAX_WEP_KEY_LEN); @@ -1213,7 +1213,7 @@ exit: _func_exit_; - return _TRUE; + return true; } @@ -1241,8 +1241,8 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) u32 ht_ielen = 0; #endif - if((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) - && (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != _TRUE)) + if((check_fwstate(pmlmepriv, _FW_LINKED) != true) + && (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != true)) return 0; #ifdef CONFIG_80211N_HT diff --git a/core/rtw_iol.c b/core/rtw_iol.c index a35e0ea..20f8cad 100755 --- a/core/rtw_iol.c +++ b/core/rtw_iol.c @@ -99,11 +99,11 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len bool rtw_IOL_applied(struct adapter *adapter) { if(1 == adapter->registrypriv.fw_iol) - return _TRUE; + return true; if((2 == adapter->registrypriv.fw_iol) && (!adapter_to_dvobj(adapter)->ishighspeed)) - return _TRUE; - return _FALSE; + return true; + return false; } int rtw_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt) @@ -233,14 +233,14 @@ int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame) u8 rtw_IOL_cmd_boundary_handle(struct xmit_frame *pxmit_frame) { - u8 is_cmd_bndy = _FALSE; + u8 is_cmd_bndy = false; if(((pxmit_frame->attrib.pktlen+32)%256) + 8 >= 256){ rtw_IOL_append_END_cmd(pxmit_frame); pxmit_frame->attrib.pktlen = ((((pxmit_frame->attrib.pktlen+32)/256)+1)*256 ); //printk("==> %s, pktlen(%d)\n",__FUNCTION__,pxmit_frame->attrib.pktlen); pxmit_frame->attrib.last_txcmdsz = pxmit_frame->attrib.pktlen; - is_cmd_bndy = _TRUE; + is_cmd_bndy = true; } return is_cmd_bndy; } diff --git a/core/rtw_led.c b/core/rtw_led.c index 03ca868..9d4b730 100755 --- a/core/rtw_led.c +++ b/core/rtw_led.c @@ -32,7 +32,7 @@ void BlinkTimerCallback(void *data) //DBG_871X("%s\n", __FUNCTION__); - if( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)) + if( (padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true)) { //DBG_871X("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __FUNCTION__, padapter->bSurpriseRemoved, padapter->bDriverStopped); return; @@ -63,18 +63,18 @@ void BlinkWorkItemCallback(struct work_struct *work) void ResetLedStatus(PLED_871x pLed) { pLed->CurrLedState = RTW_LED_OFF; // Current LED state. - pLed->bLedOn = _FALSE; // true if LED is ON, false if LED is OFF. + pLed->bLedOn = false; // true if LED is ON, false if LED is OFF. - pLed->bLedBlinkInProgress = _FALSE; // true if it is blinking, false o.w.. - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; // true if it is blinking, false o.w.. + pLed->bLedWPSBlinkInProgress = false; pLed->BlinkTimes = 0; // Number of times to toggle led state for blinking. pLed->BlinkingLedState = LED_UNKNOWN; // Next state for blinking, either RTW_LED_ON or RTW_LED_OFF are. - pLed->bLedNoLinkBlinkInProgress = _FALSE; - pLed->bLedLinkBlinkInProgress = _FALSE; - pLed->bLedStartToLinkBlinkInProgress = _FALSE; - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedNoLinkBlinkInProgress = false; + pLed->bLedLinkBlinkInProgress = false; + pLed->bLedStartToLinkBlinkInProgress = false; + pLed->bLedScanBlinkInProgress = false; } // @@ -132,7 +132,7 @@ SwLedBlink( { struct adapter *padapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - u8 bStopBlinking = _FALSE; + u8 bStopBlinking = false; // Change LED according to BlinkingLedState specified. if( pLed->BlinkingLedState == RTW_LED_ON ) @@ -154,36 +154,36 @@ SwLedBlink( case LED_BLINK_NORMAL: if(pLed->BlinkTimes == 0) { - bStopBlinking = _TRUE; + bStopBlinking = true; } break; case LED_BLINK_StartToBlink: if( check_fwstate(pmlmepriv, _FW_LINKED) && check_fwstate(pmlmepriv, WIFI_STATION_STATE) ) { - bStopBlinking = _TRUE; + bStopBlinking = true; } if( check_fwstate(pmlmepriv, _FW_LINKED) && (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) || check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) ) { - bStopBlinking = _TRUE; + bStopBlinking = true; } else if(pLed->BlinkTimes == 0) { - bStopBlinking = _TRUE; + bStopBlinking = true; } break; case LED_BLINK_WPS: if( pLed->BlinkTimes == 0 ) { - bStopBlinking = _TRUE; + bStopBlinking = true; } break; default: - bStopBlinking = _TRUE; + bStopBlinking = true; break; } @@ -195,17 +195,17 @@ SwLedBlink( { SwLedOff(padapter, pLed); } - else if( (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) && (pLed->bLedOn == _FALSE)) + else if( (check_fwstate(pmlmepriv, _FW_LINKED)== true) && (pLed->bLedOn == false)) { SwLedOn(padapter, pLed); } - else if( (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) && pLed->bLedOn == _TRUE) + else if( (check_fwstate(pmlmepriv, _FW_LINKED)== true) && pLed->bLedOn == true) { SwLedOff(padapter, pLed); } pLed->BlinkTimes = 0; - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } else { @@ -255,7 +255,7 @@ SwLedBlink1( struct led_priv *ledpriv = &(padapter->ledpriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); PLED_871x pLed1 = &(ledpriv->SwLed1); - u8 bStopBlinking = _FALSE; + u8 bStopBlinking = false; #ifndef CONFIG_LED_REMOVE_HAL if(pHalData->EEPROMCustomerID == RT_CID_819x_CAMEO) @@ -277,12 +277,12 @@ SwLedBlink1( #ifndef CONFIG_LED_REMOVE_HAL if(pHalData->EEPROMCustomerID == RT_CID_DEFAULT) { - if(check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) + if(check_fwstate(pmlmepriv, _FW_LINKED)== true) { if(!pLed1->bSWLedCtrl) { SwLedOn(padapter, pLed1); - pLed1->bSWLedCtrl = _TRUE; + pLed1->bSWLedCtrl = true; } else if(!pLed1->bLedOn) SwLedOn(padapter, pLed1); @@ -293,7 +293,7 @@ SwLedBlink1( if(!pLed1->bSWLedCtrl) { SwLedOff(padapter, pLed1); - pLed1->bSWLedCtrl = _TRUE; + pLed1->bSWLedCtrl = true; } else if(pLed1->bLedOn) SwLedOff(padapter, pLed1); @@ -332,14 +332,14 @@ SwLedBlink1( pLed->BlinkTimes--; if( pLed->BlinkTimes == 0 ) { - bStopBlinking = _TRUE; + bStopBlinking = true; } if(bStopBlinking) { - if(check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) + if(check_fwstate(pmlmepriv, _FW_LINKED)== true) { - pLed->bLedLinkBlinkInProgress = _TRUE; + pLed->bLedLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_NORMAL; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -349,9 +349,9 @@ SwLedBlink1( RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); } - else if(check_fwstate(pmlmepriv, _FW_LINKED)== _FALSE) + else if(check_fwstate(pmlmepriv, _FW_LINKED)== false) { - pLed->bLedNoLinkBlinkInProgress = _TRUE; + pLed->bLedNoLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SLOWLY; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -360,7 +360,7 @@ SwLedBlink1( _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); } - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } else { @@ -376,13 +376,13 @@ SwLedBlink1( pLed->BlinkTimes--; if( pLed->BlinkTimes == 0 ) { - bStopBlinking = _TRUE; + bStopBlinking = true; } if(bStopBlinking) { - if(check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) + if(check_fwstate(pmlmepriv, _FW_LINKED)== true) { - pLed->bLedLinkBlinkInProgress = _TRUE; + pLed->bLedLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_NORMAL; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -391,9 +391,9 @@ SwLedBlink1( _set_timer(&(pLed->BlinkTimer), LED_BLINK_LINK_INTERVAL_ALPHA); RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); } - else if(check_fwstate(pmlmepriv, _FW_LINKED)== _FALSE) + else if(check_fwstate(pmlmepriv, _FW_LINKED)== false) { - pLed->bLedNoLinkBlinkInProgress = _TRUE; + pLed->bLedNoLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SLOWLY; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -403,7 +403,7 @@ SwLedBlink1( RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); } pLed->BlinkTimes = 0; - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } else { @@ -425,13 +425,13 @@ SwLedBlink1( case LED_BLINK_WPS_STOP: //WPS success if(pLed->BlinkingLedState == RTW_LED_ON) - bStopBlinking = _FALSE; + bStopBlinking = false; else - bStopBlinking = _TRUE; + bStopBlinking = true; if(bStopBlinking) { - pLed->bLedLinkBlinkInProgress = _TRUE; + pLed->bLedLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_NORMAL; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -440,7 +440,7 @@ SwLedBlink1( _set_timer(&(pLed->BlinkTimer), LED_BLINK_LINK_INTERVAL_ALPHA); RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedWPSBlinkInProgress = false; } else { @@ -462,7 +462,7 @@ SwLedBlink2( { struct adapter *padapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - u8 bStopBlinking = _FALSE; + u8 bStopBlinking = false; // Change LED according to BlinkingLedState specified. if( pLed->BlinkingLedState == RTW_LED_ON) @@ -482,7 +482,7 @@ SwLedBlink2( pLed->BlinkTimes--; if( pLed->BlinkTimes == 0 ) { - bStopBlinking = _TRUE; + bStopBlinking = true; } if(bStopBlinking) @@ -491,7 +491,7 @@ SwLedBlink2( { SwLedOff(padapter, pLed); } - else if(check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) + else if(check_fwstate(pmlmepriv, _FW_LINKED)== true) { pLed->CurrLedState = RTW_LED_ON; pLed->BlinkingLedState = RTW_LED_ON; @@ -499,14 +499,14 @@ SwLedBlink2( RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("stop scan blink CurrLedState %d\n", pLed->CurrLedState)); } - else if(check_fwstate(pmlmepriv, _FW_LINKED)== _FALSE) + else if(check_fwstate(pmlmepriv, _FW_LINKED)== false) { pLed->CurrLedState = RTW_LED_OFF; pLed->BlinkingLedState = RTW_LED_OFF; SwLedOff(padapter, pLed); RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("stop scan blink CurrLedState %d\n", pLed->CurrLedState)); } - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } else { @@ -529,7 +529,7 @@ SwLedBlink2( pLed->BlinkTimes--; if( pLed->BlinkTimes == 0 ) { - bStopBlinking = _TRUE; + bStopBlinking = true; } if(bStopBlinking) { @@ -537,7 +537,7 @@ SwLedBlink2( { SwLedOff(padapter, pLed); } - else if(check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) + else if(check_fwstate(pmlmepriv, _FW_LINKED)== true) { pLed->CurrLedState = RTW_LED_ON; pLed->BlinkingLedState = RTW_LED_ON; @@ -545,14 +545,14 @@ SwLedBlink2( RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("stop CurrLedState %d\n", pLed->CurrLedState)); } - else if(check_fwstate(pmlmepriv, _FW_LINKED)== _FALSE) + else if(check_fwstate(pmlmepriv, _FW_LINKED)== false) { pLed->CurrLedState = RTW_LED_OFF; pLed->BlinkingLedState = RTW_LED_OFF; SwLedOff(padapter, pLed); RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("stop CurrLedState %d\n", pLed->CurrLedState)); } - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } else { @@ -584,7 +584,7 @@ SwLedBlink3( { struct adapter *padapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - u8 bStopBlinking = _FALSE; + u8 bStopBlinking = false; // Change LED according to BlinkingLedState specified. if( pLed->BlinkingLedState == RTW_LED_ON ) @@ -605,7 +605,7 @@ SwLedBlink3( pLed->BlinkTimes--; if( pLed->BlinkTimes == 0 ) { - bStopBlinking = _TRUE; + bStopBlinking = true; } if(bStopBlinking) @@ -614,7 +614,7 @@ SwLedBlink3( { SwLedOff(padapter, pLed); } - else if(check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) + else if(check_fwstate(pmlmepriv, _FW_LINKED)== true) { pLed->CurrLedState = RTW_LED_ON; pLed->BlinkingLedState = RTW_LED_ON; @@ -623,7 +623,7 @@ SwLedBlink3( RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); } - else if(check_fwstate(pmlmepriv, _FW_LINKED)== _FALSE) + else if(check_fwstate(pmlmepriv, _FW_LINKED)== false) { pLed->CurrLedState = RTW_LED_OFF; pLed->BlinkingLedState = RTW_LED_OFF; @@ -632,7 +632,7 @@ SwLedBlink3( RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); } - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } else { @@ -655,7 +655,7 @@ SwLedBlink3( pLed->BlinkTimes--; if( pLed->BlinkTimes == 0 ) { - bStopBlinking = _TRUE; + bStopBlinking = true; } if(bStopBlinking) { @@ -663,7 +663,7 @@ SwLedBlink3( { SwLedOff(padapter, pLed); } - else if(check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) + else if(check_fwstate(pmlmepriv, _FW_LINKED)== true) { pLed->CurrLedState = RTW_LED_ON; pLed->BlinkingLedState = RTW_LED_ON; @@ -673,7 +673,7 @@ SwLedBlink3( RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); } - else if(check_fwstate(pmlmepriv, _FW_LINKED)== _FALSE) + else if(check_fwstate(pmlmepriv, _FW_LINKED)== false) { pLed->CurrLedState = RTW_LED_OFF; pLed->BlinkingLedState = RTW_LED_OFF; @@ -684,7 +684,7 @@ SwLedBlink3( RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); } - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } else { @@ -716,11 +716,11 @@ SwLedBlink3( { pLed->BlinkingLedState = RTW_LED_OFF; _set_timer(&(pLed->BlinkTimer), LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA); - bStopBlinking = _FALSE; + bStopBlinking = false; } else { - bStopBlinking = _TRUE; + bStopBlinking = true; } if(bStopBlinking) @@ -736,7 +736,7 @@ SwLedBlink3( SwLedOn(padapter, pLed); RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); } - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedWPSBlinkInProgress = false; } break; @@ -757,7 +757,7 @@ SwLedBlink4( struct led_priv *ledpriv = &(padapter->ledpriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); PLED_871x pLed1 = &(ledpriv->SwLed1); - u8 bStopBlinking = _FALSE; + u8 bStopBlinking = false; // Change LED according to BlinkingLedState specified. if( pLed->BlinkingLedState == RTW_LED_ON ) @@ -805,7 +805,7 @@ SwLedBlink4( pLed->BlinkTimes--; if( pLed->BlinkTimes == 0 ) { - bStopBlinking = _FALSE; + bStopBlinking = false; } if(bStopBlinking) @@ -816,7 +816,7 @@ SwLedBlink4( } else { - pLed->bLedNoLinkBlinkInProgress = _FALSE; + pLed->bLedNoLinkBlinkInProgress = false; pLed->CurrLedState = LED_BLINK_SLOWLY; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -824,7 +824,7 @@ SwLedBlink4( pLed->BlinkingLedState = RTW_LED_ON; _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); } - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } else { @@ -847,7 +847,7 @@ SwLedBlink4( pLed->BlinkTimes--; if( pLed->BlinkTimes == 0 ) { - bStopBlinking = _TRUE; + bStopBlinking = true; } if(bStopBlinking) { @@ -857,7 +857,7 @@ SwLedBlink4( } else { - pLed->bLedNoLinkBlinkInProgress = _TRUE; + pLed->bLedNoLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SLOWLY; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -865,7 +865,7 @@ SwLedBlink4( pLed->BlinkingLedState = RTW_LED_ON; _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); } - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } else { @@ -916,7 +916,7 @@ SwLedBlink4( } else { - bStopBlinking = _TRUE; + bStopBlinking = true; } } @@ -954,7 +954,7 @@ SwLedBlink5( { struct adapter *padapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - u8 bStopBlinking = _FALSE; + u8 bStopBlinking = false; // Change LED according to BlinkingLedState specified. if( pLed->BlinkingLedState == RTW_LED_ON ) @@ -974,7 +974,7 @@ SwLedBlink5( pLed->BlinkTimes--; if( pLed->BlinkTimes == 0 ) { - bStopBlinking = _TRUE; + bStopBlinking = true; } if(bStopBlinking) @@ -993,7 +993,7 @@ SwLedBlink5( _set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA); } - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } else { @@ -1017,7 +1017,7 @@ SwLedBlink5( pLed->BlinkTimes--; if( pLed->BlinkTimes == 0 ) { - bStopBlinking = _TRUE; + bStopBlinking = true; } if(bStopBlinking) @@ -1037,7 +1037,7 @@ SwLedBlink5( _set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA); } - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } else { @@ -1072,7 +1072,7 @@ SwLedBlink6( { struct adapter *padapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - u8 bStopBlinking = _FALSE; + u8 bStopBlinking = false; // Change LED according to BlinkingLedState specified. if( pLed->BlinkingLedState == RTW_LED_ON ) @@ -1103,9 +1103,9 @@ SwLedControlMode0( { case LED_CTL_TX: case LED_CTL_RX: - if( pLed->bLedBlinkInProgress == _FALSE ) + if( pLed->bLedBlinkInProgress == false ) { - pLed->bLedBlinkInProgress = _TRUE; + pLed->bLedBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_NORMAL; pLed->BlinkTimes = 2; @@ -1119,9 +1119,9 @@ SwLedControlMode0( break; case LED_CTL_START_TO_LINK: - if( pLed->bLedBlinkInProgress == _FALSE ) + if( pLed->bLedBlinkInProgress == false ) { - pLed->bLedBlinkInProgress = _TRUE; + pLed->bLedBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_StartToBlink; pLed->BlinkTimes = 24; @@ -1140,7 +1140,7 @@ SwLedControlMode0( case LED_CTL_LINK: pLed->CurrLedState = RTW_LED_ON; - if( pLed->bLedBlinkInProgress == _FALSE ) + if( pLed->bLedBlinkInProgress == false ) { SwLedOn(padapter, pLed); } @@ -1148,7 +1148,7 @@ SwLedControlMode0( case LED_CTL_NO_LINK: pLed->CurrLedState = RTW_LED_OFF; - if( pLed->bLedBlinkInProgress == _FALSE ) + if( pLed->bLedBlinkInProgress == false ) { SwLedOff(padapter, pLed); } @@ -1159,15 +1159,15 @@ SwLedControlMode0( if(pLed->bLedBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } SwLedOff(padapter, pLed); break; case LED_CTL_START_WPS: - if( pLed->bLedBlinkInProgress == _FALSE || pLed->CurrLedState == RTW_LED_ON) + if( pLed->bLedBlinkInProgress == false || pLed->CurrLedState == RTW_LED_ON) { - pLed->bLedBlinkInProgress = _TRUE; + pLed->bLedBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_WPS; pLed->BlinkTimes = 20; @@ -1190,7 +1190,7 @@ SwLedControlMode0( { pLed->CurrLedState = RTW_LED_OFF; _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } break; @@ -1227,24 +1227,24 @@ SwLedControlMode1( case LED_CTL_POWER_ON: case LED_CTL_START_TO_LINK: case LED_CTL_NO_LINK: - if( pLed->bLedNoLinkBlinkInProgress == _FALSE ) + if( pLed->bLedNoLinkBlinkInProgress == false ) { if(pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) { return; } - if( pLed->bLedLinkBlinkInProgress == _TRUE ) + if( pLed->bLedLinkBlinkInProgress == true ) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedLinkBlinkInProgress = _FALSE; + pLed->bLedLinkBlinkInProgress = false; } - if(pLed->bLedBlinkInProgress ==_TRUE) + if(pLed->bLedBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } - pLed->bLedNoLinkBlinkInProgress = _TRUE; + pLed->bLedNoLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SLOWLY; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -1255,23 +1255,23 @@ SwLedControlMode1( break; case LED_CTL_LINK: - if( pLed->bLedLinkBlinkInProgress == _FALSE ) + if( pLed->bLedLinkBlinkInProgress == false ) { if(pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) { return; } - if(pLed->bLedNoLinkBlinkInProgress == _TRUE) + if(pLed->bLedNoLinkBlinkInProgress == true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedNoLinkBlinkInProgress = _FALSE; + pLed->bLedNoLinkBlinkInProgress = false; } - if(pLed->bLedBlinkInProgress ==_TRUE) + if(pLed->bLedBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } - pLed->bLedLinkBlinkInProgress = _TRUE; + pLed->bLedLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_NORMAL; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -1282,29 +1282,29 @@ SwLedControlMode1( break; case LED_CTL_SITE_SURVEY: - if((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)) + if((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED)== true)) ; - else if(pLed->bLedScanBlinkInProgress ==_FALSE) + else if(pLed->bLedScanBlinkInProgress ==false) { if(IS_LED_WPS_BLINKING(pLed)) return; - if(pLed->bLedNoLinkBlinkInProgress == _TRUE) + if(pLed->bLedNoLinkBlinkInProgress == true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedNoLinkBlinkInProgress = _FALSE; + pLed->bLedNoLinkBlinkInProgress = false; } - if( pLed->bLedLinkBlinkInProgress == _TRUE ) + if( pLed->bLedLinkBlinkInProgress == true ) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedLinkBlinkInProgress = _FALSE; + pLed->bLedLinkBlinkInProgress = false; } - if(pLed->bLedBlinkInProgress ==_TRUE) + if(pLed->bLedBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } - pLed->bLedScanBlinkInProgress = _TRUE; + pLed->bLedScanBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SCAN; pLed->BlinkTimes = 24; if( pLed->bLedOn ) @@ -1317,23 +1317,23 @@ SwLedControlMode1( case LED_CTL_TX: case LED_CTL_RX: - if(pLed->bLedBlinkInProgress ==_FALSE) + if(pLed->bLedBlinkInProgress ==false) { if(pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) { return; } - if(pLed->bLedNoLinkBlinkInProgress == _TRUE) + if(pLed->bLedNoLinkBlinkInProgress == true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedNoLinkBlinkInProgress = _FALSE; + pLed->bLedNoLinkBlinkInProgress = false; } - if( pLed->bLedLinkBlinkInProgress == _TRUE ) + if( pLed->bLedLinkBlinkInProgress == true ) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedLinkBlinkInProgress = _FALSE; + pLed->bLedLinkBlinkInProgress = false; } - pLed->bLedBlinkInProgress = _TRUE; + pLed->bLedBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_TXRX; pLed->BlinkTimes = 2; if( pLed->bLedOn ) @@ -1346,29 +1346,29 @@ SwLedControlMode1( case LED_CTL_START_WPS: //wait until xinpin finish case LED_CTL_START_WPS_BOTTON: - if(pLed->bLedWPSBlinkInProgress ==_FALSE) + if(pLed->bLedWPSBlinkInProgress ==false) { - if(pLed->bLedNoLinkBlinkInProgress == _TRUE) + if(pLed->bLedNoLinkBlinkInProgress == true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedNoLinkBlinkInProgress = _FALSE; + pLed->bLedNoLinkBlinkInProgress = false; } - if( pLed->bLedLinkBlinkInProgress == _TRUE ) + if( pLed->bLedLinkBlinkInProgress == true ) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedLinkBlinkInProgress = _FALSE; + pLed->bLedLinkBlinkInProgress = false; } - if(pLed->bLedBlinkInProgress ==_TRUE) + if(pLed->bLedBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } - if(pLed->bLedScanBlinkInProgress ==_TRUE) + if(pLed->bLedScanBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } - pLed->bLedWPSBlinkInProgress = _TRUE; + pLed->bLedWPSBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_WPS; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -1380,25 +1380,25 @@ SwLedControlMode1( case LED_CTL_STOP_WPS: - if(pLed->bLedNoLinkBlinkInProgress == _TRUE) + if(pLed->bLedNoLinkBlinkInProgress == true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedNoLinkBlinkInProgress = _FALSE; + pLed->bLedNoLinkBlinkInProgress = false; } - if( pLed->bLedLinkBlinkInProgress == _TRUE ) + if( pLed->bLedLinkBlinkInProgress == true ) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedLinkBlinkInProgress = _FALSE; + pLed->bLedLinkBlinkInProgress = false; } - if(pLed->bLedBlinkInProgress ==_TRUE) + if(pLed->bLedBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } - if(pLed->bLedScanBlinkInProgress ==_TRUE) + if(pLed->bLedScanBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } if(pLed->bLedWPSBlinkInProgress) { @@ -1406,7 +1406,7 @@ SwLedControlMode1( } else { - pLed->bLedWPSBlinkInProgress = _TRUE; + pLed->bLedWPSBlinkInProgress = true; } pLed->CurrLedState = LED_BLINK_WPS_STOP; @@ -1426,10 +1426,10 @@ SwLedControlMode1( if(pLed->bLedWPSBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedWPSBlinkInProgress = false; } - pLed->bLedNoLinkBlinkInProgress = _TRUE; + pLed->bLedNoLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SLOWLY; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -1444,27 +1444,27 @@ SwLedControlMode1( if( pLed->bLedNoLinkBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedNoLinkBlinkInProgress = _FALSE; + pLed->bLedNoLinkBlinkInProgress = false; } if( pLed->bLedLinkBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedLinkBlinkInProgress = _FALSE; + pLed->bLedLinkBlinkInProgress = false; } if( pLed->bLedBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } if( pLed->bLedWPSBlinkInProgress ) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedWPSBlinkInProgress = false; } if( pLed->bLedScanBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } SwLedOff(padapter, pLed); @@ -1494,17 +1494,17 @@ SwLedControlMode2( case LED_CTL_SITE_SURVEY: if(pmlmepriv->LinkDetectInfo.bBusyTraffic) ; - else if(pLed->bLedScanBlinkInProgress ==_FALSE) + else if(pLed->bLedScanBlinkInProgress ==false) { if(IS_LED_WPS_BLINKING(pLed)) return; - if(pLed->bLedBlinkInProgress ==_TRUE) + if(pLed->bLedBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } - pLed->bLedScanBlinkInProgress = _TRUE; + pLed->bLedScanBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SCAN; pLed->BlinkTimes = 24; if( pLed->bLedOn ) @@ -1517,14 +1517,14 @@ SwLedControlMode2( case LED_CTL_TX: case LED_CTL_RX: - if((pLed->bLedBlinkInProgress ==_FALSE) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)) + if((pLed->bLedBlinkInProgress ==false) && (check_fwstate(pmlmepriv, _FW_LINKED)== true)) { if(pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) { return; } - pLed->bLedBlinkInProgress = _TRUE; + pLed->bLedBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_TXRX; pLed->BlinkTimes = 2; if( pLed->bLedOn ) @@ -1541,12 +1541,12 @@ SwLedControlMode2( if( pLed->bLedBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } if( pLed->bLedScanBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } _set_timer(&(pLed->BlinkTimer), 0); @@ -1554,19 +1554,19 @@ SwLedControlMode2( case LED_CTL_START_WPS: //wait until xinpin finish case LED_CTL_START_WPS_BOTTON: - if(pLed->bLedWPSBlinkInProgress ==_FALSE) + if(pLed->bLedWPSBlinkInProgress ==false) { - if(pLed->bLedBlinkInProgress ==_TRUE) + if(pLed->bLedBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } - if(pLed->bLedScanBlinkInProgress ==_TRUE) + if(pLed->bLedScanBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } - pLed->bLedWPSBlinkInProgress = _TRUE; + pLed->bLedWPSBlinkInProgress = true; pLed->CurrLedState = RTW_LED_ON; pLed->BlinkingLedState = RTW_LED_ON; _set_timer(&(pLed->BlinkTimer), 0); @@ -1574,7 +1574,7 @@ SwLedControlMode2( break; case LED_CTL_STOP_WPS: - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedWPSBlinkInProgress = false; if(adapter_to_pwrctl(padapter)->rf_pwrstate != rf_on) { SwLedOff(padapter, pLed); @@ -1589,7 +1589,7 @@ SwLedControlMode2( break; case LED_CTL_STOP_WPS_FAIL: - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedWPSBlinkInProgress = false; if(adapter_to_pwrctl(padapter)->rf_pwrstate != rf_on) { SwLedOff(padapter, pLed); @@ -1619,17 +1619,17 @@ SwLedControlMode2( if( pLed->bLedBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } if( pLed->bLedScanBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } if( pLed->bLedWPSBlinkInProgress ) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedWPSBlinkInProgress = false; } _set_timer(&(pLed->BlinkTimer), 0); @@ -1659,17 +1659,17 @@ SwLedControlMode2( case LED_CTL_SITE_SURVEY: if(pmlmepriv->LinkDetectInfo.bBusyTraffic) ; - else if(pLed->bLedScanBlinkInProgress ==_FALSE) + else if(pLed->bLedScanBlinkInProgress ==false) { if(IS_LED_WPS_BLINKING(pLed)) return; - if(pLed->bLedBlinkInProgress ==_TRUE) + if(pLed->bLedBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } - pLed->bLedScanBlinkInProgress = _TRUE; + pLed->bLedScanBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SCAN; pLed->BlinkTimes = 24; if( pLed->bLedOn ) @@ -1682,14 +1682,14 @@ SwLedControlMode2( case LED_CTL_TX: case LED_CTL_RX: - if((pLed->bLedBlinkInProgress ==_FALSE) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)) + if((pLed->bLedBlinkInProgress ==false) && (check_fwstate(pmlmepriv, _FW_LINKED)== true)) { if(pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) { return; } - pLed->bLedBlinkInProgress = _TRUE; + pLed->bLedBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_TXRX; pLed->BlinkTimes = 2; if( pLed->bLedOn ) @@ -1709,12 +1709,12 @@ SwLedControlMode2( if( pLed->bLedBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } if( pLed->bLedScanBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } _set_timer(&(pLed->BlinkTimer), 0); @@ -1722,19 +1722,19 @@ SwLedControlMode2( case LED_CTL_START_WPS: //wait until xinpin finish case LED_CTL_START_WPS_BOTTON: - if(pLed->bLedWPSBlinkInProgress ==_FALSE) + if(pLed->bLedWPSBlinkInProgress ==false) { - if(pLed->bLedBlinkInProgress ==_TRUE) + if(pLed->bLedBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } - if(pLed->bLedScanBlinkInProgress ==_TRUE) + if(pLed->bLedScanBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } - pLed->bLedWPSBlinkInProgress = _TRUE; + pLed->bLedWPSBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_WPS; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -1748,11 +1748,11 @@ SwLedControlMode2( if(pLed->bLedWPSBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedWPSBlinkInProgress = false; } else { - pLed->bLedWPSBlinkInProgress = _TRUE; + pLed->bLedWPSBlinkInProgress = true; } pLed->CurrLedState = LED_BLINK_WPS_STOP; @@ -1773,7 +1773,7 @@ SwLedControlMode2( if(pLed->bLedWPSBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedWPSBlinkInProgress = false; } pLed->CurrLedState = RTW_LED_OFF; @@ -1797,17 +1797,17 @@ SwLedControlMode2( if( pLed->bLedBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } if( pLed->bLedScanBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } if( pLed->bLedWPSBlinkInProgress ) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedWPSBlinkInProgress = false; } _set_timer(&(pLed->BlinkTimer), 0); @@ -1839,7 +1839,7 @@ SwLedControlMode4( case LED_CTL_START_TO_LINK: if(pLed1->bLedWPSBlinkInProgress) { - pLed1->bLedWPSBlinkInProgress = _FALSE; + pLed1->bLedWPSBlinkInProgress = false; _cancel_timer_ex(&(pLed1->BlinkTimer)); pLed1->BlinkingLedState = RTW_LED_OFF; @@ -1849,24 +1849,24 @@ SwLedControlMode4( _set_timer(&(pLed->BlinkTimer), 0); } - if( pLed->bLedStartToLinkBlinkInProgress == _FALSE ) + if( pLed->bLedStartToLinkBlinkInProgress == false ) { if(pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) { return; } - if(pLed->bLedBlinkInProgress ==_TRUE) + if(pLed->bLedBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } - if(pLed->bLedNoLinkBlinkInProgress ==_TRUE) + if(pLed->bLedNoLinkBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedNoLinkBlinkInProgress = _FALSE; + pLed->bLedNoLinkBlinkInProgress = false; } - pLed->bLedStartToLinkBlinkInProgress = _TRUE; + pLed->bLedStartToLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_StartToBlink; if( pLed->bLedOn ) { @@ -1888,7 +1888,7 @@ SwLedControlMode4( { if(pLed1->bLedWPSBlinkInProgress) { - pLed1->bLedWPSBlinkInProgress = _FALSE; + pLed1->bLedWPSBlinkInProgress = false; _cancel_timer_ex(&(pLed1->BlinkTimer)); pLed1->BlinkingLedState = RTW_LED_OFF; @@ -1899,19 +1899,19 @@ SwLedControlMode4( } } - if( pLed->bLedNoLinkBlinkInProgress == _FALSE ) + if( pLed->bLedNoLinkBlinkInProgress == false ) { if(pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) { return; } - if(pLed->bLedBlinkInProgress ==_TRUE) + if(pLed->bLedBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } - pLed->bLedNoLinkBlinkInProgress = _TRUE; + pLed->bLedNoLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SLOWLY; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -1922,24 +1922,24 @@ SwLedControlMode4( break; case LED_CTL_SITE_SURVEY: - if((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)) + if((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED)== true)) ; - else if(pLed->bLedScanBlinkInProgress ==_FALSE) + else if(pLed->bLedScanBlinkInProgress ==false) { if(IS_LED_WPS_BLINKING(pLed)) return; - if(pLed->bLedNoLinkBlinkInProgress == _TRUE) + if(pLed->bLedNoLinkBlinkInProgress == true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedNoLinkBlinkInProgress = _FALSE; + pLed->bLedNoLinkBlinkInProgress = false; } - if(pLed->bLedBlinkInProgress ==_TRUE) + if(pLed->bLedBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } - pLed->bLedScanBlinkInProgress = _TRUE; + pLed->bLedScanBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SCAN; pLed->BlinkTimes = 24; if( pLed->bLedOn ) @@ -1952,18 +1952,18 @@ SwLedControlMode4( case LED_CTL_TX: case LED_CTL_RX: - if(pLed->bLedBlinkInProgress ==_FALSE) + if(pLed->bLedBlinkInProgress ==false) { if(pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) { return; } - if(pLed->bLedNoLinkBlinkInProgress == _TRUE) + if(pLed->bLedNoLinkBlinkInProgress == true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedNoLinkBlinkInProgress = _FALSE; + pLed->bLedNoLinkBlinkInProgress = false; } - pLed->bLedBlinkInProgress = _TRUE; + pLed->bLedBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_TXRX; pLed->BlinkTimes = 2; if( pLed->bLedOn ) @@ -1978,7 +1978,7 @@ SwLedControlMode4( case LED_CTL_START_WPS_BOTTON: if(pLed1->bLedWPSBlinkInProgress) { - pLed1->bLedWPSBlinkInProgress = _FALSE; + pLed1->bLedWPSBlinkInProgress = false; _cancel_timer_ex(&(pLed1->BlinkTimer)); pLed1->BlinkingLedState = RTW_LED_OFF; @@ -1988,24 +1988,24 @@ SwLedControlMode4( _set_timer(&(pLed->BlinkTimer), 0); } - if(pLed->bLedWPSBlinkInProgress ==_FALSE) + if(pLed->bLedWPSBlinkInProgress ==false) { - if(pLed->bLedNoLinkBlinkInProgress == _TRUE) + if(pLed->bLedNoLinkBlinkInProgress == true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedNoLinkBlinkInProgress = _FALSE; + pLed->bLedNoLinkBlinkInProgress = false; } - if(pLed->bLedBlinkInProgress ==_TRUE) + if(pLed->bLedBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } - if(pLed->bLedScanBlinkInProgress ==_TRUE) + if(pLed->bLedScanBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } - pLed->bLedWPSBlinkInProgress = _TRUE; + pLed->bLedWPSBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_WPS; if( pLed->bLedOn ) { @@ -2024,10 +2024,10 @@ SwLedControlMode4( if(pLed->bLedWPSBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedWPSBlinkInProgress = false; } - pLed->bLedNoLinkBlinkInProgress = _TRUE; + pLed->bLedNoLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SLOWLY; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -2041,10 +2041,10 @@ SwLedControlMode4( if(pLed->bLedWPSBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedWPSBlinkInProgress = false; } - pLed->bLedNoLinkBlinkInProgress = _TRUE; + pLed->bLedNoLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SLOWLY; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -2056,7 +2056,7 @@ SwLedControlMode4( if(pLed1->bLedWPSBlinkInProgress) _cancel_timer_ex(&(pLed1->BlinkTimer)); else - pLed1->bLedWPSBlinkInProgress = _TRUE; + pLed1->bLedWPSBlinkInProgress = true; pLed1->CurrLedState = LED_BLINK_WPS_STOP; if( pLed1->bLedOn ) @@ -2071,10 +2071,10 @@ SwLedControlMode4( if(pLed->bLedWPSBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedWPSBlinkInProgress = false; } - pLed->bLedNoLinkBlinkInProgress = _TRUE; + pLed->bLedNoLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SLOWLY; if( pLed->bLedOn ) pLed->BlinkingLedState = RTW_LED_OFF; @@ -2086,7 +2086,7 @@ SwLedControlMode4( if(pLed1->bLedWPSBlinkInProgress) _cancel_timer_ex(&(pLed1->BlinkTimer)); else - pLed1->bLedWPSBlinkInProgress = _TRUE; + pLed1->bLedWPSBlinkInProgress = true; pLed1->CurrLedState = LED_BLINK_WPS_STOP_OVERLAP; pLed1->BlinkTimes = 10; @@ -2105,38 +2105,38 @@ SwLedControlMode4( if( pLed->bLedNoLinkBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedNoLinkBlinkInProgress = _FALSE; + pLed->bLedNoLinkBlinkInProgress = false; } if( pLed->bLedLinkBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedLinkBlinkInProgress = _FALSE; + pLed->bLedLinkBlinkInProgress = false; } if( pLed->bLedBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } if( pLed->bLedWPSBlinkInProgress ) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedWPSBlinkInProgress = _FALSE; + pLed->bLedWPSBlinkInProgress = false; } if( pLed->bLedScanBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedScanBlinkInProgress = _FALSE; + pLed->bLedScanBlinkInProgress = false; } if( pLed->bLedStartToLinkBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedStartToLinkBlinkInProgress = _FALSE; + pLed->bLedStartToLinkBlinkInProgress = false; } if( pLed1->bLedWPSBlinkInProgress ) { _cancel_timer_ex(&(pLed1->BlinkTimer)); - pLed1->bLedWPSBlinkInProgress = _FALSE; + pLed1->bLedWPSBlinkInProgress = false; } pLed1->BlinkingLedState = LED_UNKNOWN; @@ -2185,16 +2185,16 @@ SwLedControlMode5( break; case LED_CTL_SITE_SURVEY: - if((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)) + if((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED)== true)) ; - else if(pLed->bLedScanBlinkInProgress ==_FALSE) + else if(pLed->bLedScanBlinkInProgress ==false) { - if(pLed->bLedBlinkInProgress ==_TRUE) + if(pLed->bLedBlinkInProgress ==true) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } - pLed->bLedScanBlinkInProgress = _TRUE; + pLed->bLedScanBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SCAN; pLed->BlinkTimes = 24; if( pLed->bLedOn ) @@ -2207,13 +2207,13 @@ SwLedControlMode5( case LED_CTL_TX: case LED_CTL_RX: - if(pLed->bLedBlinkInProgress ==_FALSE) + if(pLed->bLedBlinkInProgress ==false) { if(pLed->CurrLedState == LED_BLINK_SCAN) { return; } - pLed->bLedBlinkInProgress = _TRUE; + pLed->bLedBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_TXRX; pLed->BlinkTimes = 2; if( pLed->bLedOn ) @@ -2231,7 +2231,7 @@ SwLedControlMode5( if( pLed->bLedBlinkInProgress) { _cancel_timer_ex(&(pLed->BlinkTimer)); - pLed->bLedBlinkInProgress = _FALSE; + pLed->bLedBlinkInProgress = false; } SwLedOff(padapter, pLed); @@ -2290,7 +2290,7 @@ void BlinkHandler(PLED_871x pLed) //DBG_871X("%s (%s:%d)\n",__FUNCTION__, current->comm, current->pid); - if( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)) + if( (padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true)) { //DBG_871X("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __FUNCTION__, padapter->bSurpriseRemoved, padapter->bDriverStopped); return; @@ -2341,14 +2341,14 @@ LedControl871x( { struct led_priv *ledpriv = &(padapter->ledpriv); - if( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE) - ||(padapter->hw_init_completed == _FALSE) ) + if( (padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true) + ||(padapter->hw_init_completed == false) ) { return; } - if( ledpriv->bRegUseLed == _FALSE) + if( ledpriv->bRegUseLed == false) return; //if (!priv->up) diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 6086f3f..f26bcb2 100755 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -200,7 +200,7 @@ _func_enter_; _enter_critical_bh(&queue->lock, &irqL); - if (_rtw_queue_empty(queue) == _TRUE) + if (_rtw_queue_empty(queue) == true) pnetwork = NULL; @@ -229,7 +229,7 @@ _func_enter_; _enter_critical_bh(&free_queue->lock, &irqL); - if (_rtw_queue_empty(free_queue) == _TRUE) { + if (_rtw_queue_empty(free_queue) == true) { pnetwork=NULL; goto exit; } @@ -241,7 +241,7 @@ _func_enter_; RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("_rtw_alloc_network: ptr=%p\n", plist)); pnetwork->network_type = 0; - pnetwork->fixed = _FALSE; + pnetwork->fixed = false; pnetwork->last_scanned = rtw_get_current_time(); pnetwork->aid=0; pnetwork->join_res=0; @@ -268,13 +268,13 @@ _func_enter_; if (pnetwork == NULL) goto exit; - if (pnetwork->fixed == _TRUE) + if (pnetwork->fixed == true) goto exit; curr_time = rtw_get_current_time(); - if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==_TRUE ) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE ) ) + if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==true ) || + (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==true ) ) lifetime = 1; if (!isfreeall) { @@ -313,7 +313,7 @@ _func_enter_; if (pnetwork == NULL) goto exit; - if (pnetwork->fixed == _TRUE) + if (pnetwork->fixed == true) goto exit; //_enter_critical(&free_queue->lock, &irqL); @@ -362,7 +362,7 @@ _func_enter_; { pnetwork = LIST_CONTAINOR(plist, struct wlan_network ,list); - if (_rtw_memcmp(addr, pnetwork->network.MacAddress, ETH_ALEN) == _TRUE) + if (_rtw_memcmp(addr, pnetwork->network.MacAddress, ETH_ALEN) == true) break; plist = get_next(plist); @@ -398,7 +398,7 @@ _func_enter_; phead = get_list_head(scanned_queue); plist = get_next(phead); - while (rtw_end_of_queue_search(phead, plist) == _FALSE) + while (rtw_end_of_queue_search(phead, plist) == false) { pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); @@ -424,12 +424,12 @@ sint rtw_if_up(struct adapter *padapter) { _func_enter_; if( padapter->bDriverStopped || padapter->bSurpriseRemoved || - (check_fwstate(&padapter->mlmepriv, _FW_LINKED)== _FALSE)){ + (check_fwstate(&padapter->mlmepriv, _FW_LINKED)== false)){ RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_if_up:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved)); - res=_FALSE; + res=false; } else - res= _TRUE; + res= true; _func_exit_; return res; @@ -566,22 +566,22 @@ struct wlan_network *rtw_find_network(_queue *scanned_queue, u8 *addr) int rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork) { - int ret=_TRUE; + int ret=true; struct security_priv *psecuritypriv = &adapter->securitypriv; if ( (psecuritypriv->dot11PrivacyAlgrthm != _NO_PRIVACY_ ) && ( pnetwork->network.Privacy == 0 ) ) { - ret=_FALSE; + ret=false; } else if((psecuritypriv->dot11PrivacyAlgrthm == _NO_PRIVACY_ ) && ( pnetwork->network.Privacy == 1 ) ) { - ret=_FALSE; + ret=false; } else { - ret=_TRUE; + ret=true; } return ret; @@ -594,7 +594,7 @@ inline int is_same_ess(WLAN_BSSID_EX *a, WLAN_BSSID_EX *b) //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("(%s,%d)(%s,%d)\n", // a->Ssid.Ssid,a->Ssid.SsidLength,b->Ssid.Ssid,b->Ssid.SsidLength)); return (a->Ssid.SsidLength == b->Ssid.SsidLength) - && _rtw_memcmp(a->Ssid.Ssid, b->Ssid.Ssid, a->Ssid.SsidLength)==_TRUE; + && _rtw_memcmp(a->Ssid.Ssid, b->Ssid.Ssid, a->Ssid.SsidLength)==true; } int is_same_network(WLAN_BSSID_EX *src, WLAN_BSSID_EX *dst, u8 feature) @@ -613,7 +613,7 @@ _func_enter_; KeBugCheckEx(0x87110000, (ULONG_PTR)dst, (ULONG_PTR)src,(ULONG_PTR)&s_cap, (ULONG_PTR)&d_cap); - return _FALSE; + return false; } #endif @@ -629,16 +629,16 @@ _func_exit_; #ifdef CONFIG_P2P if ((feature == 1) && // 1: P2P supported - (_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN) == _TRUE) + (_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN) == true) ) { - return _TRUE; + return true; } #endif return ((src->Ssid.SsidLength == dst->Ssid.SsidLength) && // (src->Configuration.DSConfig == dst->Configuration.DSConfig) && - ( (_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == _TRUE) && - ( (_rtw_memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) == _TRUE) && + ( (_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == true) && + ( (_rtw_memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) == true) && ((s_cap & WLAN_CAPABILITY_IBSS) == (d_cap & WLAN_CAPABILITY_IBSS)) && ((s_cap & WLAN_CAPABILITY_BSS) == @@ -661,12 +661,12 @@ _func_enter_; while(1) { - if (rtw_end_of_queue_search(phead,plist)== _TRUE) + if (rtw_end_of_queue_search(phead,plist)== true) break; pwlan= LIST_CONTAINOR(plist, struct wlan_network, list); - if(pwlan->fixed!=_TRUE) + if(pwlan->fixed!=true) { if (oldest == NULL ||time_after(oldest->last_scanned, pwlan->last_scanned)) oldest = pwlan; @@ -763,9 +763,9 @@ static void update_current_network(struct adapter *adapter, WLAN_BSSID_EX *pnetw _func_enter_; - if ( (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) && (is_same_network(&(pmlmepriv->cur_network.network), pnetwork, 0))) + if ( (check_fwstate(pmlmepriv, _FW_LINKED)== true) && (is_same_network(&(pmlmepriv->cur_network.network), pnetwork, 0))) { - update_network(&(pmlmepriv->cur_network.network), pnetwork,adapter, _TRUE); + update_network(&(pmlmepriv->cur_network.network), pnetwork,adapter, true); rtw_update_protection(adapter, (pmlmepriv->cur_network.network.IEs) + sizeof (NDIS_802_11_FIXED_IEs), pmlmepriv->cur_network.network.IELength); } @@ -808,7 +808,7 @@ _func_enter_; while(1) { - if (rtw_end_of_queue_search(phead,plist)== _TRUE) + if (rtw_end_of_queue_search(phead,plist)== true) break; pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); @@ -836,10 +836,10 @@ _func_enter_; /* If we didn't find a match, then get a new network slot to initialize * with this beacon's information */ - //if (rtw_end_of_queue_search(phead,plist)== _TRUE) { + //if (rtw_end_of_queue_search(phead,plist)== true) { if (!target_find) { - if (_rtw_queue_empty(&(pmlmepriv->free_bss_pool)) == _TRUE) { + if (_rtw_queue_empty(&(pmlmepriv->free_bss_pool)) == true) { /* If there are no more slots, expire the oldest */ //list_del_init(&oldest->list); pnetwork = oldest; @@ -851,7 +851,7 @@ _func_enter_; _rtw_memcpy(&(pnetwork->network), target, get_WLAN_BSSID_EX_sz(target)); //pnetwork->last_scanned = rtw_get_current_time(); // variable initialize - pnetwork->fixed = _FALSE; + pnetwork->fixed = false; pnetwork->last_scanned = rtw_get_current_time(); pnetwork->network_type = 0; @@ -895,7 +895,7 @@ _func_enter_; * be already expired. In this case we do the same as we found a new * net and call the new_net handler */ - bool update_ie = _TRUE; + bool update_ie = true; pnetwork->last_scanned = rtw_get_current_time(); @@ -904,10 +904,10 @@ _func_enter_; if ((target->Reserved[0] != 2) && (target->Reserved[0] >= pnetwork->network.Reserved[0]) ) { - update_ie = _TRUE; + update_ie = true; } else { - update_ie = _FALSE; + update_ie = false; } update_network(&(pnetwork->network), target,adapter, update_ie); @@ -960,7 +960,7 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor //u8 wps_ie[512]; uint wps_ielen; - int bselected = _TRUE; + int bselected = true; desired_encmode = psecuritypriv->ndisencryptstatus; privacy = pnetwork->network.Privacy; @@ -969,11 +969,11 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor { if(rtw_get_wps_ie(pnetwork->network.IEs+_FIXED_IE_LENGTH_, pnetwork->network.IELength-_FIXED_IE_LENGTH_, NULL, &wps_ielen)!=NULL) { - return _TRUE; + return true; } else { - return _FALSE; + return false; } } if (adapter->registrypriv.wifi_spec == 1) //for correct flow of 8021X to do.... @@ -982,14 +982,14 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor uint ie_len=0; if ((desired_encmode == Ndis802_11EncryptionDisabled) && (privacy != 0)) - bselected = _FALSE; + bselected = false; if ( psecuritypriv->ndisauthtype == Ndis802_11AuthModeWPA2PSK) { p = rtw_get_ie(pnetwork->network.IEs + _BEACON_IE_OFFSET_, _RSN_IE_2_, &ie_len, (pnetwork->network.IELength - _BEACON_IE_OFFSET_)); if (p && ie_len>0) { - bselected = _TRUE; + bselected = true; } else { - bselected = _FALSE; + bselected = false; } } } @@ -997,13 +997,13 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy == 0)) { DBG_871X("desired_encmode: %d, privacy: %d\n", desired_encmode, privacy); - bselected = _FALSE; + bselected = false; } - if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) { if(pnetwork->network.InfrastructureMode != pmlmepriv->cur_network.network.InfrastructureMode) - bselected = _FALSE; + bselected = false; } @@ -1045,7 +1045,7 @@ _func_enter_; _enter_critical_bh(&pmlmepriv->lock, &irqL); // update IBSS_network 's timestamp - if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == _TRUE) + if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == true) { //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,"rtw_survey_event_callback : WIFI_ADHOC_MASTER_STATE \n\n"); if(_rtw_memcmp(&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress, ETH_ALEN)) @@ -1067,7 +1067,7 @@ _func_enter_; } // lock pmlmepriv->lock when you accessing network_q - if ((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == _FALSE) + if ((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == false) { if( pnetwork->Ssid.Ssid[0] == 0 ) { @@ -1090,7 +1090,7 @@ _func_exit_; void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) { _irqL irqL; - u8 timer_cancelled = _FALSE; + u8 timer_cancelled = false; struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); #ifdef CONFIG_MLME_EXT @@ -1116,7 +1116,7 @@ _func_enter_; { //u8 timer_cancelled; - timer_cancelled = _TRUE; + timer_cancelled = true; //_cancel_timer(&pmlmepriv->scan_to_timer, &timer_cancelled); _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); @@ -1137,11 +1137,11 @@ _func_enter_; rtw_set_signal_stat_timer(&adapter->recvpriv); #endif - if(pmlmepriv->to_join == _TRUE) + if(pmlmepriv->to_join == true) { - if((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE) ) + if((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==true) ) { - if(check_fwstate(pmlmepriv, _FW_LINKED)==_FALSE) + if(check_fwstate(pmlmepriv, _FW_LINKED)==false) { set_fwstate(pmlmepriv, _FW_UNDER_LINKING); @@ -1172,7 +1172,7 @@ _func_enter_; RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Error=>rtw_createbss_cmd status FAIL\n")); } - pmlmepriv->to_join = _FALSE; + pmlmepriv->to_join = false; } } } @@ -1180,7 +1180,7 @@ _func_enter_; { int s_ret; set_fwstate(pmlmepriv, _FW_UNDER_LINKING); - pmlmepriv->to_join = _FALSE; + pmlmepriv->to_join = false; if(_SUCCESS == (s_ret=rtw_select_and_join_from_scanned_queue(pmlmepriv))) { _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); @@ -1210,7 +1210,7 @@ _func_enter_; rtw_free_assoc_resources(adapter, 1); rtw_indicate_disconnect(adapter); } else { - pmlmepriv->to_join = _TRUE; + pmlmepriv->to_join = true; } } else @@ -1229,7 +1229,7 @@ _func_enter_; _exit_critical_bh(&pmlmepriv->lock, &irqL); #ifdef CONFIG_P2P_PS - if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { + if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { p2p_ps_wk_cmd(adapter, P2P_PS_SCAN_DONE, 0); } #endif // CONFIG_P2P_PS @@ -1369,7 +1369,7 @@ _func_enter_; pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress); if(pwlan) { - pwlan->fixed = _FALSE; + pwlan->fixed = false; #ifdef CONFIG_P2P if(!rtw_p2p_chk_state(&adapter->wdinfo, P2P_STATE_NONE)) { @@ -1430,7 +1430,7 @@ _func_enter_; RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_connect\n")); - pmlmepriv->to_join = _FALSE; + pmlmepriv->to_join = false; if(!check_fwstate(&padapter->mlmepriv, _FW_LINKED)) { @@ -1553,7 +1553,7 @@ void rtw_scan_abort(struct adapter *adapter) struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv); start = rtw_get_current_time(); - pmlmeext->scan_abort = _TRUE; + pmlmeext->scan_abort = true; while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) && rtw_get_passing_time_ms(start) <= 200) { @@ -1572,9 +1572,9 @@ void rtw_scan_abort(struct adapter *adapter) set_survey_timer(pmlmeext, 0); _set_timer(&pmlmepriv->scan_to_timer, 50); #endif - rtw_indicate_scan_done(adapter, _TRUE); + rtw_indicate_scan_done(adapter, true); } - pmlmeext->scan_abort = _FALSE; + pmlmeext->scan_abort = false; } static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, struct wlan_network *pnetwork) @@ -1605,16 +1605,16 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str #endif //sta mode - rtw_hal_set_odm_var(padapter,HAL_ODM_STA_INFO,psta,_TRUE); + rtw_hal_set_odm_var(padapter,HAL_ODM_STA_INFO,psta,true); //security related if(padapter->securitypriv.dot11AuthAlgrthm== dot11AuthAlgrthm_8021X) { - padapter->securitypriv.binstallGrpkey=_FALSE; - padapter->securitypriv.busetkipkey=_FALSE; - padapter->securitypriv.bgrpkey_handshake=_FALSE; + padapter->securitypriv.binstallGrpkey=false; + padapter->securitypriv.busetkipkey=false; + padapter->securitypriv.bgrpkey_handshake=false; - psta->ieee8021x_blocked=_TRUE; + psta->ieee8021x_blocked=true; psta->dot118021XPrivacy=padapter->securitypriv.dot11PrivacyAlgrthm; _rtw_memset((u8 *)&psta->dot118021x_UncstKey, 0, sizeof (union Keytype)); @@ -1634,7 +1634,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str // And the Wi-Fi driver shouldn't allow the data packet to be tramsmitted. if ( padapter->securitypriv.wps_ie_len != 0 ) { - psta->ieee8021x_blocked=_TRUE; + psta->ieee8021x_blocked=true; padapter->securitypriv.wps_ie_len = 0; } @@ -1646,7 +1646,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str { //preorder_ctrl = &precvpriv->recvreorder_ctrl[i]; preorder_ctrl = &psta->recvreorder_ctrl[i]; - preorder_ctrl->enable = _FALSE; + preorder_ctrl->enable = false; preorder_ctrl->indicate_seq = 0xffff; #ifdef DBG_RX_SEQ DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, @@ -1664,7 +1664,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str { //preorder_ctrl = &precvpriv->recvreorder_ctrl[i]; preorder_ctrl = &bmc_sta->recvreorder_ctrl[i]; - preorder_ctrl->enable = _FALSE; + preorder_ctrl->enable = false; preorder_ctrl->indicate_seq = 0xffff; #ifdef DBG_RX_SEQ DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, @@ -1776,7 +1776,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) struct wlan_network *pnetwork = (struct wlan_network *)pbuf; struct wlan_network *cur_network = &(pmlmepriv->cur_network); struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL; - unsigned int the_same_macaddr = _FALSE; + unsigned int the_same_macaddr = false; _func_enter_; @@ -1816,14 +1816,14 @@ _func_enter_; //s1. find ptarget_wlan if(check_fwstate(pmlmepriv, _FW_LINKED) ) { - if(the_same_macaddr == _TRUE) + if(the_same_macaddr == true) { ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress); } else { pcur_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress); - if(pcur_wlan) pcur_wlan->fixed = _FALSE; + if(pcur_wlan) pcur_wlan->fixed = false; pcur_sta = rtw_get_stainfo(pstapriv, cur_network->network.MacAddress); if(pcur_sta){ @@ -1833,8 +1833,8 @@ _func_enter_; } ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.MacAddress); - if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE){ - if(ptarget_wlan) ptarget_wlan->fixed = _TRUE; + if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true){ + if(ptarget_wlan) ptarget_wlan->fixed = true; } } @@ -1842,8 +1842,8 @@ _func_enter_; else { ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.MacAddress); - if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE){ - if(ptarget_wlan) ptarget_wlan->fixed = _TRUE; + if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true){ + if(ptarget_wlan) ptarget_wlan->fixed = true; } } @@ -1861,7 +1861,7 @@ _func_enter_; //s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode - if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) { ptarget_sta = rtw_joinbss_update_stainfo(adapter, pnetwork); if(ptarget_sta==NULL) @@ -1873,7 +1873,7 @@ _func_enter_; } //s4. indicate connect - if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) { pmlmepriv->cur_network_scanned = ptarget_wlan; rtw_indicate_connect(adapter); @@ -1908,7 +1908,7 @@ _func_enter_; //rtw_free_assoc_resources(adapter, 1); - if((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == _TRUE) + if((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == true) { RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("fail! clear _FW_UNDER_LINKING ^^^fw_state=%x\n", get_fwstate(pmlmepriv))); _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); @@ -2048,7 +2048,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf) _func_enter_; - if(rtw_access_ctrl(adapter, pstassoc->macaddr) == _FALSE) + if(rtw_access_ctrl(adapter, pstassoc->macaddr) == false) return; #if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) @@ -2123,7 +2123,7 @@ _func_enter_; //psta->aid = (uint)pstassoc->cam_id; DBG_871X("%s\n",__FUNCTION__); //for ad-hoc mode - rtw_hal_set_odm_var(adapter,HAL_ODM_STA_INFO,psta,_TRUE); + rtw_hal_set_odm_var(adapter,HAL_ODM_STA_INFO,psta,true); rtw_sta_media_status_rpt(adapter, psta, 1); @@ -2131,19 +2131,19 @@ _func_enter_; psta->dot118021XPrivacy = adapter->securitypriv.dot11PrivacyAlgrthm; - psta->ieee8021x_blocked = _FALSE; + psta->ieee8021x_blocked = false; _enter_critical_bh(&pmlmepriv->lock, &irqL); - if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==_TRUE ) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE ) ) + if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==true ) || + (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==true ) ) { if(adapter->stapriv.asoc_sta_count== 2) { _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress); pmlmepriv->cur_network_scanned = ptarget_wlan; - if(ptarget_wlan) ptarget_wlan->fixed = _TRUE; + if(ptarget_wlan) ptarget_wlan->fixed = true; _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); // a sta + bc/mc_stainfo (not Ibss_stainfo) rtw_indicate_connect(adapter); @@ -2232,7 +2232,7 @@ _func_enter_; // remove the network entry in scanned_queue pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress); if (pwlan) { - pwlan->fixed = _FALSE; + pwlan->fixed = false; rtw_free_network_nolock(pmlmepriv, pwlan); } _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); @@ -2264,7 +2264,7 @@ _func_enter_; pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress); if(pwlan) { - pwlan->fixed = _FALSE; + pwlan->fixed = false; rtw_free_network_nolock(pmlmepriv, pwlan); } _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); @@ -2413,7 +2413,7 @@ void rtw_scan_timeout_handler (struct adapter *adapter) _exit_critical_bh(&pmlmepriv->lock, &irqL); - rtw_indicate_scan_done(adapter, _TRUE); + rtw_indicate_scan_done(adapter, true); } @@ -2429,13 +2429,13 @@ static void rtw_auto_scan_handler(struct adapter *padapter) if(pmlmepriv->scan_interval==0) { /* - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) { DBG_871X("exit %s when _FW_UNDER_SURVEY|_FW_UNDER_LINKING -> \n", __FUNCTION__); return; } - if(pmlmepriv->sitesurveyctrl.traffic_busy == _TRUE) + if(pmlmepriv->sitesurveyctrl.traffic_busy == true) { DBG_871X("%s exit cause traffic_busy(%x)\n",__FUNCTION__, pmlmepriv->sitesurveyctrl.traffic_busy); return; @@ -2445,8 +2445,8 @@ static void rtw_auto_scan_handler(struct adapter *padapter) #ifdef CONFIG_CONCURRENT_MODE if (rtw_buddy_adapter_up(padapter)) { - if ((check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) || - (padapter->pbuddy_adapter->mlmepriv.LinkDetectInfo.bBusyTraffic == _TRUE)) + if ((check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) || + (padapter->pbuddy_adapter->mlmepriv.LinkDetectInfo.bBusyTraffic == true)) { DBG_871X("%s, but buddy_intf is under scanning or linking or BusyTraffic\n", __FUNCTION__); return; @@ -2487,24 +2487,24 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter) adapter->HalFunc.hal_checke_bt_hang(adapter); } #endif - if(adapter->hw_init_completed == _FALSE) + if(adapter->hw_init_completed == false) return; - if ((adapter->bDriverStopped == _TRUE)||(adapter->bSurpriseRemoved== _TRUE)) + if ((adapter->bDriverStopped == true)||(adapter->bSurpriseRemoved== true)) return; #ifdef CONFIG_CONCURRENT_MODE if(pbuddy_adapter) { - if(adapter->net_closed == _TRUE && pbuddy_adapter->net_closed == _TRUE) + if(adapter->net_closed == true && pbuddy_adapter->net_closed == true) { return; } } else #endif //CONFIG_CONCURRENT_MODE - if(adapter->net_closed == _TRUE) + if(adapter->net_closed == true) { return; } @@ -2525,7 +2525,7 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter) #ifndef CONFIG_ACTIVE_KEEP_ALIVE_CHECK #ifdef CONFIG_AP_MODE - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { expire_timeout_chk(adapter); } @@ -2543,7 +2543,7 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter) #else // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) if( rcu_dereference(adapter->pnetdev->rx_handler_data) #endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) - && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) ) + && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true) ) { // expire NAT2.5 entry void nat25_db_expire(struct adapter *priv); @@ -2572,7 +2572,7 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter) inline bool rtw_is_scan_deny(struct adapter *adapter) { struct mlme_priv *mlmepriv = &adapter->mlmepriv; - return (ATOMIC_READ(&mlmepriv->set_scan_deny) != 0) ? _TRUE : _FALSE; + return (ATOMIC_READ(&mlmepriv->set_scan_deny) != 0) ? true : false; } inline void rtw_clear_scan_deny(struct adapter *adapter) @@ -2629,37 +2629,37 @@ void rtw_event_polling_timer_hdl(struct adapter *adapter) /* * Select a new join candidate from the original @param candidate and @param competitor -* @return _TRUE: candidate is updated -* @return _FALSE: candidate is not updated +* @return true: candidate is updated +* @return false: candidate is not updated */ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv , struct wlan_network **candidate, struct wlan_network *competitor) { - int updated = _FALSE; + int updated = false; struct adapter *adapter = container_of(pmlmepriv, struct adapter, mlmepriv); //check bssid, if needed - if(pmlmepriv->assoc_by_bssid==_TRUE) { - if(_rtw_memcmp(competitor->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN) ==_FALSE) + if(pmlmepriv->assoc_by_bssid==true) { + if(_rtw_memcmp(competitor->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN) ==false) goto exit; } //check ssid, if needed if(pmlmepriv->assoc_ssid.Ssid && pmlmepriv->assoc_ssid.SsidLength) { if( competitor->network.Ssid.SsidLength != pmlmepriv->assoc_ssid.SsidLength - || _rtw_memcmp(competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength) == _FALSE + || _rtw_memcmp(competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength) == false ) goto exit; } - if(rtw_is_desired_network(adapter, competitor) == _FALSE) + if(rtw_is_desired_network(adapter, competitor) == false) goto exit; #ifdef CONFIG_LAYER2_ROAMING if(rtw_to_roaming(adapter) > 0) { if( rtw_get_passing_time_ms((u32)competitor->last_scanned) >= RTW_SCAN_RESULT_EXPIRE - || is_same_ess(&competitor->network, &pmlmepriv->cur_network.network) == _FALSE + || is_same_ess(&competitor->network, &pmlmepriv->cur_network.network) == false ) goto exit; } @@ -2668,7 +2668,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv if(*candidate == NULL ||(*candidate)->network.Rssinetwork.Rssi ) { *candidate = competitor; - updated = _TRUE; + updated = true; } if(updated){ @@ -2712,7 +2712,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv ) _queue *queue = &(pmlmepriv->scanned_queue); struct wlan_network *pnetwork = NULL; struct wlan_network *candidate = NULL; - u8 bSupportAntDiv = _FALSE; + u8 bSupportAntDiv = false; _func_enter_; @@ -2752,17 +2752,17 @@ _func_enter_; // check for situation of _FW_LINKED - if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { + if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { DBG_871X("%s: _FW_LINKED while ask_for_joinbss!!!\n", __FUNCTION__); - rtw_disassoc_cmd(adapter, 0, _TRUE); + rtw_disassoc_cmd(adapter, 0, true); rtw_indicate_disconnect(adapter); rtw_free_assoc_resources(adapter, 0); } #ifdef CONFIG_ANTENNA_DIVERSITY rtw_hal_get_def_var(adapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &(bSupportAntDiv)); - if(_TRUE == bSupportAntDiv) + if(true == bSupportAntDiv) { u8 CurrentAntenna; rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(CurrentAntenna)); @@ -2987,7 +2987,7 @@ static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid) do { if( ( psecuritypriv->PMKIDList[i].bUsed ) && - ( _rtw_memcmp( psecuritypriv->PMKIDList[i].Bssid, bssid, ETH_ALEN ) == _TRUE ) ) + ( _rtw_memcmp( psecuritypriv->PMKIDList[i].Bssid, bssid, ETH_ALEN ) == true ) ) { break; } @@ -3231,7 +3231,7 @@ void rtw_joinbss_reset(struct adapter *padapter) pmlmepriv->num_sta_no_ht = 0; - phtpriv->ampdu_enable = _FALSE;//reset to disabled + phtpriv->ampdu_enable = false;//reset to disabled // TH=1 => means that invalidate usb rx aggregation // TH=0 => means that validate usb rx aggregation, use init value. @@ -3267,7 +3267,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ struct ht_priv *phtpriv = &pmlmepriv->htpriv; - phtpriv->ht_option = _FALSE; + phtpriv->ht_option = false; p = rtw_get_ie(in_ie+12, _HT_CAPABILITY_IE_, &ielen, in_len-12); @@ -3309,7 +3309,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ pframe = rtw_set_ie(out_ie+out_len, _HT_CAPABILITY_IE_, sizeof(struct rtw_ieee80211_ht_cap), (unsigned char*)&ht_capie, pout_len); - phtpriv->ht_option = _TRUE; + phtpriv->ht_option = true; p = rtw_get_ie(in_ie+12, _HT_ADD_INFO_IE_, &ielen, in_len-12); if(p && (ielen==sizeof(struct ieee80211_ht_addt_info))) @@ -3351,20 +3351,20 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len) DBG_871X("+rtw_update_ht_cap()\n"); //maybe needs check if ap supports rx ampdu. - if((phtpriv->ampdu_enable==_FALSE) &&(pregistrypriv->ampdu_enable==1)) + if((phtpriv->ampdu_enable==false) &&(pregistrypriv->ampdu_enable==1)) { if(pregistrypriv->wifi_spec==1) { - phtpriv->ampdu_enable = _FALSE; + phtpriv->ampdu_enable = false; } else { - phtpriv->ampdu_enable = _TRUE; + phtpriv->ampdu_enable = true; } } else if(pregistrypriv->ampdu_enable==2) { - phtpriv->ampdu_enable = _TRUE; + phtpriv->ampdu_enable = true; } @@ -3476,7 +3476,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr struct pkt_attrib *pattrib =&pxmitframe->attrib; s32 bmcst = IS_MCAST(pattrib->ra); - //if(bmcst || (padapter->mlmepriv.LinkDetectInfo.bTxBusyTraffic == _FALSE)) + //if(bmcst || (padapter->mlmepriv.LinkDetectInfo.bTxBusyTraffic == false)) if(bmcst || (padapter->mlmepriv.LinkDetectInfo.NumTxOkInPeriod<100)) return; @@ -3505,7 +3505,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr phtpriv = &psta->htpriv; - if((phtpriv->ht_option==_TRUE) && (phtpriv->ampdu_enable==_TRUE)) + if((phtpriv->ht_option==true) && (phtpriv->ampdu_enable==true)) { issued = (phtpriv->agg_enable_bitmap>>priority)&0x1; issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1; @@ -3526,7 +3526,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr inline void rtw_set_roaming(struct adapter *adapter, u8 to_roaming) { if (to_roaming == 0) - adapter->mlmepriv.to_join = _FALSE; + adapter->mlmepriv.to_join = false; adapter->mlmepriv.to_roaming = to_roaming; } @@ -3562,7 +3562,7 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network) pnetwork->network.Ssid.SsidLength); _rtw_memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(NDIS_802_11_SSID)); - pmlmepriv->assoc_by_bssid = _FALSE; + pmlmepriv->assoc_by_bssid = false; #ifdef CONFIG_WAPI_SUPPORT rtw_wapi_return_all_sta_info(padapter); @@ -3591,24 +3591,24 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network) sint rtw_linked_check(struct adapter *padapter) { - if( (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == _TRUE) || - (check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == _TRUE)) + if( (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == true) || + (check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == true)) { if(padapter->stapriv.asoc_sta_count > 2) - return _TRUE; + return true; } else { //Station mode - if(check_fwstate(&padapter->mlmepriv, _FW_LINKED)== _TRUE) - return _TRUE; + if(check_fwstate(&padapter->mlmepriv, _FW_LINKED)== true) + return true; } - return _FALSE; + return false; } #ifdef CONFIG_CONCURRENT_MODE sint rtw_buddy_adapter_up(struct adapter *padapter) { - sint res = _FALSE; + sint res = false; if(padapter == NULL) return res; @@ -3616,16 +3616,16 @@ sint rtw_buddy_adapter_up(struct adapter *padapter) if(padapter->pbuddy_adapter == NULL) { - res = _FALSE; + res = false; } else if( (padapter->pbuddy_adapter->bDriverStopped) || (padapter->pbuddy_adapter->bSurpriseRemoved) || - (padapter->pbuddy_adapter->bup == _FALSE) || (padapter->pbuddy_adapter->hw_init_completed == _FALSE)) + (padapter->pbuddy_adapter->bup == false) || (padapter->pbuddy_adapter->hw_init_completed == false)) { - res = _FALSE; + res = false; } else { - res = _TRUE; + res = true; } return res; @@ -3635,28 +3635,28 @@ sint rtw_buddy_adapter_up(struct adapter *padapter) sint check_buddy_fwstate(struct adapter *padapter, sint state) { if(padapter == NULL) - return _FALSE; + return false; if(padapter->pbuddy_adapter == NULL) - return _FALSE; + return false; if ((state == WIFI_FW_NULL_STATE) && (padapter->pbuddy_adapter->mlmepriv.fw_state == WIFI_FW_NULL_STATE)) - return _TRUE; + return true; if (padapter->pbuddy_adapter->mlmepriv.fw_state & state) - return _TRUE; + return true; - return _FALSE; + return false; } u8 rtw_get_buddy_bBusyTraffic(struct adapter *padapter) { if(padapter == NULL) - return _FALSE; + return false; if(padapter->pbuddy_adapter == NULL) - return _FALSE; + return false; return padapter->pbuddy_adapter->mlmepriv.LinkDetectInfo.bBusyTraffic; } diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 7bcc84e..bb3fd7d 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -341,7 +341,7 @@ static void init_mlme_ext_priv_value(struct adapter* padapter) pmlmeext->sitesurvey_res.state = SCAN_DISABLE; pmlmeext->sitesurvey_res.channel_idx = 0; pmlmeext->sitesurvey_res.bss_cnt = 0; - pmlmeext->scan_abort = _FALSE; + pmlmeext->scan_abort = false; pmlmeinfo->state = WIFI_FW_NULL_STATE; pmlmeinfo->reauth_count = 0; @@ -435,7 +435,7 @@ static void init_channel_list(struct adapter *padapter, RT_CHANNEL_INFO *channel static u8 init_channel_set(struct adapter* padapter, u8 ChannelPlan, RT_CHANNEL_INFO *channel_set) { u8 index,chanset_size = 0; - u8 b5GBand = _FALSE, b2_4GBand = _FALSE; + u8 b5GBand = false, b2_4GBand = false; u8 Index2G = 0, Index5G=0; _rtw_memset(channel_set, 0, sizeof(RT_CHANNEL_INFO)*MAX_CHANNEL_NUM); @@ -448,7 +448,7 @@ static u8 init_channel_set(struct adapter* padapter, u8 ChannelPlan, RT_CHANNEL_ if(padapter->registrypriv.wireless_mode & WIRELESS_11G) { - b2_4GBand = _TRUE; + b2_4GBand = true; if(RT_CHANNEL_DOMAIN_REALTEK_DEFINE == ChannelPlan) Index2G = RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE.Index2G; else @@ -457,7 +457,7 @@ static u8 init_channel_set(struct adapter* padapter, u8 ChannelPlan, RT_CHANNEL_ if(padapter->registrypriv.wireless_mode & WIRELESS_11A) { - b5GBand = _TRUE; + b5GBand = true; if(RT_CHANNEL_DOMAIN_REALTEK_DEFINE == ChannelPlan) Index5G = RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE.Index5G; else @@ -561,11 +561,11 @@ int init_mlme_ext_priv(struct adapter* padapter) init_channel_list(padapter, pmlmeext->channel_set, pmlmeext->max_chan_nums, &pmlmeext->channel_list); pmlmeext->chan_scan_time = SURVEY_TO; - pmlmeext->mlmeext_init = _TRUE; + pmlmeext->mlmeext_init = true; #ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK - pmlmeext->active_keep_alive_check = _TRUE; + pmlmeext->active_keep_alive_check = true; #endif #ifdef DBG_FIXED_CHAN @@ -583,7 +583,7 @@ void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext) if (!padapter) return; - if (padapter->bDriverStopped == _TRUE) + if (padapter->bDriverStopped == true) { _cancel_timer_ex(&pmlmeext->survey_timer); _cancel_timer_ex(&pmlmeext->link_timer); @@ -710,7 +710,7 @@ void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame) switch (GetFrameSubType(pframe)) { case WIFI_AUTH: - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) ptable->func = &OnAuth; else ptable->func = &OnAuthClient; @@ -719,12 +719,12 @@ void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame) case WIFI_REASSOCREQ: _mgt_dispatcher(padapter, ptable, precv_frame); #ifdef CONFIG_HOSTAPD_MLME - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) rtw_hostapd_mlme_rx(padapter, precv_frame); #endif break; case WIFI_PROBEREQ: - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { #ifdef CONFIG_HOSTAPD_MLME rtw_hostapd_mlme_rx(padapter, precv_frame); @@ -739,12 +739,12 @@ void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame) _mgt_dispatcher(padapter, ptable, precv_frame); break; case WIFI_ACTION: - //if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + //if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) _mgt_dispatcher(padapter, ptable, precv_frame); break; default: _mgt_dispatcher(padapter, ptable, precv_frame); - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) rtw_hostapd_mlme_rx(padapter, precv_frame); break; } @@ -759,14 +759,14 @@ void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame) #ifdef CONFIG_P2P static u32 p2p_listen_state_process(struct adapter *padapter, unsigned char *da) { - bool response = _TRUE; + bool response = true; #ifdef CONFIG_IOCTL_CFG80211 if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 ) { - if(padapter->cfg80211_wdinfo.is_ro_ch == _FALSE + if(padapter->cfg80211_wdinfo.is_ro_ch == false || rtw_get_oper_ch(padapter) != padapter->wdinfo.listen_channel - || wdev_to_priv(padapter->rtw_wdev)->p2p_enabled == _FALSE + || wdev_to_priv(padapter->rtw_wdev)->p2p_enabled == false || padapter->mlmepriv.wps_probe_resp_ie == NULL || padapter->mlmepriv.p2p_probe_resp_ie == NULL ) @@ -781,7 +781,7 @@ static u32 p2p_listen_state_process(struct adapter *padapter, unsigned char *da) rtw_get_oper_ch(padapter), padapter->wdinfo.listen_channel); #endif - response = _FALSE; + response = false; } } else @@ -791,11 +791,11 @@ static u32 p2p_listen_state_process(struct adapter *padapter, unsigned char *da) // do nothing if the device name is empty if ( !padapter->wdinfo.device_name_len ) { - response = _FALSE; + response = false; } } - if (response == _TRUE) + if (response == true) issue_probersp_p2p( padapter, da); return _SUCCESS; @@ -819,7 +819,7 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame) WLAN_BSSID_EX *cur = &(pmlmeinfo->network); u8 *pframe = precv_frame->u.hdr.rx_data; uint len = precv_frame->u.hdr.len; - u8 is_valid_p2p_probereq = _FALSE; + u8 is_valid_p2p_probereq = false; #ifdef CONFIG_ATMEL_RC_PATCH u8 *target_ie=NULL, *wps_ie=NULL; @@ -860,7 +860,7 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame) if( wifi_test_chk_rate == 1 ) { - if((is_valid_p2p_probereq = process_probe_req_p2p_ie(pwdinfo, pframe, len)) == _TRUE) + if((is_valid_p2p_probereq = process_probe_req_p2p_ie(pwdinfo, pframe, len)) == true) { if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_DEVICE)) { @@ -889,8 +889,8 @@ _continue: return _SUCCESS; } - if(check_fwstate(pmlmepriv, _FW_LINKED) == _FALSE && - check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE)==_FALSE) + if(check_fwstate(pmlmepriv, _FW_LINKED) == false && + check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE)==false) { return _SUCCESS; } @@ -907,7 +907,7 @@ _continue: target_ie = rtw_get_wps_attr_content( wps_ie, wps_ielen, WPS_ATTR_MANUFACTURER, NULL, &target_ielen); } - if ((target_ie && (target_ielen == 4)) && (_TRUE ==_rtw_memcmp((void *)target_ie, "Ozmo",4 ))) { + if ((target_ie && (target_ielen == 4)) && (true ==_rtw_memcmp((void *)target_ie, "Ozmo",4 ))) { //psta->flag_atmel_rc = 1; unsigned char *sa_addr = get_sa(pframe); DBG_871X("%s: Find Ozmo RC -- %02x:%02x:%02x:%02x:%02x:%02x \n\n", @@ -931,12 +931,12 @@ _continue: //check (wildcard) SSID if (p != NULL) { - if(is_valid_p2p_probereq == _TRUE) + if(is_valid_p2p_probereq == true) { goto _issue_probersp; } - if ( (ielen != 0 && _FALSE ==_rtw_memcmp((void *)(p+2), (void *)cur->Ssid.Ssid, cur->Ssid.SsidLength)) + if ( (ielen != 0 && false ==_rtw_memcmp((void *)(p+2), (void *)cur->Ssid.Ssid, cur->Ssid.SsidLength)) || (ielen == 0 && pmlmeinfo->hidden_ssid_mode) ) { @@ -945,8 +945,8 @@ _continue: _issue_probersp: - if(((check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE && - pmlmepriv->cur_network.join_res == _TRUE)) || check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) + if(((check_fwstate(pmlmepriv, _FW_LINKED) == true && + pmlmepriv->cur_network.join_res == true)) || check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) { //DBG_871X("+issue_probersp during ap mode\n"); issue_probersp(padapter, get_sa(pframe), is_valid_p2p_probereq); @@ -973,13 +973,13 @@ unsigned int OnProbeRsp(struct adapter *padapter, union recv_frame *precv_frame) #ifdef CONFIG_P2P if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ)) { - if ( _TRUE == pwdinfo->tx_prov_disc_info.benable ) + if ( true == pwdinfo->tx_prov_disc_info.benable ) { if( _rtw_memcmp( pwdinfo->tx_prov_disc_info.peerIFAddr, GetAddr2Ptr(pframe), ETH_ALEN ) ) { if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_CLIENT)) { - pwdinfo->tx_prov_disc_info.benable = _FALSE; + pwdinfo->tx_prov_disc_info.benable = false; issue_p2p_provision_request( padapter, pwdinfo->tx_prov_disc_info.ssid.Ssid, pwdinfo->tx_prov_disc_info.ssid.SsidLength, @@ -987,7 +987,7 @@ unsigned int OnProbeRsp(struct adapter *padapter, union recv_frame *precv_frame) } else if ( rtw_p2p_chk_role(pwdinfo, P2P_ROLE_DEVICE) || rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO) ) { - pwdinfo->tx_prov_disc_info.benable = _FALSE; + pwdinfo->tx_prov_disc_info.benable = false; issue_p2p_provision_request( padapter, NULL, 0, @@ -999,24 +999,24 @@ unsigned int OnProbeRsp(struct adapter *padapter, union recv_frame *precv_frame) } else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) { - if ( _TRUE == pwdinfo->nego_req_info.benable ) + if ( true == pwdinfo->nego_req_info.benable ) { DBG_871X( "[%s] P2P State is GONEGO ING!\n", __FUNCTION__ ); if( _rtw_memcmp( pwdinfo->nego_req_info.peerDevAddr, GetAddr2Ptr(pframe), ETH_ALEN ) ) { - pwdinfo->nego_req_info.benable = _FALSE; + pwdinfo->nego_req_info.benable = false; issue_p2p_GO_request( padapter, pwdinfo->nego_req_info.peerDevAddr); } } } else if( rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_INVITE_REQ ) ) { - if ( _TRUE == pwdinfo->invitereq_info.benable ) + if ( true == pwdinfo->invitereq_info.benable ) { DBG_871X( "[%s] P2P_STATE_TX_INVITE_REQ!\n", __FUNCTION__ ); if( _rtw_memcmp( pwdinfo->invitereq_info.peer_macaddr, GetAddr2Ptr(pframe), ETH_ALEN ) ) { - pwdinfo->invitereq_info.benable = _FALSE; + pwdinfo->invitereq_info.benable = false; issue_p2p_invitation_request( padapter, pwdinfo->invitereq_info.peer_macaddr ); } } @@ -1089,7 +1089,7 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame) pbss = (WLAN_BSSID_EX*)rtw_malloc(sizeof(WLAN_BSSID_EX)); if (pbss) { if (collect_bss_info(padapter, precv_frame, pbss) == _SUCCESS) { - update_network(&(pmlmepriv->cur_network.network), pbss, padapter, _TRUE); + update_network(&(pmlmepriv->cur_network.network), pbss, padapter, true); rtw_get_bcn_info(&(pmlmepriv->cur_network)); } rtw_mfree((u8*)pbss, sizeof(WLAN_BSSID_EX)); @@ -1246,7 +1246,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) goto auth_fail; } - if(rtw_access_ctrl(padapter, sa) == _FALSE) { + if(rtw_access_ctrl(padapter, sa) == false) { status = _STATS_UNABLE_HANDLE_STA_; goto auth_fail; } @@ -1273,7 +1273,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) else { _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); - if(rtw_is_list_empty(&pstat->asoc_list)==_FALSE) + if(rtw_is_list_empty(&pstat->asoc_list)==false) { rtw_list_delete(&pstat->asoc_list); pstapriv->asoc_list_cnt--; @@ -1783,7 +1783,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) if(!selected_registrar) { - DBG_871X("selected_registrar is _FALSE , or AP is not ready to do WPS\n"); + DBG_871X("selected_registrar is false , or AP is not ready to do WPS\n"); status = _STATS_UNABLE_HANDLE_STA_; @@ -1831,7 +1831,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) pstat->flags &= ~WLAN_STA_WME; pstat->qos_option = 0; pstat->qos_info = 0; - pstat->has_legacy_ac = _TRUE; + pstat->has_legacy_ac = true; pstat->uapsd_vo = 0; pstat->uapsd_vi = 0; pstat->uapsd_be = 0; @@ -1853,9 +1853,9 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) pstat->max_sp_len = (pstat->qos_info>>5)&0x3; if((pstat->qos_info&0xf) !=0xf) - pstat->has_legacy_ac = _TRUE; + pstat->has_legacy_ac = true; else - pstat->has_legacy_ac = _FALSE; + pstat->has_legacy_ac = false; if(pstat->qos_info&0xf) { @@ -1907,7 +1907,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) pstat->flags &= ~WLAN_STA_HT; - if((pmlmepriv->htpriv.ht_option == _FALSE) && (pstat->flags&WLAN_STA_HT)) + if((pmlmepriv->htpriv.ht_option == false) && (pstat->flags&WLAN_STA_HT)) { status = _STATS_FAILURE_; goto OnAssocReqFail; @@ -1947,12 +1947,12 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) goto OnAssocReqFail; #ifdef CONFIG_P2P - pstat->is_p2p_device = _FALSE; + pstat->is_p2p_device = false; if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) { if( (p2pie=rtw_get_p2p_ie(pframe + WLAN_HDR_A3_LEN + ie_offset , pkt_len - WLAN_HDR_A3_LEN - ie_offset , NULL, &p2pielen))) { - pstat->is_p2p_device = _TRUE; + pstat->is_p2p_device = true; if((p2p_status_code=(u8)process_assoc_req_p2p_ie(pwdinfo, pframe, pkt_len, pstat))>0) { pstat->p2p_status_code = p2p_status_code; @@ -2243,7 +2243,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame) DBG_871X("%s Reason code(%d)\n", __FUNCTION__,reason); #ifdef CONFIG_AP_MODE - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { _irqL irqL; struct sta_info *psta; @@ -2262,11 +2262,11 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame) u8 updated; _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); - if(rtw_is_list_empty(&psta->asoc_list)==_FALSE) + if(rtw_is_list_empty(&psta->asoc_list)==false) { rtw_list_delete(&psta->asoc_list); pstapriv->asoc_list_cnt--; - updated = ap_free_sta(padapter, psta, _FALSE, reason); + updated = ap_free_sta(padapter, psta, false, reason); } _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); @@ -2307,7 +2307,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame) receive_disconnect(padapter, GetAddr3Ptr(pframe) ,reason); } } - pmlmepriv->LinkDetectInfo.bBusyTraffic = _FALSE; + pmlmepriv->LinkDetectInfo.bBusyTraffic = false; return _SUCCESS; } @@ -2339,7 +2339,7 @@ unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame) DBG_871X("%s Reason code(%d)\n", __FUNCTION__,reason); #ifdef CONFIG_AP_MODE - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) { + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { _irqL irqL; struct sta_info *psta; struct sta_priv *pstapriv = &padapter->stapriv; @@ -2357,11 +2357,11 @@ unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame) u8 updated; _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); - if(rtw_is_list_empty(&psta->asoc_list)==_FALSE) + if(rtw_is_list_empty(&psta->asoc_list)==false) { rtw_list_delete(&psta->asoc_list); pstapriv->asoc_list_cnt--; - updated = ap_free_sta(padapter, psta, _FALSE, reason); + updated = ap_free_sta(padapter, psta, false, reason); } _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); @@ -2379,7 +2379,7 @@ unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame) receive_disconnect(padapter, GetAddr3Ptr(pframe), reason); } - pmlmepriv->LinkDetectInfo.bBusyTraffic = _FALSE; + pmlmepriv->LinkDetectInfo.bBusyTraffic = false; return _SUCCESS; } @@ -2441,7 +2441,7 @@ static unsigned int on_action_spct_ch_switch(struct adapter *padapter, struct st * 2. things after channel switching */ - ret = rtw_set_ch_cmd(padapter, ch, bwmode, ch_offset, _TRUE); + ret = rtw_set_ch_cmd(padapter, ch, bwmode, ch_offset, true); } exit: @@ -2542,8 +2542,8 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra { #ifdef CONFIG_TDLS if((psta->tdls_sta_state & TDLS_LINKED_STATE) && - (psta->htpriv.ht_option==_TRUE) && - (psta->htpriv.ampdu_enable==_TRUE) ) + (psta->htpriv.ht_option==true) && + (psta->htpriv.ampdu_enable==true) ) { //do nothing; just don't want to return _SUCCESS; } @@ -2564,7 +2564,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra //process_addba_req(padapter, (u8*)&(pmlmeinfo->ADDBA_req), GetAddr3Ptr(pframe)); process_addba_req(padapter, (u8*)&(pmlmeinfo->ADDBA_req), addr); - if(pmlmeinfo->bAcceptAddbaReq == _TRUE) { + if(pmlmeinfo->bAcceptAddbaReq == true) { issue_action_BA(padapter, addr, RTW_WLAN_ACTION_ADDBA_RESP, 0); } else { issue_action_BA(padapter, addr, @@ -2608,7 +2608,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra tid = (frame_body[3] >> 4) & 0x0F; preorder_ctrl = &psta->recvreorder_ctrl[tid]; - preorder_ctrl->enable = _FALSE; + preorder_ctrl->enable = false; preorder_ctrl->indicate_seq = 0xffff; #ifdef DBG_RX_SEQ DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, @@ -4745,7 +4745,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) #ifdef CONFIG_INTEL_WIDI // Commented by Kurt // Appended WiDi info. only if we did issued_probereq_widi(), and then we saved ven. ext. in pmlmepriv->sa_ext. - if( _rtw_memcmp(pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN) == _FALSE + if( _rtw_memcmp(pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN) == false || pmlmepriv->num_p2p_sdt != 0 ) { //Sec dev type @@ -4768,7 +4768,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) *(__be16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_PDT_SCID_WIDI_CONSUMER_SINK ); wpsielen += 2; - if( _rtw_memcmp(pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN) == _FALSE ) + if( _rtw_memcmp(pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN) == false ) { // Vendor Extension _rtw_memcpy( wpsie + wpsielen, pmlmepriv->sa_ext, L2SDTA_SERVICE_VE_LEN ); @@ -4932,7 +4932,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) #ifdef CONFIG_WFD #ifdef CONFIG_IOCTL_CFG80211 - if ( _TRUE == pwdinfo->wfd_info->wfd_enable ) + if ( true == pwdinfo->wfd_info->wfd_enable ) #endif //CONFIG_IOCTL_CFG80211 { wfdielen = build_probe_resp_wfd_ie(pwdinfo, pframe, 0); @@ -5280,7 +5280,7 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) #ifdef CONFIG_WFD #ifdef CONFIG_IOCTL_CFG80211 - if ( _TRUE == pwdinfo->wfd_info->wfd_enable ) + if ( true == pwdinfo->wfd_info->wfd_enable ) #endif { wfdielen = build_probe_req_wfd_ie(pwdinfo, pframe); @@ -5315,7 +5315,7 @@ exit: inline void issue_probereq_p2p(struct adapter *adapter, u8 *da) { - _issue_probereq_p2p(adapter, da, _FALSE); + _issue_probereq_p2p(adapter, da, false); } int issue_probereq_p2p_ex(struct adapter *adapter, u8 *da, int try_cnt, int wait_ms) @@ -5326,7 +5326,7 @@ int issue_probereq_p2p_ex(struct adapter *adapter, u8 *da, int try_cnt, int wait do { - ret = _issue_probereq_p2p(adapter, da, wait_ms>0?_TRUE:_FALSE); + ret = _issue_probereq_p2p(adapter, da, wait_ms>0?true:false); i++; @@ -5503,7 +5503,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) // Commented by Albert 20110425 // The restore timer is enabled when issuing the nego request frame of rtw_p2p_connect function. _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); - pwdinfo->nego_req_info.benable = _FALSE; + pwdinfo->nego_req_info.benable = false; result = process_p2p_group_negotation_resp( pwdinfo, frame_body, len); issue_p2p_GO_confirm( pwdinfo->padapter, GetAddr2Ptr(pframe), result); if ( P2P_STATUS_SUCCESS == result ) @@ -5750,7 +5750,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) if ( attr_contentlen == 1 ) { DBG_871X( "[%s] Status = %d\n", __FUNCTION__, attr_content ); - pwdinfo->invitereq_info.benable = _FALSE; + pwdinfo->invitereq_info.benable = false; if ( attr_content == P2P_STATUS_SUCCESS ) { @@ -5855,7 +5855,7 @@ static unsigned int on_action_public_vendor(union recv_frame *precv_frame) uint frame_len = precv_frame->u.hdr.len; u8 *frame_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr); - if (_rtw_memcmp(frame_body + 2, P2P_OUI, 4) == _TRUE) { + if (_rtw_memcmp(frame_body + 2, P2P_OUI, 4) == true) { ret = on_action_public_p2p(precv_frame); } @@ -6103,12 +6103,12 @@ exit: inline struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv) { - return _alloc_mgtxmitframe(pxmitpriv, _FALSE); + return _alloc_mgtxmitframe(pxmitpriv, false); } inline struct xmit_frame *alloc_mgtxmitframe_once(struct xmit_priv *pxmitpriv) { - return _alloc_mgtxmitframe(pxmitpriv, _TRUE); + return _alloc_mgtxmitframe(pxmitpriv, true); } @@ -6146,24 +6146,24 @@ void update_mgntframe_attrib(struct adapter *padapter, struct pkt_attrib *pattri pattrib->raid = 5;//a/g mode pattrib->encrypt = _NO_PRIVACY_; - pattrib->bswenc = _FALSE; + pattrib->bswenc = false; - pattrib->qos_en = _FALSE; - pattrib->ht_en = _FALSE; + pattrib->qos_en = false; + pattrib->ht_en = false; pattrib->bwmode = HT_CHANNEL_WIDTH_20; pattrib->ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; - pattrib->sgi = _FALSE; + pattrib->sgi = false; pattrib->seqnum = pmlmeext->mgnt_seq; - pattrib->retry_ctrl = _TRUE; + pattrib->retry_ctrl = true; } void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe) { - if(padapter->bSurpriseRemoved == _TRUE || - padapter->bDriverStopped == _TRUE) + if(padapter->bSurpriseRemoved == true || + padapter->bDriverStopped == true) { rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf); rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe); @@ -6181,8 +6181,8 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfr struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf; struct submit_ctx sctx; - if(padapter->bSurpriseRemoved == _TRUE || - padapter->bDriverStopped == _TRUE) + if(padapter->bSurpriseRemoved == true || + padapter->bDriverStopped == true) { rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf); rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe); @@ -6215,8 +6215,8 @@ s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmg pxmitpriv = &(padapter->pbuddy_adapter->xmitpriv); #endif - if(padapter->bSurpriseRemoved == _TRUE || - padapter->bDriverStopped == _TRUE) + if(padapter->bSurpriseRemoved == true || + padapter->bDriverStopped == true) { rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf); rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe); @@ -6224,14 +6224,14 @@ s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmg } _enter_critical_mutex(&pxmitpriv->ack_tx_mutex, NULL); - pxmitpriv->ack_tx = _TRUE; + pxmitpriv->ack_tx = true; pmgntframe->ack_report = 1; if (rtw_hal_mgnt_xmit(padapter, pmgntframe) == _SUCCESS) { ret = rtw_ack_tx_wait(pxmitpriv, timeout_ms); } - pxmitpriv->ack_tx = _FALSE; + pxmitpriv->ack_tx = false; _exit_critical_mutex(&pxmitpriv->ack_tx_mutex, NULL); return ret; @@ -6492,7 +6492,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) pattrib->pktlen += len; #ifdef CONFIG_WFD #ifdef CONFIG_IOCTL_CFG80211 - if(_TRUE == pwdinfo->wfd_info->wfd_enable) + if(true == pwdinfo->wfd_info->wfd_enable) #endif //CONFIG_IOCTL_CFG80211 { len = build_beacon_wfd_ie( pwdinfo, pframe ); @@ -6574,7 +6574,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) _issue_bcn: #if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) - pmlmepriv->update_bcn = _FALSE; + pmlmepriv->update_bcn = false; _exit_critical_bh(&pmlmepriv->bcn_update_lock, &irqL); #endif //#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) @@ -6818,7 +6818,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p #ifdef CONFIG_WFD #ifdef CONFIG_IOCTL_CFG80211 - if(_TRUE == pwdinfo->wfd_info->wfd_enable) + if(true == pwdinfo->wfd_info->wfd_enable) #endif //CONFIG_IOCTL_CFG80211 { len = build_probe_resp_wfd_ie(pwdinfo, pframe, 0); @@ -6955,7 +6955,7 @@ exit: inline void issue_probereq(struct adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da) { - _issue_probereq(padapter, pssid, da, _FALSE); + _issue_probereq(padapter, pssid, da, false); } int issue_probereq_ex(struct adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da, @@ -6967,7 +6967,7 @@ int issue_probereq_ex(struct adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da, do { - ret = _issue_probereq(padapter, pssid, da, wait_ms>0?_TRUE:_FALSE); + ret = _issue_probereq(padapter, pssid, da, wait_ms>0?true:false); i++; @@ -7265,7 +7265,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i #ifdef CONFIG_P2P if( padapter->wdinfo.driver_interface == DRIVER_WEXT ) { - if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO) && (pstat->is_p2p_device == _TRUE)) { + if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO) && (pstat->is_p2p_device == true)) { u32 len; len = build_assoc_resp_p2p_ie(pwdinfo, pframe, pstat->p2p_status_code); @@ -7277,7 +7277,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i #ifdef CONFIG_WFD if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO) #ifdef CONFIG_IOCTL_CFG80211 - && (_TRUE == pwdinfo->wfd_info->wfd_enable) + && (true == pwdinfo->wfd_info->wfd_enable) #endif //CONFIG_IOCTL_CFG80211 ) { @@ -7445,7 +7445,7 @@ void issue_assocreq(struct adapter *padapter) #ifdef CONFIG_80211N_HT //HT caps - if(padapter->mlmepriv.htpriv.ht_option==_TRUE) { + if(padapter->mlmepriv.htpriv.ht_option==true) { p = rtw_get_ie((pmlmeinfo->network.IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_CAPABILITY_IE_, &ie_len, (pmlmeinfo->network.IELength - sizeof(NDIS_802_11_FIXED_IEs))); if (p && (!is_ap_in_tkip(padapter))) { _rtw_memcpy(&(pmlmeinfo->HT_caps), (p + 2), sizeof(struct HT_caps_element)); @@ -7498,7 +7498,7 @@ void issue_assocreq(struct adapter *padapter) #endif #ifdef CONFIG_BT_COEXIST - if (BT_1Ant(padapter) == _TRUE) + if (BT_1Ant(padapter) == true) { // set to 8K pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para &= (u8)~IEEE80211_HT_CAP_AMPDU_FACTOR; @@ -7713,7 +7713,7 @@ void issue_assocreq(struct adapter *padapter) #ifdef CONFIG_WFD #ifdef CONFIG_IOCTL_CFG80211 - if ( _TRUE == pwdinfo->wfd_info->wfd_enable ) + if ( true == pwdinfo->wfd_info->wfd_enable ) #endif //CONFIG_IOCTL_CFG80211 { wfdielen = build_assoc_req_wfd_ie(pwdinfo, pframe); @@ -7775,7 +7775,7 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned //update attribute pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - pattrib->retry_ctrl = _FALSE; + pattrib->retry_ctrl = false; _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); @@ -7843,7 +7843,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow do { - ret = _issue_nulldata(padapter, da, power_mode, wait_ms>0?_TRUE:_FALSE); + ret = _issue_nulldata(padapter, da, power_mode, wait_ms>0?true:false); i++; @@ -7902,7 +7902,7 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 update_mgntframe_attrib(padapter, pattrib); pattrib->hdrlen +=2; - pattrib->qos_en = _TRUE; + pattrib->qos_en = true; pattrib->eosp = 1; pattrib->ack_policy = 0; pattrib->mdata = 0; @@ -7978,7 +7978,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int do { - ret = _issue_qos_nulldata(padapter, da, tid, wait_ms>0?_TRUE:_FALSE); + ret = _issue_qos_nulldata(padapter, da, tid, wait_ms>0?true:false); i++; @@ -8044,7 +8044,7 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned s //update attribute pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - pattrib->retry_ctrl = _FALSE; + pattrib->retry_ctrl = false; _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); @@ -8087,7 +8087,7 @@ exit: int issue_deauth(struct adapter *padapter, unsigned char *da, unsigned short reason) { DBG_871X("%s to "MAC_FMT"\n", __func__, MAC_ARG(da)); - return _issue_deauth(padapter, da, reason, _FALSE); + return _issue_deauth(padapter, da, reason, false); } int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int try_cnt, @@ -8099,7 +8099,7 @@ int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int do { - ret = _issue_deauth(padapter, da, reason, wait_ms>0?_TRUE:_FALSE); + ret = _issue_deauth(padapter, da, reason, wait_ms>0?true:false); i++; @@ -8344,9 +8344,9 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr, pframe = rtw_set_fixed_ie(pframe, 1, &(pmlmeinfo->dialogToken), &(pattrib->pktlen)); #ifdef CONFIG_BT_COEXIST - if ((BT_1Ant(padapter) == _TRUE) && + if ((BT_1Ant(padapter) == true) && ((pmlmeinfo->assoc_AP_vendor != broadcomAP) || - (_rtw_memcmp(raddr, tendaAPMac, 3) == _FALSE))) { + (_rtw_memcmp(raddr, tendaAPMac, 3) == false))) { // A-MSDU NOT Supported BA_para_set = 0; // immediate Block Ack @@ -8400,9 +8400,9 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr, BA_para_set = ((le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f) | 0x1000); //64 buffer size #ifdef CONFIG_BT_COEXIST - if ((BT_1Ant(padapter) == _TRUE) && + if ((BT_1Ant(padapter) == true) && ((pmlmeinfo->assoc_AP_vendor != broadcomAP) || - (_rtw_memcmp(raddr, tendaAPMac, 3) == _FALSE))) { + (_rtw_memcmp(raddr, tendaAPMac, 3) == false))) { // max buffer size is 8 MSDU BA_para_set &= ~RTW_IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK; BA_para_set |= (8 << 6) & RTW_IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK; @@ -8461,7 +8461,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) if((pmlmepriv->num_FortyMHzIntolerant==0) || (pmlmepriv->num_sta_no_ht==0)) return; - if(_TRUE == pmlmeinfo->bwmode_updated) + if(true == pmlmeinfo->bwmode_updated) return; @@ -8532,7 +8532,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) u8 *p; WLAN_BSSID_EX *pbss_network; - if (rtw_end_of_queue_search(phead,plist)== _TRUE) + if (rtw_end_of_queue_search(phead,plist)== true) break; pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); @@ -8620,12 +8620,12 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr) { for(tid = 0;tidrecvreorder_ctrl[tid].enable == _TRUE) + if(psta->recvreorder_ctrl[tid].enable == true) { DBG_871X("rx agg disable tid(%d)\n",tid); issue_action_BA(padapter, addr, RTW_WLAN_ACTION_DELBA, (((tid <<1) |initiator)&0x1F)); - psta->recvreorder_ctrl[tid].enable = _FALSE; + psta->recvreorder_ctrl[tid].enable = false; psta->recvreorder_ctrl[tid].indicate_seq = 0xffff; #ifdef DBG_RX_SEQ DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, @@ -8659,7 +8659,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr) unsigned int send_beacon(struct adapter *padapter) { - u8 bxmitok = _FALSE; + u8 bxmitok = false; int issue=0; int poll = 0; u32 start = rtw_get_current_time(); @@ -8672,9 +8672,9 @@ unsigned int send_beacon(struct adapter *padapter) rtw_yield_os(); rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bxmitok)); poll++; - }while((poll%10)!=0 && _FALSE == bxmitok && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); + }while((poll%10)!=0 && false == bxmitok && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); - }while(_FALSE == bxmitok && issue<100 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); + }while(false == bxmitok && issue<100 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); if(padapter->bSurpriseRemoved || padapter->bDriverStopped) { @@ -8682,7 +8682,7 @@ unsigned int send_beacon(struct adapter *padapter) } - if(_FALSE == bxmitok) + if(false == bxmitok) { DBG_871X("%s fail! %u ms\n", __FUNCTION__, rtw_get_passing_time_ms(start)); return _FAIL; @@ -8718,8 +8718,8 @@ BOOLEAN IsLegal5GChannel( 161,163,165}; for(i=0;ipbuddy_adapter, 0, NULL, _TRUE); + update_beacon(padapter->pbuddy_adapter, 0, NULL, true); } } else if( stay_buddy_ch == 2 ) @@ -8899,7 +8899,7 @@ void site_survey(struct adapter *padapter) #endif//CONFIG_P2P { if(ScanType == SCAN_ACTIVE){ - if( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE){ + if( check_fwstate(pmlmepriv, _FW_LINKED) == true){ if(survey_channel == pmlmeext->cur_channel ) set_survey_timer(pmlmeext, 200); else @@ -8986,7 +8986,7 @@ void site_survey(struct adapter *padapter) rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); //turn on dynamic functions Restore_DM_Func_Flag(padapter); - //Switch_DM_Func(padapter, DYNAMIC_FUNC_DIG|DYNAMIC_FUNC_HP|DYNAMIC_FUNC_SS, _TRUE); + //Switch_DM_Func(padapter, DYNAMIC_FUNC_DIG|DYNAMIC_FUNC_HP|DYNAMIC_FUNC_SS, true); _set_timer( &pwdinfo->find_phase_timer, ( u32 ) ( ( u32 ) ( pwdinfo->listen_dwell ) * 100 ) ); } @@ -9071,14 +9071,14 @@ void site_survey(struct adapter *padapter) rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); //turn on dynamic functions Restore_DM_Func_Flag(padapter); - //Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, _TRUE); + //Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true); - if (is_client_associated_to_ap(padapter) == _TRUE) + if (is_client_associated_to_ap(padapter) == true) { issue_nulldata(padapter, NULL, 0, 3, 500); #ifdef CONFIG_CONCURRENT_MODE - if(is_client_associated_to_ap(padapter->pbuddy_adapter) == _TRUE) + if(is_client_associated_to_ap(padapter->pbuddy_adapter) == true) { DBG_871X("adapter is surveydone(buddy_adapter is linked), issue nulldata(pwrbit=0)\n"); @@ -9087,7 +9087,7 @@ void site_survey(struct adapter *padapter) #endif } #ifdef CONFIG_CONCURRENT_MODE - else if(is_client_associated_to_ap(padapter->pbuddy_adapter) == _TRUE) + else if(is_client_associated_to_ap(padapter->pbuddy_adapter) == true) { issue_nulldata(padapter->pbuddy_adapter, NULL, 0, 3, 500); } @@ -9117,7 +9117,7 @@ void site_survey(struct adapter *padapter) DBG_871X("restart pbuddy_adapter's beacon\n"); - update_beacon(padapter->pbuddy_adapter, 0, NULL, _TRUE); + update_beacon(padapter->pbuddy_adapter, 0, NULL, true); } #endif @@ -9313,7 +9313,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLA bssid->Configuration.ATIMWindow = 0; //20/40 BSS Coexistence check - if((pregistrypriv->wifi_spec==1) && (_FALSE == pmlmeinfo->bwmode_updated)) + if((pregistrypriv->wifi_spec==1) && (false == pmlmeinfo->bwmode_updated)) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; #ifdef CONFIG_80211N_HT @@ -9466,7 +9466,7 @@ void start_clnt_join(struct adapter* padapter) struct wlan_network *scanned = NULL; u8 ie_offset = 0; _irqL irqL; - bool has_p2p_ie = _FALSE; + bool has_p2p_ie = false; _enter_critical_bh(&(padapter->mlmepriv.scanned_queue.lock), &irqL); @@ -9476,19 +9476,19 @@ void start_clnt_join(struct adapter* padapter) if(scanned==NULL) rtw_warn_on(1); - if (_rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(NDIS_802_11_SSID)) == _TRUE - && _rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(NDIS_802_11_MAC_ADDRESS)) == _TRUE + if (_rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(NDIS_802_11_SSID)) == true + && _rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(NDIS_802_11_MAC_ADDRESS)) == true ) { ie_offset = (scanned->network.Reserved[0] == 2? 0:12); if (rtw_get_p2p_ie(scanned->network.IEs+ie_offset, scanned->network.IELength-ie_offset, NULL, NULL)) - has_p2p_ie = _TRUE; + has_p2p_ie = true; break; } } _exit_critical_bh(&(padapter->mlmepriv.scanned_queue.lock), &irqL); - if (scanned == NULL || rtw_end_of_queue_search(head, pos) || has_p2p_ie == _FALSE) + if (scanned == NULL || rtw_end_of_queue_search(head, pos) || has_p2p_ie == false) #endif /* CONFIG_P2P */ issue_deauth_ex(padapter, pnetwork->MacAddress, WLAN_REASON_DEAUTH_LEAVING, 5, 100); } @@ -10180,27 +10180,27 @@ void update_sta_info(struct adapter *padapter, struct sta_info *psta) //HT if(pmlmepriv->htpriv.ht_option) { - psta->htpriv.ht_option = _TRUE; + psta->htpriv.ht_option = true; psta->htpriv.ampdu_enable = pmlmepriv->htpriv.ampdu_enable; if (support_short_GI(padapter, &(pmlmeinfo->HT_caps))) - psta->htpriv.sgi = _TRUE; + psta->htpriv.sgi = true; - psta->qos_option = _TRUE; + psta->qos_option = true; } else #endif //CONFIG_80211N_HT { #ifdef CONFIG_80211N_HT - psta->htpriv.ht_option = _FALSE; + psta->htpriv.ht_option = false; - psta->htpriv.ampdu_enable = _FALSE; + psta->htpriv.ampdu_enable = false; - psta->htpriv.sgi = _FALSE; + psta->htpriv.sgi = false; #endif //CONFIG_80211N_HT - psta->qos_option = _FALSE; + psta->qos_option = false; } #ifdef CONFIG_80211N_HT @@ -10213,7 +10213,7 @@ void update_sta_info(struct adapter *padapter, struct sta_info *psta) //QoS if(pmlmepriv->qospriv.qos_option) - psta->qos_option = _TRUE; + psta->qos_option = true; psta->state = _FW_LINKED; @@ -10265,7 +10265,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res) //turn on dynamic functions - Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, _TRUE); + Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true); // update IOT-releated issue update_IOT_info(padapter); @@ -10402,7 +10402,7 @@ void mlmeext_sta_del_event_callback(struct adapter *padapter) dc_set_channel_bwmode_disconnect(padapter); #else #ifdef CONFIG_CONCURRENT_MODE - if((check_buddy_fwstate(padapter, _FW_LINKED)) != _TRUE) + if((check_buddy_fwstate(padapter, _FW_LINKED)) != true) { #endif //CONFIG_CONCURRENT_MODE @@ -10457,7 +10457,7 @@ void _linked_rx_signal_strehgth_display(struct adapter *padapter) static u8 chk_ap_is_alive(struct adapter *padapter, struct sta_info *psta) { - u8 ret = _FALSE; + u8 ret = false; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -10487,11 +10487,11 @@ static u8 chk_ap_is_alive(struct adapter *padapter, struct sta_info *psta) && sta_rx_probersp_pkts(psta) == sta_last_rx_probersp_pkts(psta) ) { - ret = _FALSE; + ret = false; } else { - ret = _TRUE; + ret = true; } sta_update_last_rx_pkts(psta); @@ -10532,7 +10532,7 @@ void linked_status_chk(struct adapter *padapter) // Marked by Kurt 20130715 // For WiDi 3.5 and latered on, they don't ask WiDi sink to do roaming, so we could not check rx limit that strictly. - // todo: To check why we under miracast session, rx_chk would be _FALSE + // todo: To check why we under miracast session, rx_chk would be false //#ifdef CONFIG_INTEL_WIDI //if (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_NONE) // rx_chk_limit = 1; @@ -10540,12 +10540,12 @@ void linked_status_chk(struct adapter *padapter) if ((psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress)) != NULL) { - bool is_p2p_enable = _FALSE; + bool is_p2p_enable = false; #ifdef CONFIG_P2P is_p2p_enable = !rtw_p2p_chk_state(&padapter->wdinfo, P2P_STATE_NONE); #endif - if (chk_ap_is_alive(padapter, psta) == _FALSE) + if (chk_ap_is_alive(padapter, psta) == false) rx_chk = _FAIL; if (pxmitpriv->last_tx_pkts == pxmitpriv->tx_pkts) @@ -10683,7 +10683,7 @@ void survey_timer_hdl(struct adapter *padapter) pmlmeext->sitesurvey_res.channel_idx++; } - if(pmlmeext->scan_abort == _TRUE) + if(pmlmeext->scan_abort == true) { #ifdef CONFIG_P2P if(!rtw_p2p_chk_state(&padapter->wdinfo, P2P_STATE_NONE)) @@ -10704,7 +10704,7 @@ void survey_timer_hdl(struct adapter *padapter) ); } - pmlmeext->scan_abort = _FALSE;//reset + pmlmeext->scan_abort = false;//reset } if ((ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj))) == NULL) @@ -10792,7 +10792,7 @@ void addba_timer_hdl(struct sta_info *psta) phtpriv = &psta->htpriv; - if((phtpriv->ht_option==_TRUE) && (phtpriv->ampdu_enable==_TRUE)) + if((phtpriv->ht_option==true) && (phtpriv->ampdu_enable==true)) { if(phtpriv->candidate_tid_bitmap) phtpriv->candidate_tid_bitmap=0x0; @@ -10810,9 +10810,9 @@ void sa_query_timer_hdl(struct adapter *padapter) //disconnect _enter_critical_bh(&pmlmepriv->lock, &irqL); - if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) + if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { - rtw_disassoc_cmd(padapter, 0, _TRUE); + rtw_disassoc_cmd(padapter, 0, true); rtw_indicate_disconnect(padapter); rtw_free_assoc_resources(padapter, 1); } @@ -10902,7 +10902,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf) //disable dynamic functions, such as high power, DIG Save_DM_Func_Flag(padapter); - Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, _FALSE); + Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false); //config the initial gain under linking, need to write the BB registers //initialgain = 0x1E; @@ -10970,7 +10970,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) } #ifdef CONFIG_ANTENNA_DIVERSITY - rtw_antenna_select_cmd(padapter, pparm->network.PhyInfo.Optimum_antenna, _FALSE); + rtw_antenna_select_cmd(padapter, pparm->network.PhyInfo.Optimum_antenna, false); #endif #ifdef CONFIG_WAPI_SUPPORT @@ -10988,7 +10988,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) pmlmeinfo->HT_info_enable = 0; pmlmeinfo->agg_enable_bitmap = 0; pmlmeinfo->candidate_tid_bitmap = 0; - pmlmeinfo->bwmode_updated = _FALSE; + pmlmeinfo->bwmode_updated = false; //pmlmeinfo->assoc_AP_vendor = HT_IOT_PEER_MAX; _rtw_memcpy(pnetwork, pbuf, FIELD_OFFSET(WLAN_BSSID_EX, IELength)); @@ -11080,7 +11080,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) #endif //disable dynamic functions, such as high power, DIG - //Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, _FALSE); + //Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false); //config the initial gain under linking, need to write the BB registers //initialgain = 0x1E; @@ -11142,7 +11142,7 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf) dc_set_channel_bwmode_disconnect(padapter); #else #ifdef CONFIG_CONCURRENT_MODE - if((check_buddy_fwstate(padapter, _FW_LINKED)) != _TRUE) + if((check_buddy_fwstate(padapter, _FW_LINKED)) != true) { #endif //CONFIG_CONCURRENT_MODE //switch to the 20M Hz mode after disconnect @@ -11232,7 +11232,7 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct sitesurvey_parm *pparm = (struct sitesurvey_parm *)pbuf; - u8 bdelayscan = _FALSE; + u8 bdelayscan = false; u8 val8; u32 initialgain; u32 i; @@ -11273,7 +11273,7 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf) #endif //issue null data if associating to the AP - if (is_client_associated_to_ap(padapter) == _TRUE) + if (is_client_associated_to_ap(padapter) == true) { pmlmeext->sitesurvey_res.state = SCAN_TXNULL; @@ -11285,17 +11285,17 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf) issue_nulldata(padapter, NULL, 1, 3, 500); #ifdef CONFIG_CONCURRENT_MODE - if(is_client_associated_to_ap(padapter->pbuddy_adapter) == _TRUE) + if(is_client_associated_to_ap(padapter->pbuddy_adapter) == true) { DBG_871X("adapter is scanning(buddy_adapter is linked), issue nulldata(pwrbit=1)\n"); issue_nulldata(padapter->pbuddy_adapter, NULL, 1, 3, 500); } #endif - bdelayscan = _TRUE; + bdelayscan = true; } #ifdef CONFIG_CONCURRENT_MODE - else if(is_client_associated_to_ap(padapter->pbuddy_adapter) == _TRUE) + else if(is_client_associated_to_ap(padapter->pbuddy_adapter) == true) { #ifdef CONFIG_TDLS if(padapter->pbuddy_adapter->wdinfo.wfd_tdls_enable == 1) @@ -11308,7 +11308,7 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf) issue_nulldata(padapter->pbuddy_adapter, NULL, 1, 3, 500); - bdelayscan = _TRUE; + bdelayscan = true; } #endif if(bdelayscan) @@ -11323,12 +11323,12 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf) { //disable dynamic functions, such as high power, DIG Save_DM_Func_Flag(padapter); - Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, _FALSE); + Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false); //config the initial gain under scaning, need to write the BB registers #ifdef CONFIG_P2P #ifdef CONFIG_IOCTL_CFG80211 - if((wdev_to_priv(padapter->rtw_wdev))->p2p_enabled == _TRUE && pwdinfo->driver_interface == DRIVER_CFG80211 ) + if((wdev_to_priv(padapter->rtw_wdev))->p2p_enabled == true && pwdinfo->driver_interface == DRIVER_CFG80211 ) initialgain = 0x30; else #endif //CONFIG_IOCTL_CFG80211 @@ -11553,8 +11553,8 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf) } #ifdef CONFIG_TDLS else if((psta->tdls_sta_state & TDLS_LINKED_STATE)&& - (psta->htpriv.ht_option==_TRUE) && - (psta->htpriv.ampdu_enable==_TRUE) ) + (psta->htpriv.ht_option==true) && + (psta->htpriv.ampdu_enable==true) ) { issue_action_BA(padapter, pparm->addr, RTW_WLAN_ACTION_ADDBA_REQ, pparm->tid); @@ -11719,7 +11719,7 @@ u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf) xmitframe_phead = get_list_head(&psta_bmc->sleep_q); xmitframe_plist = get_next(xmitframe_phead); - while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE) + while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == false) { pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); @@ -11757,7 +11757,7 @@ void dc_SelectChannel(struct adapter *padapter, unsigned char channel) struct adapter *ptarget_adapter; if( (padapter->pbuddy_adapter != NULL) && - (padapter->DualMacConcurrent == _TRUE) && + (padapter->DualMacConcurrent == true) && (padapter->adapter_type == SECONDARY_ADAPTER)) { // only mac0 could control BB&RF @@ -11780,7 +11780,7 @@ void dc_SetBWMode(struct adapter *padapter, unsigned short bwmode, unsigned char struct adapter *ptarget_adapter; if( (padapter->pbuddy_adapter != NULL) && - (padapter->DualMacConcurrent == _TRUE) && + (padapter->DualMacConcurrent == true) && (padapter->adapter_type == SECONDARY_ADAPTER)) { // only mac0 could control BB&RF @@ -11857,10 +11857,10 @@ void dc_set_channel_bwmode_disconnect(struct adapter *padapter) struct mlme_priv *pbuddy_mlmepriv = NULL; if(pbuddy_adapter != NULL && - padapter->DualMacConcurrent == _TRUE) + padapter->DualMacConcurrent == true) { pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); - if((check_fwstate(pbuddy_mlmepriv, _FW_LINKED)) != _TRUE) + if((check_fwstate(pbuddy_mlmepriv, _FW_LINKED)) != true) { //switch to the 20M Hz mode after disconnect pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20; @@ -11890,7 +11890,7 @@ u8 dc_handle_join_request(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset) u8 ret = _SUCCESS; if(pbuddy_adapter != NULL && - padapter->DualMacConcurrent == _TRUE) + padapter->DualMacConcurrent == true) { pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); @@ -11899,7 +11899,7 @@ u8 dc_handle_join_request(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset) pmlmeext->cur_bwmode != pbuddy_mlmeext->cur_bwmode || pmlmeext->cur_ch_offset != pbuddy_mlmeext->cur_ch_offset) { - if((check_fwstate(pbuddy_mlmepriv, WIFI_AP_STATE)) == _TRUE) + if((check_fwstate(pbuddy_mlmepriv, WIFI_AP_STATE)) == true) { //issue deauth to all stas if if2 is at ap mode rtw_sta_flush(pbuddy_adapter); @@ -11907,7 +11907,7 @@ u8 dc_handle_join_request(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset) //rtw_hal_set_hwreg(padapter, HW_VAR_CHECK_TXBUF, 0); rtw_hal_set_hwreg(pbuddy_adapter, HW_VAR_CHECK_TXBUF, 0); } - else if(check_fwstate(pbuddy_mlmepriv, _FW_LINKED) == _TRUE) + else if(check_fwstate(pbuddy_mlmepriv, _FW_LINKED) == true) { if(pmlmeext->cur_channel == pbuddy_mlmeext->cur_channel) { @@ -11926,7 +11926,7 @@ u8 dc_handle_join_request(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset) } } } - else if (is_client_associated_to_ap(pbuddy_adapter) == _TRUE) + else if (is_client_associated_to_ap(pbuddy_adapter) == true) { issue_nulldata(pbuddy_adapter, NULL, 1, 0, 0); } @@ -11956,11 +11956,11 @@ void dc_handle_join_done(struct adapter *padapter, u8 join_res) struct mlme_ext_priv *pbuddy_mlmeext = NULL; struct mlme_ext_info *pbuddy_mlmeinfo = NULL; WLAN_BSSID_EX *pbuddy_network_mlmeext = NULL; - u8 change_band = _FALSE; + u8 change_band = false; if(pbuddy_adapter != NULL && - padapter->DualMacConcurrent == _TRUE) + padapter->DualMacConcurrent == true) { pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; @@ -11982,7 +11982,7 @@ void dc_handle_join_done(struct adapter *padapter, u8 join_res) if((pbuddy_mlmeext->cur_channel <= 14 && pmlmeext->cur_channel >= 36) || (pbuddy_mlmeext->cur_channel >= 36 && pmlmeext->cur_channel <= 14)) { - change_band = _TRUE; + change_band = true; } //sync channel/bwmode/ch_offset with another adapter @@ -12069,14 +12069,14 @@ void dc_handle_join_done(struct adapter *padapter, u8 join_res) DBG_871X("after join, another adapter, CH=%d, BW=%d, offset=%d\n", pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_bwmode, pbuddy_mlmeext->cur_ch_offset); - if(change_band == _TRUE) + if(change_band == true) dc_change_band(pbuddy_adapter, pbuddy_network_mlmeext); DBG_871X("update pbuddy_adapter's beacon\n"); - update_beacon(pbuddy_adapter, 0, NULL, _TRUE); + update_beacon(pbuddy_adapter, 0, NULL, true); } - else if (is_client_associated_to_ap(pbuddy_adapter) == _TRUE) + else if (is_client_associated_to_ap(pbuddy_adapter) == true) { if((pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) && (pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_20)) @@ -12095,7 +12095,7 @@ sint dc_check_fwstate(_adapter *padapter, sint fw_state) struct mlme_priv *pbuddy_mlmepriv = NULL; if(padapter->pbuddy_adapter != NULL && - padapter->DualMacConcurrent == _TRUE) + padapter->DualMacConcurrent == true) { pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); @@ -12103,7 +12103,7 @@ sint dc_check_fwstate(_adapter *padapter, sint fw_state) return check_fwstate(pbuddy_mlmepriv, fw_state); } - return _FALSE; + return false; } u8 dc_handle_site_survey(struct adapter *padapter) @@ -12114,25 +12114,25 @@ u8 dc_handle_site_survey(struct adapter *padapter) // only mac0 can do scan request, help issue nulldata(1) for mac1 if(pbuddy_adapter != NULL && - padapter->DualMacConcurrent == _TRUE) + padapter->DualMacConcurrent == true) { - if (is_client_associated_to_ap(pbuddy_adapter) == _TRUE) + if (is_client_associated_to_ap(pbuddy_adapter) == true) { pmlmeext->sitesurvey_res.state = SCAN_TXNULL; issue_nulldata(pbuddy_adapter, NULL, 1, 2, 0); - return _TRUE; + return true; } } - return _FALSE; + return false; } void dc_report_survey_event(struct adapter *padapter, union recv_frame *precv_frame) { if(padapter->pbuddy_adapter != NULL && - padapter->DualMacConcurrent == _TRUE) + padapter->DualMacConcurrent == true) { report_survey_event(padapter->pbuddy_adapter, precv_frame); } @@ -12151,7 +12151,7 @@ void dc_set_channel_bwmode_survey_done(struct adapter *padapter) u8 cur_ch_offset; if(pbuddy_adapter != NULL && - padapter->DualMacConcurrent == _TRUE) + padapter->DualMacConcurrent == true) { pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; @@ -12182,7 +12182,7 @@ void dc_set_channel_bwmode_survey_done(struct adapter *padapter) set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode); - if (is_client_associated_to_ap(pbuddy_adapter) == _TRUE) + if (is_client_associated_to_ap(pbuddy_adapter) == true) { //issue null data issue_nulldata(pbuddy_adapter, NULL, 0, 0, 0); @@ -12196,7 +12196,7 @@ void dc_set_channel_bwmode_survey_done(struct adapter *padapter) DBG_871X("restart pbuddy_adapter's beacon\n"); - update_beacon(pbuddy_adapter, 0, NULL, _TRUE); + update_beacon(pbuddy_adapter, 0, NULL, true); } } else @@ -12225,7 +12225,7 @@ void dc_set_ap_channel_bandwidth(struct adapter *padapter, u8 channel, u8 channe cur_channel = channel; cur_bwmode = bwmode; cur_ch_offset = channel_offset; - change_band = _FALSE; + change_band = false; p = rtw_get_ie((pnetwork->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_ADD_INFO_IE_, &ie_len, (pnetwork->IELength - sizeof(NDIS_802_11_FIXED_IEs))); if( p && ie_len) @@ -12234,7 +12234,7 @@ void dc_set_ap_channel_bandwidth(struct adapter *padapter, u8 channel, u8 channe } if(pbuddy_adapter != NULL && - padapter->DualMacConcurrent == _TRUE) + padapter->DualMacConcurrent == true) { pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; @@ -12243,7 +12243,7 @@ void dc_set_ap_channel_bandwidth(struct adapter *padapter, u8 channel, u8 channe { set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode); } - else if(check_fwstate(pbuddy_mlmepriv, _FW_LINKED)==_TRUE) + else if(check_fwstate(pbuddy_mlmepriv, _FW_LINKED)==true) { //To sync cur_channel/cur_bwmode/cur_ch_offset with another adapter DBG_871X("Another iface is at linked state, sync cur_channel/cur_bwmode/cur_ch_offset\n"); @@ -12324,14 +12324,14 @@ void dc_set_ap_channel_bandwidth(struct adapter *padapter, u8 channel, u8 channe if((channel <= 14 && cur_channel >= 36) || (channel >= 36 && cur_channel <= 14)) { - change_band = _TRUE; + change_band = true; } pmlmeext->cur_channel = cur_channel; pmlmeext->cur_bwmode = cur_bwmode; pmlmeext->cur_ch_offset = cur_ch_offset; - if(change_band == _TRUE) + if(change_band == true) dc_change_band(padapter, pnetwork); DBG_871X("dualmac_concurrent_ap_set_channel_bwmode <==\n"); @@ -12342,7 +12342,7 @@ void dc_resume_xmit(_adapter *padapter) struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; if(pbuddy_adapter != NULL && - padapter->DualMacConcurrent == _TRUE) + padapter->DualMacConcurrent == true) { DBG_871X("dc_resume_xmit, resume pbuddy_adapter Tx\n"); rtw_os_xmit_schedule(pbuddy_adapter); @@ -12355,17 +12355,17 @@ u8 dc_check_xmit(struct adapter *padapter) struct mlme_priv *pbuddy_mlmepriv = NULL; if(pbuddy_adapter != NULL && - padapter->DualMacConcurrent == _TRUE) + padapter->DualMacConcurrent == true) { pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); - if (check_fwstate(pbuddy_mlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) + if (check_fwstate(pbuddy_mlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) { DBG_871X("dc_check_xmit pbuddy_adapter is under survey or under linking\n"); - return _FALSE; + return false; } } - return _TRUE; + return true; } #endif @@ -12377,21 +12377,21 @@ sint check_buddy_mlmeinfo_state(struct adapter *padapter, u32 state) struct mlme_ext_info *pbuddy_mlmeinfo; if(padapter == NULL) - return _FALSE; + return false; pbuddy_adapter = padapter->pbuddy_adapter; if(pbuddy_adapter == NULL) - return _FALSE; + return false; pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; pbuddy_mlmeinfo = &(pbuddy_mlmeext->mlmext_info); if((pbuddy_mlmeinfo->state&0x03) == state) - return _TRUE; + return true; - return _FALSE; + return false; } @@ -12575,7 +12575,7 @@ void concurrent_chk_joinbss_done(struct adapter *padapter, int join_res) DBG_871X("update pbuddy_adapter's beacon\n"); - update_beacon(pbuddy_adapter, 0, NULL, _TRUE); + update_beacon(pbuddy_adapter, 0, NULL, true); } else if(((pbuddy_mlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) && @@ -12611,8 +12611,8 @@ int rtw_chk_start_clnt_join(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset unsigned char cur_ch = pmlmeext->cur_channel; unsigned char cur_bw = pmlmeext->cur_bwmode; unsigned char cur_ch_offset = pmlmeext->cur_ch_offset; - bool chbw_allow = _TRUE; - bool connect_allow = _TRUE; + bool chbw_allow = true; + bool connect_allow = true; #ifdef CONFIG_CONCURRENT_MODE struct adapter *pbuddy_adapter; @@ -12638,13 +12638,13 @@ int rtw_chk_start_clnt_join(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset if(pmlmeext->cur_channel != pbuddy_mlmeext->cur_channel) { - chbw_allow = _FALSE; + chbw_allow = false; } else if((pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) && (pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) && (pmlmeext->cur_ch_offset != pbuddy_mlmeext->cur_ch_offset)) { - chbw_allow = _FALSE; + chbw_allow = false; } else if((pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_20) && (pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40)) @@ -12655,7 +12655,7 @@ int rtw_chk_start_clnt_join(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset } DBG_871X("start_clnt_join: connect_allow:%d, chbw_allow:%d\n", connect_allow, chbw_allow); - if (chbw_allow == _FALSE) { + if (chbw_allow == false) { #ifdef CONFIG_SPCT_CH_SWITCH if (1) { rtw_ap_inform_ch_switch(pbuddy_adapter, pmlmeext->cur_channel , pmlmeext->cur_ch_offset); @@ -12668,8 +12668,8 @@ int rtw_chk_start_clnt_join(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset rtw_hal_set_hwreg(padapter, HW_VAR_CHECK_TXBUF, 0); } } - else if(check_fwstate(pbuddy_mlmepriv, _FW_LINKED) == _TRUE && - check_fwstate(pbuddy_mlmepriv, WIFI_STATION_STATE) == _TRUE) //for Client Mode/p2p client + else if(check_fwstate(pbuddy_mlmepriv, _FW_LINKED) == true && + check_fwstate(pbuddy_mlmepriv, WIFI_STATION_STATE) == true) //for Client Mode/p2p client { DBG_871X("start_clnt_join: "ADPT_FMT"(ch=%d, bw=%d, ch_offset=%d)" ", "ADPT_FMT" STA mode(ch=%d, bw=%d, ch_offset=%d)\n", @@ -12678,7 +12678,7 @@ int rtw_chk_start_clnt_join(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset if(pmlmeext->cur_channel != pbuddy_mlmeext->cur_channel) { - chbw_allow = _FALSE; + chbw_allow = false; } else if((pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_20) && (pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40)) @@ -12690,7 +12690,7 @@ int rtw_chk_start_clnt_join(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset (pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) && (pmlmeext->cur_ch_offset != pbuddy_mlmeext->cur_ch_offset)) { - chbw_allow = _FALSE; + chbw_allow = false; } connect_allow = chbw_allow; @@ -12700,14 +12700,14 @@ int rtw_chk_start_clnt_join(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset if (!rtw_p2p_chk_state(&(pbuddy_adapter->wdinfo), P2P_STATE_NONE) && pbuddy_adapter->wdinfo.driver_interface == DRIVER_CFG80211) { - connect_allow = _TRUE; + connect_allow = true; } #endif /* CONFIG_P2P && CONFIG_IOCTL_CFG80211 */ DBG_871X("start_clnt_join: connect_allow:%d, chbw_allow:%d\n", connect_allow, chbw_allow); - if (connect_allow == _TRUE && chbw_allow == _FALSE) { + if (connect_allow == true && chbw_allow == false) { /* disconnect buddy's connection */ - rtw_disassoc_cmd(pbuddy_adapter, 500, _FALSE); + rtw_disassoc_cmd(pbuddy_adapter, 500, false); rtw_indicate_disconnect(pbuddy_adapter); rtw_free_assoc_resources(pbuddy_adapter, 1); } @@ -12718,17 +12718,17 @@ exit: if (!ch || !bw || !offset) { rtw_warn_on(1); - connect_allow = _FALSE; + connect_allow = false; } - if (connect_allow == _TRUE) { + if (connect_allow == true) { DBG_871X("start_join_set_ch_bw: ch=%d, bwmode=%d, ch_offset=%d\n", cur_ch, cur_bw, cur_ch_offset); *ch = cur_ch; *bw = cur_bw; *offset = cur_ch_offset; } - return connect_allow == _TRUE ? _SUCCESS : _FAIL; + return connect_allow == true ? _SUCCESS : _FAIL; } /* Find union about ch, bw, ch_offset of all linked interfaces */ @@ -12869,7 +12869,7 @@ u8 set_csa_hdl(struct adapter *padapter, unsigned char *pbuf) rtw_hal_set_hwreg(padapter, HW_VAR_TXPAUSE, &gval8); - rtw_free_network_queue(padapter, _TRUE); + rtw_free_network_queue(padapter, true); rtw_indicate_disconnect(padapter); if ( ((new_ch_no >= 52) && (new_ch_no <= 64)) ||((new_ch_no >= 100) && (new_ch_no <= 140)) ) { diff --git a/core/rtw_mp_ioctl.c b/core/rtw_mp_ioctl.c index 61a2f10..cde81fd 100755 --- a/core/rtw_mp_ioctl.c +++ b/core/rtw_mp_ioctl.c @@ -1160,7 +1160,7 @@ _func_enter_; ("+oid_rt_pro_read_efuse_hd: buf_len=%d addr=%d cnts=%d\n", poid_par_priv->information_buf_len, addr, cnts)); - EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false); if ((addr + cnts) > max_available_size) { RT_TRACE(_module_mp_, _drv_err_, ("!oid_rt_pro_read_efuse_hdl: parameter error!\n")); @@ -1168,7 +1168,7 @@ _func_enter_; } _irqlevel_changed_(&oldirql, LOWER); - if (rtw_efuse_access(Adapter, _FALSE, addr, cnts, data) == _FAIL) { + if (rtw_efuse_access(Adapter, false, addr, cnts, data) == _FAIL) { RT_TRACE(_module_mp_, _drv_err_, ("!oid_rt_pro_read_efuse_hdl: rtw_efuse_access FAIL!\n")); status = NDIS_STATUS_FAILURE; } else @@ -1203,7 +1203,7 @@ _func_enter_; ("+oid_rt_pro_write_efuse_hdl: buf_len=%d addr=0x%04x cnts=%d\n", poid_par_priv->information_buf_len, addr, cnts)); - EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false); if ((addr + cnts) > max_available_size) { RT_TRACE(_module_mp_, _drv_err_, ("!oid_rt_pro_write_efuse_hdl: parameter error")); @@ -1211,7 +1211,7 @@ _func_enter_; } _irqlevel_changed_(&oldirql, LOWER); - if (rtw_efuse_access(Adapter, _TRUE, addr, cnts, data) == _FAIL) + if (rtw_efuse_access(Adapter, true, addr, cnts, data) == _FAIL) status = NDIS_STATUS_FAILURE; _irqlevel_changed_(&oldirql, RAISE); @@ -1243,23 +1243,23 @@ _func_enter_; ("oid_rt_pro_rw_efuse_pgpkt_hdl: Read offset=0x%x\n",\ ppgpkt->offset)); - Efuse_PowerSwitch(Adapter, _FALSE, _TRUE); - if (Efuse_PgPacketRead(Adapter, ppgpkt->offset, ppgpkt->data, _FALSE) == _TRUE) + Efuse_PowerSwitch(Adapter, false, true); + if (Efuse_PgPacketRead(Adapter, ppgpkt->offset, ppgpkt->data, false) == true) *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; else status = NDIS_STATUS_FAILURE; - Efuse_PowerSwitch(Adapter, _FALSE, _FALSE); + Efuse_PowerSwitch(Adapter, false, false); } else { RT_TRACE(_module_mp_, _drv_notice_, ("oid_rt_pro_rw_efuse_pgpkt_hdl: Write offset=0x%x word_en=0x%x\n",\ ppgpkt->offset, ppgpkt->word_en)); - Efuse_PowerSwitch(Adapter, _TRUE, _TRUE); - if (Efuse_PgPacketWrite(Adapter, ppgpkt->offset, ppgpkt->word_en, ppgpkt->data, _FALSE) == _TRUE) + Efuse_PowerSwitch(Adapter, true, true); + if (Efuse_PgPacketWrite(Adapter, ppgpkt->offset, ppgpkt->word_en, ppgpkt->data, false) == true) *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; else status = NDIS_STATUS_FAILURE; - Efuse_PowerSwitch(Adapter, _TRUE, _FALSE); + Efuse_PowerSwitch(Adapter, true, false); } _irqlevel_changed_(&oldirql, RAISE); @@ -1357,7 +1357,7 @@ _func_enter_; RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_efuse_map_hdl\n")); - EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, _FALSE); + EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false); *poid_par_priv->bytes_rw = 0; diff --git a/core/rtw_p2p.c b/core/rtw_p2p.c index ffe244c..ef1164c 100755 --- a/core/rtw_p2p.c +++ b/core/rtw_p2p.c @@ -42,7 +42,7 @@ int rtw_p2p_is_channel_list_ok( u8 desired_ch, u8* ch_list, u8 ch_cnt ) int is_any_client_associated(struct adapter *padapter) { - return padapter->stapriv.asoc_list_cnt ? _TRUE : _FALSE; + return padapter->stapriv.asoc_list_cnt ? true : false; } static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf) @@ -68,7 +68,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf) plist = get_next(phead); //look up sta asoc_queue - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); @@ -596,7 +596,7 @@ u32 build_beacon_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) // Value: // Associated BSSID - if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) + if ( check_fwstate(pmlmepriv, _FW_LINKED) == true ) { _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); } @@ -709,7 +709,7 @@ u32 build_probe_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) // Value: // Associated BSSID - if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) + if ( check_fwstate(pmlmepriv, _FW_LINKED) == true ) { _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); } @@ -783,7 +783,7 @@ u32 build_probe_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 tunnel // WFD device information // WFD primary sink + available for WFD session + WiFi Direct mode - if ( _TRUE == pwdinfo->session_available ) + if ( true == pwdinfo->session_available ) { if ( P2P_ROLE_GO == pwdinfo->role ) { @@ -867,7 +867,7 @@ u32 build_probe_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 tunnel // Value: // Associated BSSID - if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) + if ( check_fwstate(pmlmepriv, _FW_LINKED) == true ) { _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); } @@ -1011,7 +1011,7 @@ u32 build_assoc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) // Value: // Associated BSSID - if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) + if ( check_fwstate(pmlmepriv, _FW_LINKED) == true ) { _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); } @@ -1109,7 +1109,7 @@ u32 build_assoc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) // Value: // Associated BSSID - if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) + if ( check_fwstate(pmlmepriv, _FW_LINKED) == true ) { _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); } @@ -1207,7 +1207,7 @@ u32 build_nego_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) // Value: // Associated BSSID - if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) + if ( check_fwstate(pmlmepriv, _FW_LINKED) == true ) { _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); } @@ -1305,7 +1305,7 @@ u32 build_nego_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) // Value: // Associated BSSID - if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) + if ( check_fwstate(pmlmepriv, _FW_LINKED) == true ) { _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); } @@ -1404,7 +1404,7 @@ u32 build_nego_confirm_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) // Value: // Associated BSSID - if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) + if ( check_fwstate(pmlmepriv, _FW_LINKED) == true ) { _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); } @@ -1503,7 +1503,7 @@ u32 build_invitation_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) // Value: // Associated BSSID - if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) + if ( check_fwstate(pmlmepriv, _FW_LINKED) == true ) { _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); } @@ -1616,7 +1616,7 @@ u32 build_invitation_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) // Value: // Associated BSSID - if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) + if ( check_fwstate(pmlmepriv, _FW_LINKED) == true ) { _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); } @@ -1729,7 +1729,7 @@ u32 build_provdisc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) // Value: // Associated BSSID - if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) + if ( check_fwstate(pmlmepriv, _FW_LINKED) == true ) { _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); } @@ -1828,7 +1828,7 @@ u32 build_provdisc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) // Value: // Associated BSSID - if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) + if ( check_fwstate(pmlmepriv, _FW_LINKED) == true ) { _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); } @@ -1878,7 +1878,7 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) u8 zero_array_check[L2SDTA_SERVICE_VE_LEN] = { 0x00 }; u8 widi_version = 0, i = 0; - if( _rtw_memcmp( pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN ) == _FALSE ) + if( _rtw_memcmp( pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN ) == false ) { widi_version = 35; } @@ -2280,7 +2280,7 @@ u32 build_deauth_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) u32 process_probe_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint len) { u8 *p; - u32 ret=_FALSE; + u32 ret=false; u8 *p2pie; u32 p2pielen = 0; int ssid_len=0, rate_cnt = 0; @@ -2339,11 +2339,11 @@ u32 process_probe_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l //Check Requested Device Type attributes in WSC IE. //Check Device ID attribute in P2P IE - ret = _TRUE; + ret = true; } else if ( (p != NULL) && ( ssid_len == 0 ) ) { - ret = _TRUE; + ret = true; } } else @@ -2521,7 +2521,7 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le plist = get_next(phead); //look up sta asoc_queue - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); @@ -2569,13 +2569,13 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le issue_p2p_devdisc_resp(pwdinfo, GetAddr2Ptr(pframe), status, dialogToken); - return (status==P2P_STATUS_SUCCESS) ? _TRUE:_FALSE; + return (status==P2P_STATUS_SUCCESS) ? true:false; } u32 process_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *pframe, uint len) { - return _TRUE; + return true; } u8 process_p2p_provdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint len ) @@ -2620,14 +2620,14 @@ u8 process_p2p_provdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint l } } DBG_871X( "[%s] config method = %s\n", __FUNCTION__, pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req ); - return _TRUE; + return true; } u8 process_p2p_provdisc_resp(struct wifidirect_info *pwdinfo, u8 *pframe) { - return _TRUE; + return true; } u8 rtw_p2p_get_peer_ch_list(struct wifidirect_info *pwdinfo, u8 *ch_content, u8 ch_cnt, u8 *peer_ch_list) @@ -2788,7 +2788,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe #if defined(CONFIG_WFD) && defined(CONFIG_TDLS) if(!(cap_attr & P2P_GRPCAP_INTRABSS) ) - ptdlsinfo->ap_prohibited = _TRUE; + ptdlsinfo->ap_prohibited = true; #endif //defined(CONFIG_WFD) && defined(CONFIG_TDLS) } @@ -2990,7 +2990,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram cap_attr = le16_to_cpu(cap_attr); #ifdef CONFIG_TDLS if(!(cap_attr & P2P_GRPCAP_INTRABSS) ) - ptdlsinfo->ap_prohibited = _TRUE; + ptdlsinfo->ap_prohibited = true; #endif // CONFIG_TDLS } @@ -3300,7 +3300,7 @@ u8 process_p2p_presence_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le issue_p2p_presence_resp(pwdinfo, GetAddr2Ptr(pframe), status, dialogToken); - return _TRUE; + return true; } void find_phase_handler( struct adapter* padapter ) @@ -3467,7 +3467,7 @@ _func_enter_; } else if ( rtw_p2p_chk_state(pwdinfo, P2P_STATE_LISTEN) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL) || - ( rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) && pwdinfo->nego_req_info.benable == _FALSE ) || + ( rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) && pwdinfo->nego_req_info.benable == false ) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ) ) { // Now, the driver is in the listen state of P2P mode. @@ -3505,7 +3505,7 @@ _func_enter_; issue_probereq_p2p(padapter, NULL); _set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); } - else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) && pwdinfo->nego_req_info.benable == _TRUE) + else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) && pwdinfo->nego_req_info.benable == true) { val8 = 1; set_channel_bwmode(padapter, pwdinfo->nego_req_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); @@ -3513,7 +3513,7 @@ _func_enter_; issue_probereq_p2p(padapter, NULL); _set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); } - else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_INVITE_REQ ) && pwdinfo->invitereq_info.benable == _TRUE) + else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_INVITE_REQ ) && pwdinfo->invitereq_info.benable == true) { /* val8 = 1; @@ -3572,7 +3572,7 @@ _func_enter_; DBG_871X("%s, role=%d, p2p_state=%d\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo)); #endif - pcfg80211_wdinfo->is_ro_ch = _FALSE; + pcfg80211_wdinfo->is_ro_ch = false; DBG_871X("cfg80211_remain_on_channel_expired\n"); @@ -3669,7 +3669,7 @@ static void rtw_change_p2pie_ch_list(struct adapter *padapter, const u8 *frame_b static bool rtw_chk_p2pie_ch_list_with_buddy(struct adapter *padapter, const u8 *frame_body, u32 len) { - bool fit = _FALSE; + bool fit = false; #ifdef CONFIG_CONCURRENT_MODE u8 *ies, *p2p_ie; u32 ies_len, p2p_ielen; @@ -3700,7 +3700,7 @@ static bool rtw_chk_p2pie_ch_list_with_buddy(struct adapter *padapter, const u8 for(i=0; i>1 == resp >>1) - return req&0x01 ? _TRUE : _FALSE; + return req&0x01 ? true : false; else if (req>>1 > resp>>1) - return _TRUE; + return true; else - return _FALSE; + return false; } int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx) @@ -4010,7 +4010,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx { action = frame_body[1]; if (action == ACT_PUBLIC_VENDOR - && _rtw_memcmp(frame_body+2, P2P_OUI, 4) == _TRUE + && _rtw_memcmp(frame_body+2, P2P_OUI, 4) == true ) { OUI_Subtype = frame_body[6]; @@ -4036,11 +4036,11 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx if (tx) { #ifdef CONFIG_DRV_ISSUE_PROV_REQ // IOT FOR S2 - if(pwdev_priv->provdisc_req_issued == _FALSE) + if(pwdev_priv->provdisc_req_issued == false) rtw_cfg80211_issue_p2p_provision_request(padapter, buf, len); #endif //CONFIG_DRV_ISSUE_PROV_REQ - //pwdev_priv->provdisc_req_issued = _FALSE; + //pwdev_priv->provdisc_req_issued = false; #ifdef CONFIG_CONCURRENT_MODE if(check_buddy_fwstate(padapter, _FW_LINKED) @@ -4069,13 +4069,13 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128); DBG_871X("RTW_%s:P2P_GO_NEGO_REQ, dialogToken=%d, intent:%u%s, listen_ch:%d, op_ch:%d, ch_list:%s\n", - (tx==_TRUE)?"Tx":"Rx", dialogToken, (intent>>1), intent&0x1 ? "+" : "-", listen_ch, op_ch, ch_list_buf); + (tx==true)?"Tx":"Rx", dialogToken, (intent>>1), intent&0x1 ? "+" : "-", listen_ch, op_ch, ch_list_buf); if (!tx) { #ifdef CONFIG_CONCURRENT_MODE if((check_buddy_fwstate(padapter, _FW_LINKED) || check_buddy_fwstate(padapter, WIFI_AP_STATE)) - && rtw_chk_p2pie_ch_list_with_buddy(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)) == _FALSE) + && rtw_chk_p2pie_ch_list_with_buddy(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)) == false) { DBG_871X(FUNC_ADPT_FMT" ch_list has no intersect with buddy\n", FUNC_ADPT_ARG(padapter)); rtw_change_p2pie_ch_list(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr), 0); @@ -4105,7 +4105,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx status = *cont; if (nego_info->token == dialogToken && nego_info->state == 0 - && _rtw_memcmp(nego_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN) == _TRUE + && _rtw_memcmp(nego_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN) == true ) { nego_info->status = (status==-1) ? 0xff : status; nego_info->rsp_op_ch= op_ch; @@ -4117,14 +4117,14 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128); DBG_871X("RTW_%s:P2P_GO_NEGO_RESP, dialogToken=%d, intent:%u%s, status:%d, op_ch:%d, ch_list:%s\n", - (tx==_TRUE)?"Tx":"Rx", dialogToken, (intent>>1), intent&0x1 ? "+" : "-", status, op_ch, ch_list_buf); + (tx==true)?"Tx":"Rx", dialogToken, (intent>>1), intent&0x1 ? "+" : "-", status, op_ch, ch_list_buf); if (!tx) { - pwdev_priv->provdisc_req_issued = _FALSE; + pwdev_priv->provdisc_req_issued = false; #ifdef CONFIG_CONCURRENT_MODE if((check_buddy_fwstate(padapter, _FW_LINKED) || check_buddy_fwstate(padapter, WIFI_AP_STATE)) - && rtw_chk_p2pie_ch_list_with_buddy(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)) == _FALSE) + && rtw_chk_p2pie_ch_list_with_buddy(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)) == false) { DBG_871X(FUNC_ADPT_FMT" ch_list has no intersect with buddy\n", FUNC_ADPT_ARG(padapter)); rtw_change_p2pie_ch_list(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr), 0); @@ -4137,7 +4137,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx case P2P_GO_NEGO_CONF: { struct rtw_wdev_nego_info* nego_info = &pwdev_priv->nego_info; - bool is_go = _FALSE; + bool is_go = false; if (tx) { #ifdef CONFIG_CONCURRENT_MODE @@ -4153,7 +4153,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx status = *cont; if (nego_info->token == dialogToken && nego_info->state == 1 - && _rtw_memcmp(nego_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN) == _TRUE + && _rtw_memcmp(nego_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN) == true ) { nego_info->status = (status==-1) ? 0xff : status; nego_info->conf_op_ch = (op_ch==-1) ? 0 : op_ch; @@ -4161,7 +4161,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx if (status == 0) { if (rtw_p2p_nego_intent_compare(nego_info->req_intent, nego_info->rsp_intent) && tx) - is_go = _TRUE; + is_go = true; } nego_info->token = 0; /* init */ @@ -4169,7 +4169,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128); DBG_871X("RTW_%s:P2P_GO_NEGO_CONF, dialogToken=%d, status:%d, op_ch:%d, ch_list:%s\n", - (tx==_TRUE)?"Tx":"Rx", dialogToken, status, op_ch, ch_list_buf); + (tx==true)?"Tx":"Rx", dialogToken, status, op_ch, ch_list_buf); if (!tx) { } @@ -4206,16 +4206,16 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128); DBG_871X("RTW_%s:P2P_INVIT_REQ, dialogToken=%d, flags:0x%02x, op_ch:%d, ch_list:%s\n", - (tx==_TRUE)?"Tx":"Rx", dialogToken, flags, op_ch, ch_list_buf); + (tx==true)?"Tx":"Rx", dialogToken, flags, op_ch, ch_list_buf); if (!tx) { #ifdef CONFIG_CONCURRENT_MODE if(check_buddy_fwstate(padapter, _FW_LINKED) || check_buddy_fwstate(padapter, WIFI_AP_STATE)) { - if (op_ch != -1 && rtw_chk_p2pie_op_ch_with_buddy(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)) == _FALSE) { + if (op_ch != -1 && rtw_chk_p2pie_op_ch_with_buddy(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)) == false) { DBG_871X(FUNC_ADPT_FMT" op_ch:%u has no intersect with buddy\n", FUNC_ADPT_ARG(padapter), op_ch); rtw_change_p2pie_ch_list(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr), 0); - } else if (rtw_chk_p2pie_ch_list_with_buddy(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)) == _FALSE) { + } else if (rtw_chk_p2pie_ch_list_with_buddy(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)) == false) { DBG_871X(FUNC_ADPT_FMT" ch_list has no intersect with buddy\n", FUNC_ADPT_ARG(padapter)); rtw_change_p2pie_ch_list(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr), 0); } @@ -4252,7 +4252,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx op_ch = *(cont+4); if (invit_info->token == dialogToken && invit_info->state == 0 - && _rtw_memcmp(invit_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN) == _TRUE + && _rtw_memcmp(invit_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN) == true ) { invit_info->status = (status==-1) ? 0xff : status; invit_info->rsp_op_ch= op_ch; @@ -4262,7 +4262,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128); DBG_871X("RTW_%s:P2P_INVIT_RESP, dialogToken=%d, status:%d, op_ch:%d, ch_list:%s\n", - (tx==_TRUE)?"Tx":"Rx", dialogToken, status, op_ch, ch_list_buf); + (tx==true)?"Tx":"Rx", dialogToken, status, op_ch, ch_list_buf); if (!tx) { } @@ -4270,11 +4270,11 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx break; } case P2P_DEVDISC_REQ: - DBG_871X("RTW_%s:P2P_DEVDISC_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken); + DBG_871X("RTW_%s:P2P_DEVDISC_REQ, dialogToken=%d\n", (tx==true)?"Tx":"Rx", dialogToken); break; case P2P_DEVDISC_RESP: cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len); - DBG_871X("RTW_%s:P2P_DEVDISC_RESP, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1); + DBG_871X("RTW_%s:P2P_DEVDISC_RESP, dialogToken=%d, status:%d\n", (tx==true)?"Tx":"Rx", dialogToken, cont?*cont:-1); break; case P2P_PROVISION_DISC_REQ: { @@ -4283,25 +4283,25 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx uint p2p_ielen = 0; uint contentlen = 0; - DBG_871X("RTW_%s:P2P_PROVISION_DISC_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken); + DBG_871X("RTW_%s:P2P_PROVISION_DISC_REQ, dialogToken=%d\n", (tx==true)?"Tx":"Rx", dialogToken); //if(tx) { - pwdev_priv->provdisc_req_issued = _FALSE; + pwdev_priv->provdisc_req_issued = false; if( (p2p_ie=rtw_get_p2p_ie( frame_body + _PUBLIC_ACTION_IE_OFFSET_, frame_body_len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen))) { if(rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, NULL, &contentlen)) { - pwdev_priv->provdisc_req_issued = _FALSE;//case: p2p_client join p2p GO + pwdev_priv->provdisc_req_issued = false;//case: p2p_client join p2p GO } else { #ifdef CONFIG_DEBUG_CFG80211 - DBG_871X("provdisc_req_issued is _TRUE\n"); + DBG_871X("provdisc_req_issued is true\n"); #endif //CONFIG_DEBUG_CFG80211 - pwdev_priv->provdisc_req_issued = _TRUE;//case: p2p_devices connection before Nego req. + pwdev_priv->provdisc_req_issued = true;//case: p2p_devices connection before Nego req. } } @@ -4309,10 +4309,10 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx } break; case P2P_PROVISION_DISC_RESP: - DBG_871X("RTW_%s:P2P_PROVISION_DISC_RESP, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken); + DBG_871X("RTW_%s:P2P_PROVISION_DISC_RESP, dialogToken=%d\n", (tx==true)?"Tx":"Rx", dialogToken); break; default: - DBG_871X("RTW_%s:OUI_Subtype=%d, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", OUI_Subtype, dialogToken); + DBG_871X("RTW_%s:OUI_Subtype=%d, dialogToken=%d\n", (tx==true)?"Tx":"Rx", OUI_Subtype, dialogToken); break; } @@ -4334,26 +4334,26 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx switch(OUI_Subtype) { case P2P_NOTICE_OF_ABSENCE: - DBG_871X("RTW_%s:P2P_NOTICE_OF_ABSENCE, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken); + DBG_871X("RTW_%s:P2P_NOTICE_OF_ABSENCE, dialogToken=%d\n", (tx==true)?"TX":"RX", dialogToken); break; case P2P_PRESENCE_REQUEST: - DBG_871X("RTW_%s:P2P_PRESENCE_REQUEST, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken); + DBG_871X("RTW_%s:P2P_PRESENCE_REQUEST, dialogToken=%d\n", (tx==true)?"TX":"RX", dialogToken); break; case P2P_PRESENCE_RESPONSE: - DBG_871X("RTW_%s:P2P_PRESENCE_RESPONSE, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken); + DBG_871X("RTW_%s:P2P_PRESENCE_RESPONSE, dialogToken=%d\n", (tx==true)?"TX":"RX", dialogToken); break; case P2P_GO_DISC_REQUEST: - DBG_871X("RTW_%s:P2P_GO_DISC_REQUEST, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken); + DBG_871X("RTW_%s:P2P_GO_DISC_REQUEST, dialogToken=%d\n", (tx==true)?"TX":"RX", dialogToken); break; default: - DBG_871X("RTW_%s:OUI_Subtype=%d, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", OUI_Subtype, dialogToken); + DBG_871X("RTW_%s:OUI_Subtype=%d, dialogToken=%d\n", (tx==true)?"TX":"RX", OUI_Subtype, dialogToken); break; } } else { - DBG_871X("RTW_%s:action frame category=%d\n", (tx==_TRUE)?"TX":"RX", category); + DBG_871X("RTW_%s:action frame category=%d\n", (tx==true)?"TX":"RX", category); } return is_p2p_frame; @@ -4468,7 +4468,7 @@ void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength) u32 attr_contentlen = 0; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); - u8 find_p2p = _FALSE, find_p2p_ps = _FALSE; + u8 find_p2p = false, find_p2p_ps = false; u8 noa_offset, noa_num, noa_index; _func_enter_; @@ -4491,11 +4491,11 @@ _func_enter_; while(p2p_ie) { - find_p2p = _TRUE; + find_p2p = true; // Get Notice of Absence IE. if(rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_NOA, noa_attr, &attr_contentlen)) { - find_p2p_ps = _TRUE; + find_p2p_ps = true; noa_index = noa_attr[0]; if( (pwdinfo->p2p_ps_mode == P2P_PS_NONE) || @@ -4534,7 +4534,7 @@ _func_enter_; { pwdinfo->p2p_ps_mode = P2P_PS_CTWINDOW; // driver should wait LPS for entering CTWindow - if(adapter_to_pwrctl(padapter)->bFwCurrentInPSMode == _TRUE) + if(adapter_to_pwrctl(padapter)->bFwCurrentInPSMode == true) { p2p_ps_wk_cmd(padapter, P2P_PS_ENABLE, 1); } @@ -4558,9 +4558,9 @@ _func_enter_; } - if(find_p2p == _TRUE) + if(find_p2p == true) { - if( (pwdinfo->p2p_ps_mode > P2P_PS_NONE) && (find_p2p_ps == _FALSE) ) + if( (pwdinfo->p2p_ps_mode > P2P_PS_NONE) && (find_p2p_ps == false) ) { p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1); } @@ -4589,7 +4589,7 @@ _func_enter_; pwdinfo->opp_ps = 0; pwdinfo->noa_num = 0; pwdinfo->p2p_ps_mode = P2P_PS_NONE; - if(pwrpriv->bFwCurrentInPSMode == _TRUE) + if(pwrpriv->bFwCurrentInPSMode == true) { if(pwrpriv->smart_ps == 0) { @@ -4750,7 +4750,7 @@ static void pre_tx_scan_timer_process (void *FunctionContext) if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ)) { - if ( _TRUE == pwdinfo->tx_prov_disc_info.benable ) // the provision discovery request frame is trigger to send or not + if ( true == pwdinfo->tx_prov_disc_info.benable ) // the provision discovery request frame is trigger to send or not { p2p_protocol_wk_cmd( adapter, P2P_PRE_TX_PROVDISC_PROCESS_WK ); //issue_probereq_p2p(adapter, NULL); @@ -4759,14 +4759,14 @@ static void pre_tx_scan_timer_process (void *FunctionContext) } else if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) { - if ( _TRUE == pwdinfo->nego_req_info.benable ) + if ( true == pwdinfo->nego_req_info.benable ) { p2p_protocol_wk_cmd( adapter, P2P_PRE_TX_NEGOREQ_PROCESS_WK ); } } else if ( rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_INVITE_REQ ) ) { - if ( _TRUE == pwdinfo->invitereq_info.benable ) + if ( true == pwdinfo->invitereq_info.benable ) { p2p_protocol_wk_cmd( adapter, P2P_PRE_TX_INVITEREQ_PROCESS_WK ); } @@ -4818,7 +4818,7 @@ void reset_global_wifidirect_info( struct adapter* padapter ) pwdinfo = &padapter->wdinfo; pwdinfo->persistent_supported = 0; - pwdinfo->session_available = _TRUE; + pwdinfo->session_available = true; pwdinfo->wfd_tdls_enable = 0; pwdinfo->wfd_tdls_weaksec = 0; } @@ -4832,13 +4832,13 @@ int rtw_init_wifi_display_info(struct adapter* padapter) // Used in P2P and TDLS pwfd_info->rtsp_ctrlport = 554; pwfd_info->peer_rtsp_ctrlport = 0; // Reset to 0 - pwfd_info->wfd_enable = _FALSE; + pwfd_info->wfd_enable = false; pwfd_info->wfd_device_type = WFD_DEVINFO_PSINK; pwfd_info->scan_result_type = SCAN_RESULT_P2P_ONLY; // Used in P2P - pwfd_info->peer_session_avail = _TRUE; - pwfd_info->wfd_pc = _FALSE; + pwfd_info->peer_session_avail = true; + pwfd_info->wfd_pc = false; // Used in TDLS _rtw_memset( pwfd_info->ip_address, 0x00, 4 ); @@ -4907,7 +4907,7 @@ void init_wifidirect_info( struct adapter* padapter, enum P2P_ROLE role) pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; } - if ( ( check_buddy_fwstate(padapter, _FW_LINKED ) == _TRUE ) && + if ( ( check_buddy_fwstate(padapter, _FW_LINKED ) == true ) && ( ( pbuddy_mlmeext->cur_channel == 1) || ( pbuddy_mlmeext->cur_channel == 6 ) || ( pbuddy_mlmeext->cur_channel == 11 ) ) ) { @@ -4926,7 +4926,7 @@ void init_wifidirect_info( struct adapter* padapter, enum P2P_ROLE role) { rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); #ifdef CONFIG_CONCURRENT_MODE - if ( check_buddy_fwstate(padapter, _FW_LINKED ) == _TRUE ) + if ( check_buddy_fwstate(padapter, _FW_LINKED ) == true ) { rtw_p2p_set_state(pwdinfo, P2P_STATE_IDLE); } @@ -5213,22 +5213,22 @@ int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role) //Enable P2P function init_wifidirect_info(padapter, role); - rtw_hal_set_odm_var(padapter,HAL_ODM_P2P_STATE,NULL,_TRUE); + rtw_hal_set_odm_var(padapter,HAL_ODM_P2P_STATE,NULL,true); #ifdef CONFIG_WFD - rtw_hal_set_odm_var(padapter,HAL_ODM_WIFI_DISPLAY_STATE,NULL,_TRUE); + rtw_hal_set_odm_var(padapter,HAL_ODM_WIFI_DISPLAY_STATE,NULL,true); #endif } else if (role == P2P_ROLE_DISABLE) { #ifdef CONFIG_INTEL_WIDI - if( padapter->mlmepriv.p2p_reject_disable == _TRUE ) + if( padapter->mlmepriv.p2p_reject_disable == true ) return ret; #endif //CONFIG_INTEL_WIDI #ifdef CONFIG_IOCTL_CFG80211 if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 ) - wdev_to_priv(padapter->rtw_wdev)->p2p_enabled = _FALSE; + wdev_to_priv(padapter->rtw_wdev)->p2p_enabled = false; #endif //CONFIG_IOCTL_CFG80211 if (_FAIL == rtw_pwr_wakeup(padapter)) { @@ -5255,9 +5255,9 @@ int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role) _rtw_memset(&pwdinfo->rx_prov_disc_info, 0x00, sizeof(struct rx_provdisc_req_info)); } - rtw_hal_set_odm_var(padapter,HAL_ODM_P2P_STATE,NULL,_FALSE); + rtw_hal_set_odm_var(padapter,HAL_ODM_P2P_STATE,NULL,false); #ifdef CONFIG_WFD - rtw_hal_set_odm_var(padapter,HAL_ODM_WIFI_DISPLAY_STATE,NULL,_FALSE); + rtw_hal_set_odm_var(padapter,HAL_ODM_WIFI_DISPLAY_STATE,NULL,false); #endif //Restore to initial setting. diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c index fffbd70..f58180c 100755 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -34,13 +34,13 @@ void _ips_enter(struct adapter * padapter) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); - if (padapter->hw_init_completed == _FALSE) { + if (padapter->hw_init_completed == false) { DBG_871X("%s: hw_init_completed: %d\n", __func__, padapter->hw_init_completed); return; } - pwrpriv->bips_processing = _TRUE; + pwrpriv->bips_processing = true; // syn ips_mode with request pwrpriv->ips_mode = pwrpriv->ips_mode_req; @@ -52,16 +52,16 @@ void _ips_enter(struct adapter * padapter) #endif if(rf_off == pwrpriv->change_rfpwrstate ) { - pwrpriv->bpower_saving = _TRUE; + pwrpriv->bpower_saving = true; DBG_871X_LEVEL(_drv_always_, "nolinked power save enter\n"); if(pwrpriv->ips_mode == IPS_LEVEL_2) - pwrpriv->bkeepfwalive = _TRUE; + pwrpriv->bkeepfwalive = true; rtw_ips_pwr_down(padapter); pwrpriv->rf_pwrstate = rf_off; } - pwrpriv->bips_processing = _FALSE; + pwrpriv->bips_processing = false; } @@ -81,7 +81,7 @@ int _ips_leave(struct adapter * padapter) if((pwrpriv->rf_pwrstate == rf_off) &&(!pwrpriv->bips_processing)) { - pwrpriv->bips_processing = _TRUE; + pwrpriv->bips_processing = true; pwrpriv->change_rfpwrstate = rf_on; pwrpriv->ips_leave_cnts++; DBG_871X("==>ips_leave cnts:%d\n",pwrpriv->ips_leave_cnts); @@ -92,10 +92,10 @@ int _ips_leave(struct adapter * padapter) DBG_871X_LEVEL(_drv_always_, "nolinked power save leave\n"); DBG_871X("==> ips_leave.....LED(0x%08x)...\n",rtw_read32(padapter,0x4c)); - pwrpriv->bips_processing = _FALSE; + pwrpriv->bips_processing = false; - pwrpriv->bkeepfwalive = _FALSE; - pwrpriv->bpower_saving = _FALSE; + pwrpriv->bkeepfwalive = false; + pwrpriv->bpower_saving = false; } return result; @@ -131,7 +131,7 @@ bool rtw_pwr_unassociated_idle(struct adapter *adapter) #endif #endif - bool ret = _FALSE; + bool ret = false; if (adapter_to_pwrctl(adapter)->ips_deny_time >= rtw_get_current_time()) { //DBG_871X("%s ips_deny_time\n", __func__); @@ -181,7 +181,7 @@ bool rtw_pwr_unassociated_idle(struct adapter *adapter) #endif #ifdef CONFIG_INTEL_PROXIM - if(adapter->proximity.proxim_on==_TRUE){ + if(adapter->proximity.proxim_on==true){ return; } #endif @@ -194,7 +194,7 @@ bool rtw_pwr_unassociated_idle(struct adapter *adapter) goto exit; } - ret = _TRUE; + ret = true; exit: return ret; @@ -211,10 +211,10 @@ void rtw_ps_processor(struct adapter*padapter) rt_rf_power_state rfpwrstate; #endif //SUPPORT_HW_RFOFF_DETECTED - pwrpriv->ps_processing = _TRUE; + pwrpriv->ps_processing = true; #ifdef SUPPORT_HW_RFOFF_DETECTED - if(pwrpriv->bips_processing == _TRUE) + if(pwrpriv->bips_processing == true) goto exit; //DBG_871X("==> fw report state(0x%x)\n",rtw_read8(padapter,0x1ca)); @@ -225,8 +225,8 @@ void rtw_ps_processor(struct adapter*padapter) { if(pwrpriv->rf_pwrstate == rf_on) { - if(padapter->net_closed == _TRUE) - pwrpriv->ps_flag = _TRUE; + if(padapter->net_closed == true) + pwrpriv->ps_flag = true; rfpwrstate = RfOnOffDetect(padapter); DBG_871X("@@@@- #1 %s==> rfstate:%s \n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); @@ -236,8 +236,8 @@ void rtw_ps_processor(struct adapter*padapter) { pwrpriv->change_rfpwrstate = rf_off; - pwrpriv->bkeepfwalive = _TRUE; - pwrpriv->brfoffbyhw = _TRUE; + pwrpriv->bkeepfwalive = true; + pwrpriv->brfoffbyhw = true; autosuspend_enter(padapter); } @@ -255,8 +255,8 @@ void rtw_ps_processor(struct adapter*padapter) if(rfpwrstate == rf_off) { pwrpriv->change_rfpwrstate = rf_off; - pwrpriv->brfoffbyhw = _TRUE; - padapter->bCardDisableWOHSM = _TRUE; + pwrpriv->brfoffbyhw = true; + padapter->bCardDisableWOHSM = true; rtw_hw_suspend(padapter ); } else @@ -274,7 +274,7 @@ void rtw_ps_processor(struct adapter*padapter) if (pwrpriv->ips_mode_req == IPS_NONE) goto exit; - if (rtw_pwr_unassociated_idle(padapter) == _FALSE) + if (rtw_pwr_unassociated_idle(padapter) == false) goto exit; if((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts%4)==0)) @@ -288,22 +288,22 @@ void rtw_ps_processor(struct adapter*padapter) if(padapter->registrypriv.usbss_enable) { if(pwrpriv->bHWPwrPindetect) - pwrpriv->bkeepfwalive = _TRUE; + pwrpriv->bkeepfwalive = true; - if(padapter->net_closed == _TRUE) - pwrpriv->ps_flag = _TRUE; + if(padapter->net_closed == true) + pwrpriv->ps_flag = true; #if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND) - if (_TRUE==pwrpriv->bInternalAutoSuspend) { + if (true==pwrpriv->bInternalAutoSuspend) { DBG_871X("<==%s .pwrpriv->bInternalAutoSuspend)(%x)\n",__FUNCTION__,pwrpriv->bInternalAutoSuspend); } else { pwrpriv->change_rfpwrstate = rf_off; - padapter->bCardDisableWOHSM = _TRUE; + padapter->bCardDisableWOHSM = true; DBG_871X("<==%s .pwrpriv->bInternalAutoSuspend)(%x) call autosuspend_enter\n",__FUNCTION__,pwrpriv->bInternalAutoSuspend); autosuspend_enter(padapter); } #else - padapter->bCardDisableWOHSM = _TRUE; + padapter->bCardDisableWOHSM = true; autosuspend_enter(padapter); #endif //if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND) } @@ -324,7 +324,7 @@ void rtw_ps_processor(struct adapter*padapter) } exit: rtw_set_pwr_state_check_timer(pwrpriv); - pwrpriv->ps_processing = _FALSE; + pwrpriv->ps_processing = false; return; } @@ -358,14 +358,14 @@ _func_enter_; pslv = PS_STATE(pslv); - if (_TRUE == pwrpriv->btcoex_rfon) + if (true == pwrpriv->btcoex_rfon) { if (pslv < PS_STATE_S4) pslv = PS_STATE_S3; } #ifdef CONFIG_LPS_RPWM_TIMER - if (pwrpriv->brpwmtimeout == _TRUE) + if (pwrpriv->brpwmtimeout == true) { DBG_871X("%s: RPWM timeout, force to set RPWM(0x%02X) again!\n", __FUNCTION__, pslv); } @@ -379,8 +379,8 @@ _func_enter_; } } - if ((padapter->bSurpriseRemoved == _TRUE) || - (padapter->hw_init_completed == _FALSE)) + if ((padapter->bSurpriseRemoved == true) || + (padapter->hw_init_completed == false)) { RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, ("%s: SurpriseRemoved(%d) hw_init_completed(%d)\n", @@ -391,7 +391,7 @@ _func_enter_; return; } - if (padapter->bDriverStopped == _TRUE) + if (padapter->bDriverStopped == true) { RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, ("%s: change power state(0x%02X) when DriverStopped\n", __FUNCTION__, pslv)); @@ -481,13 +481,13 @@ u8 PS_RDY_CHECK(struct adapter * padapter) struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); #ifdef CONFIG_WOWLAN - if(_TRUE == pwrpriv->bInSuspend && pwrpriv->wowlan_mode) - return _TRUE; - else if (_TRUE == pwrpriv->bInSuspend) - return _FALSE; + if(true == pwrpriv->bInSuspend && pwrpriv->wowlan_mode) + return true; + else if (true == pwrpriv->bInSuspend) + return false; #else - if(_TRUE == pwrpriv->bInSuspend ) - return _FALSE; + if(true == pwrpriv->bInSuspend ) + return false; #endif curr_time = rtw_get_current_time(); @@ -495,29 +495,29 @@ u8 PS_RDY_CHECK(struct adapter * padapter) if(delta_time < LPS_DELAY_TIME) { - return _FALSE; + return false; } - if ((check_fwstate(pmlmepriv, _FW_LINKED) == _FALSE) || - (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) || - (check_fwstate(pmlmepriv, WIFI_UNDER_WPS) == _TRUE) || - (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) ) - return _FALSE; + if ((check_fwstate(pmlmepriv, _FW_LINKED) == false) || + (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) || + (check_fwstate(pmlmepriv, WIFI_UNDER_WPS) == true) || + (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) || + (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) || + (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) ) + return false; - if( (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) && (padapter->securitypriv.binstallGrpkey == _FALSE) ) + if( (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) && (padapter->securitypriv.binstallGrpkey == false) ) { DBG_871X("Group handshake still in progress !!!\n"); - return _FALSE; + return false; } #ifdef CONFIG_IOCTL_CFG80211 if (!rtw_cfg80211_pwr_mgmt(padapter)) - return _FALSE; + return false; #endif - return _TRUE; + return true; } void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode) @@ -577,7 +577,7 @@ _func_enter_; phead = &(pstapriv->sta_hash[i]); plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { ptdls_sta = LIST_CONTAINOR(plist, struct sta_info, hash_list); @@ -593,7 +593,7 @@ _func_enter_; pwrpriv->pwr_mode = ps_mode; rtw_set_rpwm(padapter, PS_STATE_S4); #ifdef CONFIG_WOWLAN - if (pwrpriv->wowlan_mode == _TRUE) + if (pwrpriv->wowlan_mode == true) { u32 start_time, delay_ms; u8 val8; @@ -615,14 +615,14 @@ _func_enter_; } #endif rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode)); - pwrpriv->bFwCurrentInPSMode = _FALSE; + pwrpriv->bFwCurrentInPSMode = false; } } else { if (PS_RDY_CHECK(padapter) #ifdef CONFIG_BT_COEXIST - || (BT_1Ant(padapter) == _TRUE) + || (BT_1Ant(padapter) == true) #endif ) { @@ -636,7 +636,7 @@ _func_enter_; phead = &(pstapriv->sta_hash[i]); plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { ptdls_sta = LIST_CONTAINOR(plist, struct sta_info, hash_list); @@ -649,7 +649,7 @@ _func_enter_; _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); #endif //CONFIG_TDLS - pwrpriv->bFwCurrentInPSMode = _TRUE; + pwrpriv->bFwCurrentInPSMode = true; pwrpriv->pwr_mode = ps_mode; pwrpriv->smart_ps = smart_ps; pwrpriv->bcn_ant_mode = bcn_ant_mode; @@ -687,7 +687,7 @@ _func_exit_; s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms) { u32 start_time; - u8 bAwake = _FALSE; + u8 bAwake = false; s32 err = 0; @@ -695,10 +695,10 @@ s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms) while (1) { rtw_hal_get_hwreg(padapter, HW_VAR_FWLPS_RF_ON, &bAwake); - if (_TRUE == bAwake) + if (true == bAwake) break; - if (_TRUE == padapter->bSurpriseRemoved) + if (true == padapter->bSurpriseRemoved) { err = -2; DBG_871X("%s: device surprise removed!!\n", __FUNCTION__); @@ -761,17 +761,17 @@ _func_enter_; } #endif - if (PS_RDY_CHECK(padapter) == _FALSE) + if (PS_RDY_CHECK(padapter) == false) return; - if (_TRUE == pwrpriv->bLeisurePs) + if (true == pwrpriv->bLeisurePs) { // Idle for a while if we connect to AP a while ago. if(pwrpriv->LpsIdleCount >= 2) // 4 Sec { if(pwrpriv->pwr_mode == PS_MODE_ACTIVE) { - pwrpriv->bpower_saving = _TRUE; + pwrpriv->bpower_saving = true; DBG_871X("%s smart_ps:%d\n", __func__, pwrpriv->smart_ps); //For Tenda W311R IOT issue rtw_set_ps_mode(padapter, pwrpriv->power_mgnt, pwrpriv->smart_ps, 0x40); @@ -796,7 +796,7 @@ void LPS_Leave(struct adapter *padapter) struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); u32 start_time; - u8 bAwake = _FALSE; + u8 bAwake = false; _func_enter_; @@ -818,7 +818,7 @@ _func_enter_; } } - pwrpriv->bpower_saving = _FALSE; + pwrpriv->bpower_saving = false; // DBG_871X("-LeisurePSLeave\n"); @@ -838,7 +838,7 @@ void LeaveAllPowerSaveMode(IN struct adapter *Adapter) _func_enter_; //DBG_871X("%s.....\n",__FUNCTION__); - if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) + if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { //connect #ifdef CONFIG_LPS_LCLK enqueue = 1; @@ -874,7 +874,7 @@ _func_enter_; { #if defined(CONFIG_PLATFORM_SPRD) #ifdef CONFIG_IPS - if(_FALSE == ips_leave(Adapter)) + if(false == ips_leave(Adapter)) { DBG_871X("======> ips_leave fail.............\n"); } @@ -899,7 +899,7 @@ _func_enter_; pwrpriv = adapter_to_pwrctl(padapter); - bReady = _FALSE; + bReady = false; start_time = rtw_get_current_time(); rtw_yield_os(); @@ -908,18 +908,18 @@ _func_enter_; { _enter_pwrlock(&pwrpriv->lock); - if ((padapter->bSurpriseRemoved == _TRUE) - || (padapter->hw_init_completed == _FALSE) - || (padapter->bDriverStopped== _TRUE) + if ((padapter->bSurpriseRemoved == true) + || (padapter->hw_init_completed == false) + || (padapter->bDriverStopped== true) || (pwrpriv->pwr_mode == PS_MODE_ACTIVE) ) { - bReady = _TRUE; + bReady = true; } _exit_pwrlock(&pwrpriv->lock); - if(_TRUE == bReady) + if(true == bReady) break; if(rtw_get_passing_time_ms(start_time)>100) @@ -1037,9 +1037,9 @@ static void rpwmtimeout_workitem_callback(struct work_struct *work) DBG_871X("%s: cpwm=%d, nothing to do!\n", __func__, pwrpriv->cpwm); goto exit; } - pwrpriv->brpwmtimeout = _TRUE; + pwrpriv->brpwmtimeout = true; rtw_set_rpwm(padapter, pwrpriv->rpwm); - pwrpriv->brpwmtimeout = _FALSE; + pwrpriv->brpwmtimeout = false; exit: _exit_pwrlock(&pwrpriv->lock); @@ -1102,7 +1102,7 @@ _func_enter_; res = _SUCCESS; pwrctrl = adapter_to_pwrctl(padapter); #ifdef CONFIG_BT_COEXIST - if (_TRUE == adapter_to_pwrctl(padapter)->btcoex_rfon) + if (true == adapter_to_pwrctl(padapter)->btcoex_rfon) pslv = PS_STATE_S3; else #endif @@ -1114,7 +1114,7 @@ _func_enter_; register_task_alive(pwrctrl, XMIT_ALIVE); - if (pwrctrl->bFwCurrentInPSMode == _TRUE) + if (pwrctrl->bFwCurrentInPSMode == true) { RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, ("rtw_register_tx_alive: cpwm=0x%02x alives=0x%08x\n", @@ -1168,7 +1168,7 @@ _func_enter_; res = _SUCCESS; pwrctrl = adapter_to_pwrctl(padapter); #ifdef CONFIG_BT_COEXIST - if (_TRUE == adapter_to_pwrctl(padapter)->btcoex_rfon) + if (true == adapter_to_pwrctl(padapter)->btcoex_rfon) pslv = PS_STATE_S3; else #endif @@ -1180,7 +1180,7 @@ _func_enter_; register_task_alive(pwrctrl, CMD_ALIVE); - if (pwrctrl->bFwCurrentInPSMode == _TRUE) + if (pwrctrl->bFwCurrentInPSMode == true) { RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_info_, ("rtw_register_cmd_alive: cpwm=0x%02x alives=0x%08x\n", @@ -1292,7 +1292,7 @@ _func_enter_; unregister_task_alive(pwrctrl, XMIT_ALIVE); if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && - (pwrctrl->bFwCurrentInPSMode == _TRUE)) + (pwrctrl->bFwCurrentInPSMode == true)) { RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, ("%s: cpwm=0x%02x alives=0x%08x\n", @@ -1330,7 +1330,7 @@ _func_enter_; unregister_task_alive(pwrctrl, CMD_ALIVE); if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && - (pwrctrl->bFwCurrentInPSMode == _TRUE)) + (pwrctrl->bFwCurrentInPSMode == true)) { RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_info_, ("%s: cpwm=0x%02x alives=0x%08x\n", @@ -1411,16 +1411,16 @@ _func_enter_; pwrctrlpriv->rf_pwrstate = rf_on; pwrctrlpriv->ips_enter_cnts=0; pwrctrlpriv->ips_leave_cnts=0; - pwrctrlpriv->bips_processing = _FALSE; + pwrctrlpriv->bips_processing = false; pwrctrlpriv->ips_mode = padapter->registrypriv.ips_mode; pwrctrlpriv->ips_mode_req = padapter->registrypriv.ips_mode; pwrctrlpriv->pwr_state_check_interval = RTW_PWR_STATE_CHK_INTERVAL; pwrctrlpriv->pwr_state_check_cnts = 0; - pwrctrlpriv->bInternalAutoSuspend = _FALSE; - pwrctrlpriv->bInSuspend = _FALSE; - pwrctrlpriv->bkeepfwalive = _FALSE; + pwrctrlpriv->bInternalAutoSuspend = false; + pwrctrlpriv->bInSuspend = false; + pwrctrlpriv->bkeepfwalive = false; #ifdef CONFIG_AUTOSUSPEND #ifdef SUPPORT_HW_RFOFF_DETECTED @@ -1434,9 +1434,9 @@ _func_enter_; pwrctrlpriv->power_mgnt =PS_MODE_ACTIVE ; else pwrctrlpriv->power_mgnt =padapter->registrypriv.power_mgnt;// PS_MODE_MIN; - pwrctrlpriv->bLeisurePs = (PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt)?_TRUE:_FALSE; + pwrctrlpriv->bLeisurePs = (PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt)?true:false; - pwrctrlpriv->bFwCurrentInPSMode = _FALSE; + pwrctrlpriv->bFwCurrentInPSMode = false; pwrctrlpriv->rpwm = 0; pwrctrlpriv->cpwm = PS_STATE_S4; @@ -1447,7 +1447,7 @@ _func_enter_; pwrctrlpriv->tog = 0x80; - pwrctrlpriv->btcoex_rfon = _FALSE; + pwrctrlpriv->btcoex_rfon = false; #ifdef CONFIG_LPS_LCLK rtw_hal_set_hwreg(padapter, HW_VAR_SET_RPWM, (u8 *)(&pwrctrlpriv->rpwm)); @@ -1455,7 +1455,7 @@ _func_enter_; _init_workitem(&pwrctrlpriv->cpwm_event, cpwm_event_callback, NULL); #ifdef CONFIG_LPS_RPWM_TIMER - pwrctrlpriv->brpwmtimeout = _FALSE; + pwrctrlpriv->brpwmtimeout = false; _init_workitem(&pwrctrlpriv->rpwmtimeoutwi, rpwmtimeout_workitem_callback, NULL); _init_timer(&pwrctrlpriv->pwr_rpwm_timer, padapter->pnetdev, pwr_rpwm_timeout_handler, padapter); #endif // CONFIG_LPS_RPWM_TIMER @@ -1539,12 +1539,12 @@ void rtw_resume_in_workqueue(struct pwrctrl_priv *pwrpriv) #if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER) inline bool rtw_is_earlysuspend_registered(struct pwrctrl_priv *pwrpriv) { - return (pwrpriv->early_suspend.suspend) ? _TRUE : _FALSE; + return (pwrpriv->early_suspend.suspend) ? true : false; } inline bool rtw_is_do_late_resume(struct pwrctrl_priv *pwrpriv) { - return (pwrpriv->do_late_resume) ? _TRUE : _FALSE; + return (pwrpriv->do_late_resume) ? true : false; } inline void rtw_set_do_late_resume(struct pwrctrl_priv *pwrpriv, bool enable) @@ -1560,7 +1560,7 @@ static void rtw_early_suspend(struct early_suspend *h) struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); DBG_871X("%s\n",__FUNCTION__); - rtw_set_do_late_resume(pwrpriv, _FALSE); + rtw_set_do_late_resume(pwrpriv, false); } static void rtw_late_resume(struct early_suspend *h) @@ -1571,7 +1571,7 @@ static void rtw_late_resume(struct early_suspend *h) DBG_871X("%s\n",__FUNCTION__); if(pwrpriv->do_late_resume) { - rtw_set_do_late_resume(pwrpriv, _FALSE); + rtw_set_do_late_resume(pwrpriv, false); rtw_resume_process(adapter); } } @@ -1591,7 +1591,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) { DBG_871X("%s\n", __FUNCTION__); - rtw_set_do_late_resume(pwrpriv, _FALSE); + rtw_set_do_late_resume(pwrpriv, false); if (pwrpriv->early_suspend.suspend) unregister_early_suspend(&pwrpriv->early_suspend); @@ -1608,7 +1608,7 @@ static void rtw_early_suspend(android_early_suspend_t *h) struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); DBG_871X("%s\n",__FUNCTION__); - rtw_set_do_late_resume(pwrpriv, _FALSE); + rtw_set_do_late_resume(pwrpriv, false); } static void rtw_late_resume(android_early_suspend_t *h) @@ -1619,7 +1619,7 @@ static void rtw_late_resume(android_early_suspend_t *h) DBG_871X("%s\n",__FUNCTION__); if(pwrpriv->do_late_resume) { - rtw_set_do_late_resume(pwrpriv, _FALSE); + rtw_set_do_late_resume(pwrpriv, false); rtw_resume_process(adapter); } } @@ -1639,7 +1639,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) { DBG_871X("%s\n", __FUNCTION__); - rtw_set_do_late_resume(pwrpriv, _FALSE); + rtw_set_do_late_resume(pwrpriv, false); if (pwrpriv->early_suspend.suspend) android_unregister_early_suspend(&pwrpriv->early_suspend); @@ -1651,7 +1651,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) u8 rtw_interface_ps_func(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val) { - u8 bResult = _TRUE; + u8 bResult = true; rtw_hal_intf_ps_func(padapter,efunc_id,val); return bResult; @@ -1682,7 +1682,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal if (padapter->pbuddy_adapter) LeaveAllPowerSaveMode(padapter->pbuddy_adapter); - if ((padapter->isprimary == _FALSE) && padapter->pbuddy_adapter){ + if ((padapter->isprimary == false) && padapter->pbuddy_adapter){ padapter = padapter->pbuddy_adapter; pmlmepriv = &padapter->mlmepriv; } @@ -1714,7 +1714,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal } #endif - if (pwrpriv->bInternalAutoSuspend == _FALSE && pwrpriv->bInSuspend) { + if (pwrpriv->bInternalAutoSuspend == false && pwrpriv->bInSuspend) { DBG_871X("%s wait bInSuspend...\n", __func__); while (pwrpriv->bInSuspend && ((rtw_get_passing_time_ms(start) <= 3000 && !rtw_is_do_late_resume(pwrpriv)) @@ -1729,22 +1729,22 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal } //System suspend is not allowed to wakeup - if((pwrpriv->bInternalAutoSuspend == _FALSE) && (_TRUE == pwrpriv->bInSuspend )){ + if((pwrpriv->bInternalAutoSuspend == false) && (true == pwrpriv->bInSuspend )){ ret = _FAIL; goto exit; } //block??? - if((pwrpriv->bInternalAutoSuspend == _TRUE) && (padapter->net_closed == _TRUE)) { + if((pwrpriv->bInternalAutoSuspend == true) && (padapter->net_closed == true)) { ret = _FAIL; goto exit; } //I think this should be check in IPS, LPS, autosuspend functions... - if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) + if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { #if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND) - if(_TRUE==pwrpriv->bInternalAutoSuspend){ + if(true==pwrpriv->bInternalAutoSuspend){ if(0==pwrpriv->autopm_cnt){ #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) if (usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf) < 0) @@ -1769,7 +1769,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal if(rf_off == pwrpriv->rf_pwrstate ) { #ifdef CONFIG_AUTOSUSPEND - if(pwrpriv->brfoffbyhw==_TRUE) + if(pwrpriv->brfoffbyhw==true) { DBG_8192C("hw still in rf_off state ...........\n"); ret = _FAIL; @@ -1810,7 +1810,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal , padapter->bDriverStopped , padapter->bup , padapter->hw_init_completed); - ret= _FALSE; + ret= false; goto exit; } @@ -1839,7 +1839,7 @@ int rtw_pm_set_lps(struct adapter *padapter, u8 mode) pwrctrlpriv->LpsIdleCount = 2; } pwrctrlpriv->power_mgnt = mode; - pwrctrlpriv->bLeisurePs = (PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt)?_TRUE:_FALSE; + pwrctrlpriv->bLeisurePs = (PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt)?true:false; } } else diff --git a/core/rtw_recv.c b/core/rtw_recv.c index a5c4588..5a089f5 100755 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -185,7 +185,7 @@ union recv_frame *_rtw_alloc_recvframe (_queue *pfree_recv_queue) struct recv_priv *precvpriv; _func_enter_; - if(_rtw_queue_empty(pfree_recv_queue) == _TRUE) + if(_rtw_queue_empty(pfree_recv_queue) == true) { precvframe = NULL; } @@ -354,7 +354,7 @@ _func_enter_; phead = get_list_head(pframequeue); plist = get_next(phead); - while(rtw_end_of_queue_search(phead, plist) == _FALSE) + while(rtw_end_of_queue_search(phead, plist) == false) { precvframe = LIST_CONTAINOR(plist, union recv_frame, u); @@ -422,7 +422,7 @@ struct recv_buf *rtw_dequeue_recvbuf (_queue *queue) _enter_critical_ex(&queue->lock, &irqL); - if(_rtw_queue_empty(queue) == _TRUE) + if(_rtw_queue_empty(queue) == true) { precvbuf = NULL; } @@ -450,7 +450,7 @@ sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe){ sint i,res=_SUCCESS; u32 datalen; u8 miccode[8]; - u8 bmic_err=_FALSE,brpt_micerror = _TRUE; + u8 bmic_err=false,brpt_micerror = true; u8 *pframe, *payload,*pframemic; u8 *mickey; //u8 *iv,rxdata_key_idx=0; @@ -484,7 +484,7 @@ _func_enter_; //DBG_871X("\n recvframe_chkmic: bcmc key psecuritypriv->dot118021XGrpKeyid(%d),pmlmeinfo->key_index(%d) ,recv key_id(%d)\n", // psecuritypriv->dot118021XGrpKeyid,pmlmeinfo->key_index,rxdata_key_idx); - if(psecuritypriv->binstallGrpkey==_FALSE) + if(psecuritypriv->binstallGrpkey==false) { res=_FAIL; RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n")); @@ -509,17 +509,17 @@ _func_enter_; pframemic=payload+datalen; - bmic_err=_FALSE; + bmic_err=false; for(i=0;i<8;i++){ if(miccode[i] != *(pframemic+i)){ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvframe_chkmic:miccode[%d](%02x) != *(pframemic+%d)(%02x) ",i,miccode[i],i,*(pframemic+i))); - bmic_err=_TRUE; + bmic_err=true; } } - if(bmic_err==_TRUE){ + if(bmic_err==true){ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n *(pframemic-8)-*(pframemic-1)=0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n", *(pframemic-8),*(pframemic-7),*(pframemic-6),*(pframemic-5),*(pframemic-4),*(pframemic-3),*(pframemic-2),*(pframemic-1))); @@ -546,10 +546,10 @@ _func_enter_; // double check key_index for some timing issue , // cannot compare with psecuritypriv->dot118021XGrpKeyid also cause timing issue - if((IS_MCAST(prxattrib->ra)==_TRUE) && (prxattrib->key_index != pmlmeinfo->key_index )) - brpt_micerror = _FALSE; + if((IS_MCAST(prxattrib->ra)==true) && (prxattrib->key_index != pmlmeinfo->key_index )) + brpt_micerror = false; - if((prxattrib->bdecrypted ==_TRUE)&& (brpt_micerror == _TRUE)) + if((prxattrib->bdecrypted ==true)&& (brpt_micerror == true)) { rtw_handle_tkip_mic_err(adapter,(u8)IS_MCAST(prxattrib->ra)); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" mic error :prxattrib->bdecrypted=%d ",prxattrib->bdecrypted)); @@ -566,9 +566,9 @@ _func_enter_; } else{ //mic checked ok - if((psecuritypriv->bcheck_grpkey ==_FALSE)&&(IS_MCAST(prxattrib->ra)==_TRUE)){ - psecuritypriv->bcheck_grpkey =_TRUE; - RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("psecuritypriv->bcheck_grpkey =_TRUE")); + if((psecuritypriv->bcheck_grpkey ==false)&&(IS_MCAST(prxattrib->ra)==true)){ + psecuritypriv->bcheck_grpkey =true; + RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("psecuritypriv->bcheck_grpkey =true")); } } @@ -626,13 +626,13 @@ _func_enter_; } } - if((prxattrib->encrypt>0) && ((prxattrib->bdecrypted==0) ||(psecuritypriv->sw_decrypt==_TRUE))) + if((prxattrib->encrypt>0) && ((prxattrib->bdecrypted==0) ||(psecuritypriv->sw_decrypt==true))) { #ifdef CONFIG_CONCURRENT_MODE if(!IS_MCAST(prxattrib->ra))//bc/mc packets use sw decryption for concurrent mode #endif - psecuritypriv->hw_decrypted=_FALSE; + psecuritypriv->hw_decrypted=false; #ifdef DBG_RX_DECRYPTOR DBG_871X("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n" @@ -664,7 +664,7 @@ _func_enter_; && (psecuritypriv->busetkipkey==1 || prxattrib->encrypt !=_TKIP_ ) ) { - psecuritypriv->hw_decrypted=_TRUE; + psecuritypriv->hw_decrypted=true; #ifdef DBG_RX_DECRYPTOR DBG_871X("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n" , prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted); @@ -683,7 +683,7 @@ _func_enter_; } else{ - prxattrib->bdecrypted = _TRUE; + prxattrib->bdecrypted = true; } //recvframe_chkmic(adapter, precv_frame); //move to recvframme_defrag function @@ -1095,8 +1095,8 @@ sint sta2sta_data_frame( _func_enter_; - if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) + if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) || + (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) { // filter packets that SA is myself or multicast or broadcast @@ -1121,7 +1121,7 @@ _func_enter_; sta_addr = pattrib->src; } - else if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) + else if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) { #ifdef CONFIG_TDLS @@ -1219,7 +1219,7 @@ _func_enter_; } } - else if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + else if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { if (bmcast) { @@ -1241,7 +1241,7 @@ _func_enter_; } } - else if(check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) + else if(check_fwstate(pmlmepriv, WIFI_MP_STATE) == true) { _rtw_memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN); _rtw_memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN); @@ -1300,9 +1300,9 @@ sint ap2sta_data_frame( _func_enter_; - if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) - && (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE - || check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE ) + if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) + && (check_fwstate(pmlmepriv, _FW_LINKED) == true + || check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true ) ) { @@ -1379,8 +1379,8 @@ _func_enter_; } } - else if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) && - (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) ) + else if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true) && + (check_fwstate(pmlmepriv, _FW_LINKED) == true) ) { _rtw_memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN); _rtw_memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN); @@ -1404,7 +1404,7 @@ _func_enter_; } - else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { /* Special case */ ret = RTW_RX_HANDLED; @@ -1455,7 +1455,7 @@ sint sta2ap_data_frame( _func_enter_; - if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { //For AP mode, RA=BSSID, TX=STA(SRC_ADDR), A3=DST_ADDR if(!_rtw_memcmp(pattrib->bssid, mybssid, ETH_ALEN)) @@ -1593,7 +1593,7 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_ xmitframe_phead = get_list_head(&psta->sleep_q); xmitframe_plist = get_next(xmitframe_phead); - if ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE) + if ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == false) { pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); @@ -1620,7 +1620,7 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_ //upate BCN for TIM IE //update_BCNTIM(padapter); - update_beacon(padapter, _TIM_IE_, NULL, _FALSE); + update_beacon(padapter, _TIM_IE_, NULL, false); } //_exit_critical_bh(&psta->sleep_q.lock, &irqL); @@ -1652,7 +1652,7 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_ //upate BCN for TIM IE //update_BCNTIM(padapter); - update_beacon(padapter, _TIM_IE_, NULL, _FALSE); + update_beacon(padapter, _TIM_IE_, NULL, false); } } @@ -1691,7 +1691,7 @@ sint validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_ else if (GetFrameSubType(precv_frame->u.hdr.rx_data) == WIFI_PROBEREQ) psta->sta_stats.rx_probereq_pkts++; else if (GetFrameSubType(precv_frame->u.hdr.rx_data) == WIFI_PROBERSP) { - if (_rtw_memcmp(padapter->eeprompriv.mac_addr, GetAddr1Ptr(precv_frame->u.hdr.rx_data), ETH_ALEN) == _TRUE) + if (_rtw_memcmp(padapter->eeprompriv.mac_addr, GetAddr1Ptr(precv_frame->u.hdr.rx_data), ETH_ALEN) == true) psta->sta_stats.rx_probersp_pkts++; else if (is_broadcast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)) || is_multicast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data))) @@ -1703,7 +1703,7 @@ sint validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_ } #ifdef CONFIG_INTEL_PROXIM - if(padapter->proximity.proxim_on==_TRUE) + if(padapter->proximity.proxim_on==true) { struct rx_pkt_attrib * pattrib=&precv_frame->u.hdr.attrib; struct recv_stat* prxstat=( struct recv_stat * ) precv_frame->u.hdr.rx_head ; @@ -1862,7 +1862,7 @@ _func_enter_; if(pattrib->priority!=0 && pattrib->priority!=3) { - adapter->recvpriv.bIsAnyNonBEPkts = _TRUE; + adapter->recvpriv.bIsAnyNonBEPkts = true; } } else @@ -1935,7 +1935,7 @@ static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *prec //only support station mode if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) - && adapter->securitypriv.binstallBIPkey == _TRUE) + && adapter->securitypriv.binstallBIPkey == true) { //unicast management frame decrypt if(pattrib->privacy && !(IS_MCAST(GetAddr1Ptr(ptr))) && @@ -2280,16 +2280,16 @@ _func_enter_; /* convert hdr + possible LLC headers into Ethernet header */ //eth_type = (psnap_type[0] << 8) | psnap_type[1]; if((_rtw_memcmp(psnap, rtw_rfc1042_header, SNAP_SIZE) && - (_rtw_memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2) == _FALSE) && - (_rtw_memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2)==_FALSE) )|| + (_rtw_memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2) == false) && + (_rtw_memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2)==false) )|| //eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || _rtw_memcmp(psnap, rtw_bridge_tunnel_header, SNAP_SIZE)){ /* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ - bsnaphdr = _TRUE; + bsnaphdr = true; } else { /* Leave Ethernet header part of hdr and full payload */ - bsnaphdr = _FALSE; + bsnaphdr = false; } rmv_len = pattrib->hdrlen + pattrib->iv_len +(bsnaphdr?SNAP_SIZE:0); @@ -2301,7 +2301,7 @@ _func_enter_; eth_type= ntohs((unsigned short )eth_type); //pattrib->ether_type pattrib->eth_type = eth_type; - if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE)) + if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)) { ptr += rmv_len ; *ptr = 0x87; @@ -2355,12 +2355,12 @@ _func_enter_; if (psnap->dsap==0xaa && psnap->ssap==0xaa && psnap->ctrl==0x03) { if (_rtw_memcmp(psnap->oui, oui_rfc1042, WLAN_IEEE_OUI_LEN)) - bsnaphdr=_TRUE;//wlan_pkt_format = WLAN_PKT_FORMAT_SNAP_RFC1042; + bsnaphdr=true;//wlan_pkt_format = WLAN_PKT_FORMAT_SNAP_RFC1042; else if (_rtw_memcmp(psnap->oui, SNAP_HDR_APPLETALK_DDP, WLAN_IEEE_OUI_LEN) && _rtw_memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_DDP, 2) ) - bsnaphdr=_TRUE; //wlan_pkt_format = WLAN_PKT_FORMAT_APPLETALK; + bsnaphdr=true; //wlan_pkt_format = WLAN_PKT_FORMAT_APPLETALK; else if (_rtw_memcmp( psnap->oui, oui_8021h, WLAN_IEEE_OUI_LEN)) - bsnaphdr=_TRUE; //wlan_pkt_format = WLAN_PKT_FORMAT_SNAP_TUNNEL; + bsnaphdr=true; //wlan_pkt_format = WLAN_PKT_FORMAT_SNAP_TUNNEL; else { RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("drop pkt due to invalid frame format!\n")); ret= _FAIL; @@ -2368,12 +2368,12 @@ _func_enter_; } } else - bsnaphdr=_FALSE;//wlan_pkt_format = WLAN_PKT_FORMAT_OTHERS; + bsnaphdr=false;//wlan_pkt_format = WLAN_PKT_FORMAT_OTHERS; rmv_len = pattrib->hdrlen + pattrib->iv_len +(bsnaphdr?SNAP_SIZE:0); RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("===pattrib->hdrlen: %x, pattrib->iv_len:%x ===\n", pattrib->hdrlen, pattrib->iv_len)); - if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) + if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == true) { ptr += rmv_len ; *ptr = 0x87; @@ -2502,7 +2502,7 @@ _func_enter_; data=get_recvframe_data(prframe); - while(rtw_end_of_queue_search(phead, plist) == _FALSE) + while(rtw_end_of_queue_search(phead, plist) == false) { pnextrframe = LIST_CONTAINOR(plist, union recv_frame , u); pnfhdr=&pnextrframe->u.hdr; @@ -2604,7 +2604,7 @@ _func_enter_; if(fragnum==0) { //the first fragment - if(_rtw_queue_empty(pdefrag_q) == _FALSE) + if(_rtw_queue_empty(pdefrag_q) == false) { //free current defrag_q rtw_free_recvframe_queue(pdefrag_q, pfree_recv_queue); @@ -2825,7 +2825,7 @@ int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe) #endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) - if( br_port && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) ) + if( br_port && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true) ) { int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb); if (nat25_handle_frame(padapter, sub_skb) == -1) { @@ -2899,7 +2899,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num) #endif - return _FALSE; + return false; } // @@ -2934,7 +2934,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num) //DbgPrint("exit->check_indicate_seq(): IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); - return _TRUE; + return true; } int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union recv_frame *prframe); @@ -2955,7 +2955,7 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec phead = get_list_head(ppending_recvframe_queue); plist = get_next(phead); - while(rtw_end_of_queue_search(phead, plist) == _FALSE) + while(rtw_end_of_queue_search(phead, plist) == false) { pnextrframe = LIST_CONTAINOR(plist, union recv_frame, u); pnextattrib = &pnextrframe->u.hdr.attrib; @@ -2971,7 +2971,7 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec //_exit_critical_ex(&ppending_recvframe_queue->lock, &irql); - return _FALSE; + return false; } else { @@ -2995,7 +2995,7 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec //RT_TRACE(COMP_RX_REORDER, DBG_TRACE, ("InsertRxReorderList(): Pkt insert into buffer!! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, SeqNum)); - return _TRUE; + return true; } @@ -3008,7 +3008,7 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr union recv_frame *prframe; struct rx_pkt_attrib *pattrib; //u8 index = 0; - int bPktInBuf = _FALSE; + int bPktInBuf = false; struct recv_priv *precvpriv = &padapter->recvpriv; _queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue; @@ -3021,13 +3021,13 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr plist = get_next(phead); // Handling some condition for forced indicate case. - if(bforced==_TRUE) + if(bforced==true) { if(rtw_is_list_empty(phead)) { // _exit_critical_ex(&ppending_recvframe_queue->lock, &irql); //_rtw_spinunlock_ex(&ppending_recvframe_queue->lock); - return _TRUE; + return true; } prframe = LIST_CONTAINOR(plist, union recv_frame, u); @@ -3077,8 +3077,8 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr { //DBG_871X("recv_indicatepkts_in_order, amsdu!=1, indicate_seq=%d, seq_num=%d\n", preorder_ctrl->indicate_seq, pattrib->seq_num); - if ((padapter->bDriverStopped == _FALSE) && - (padapter->bSurpriseRemoved == _FALSE)) + if ((padapter->bDriverStopped == false) && + (padapter->bSurpriseRemoved == false)) { rtw_recv_indicatepkt(padapter, prframe);//indicate this recv_frame @@ -3099,12 +3099,12 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr //Update local variables. - bPktInBuf = _FALSE; + bPktInBuf = false; } else { - bPktInBuf = _TRUE; + bPktInBuf = true; break; } @@ -3132,7 +3132,7 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr */ //_exit_critical_ex(&ppending_recvframe_queue->lock, &irql); - //return _TRUE; + //return true; return bPktInBuf; } @@ -3155,8 +3155,8 @@ int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe // || (pattrib->eth_type==0x0806) || (pattrib->ack_policy!=0)) if (pattrib->qos!=1) { - if ((padapter->bDriverStopped == _FALSE) && - (padapter->bSurpriseRemoved == _FALSE)) + if ((padapter->bDriverStopped == false) && + (padapter->bSurpriseRemoved == false)) { RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("@@@@ recv_indicatepkt_reorder -recv_func recv_indicatepkt\n" )); @@ -3173,7 +3173,7 @@ int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe } - if (preorder_ctrl->enable == _FALSE) + if (preorder_ctrl->enable == false) { //indicate this recv_frame preorder_ctrl->indicate_seq = pattrib->seq_num; @@ -3202,7 +3202,7 @@ int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe } else if(pattrib->amsdu==1) //temp filter -> means didn't support A-MSDUs in a A-MPDU { - if (preorder_ctrl->enable == _FALSE) + if (preorder_ctrl->enable == false) { preorder_ctrl->indicate_seq = pattrib->seq_num; #ifdef DBG_RX_SEQ @@ -3277,8 +3277,8 @@ int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe // 2. All packets with SeqNum larger than or equal to WinStart => Buffer it. // - //recv_indicatepkts_in_order(padapter, preorder_ctrl, _TRUE); - if(recv_indicatepkts_in_order(padapter, preorder_ctrl, _FALSE)==_TRUE) + //recv_indicatepkts_in_order(padapter, preorder_ctrl, true); + if(recv_indicatepkts_in_order(padapter, preorder_ctrl, false)==true) { _set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME); _exit_critical_bh(&ppending_recvframe_queue->lock, &irql); @@ -3319,7 +3319,7 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext) _enter_critical_bh(&ppending_recvframe_queue->lock, &irql); - if(recv_indicatepkts_in_order(padapter, preorder_ctrl, _TRUE)==_TRUE) + if(recv_indicatepkts_in_order(padapter, preorder_ctrl, true)==true) { _set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME); } @@ -3344,12 +3344,12 @@ int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prfram struct ht_priv *phtpriv = &pmlmepriv->htpriv; #ifdef CONFIG_TDLS - if( (phtpriv->ht_option==_TRUE) || + if( (phtpriv->ht_option==true) || ((psta->tdls_sta_state & TDLS_LINKED_STATE) && - (psta->htpriv.ht_option==_TRUE) && - (psta->htpriv.ampdu_enable==_TRUE))) //B/G/N Mode + (psta->htpriv.ht_option==true) && + (psta->htpriv.ampdu_enable==true))) //B/G/N Mode #else - if(phtpriv->ht_option==_TRUE) //B/G/N Mode + if(phtpriv->ht_option==true) //B/G/N Mode #endif //CONFIG_TDLS { //prframe->u.hdr.preorder_ctrl = &precvpriv->recvreorder_ctrl[pattrib->priority]; @@ -3360,8 +3360,8 @@ int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prfram DBG_871X("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __FUNCTION__); #endif - if ((padapter->bDriverStopped == _FALSE) && - (padapter->bSurpriseRemoved == _FALSE)) + if ((padapter->bDriverStopped == false) && + (padapter->bSurpriseRemoved == false)) { retval = _FAIL; return retval; @@ -3381,7 +3381,7 @@ int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prfram return retval; } - if ((padapter->bDriverStopped ==_FALSE)&&( padapter->bSurpriseRemoved==_FALSE)) + if ((padapter->bDriverStopped ==false)&&( padapter->bSurpriseRemoved==false)) { //indicate this recv_frame RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("@@@@ process_recv_indicatepkts- recv_func recv_indicatepkt\n" )); @@ -3522,7 +3522,7 @@ int recv_func_posthandle(struct adapter *padapter, union recv_frame *prframe) goto _recv_data_drop; } - if ((padapter->bDriverStopped == _FALSE) && (padapter->bSurpriseRemoved == _FALSE)) + if ((padapter->bDriverStopped == false) && (padapter->bSurpriseRemoved == false)) { RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("@@@@ recv_func: recv_func rtw_recv_indicatepkt\n" )); //indicate this recv_frame @@ -3611,7 +3611,7 @@ int recv_func(struct adapter *padapter, union recv_frame *rframe) /* check if need to enqueue into uc_swdec_pending_queue*/ if (check_fwstate(mlmepriv, WIFI_STATION_STATE) && !IS_MCAST(prxattrib->ra) && prxattrib->encrypt>0 && - (prxattrib->bdecrypted == 0 ||psecuritypriv->sw_decrypt == _TRUE) && + (prxattrib->bdecrypted == 0 ||psecuritypriv->sw_decrypt == true) && psecuritypriv->ndisauthtype == Ndis802_11AuthModeWPAPSK && !psecuritypriv->busetkipkey) { @@ -3707,21 +3707,21 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS){ if (rtw_get_on_cur_ch_time(adapter) == 0 || rtw_get_passing_time_ms(rtw_get_on_cur_ch_time(adapter)) < 2 * adapter->mlmeextpriv.mlmext_info.bcn_interval #ifdef CONFIG_BT_COEXIST - || ((BTDM_IsBtDisabled(adapter) == _FALSE) && (BT_IsBtInquiryPage(adapter) == _TRUE)) + || ((BTDM_IsBtDisabled(adapter) == false) && (BT_IsBtInquiryPage(adapter) == true)) #endif ) { goto set_timer; } } - if(check_fwstate(&adapter->mlmepriv, _FW_UNDER_SURVEY) == _TRUE - || check_fwstate(&adapter->mlmepriv, _FW_LINKED) == _FALSE + if(check_fwstate(&adapter->mlmepriv, _FW_UNDER_SURVEY) == true + || check_fwstate(&adapter->mlmepriv, _FW_LINKED) == false ) { goto set_timer; } #ifdef CONFIG_CONCURRENT_MODE - if (check_buddy_fwstate(adapter, _FW_UNDER_SURVEY) == _TRUE) + if (check_buddy_fwstate(adapter, _FW_UNDER_SURVEY) == true) goto set_timer; #endif diff --git a/core/rtw_security.c b/core/rtw_security.c index a0b7db0..9d03a55 100755 --- a/core/rtw_security.c +++ b/core/rtw_security.c @@ -805,7 +805,7 @@ _func_enter_; static u32 no_gkey_bc_cnt = 0; static u32 no_gkey_mc_cnt = 0; - if(psecuritypriv->binstallGrpkey==_FALSE) + if(psecuritypriv->binstallGrpkey==false) { res=_FAIL; @@ -2005,7 +2005,7 @@ _func_enter_; //in concurrent we should use sw descrypt in group key, so we remove this message //DBG_871X("rx bc/mc packets, to perform sw rtw_aes_decrypt\n"); //prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; - if(psecuritypriv->binstallGrpkey==_FALSE) + if(psecuritypriv->binstallGrpkey==false) { res=_FAIL; @@ -3080,7 +3080,7 @@ _func_enter_; RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("^^^rtw_use_tkipkey_handler ^^^\n")); - padapter->securitypriv.busetkipkey=_TRUE; + padapter->securitypriv.busetkipkey=true; RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("^^^rtw_use_tkipkey_handler padapter->securitypriv.busetkipkey=%d^^^\n",padapter->securitypriv.busetkipkey)); @@ -3098,9 +3098,9 @@ void rtw_sec_restore_wep_key(struct adapter *adapter) for(keyid=0;keyid<4;keyid++){ if(securitypriv->key_mask & BIT(keyid)){ if(keyid == securitypriv->dot11PrivacyKeyIndex) - rtw_set_key(adapter,securitypriv, keyid, 1, _TRUE); + rtw_set_key(adapter,securitypriv, keyid, 1, true); else - rtw_set_key(adapter,securitypriv, keyid, 0, _TRUE); + rtw_set_key(adapter,securitypriv, keyid, 0, true); } } } @@ -3111,12 +3111,12 @@ u8 rtw_handle_tkip_countermeasure(struct adapter* adapter, const char *caller) struct security_priv* securitypriv=&(adapter->securitypriv); u8 status = _SUCCESS; - if (securitypriv->btkip_countermeasure == _TRUE) { + if (securitypriv->btkip_countermeasure == true) { u32 passing_ms = rtw_get_passing_time_ms(securitypriv->btkip_countermeasure_time); if (passing_ms > 60*1000) { DBG_871X_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%ds > 60s \n", caller, ADPT_ARG(adapter), passing_ms/1000); - securitypriv->btkip_countermeasure = _FALSE; + securitypriv->btkip_countermeasure = false; securitypriv->btkip_countermeasure_time = 0; } else { DBG_871X_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%ds < 60s \n", diff --git a/core/rtw_sreset.c b/core/rtw_sreset.c index 6503ab4..d0e6f50 100755 --- a/core/rtw_sreset.c +++ b/core/rtw_sreset.c @@ -27,7 +27,7 @@ void sreset_init_value(struct adapter *padapter) struct sreset_priv *psrtpriv = &pHalData->srestpriv; _rtw_mutex_init(&psrtpriv->silentreset_mutex); - psrtpriv->silent_reset_inprogress = _FALSE; + psrtpriv->silent_reset_inprogress = false; psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; psrtpriv->last_tx_time =0; psrtpriv->last_tx_complete_time =0; @@ -39,7 +39,7 @@ void sreset_reset_value(struct adapter *padapter) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); struct sreset_priv *psrtpriv = &pHalData->srestpriv; - //psrtpriv->silent_reset_inprogress = _FALSE; + //psrtpriv->silent_reset_inprogress = false; psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; psrtpriv->last_tx_time =0; psrtpriv->last_tx_complete_time =0; @@ -55,7 +55,7 @@ u8 sreset_get_wifi_status(struct adapter *padapter) u8 status = WIFI_STATUS_SUCCESS; u32 val32 = 0; _irqL irqL; - if(psrtpriv->silent_reset_inprogress == _TRUE) + if(psrtpriv->silent_reset_inprogress == true) { return status; } @@ -106,7 +106,7 @@ bool sreset_inprogress(struct adapter *padapter) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); return pHalData->srestpriv.silent_reset_inprogress; #else - return _FALSE; + return false; #endif } @@ -145,9 +145,9 @@ void sreset_restore_security_station(struct adapter *padapter) else { //pairwise key - rtw_setstakey_cmd(padapter, (unsigned char *)psta, _TRUE,_FALSE); + rtw_setstakey_cmd(padapter, (unsigned char *)psta, true,false); //group key - rtw_set_key(padapter,&padapter->securitypriv,padapter->securitypriv.dot118021XGrpKeyid, 0,_FALSE); + rtw_set_key(padapter,&padapter->securitypriv,padapter->securitypriv.dot118021XGrpKeyid, 0,false); } } } @@ -158,7 +158,7 @@ void sreset_restore_network_station(struct adapter *padapter) struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - rtw_setopmode_cmd(padapter, Ndis802_11Infrastructure,_FALSE); + rtw_setopmode_cmd(padapter, Ndis802_11Infrastructure,false); { u8 threshold; @@ -179,7 +179,7 @@ void sreset_restore_network_station(struct adapter *padapter) set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); //disable dynamic functions, such as high power, DIG - //Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, _FALSE); + //Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false); rtw_hal_set_hwreg(padapter, HW_VAR_BSSID, pmlmeinfo->network.MacAddress); @@ -287,7 +287,7 @@ void sreset_reset(struct adapter *padapter) _enter_pwrlock(&pwrpriv->lock); - psrtpriv->silent_reset_inprogress = _TRUE; + psrtpriv->silent_reset_inprogress = true; pwrpriv->change_rfpwrstate = rf_off; sreset_stop_adapter(padapter); @@ -305,7 +305,7 @@ void sreset_reset(struct adapter *padapter) sreset_start_adapter(padapter->pbuddy_adapter); #endif - psrtpriv->silent_reset_inprogress = _FALSE; + psrtpriv->silent_reset_inprogress = false; _exit_pwrlock(&pwrpriv->lock); diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c index c0afe88..e44898d 100755 --- a/core/rtw_sta_mgt.c +++ b/core/rtw_sta_mgt.c @@ -62,7 +62,7 @@ _func_enter_; psta->capability = 0; - psta->bpairwise_key_installed = _FALSE; + psta->bpairwise_key_installed = false; #ifdef CONFIG_NATIVEAP_MLME @@ -245,7 +245,7 @@ _func_enter_; phead = get_list_head(&pstapriv->free_sta_queue); plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info ,list); plist = get_next(plist); @@ -300,7 +300,7 @@ _func_enter_; phead = &(pstapriv->sta_hash[index]); plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { int i; psta = LIST_CONTAINOR(plist, struct sta_info ,hash_list); @@ -348,7 +348,7 @@ _func_enter_; //_enter_critical_bh(&(pfree_sta_queue->lock), &irqL); _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL2); - if (_rtw_queue_empty(pfree_sta_queue) == _TRUE) + if (_rtw_queue_empty(pfree_sta_queue) == true) { //_exit_critical_bh(&(pfree_sta_queue->lock), &irqL); _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL2); @@ -421,7 +421,7 @@ _func_enter_; preorder_ctrl->padapter = pstapriv->padapter; - preorder_ctrl->enable = _FALSE; + preorder_ctrl->enable = false; preorder_ctrl->indicate_seq = 0xffff; #ifdef DBG_RX_SEQ @@ -592,7 +592,7 @@ _func_enter_; } if (!(psta->state & WIFI_AP_STATE)) - rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, _FALSE); + rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, false); #ifdef CONFIG_AP_MODE @@ -680,7 +680,7 @@ _func_enter_; phead = &(pstapriv->sta_hash[index]); plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info ,hash_list); @@ -738,12 +738,12 @@ _func_enter_; plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); - if ((_rtw_memcmp(psta->hwaddr, addr, ETH_ALEN))== _TRUE) + if ((_rtw_memcmp(psta->hwaddr, addr, ETH_ALEN))== true) { // if found the matched address break; } @@ -813,12 +813,12 @@ _func_exit_; u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr) { - u8 res = _TRUE; + u8 res = true; #ifdef CONFIG_AP_MODE _irqL irqL; _list *plist, *phead; struct rtw_wlan_acl_node *paclnode; - u8 match = _FALSE; + u8 match = false; struct sta_priv *pstapriv = &padapter->stapriv; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; _queue *pacl_node_q =&pacl_list->acl_node_q; @@ -826,16 +826,16 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr) _enter_critical_bh(&(pacl_node_q->lock), &irqL); phead = get_list_head(pacl_node_q); plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); plist = get_next(plist); if(_rtw_memcmp(paclnode->addr, mac_addr, ETH_ALEN)) { - if(paclnode->valid == _TRUE) + if(paclnode->valid == true) { - match = _TRUE; + match = true; break; } } @@ -845,15 +845,15 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr) if(pacl_list->mode == 1)//accept unless in deny list { - res = (match == _TRUE) ? _FALSE:_TRUE; + res = (match == true) ? false:true; } else if(pacl_list->mode == 2)//deny unless in accept list { - res = (match == _TRUE) ? _TRUE:_FALSE; + res = (match == true) ? true:false; } else { - res = _TRUE; + res = true; } #endif diff --git a/core/rtw_tdls.c b/core/rtw_tdls.c index 320d9ea..f87770b 100755 --- a/core/rtw_tdls.c +++ b/core/rtw_tdls.c @@ -34,10 +34,10 @@ void rtw_reset_tdls_info(_adapter* padapter) { struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; - ptdlsinfo->ap_prohibited = _FALSE; + ptdlsinfo->ap_prohibited = false; ptdlsinfo->setup_state = TDLS_STATE_NONE; ptdlsinfo->sta_cnt = 0; - ptdlsinfo->sta_maximum = _FALSE; + ptdlsinfo->sta_maximum = false; ptdlsinfo->macid_index= 6; ptdlsinfo->clear_cam= 0; ptdlsinfo->ch_sensing = 0; @@ -166,7 +166,7 @@ s32 update_tdls_attrib(_adapter *padapter, struct pkt_attrib *pattrib) pattrib->priority = 0; } - if (psta->ieee8021x_blocked == _TRUE) + if (psta->ieee8021x_blocked == true) { pattrib->encrypt = 0; } @@ -217,11 +217,11 @@ s32 update_tdls_attrib(_adapter *padapter, struct pkt_attrib *pattrib) } if (pattrib->encrypt && - ((padapter->securitypriv.sw_encrypt == _TRUE) || (psecuritypriv->hw_decrypted == _FALSE))) + ((padapter->securitypriv.sw_encrypt == true) || (psecuritypriv->hw_decrypted == false))) { - pattrib->bswenc = _TRUE; + pattrib->bswenc = true; } else { - pattrib->bswenc = _FALSE; + pattrib->bswenc = false; } //qos_en, ht_en, init rate, ,bw, ch_offset, sgi @@ -231,12 +231,12 @@ s32 update_tdls_attrib(_adapter *padapter, struct pkt_attrib *pattrib) pattrib->bwmode = psta->htpriv.bwmode; pattrib->ch_offset = psta->htpriv.ch_offset; pattrib->sgi= psta->htpriv.sgi; - pattrib->ampdu_en = _FALSE; + pattrib->ampdu_en = false; //if(pattrib->ht_en && psta->htpriv.ampdu_enable) //{ // if(psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority)) - // pattrib->ampdu_en = _TRUE; + // pattrib->ampdu_en = true; //} exit: @@ -257,13 +257,13 @@ void free_tdls_sta(_adapter *padapter, struct sta_info *ptdls_sta) _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); if( ptdlsinfo->sta_cnt < (NUM_STA - 2) ) // -2: AP + BC/MC sta { - ptdlsinfo->sta_maximum = _FALSE; + ptdlsinfo->sta_maximum = false; _rtw_memset( &ptdlsinfo->ss_record, 0x00, sizeof(struct tdls_ss_record) ); } //ready to clear cam if(ptdls_sta->mac_id!=0){ ptdlsinfo->clear_cam=ptdls_sta->mac_id; - rtw_setstakey_cmd(padapter, (u8 *)ptdls_sta, _TRUE, _TRUE); + rtw_setstakey_cmd(padapter, (u8 *)ptdls_sta, true, true); } if(ptdlsinfo->sta_cnt==0){ @@ -294,7 +294,7 @@ void rtw_tdls_set_key(_adapter *adapter, struct rx_pkt_attrib *prx_pkt_attrib, s if(prx_pkt_attrib->encrypt) { ptdls_sta->dot118021XPrivacy=_AES_; - rtw_setstakey_cmd(adapter, (u8*)ptdls_sta, _TRUE, _TRUE); + rtw_setstakey_cmd(adapter, (u8*)ptdls_sta, true, true); } } @@ -315,13 +315,13 @@ void rtw_tdls_process_ht_cap(_adapter *adapter, struct sta_info *ptdls_sta, u8 * if(ptdls_sta->flags & WLAN_STA_HT) { - if(adapter->registrypriv.ht_enable == _TRUE) + if(adapter->registrypriv.ht_enable == true) { - ptdls_sta->htpriv.ht_option = _TRUE; + ptdls_sta->htpriv.ht_option = true; } else { - ptdls_sta->htpriv.ht_option = _FALSE; + ptdls_sta->htpriv.ht_option = false; ptdls_sta->stat_code = _STATS_FAILURE_; } } @@ -331,12 +331,12 @@ void rtw_tdls_process_ht_cap(_adapter *adapter, struct sta_info *ptdls_sta, u8 * { //check if sta supports rx ampdu if(adapter->registrypriv.ampdu_enable==1) - ptdls_sta->htpriv.ampdu_enable = _TRUE; + ptdls_sta->htpriv.ampdu_enable = true; //check if sta support s Short GI if(ptdls_sta->htpriv.ht_cap.cap_info & cpu_to_le16(IEEE80211_HT_CAP_SGI_20|IEEE80211_HT_CAP_SGI_40)) { - ptdls_sta->htpriv.sgi = _TRUE; + ptdls_sta->htpriv.sgi = true; } // bwmode would still followed AP's setting @@ -550,7 +550,7 @@ void issue_tdls_setup_req(_adapter *padapter, u8 *mac_addr) static u8 dialogtoken = 0; u32 timeout_interval= TPK_RESEND_COUNT * 1000; //retry timer should set at least 301 sec, using TPK_count counting 301 times. - if(ptdlsinfo->ap_prohibited == _TRUE) + if(ptdlsinfo->ap_prohibited == true) goto exit; if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) @@ -586,7 +586,7 @@ void issue_tdls_setup_req(_adapter *padapter, u8 *mac_addr) _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); if( ptdlsinfo->sta_cnt == (NUM_STA - 2) ) // -2: AP + BC/MC sta { - ptdlsinfo->sta_maximum = _TRUE; + ptdlsinfo->sta_maximum = true; } } else @@ -992,9 +992,9 @@ void issue_tdls_ch_switch_rsp(_adapter *padapter, u8 *mac_addr) pattrib->qsel=pattrib->priority; /* _enter_critical_bh(&pxmitpriv->lock, &irqL); - if(xmitframe_enqueue_for_tdls_sleeping_sta(padapter, pmgntframe)==_TRUE){ + if(xmitframe_enqueue_for_tdls_sleeping_sta(padapter, pmgntframe)==true){ _exit_critical_bh(&pxmitpriv->lock, &irqL); - return _FALSE; + return false; } */ if(rtw_xmit_tdls_coalesce(padapter, pmgntframe, TDLS_CHANNEL_SWITCH_RESPONSE) !=_SUCCESS ){ @@ -1032,7 +1032,7 @@ sint On_TDLS_Dis_Rsp(_adapter *adapter, union recv_frame *precv_frame) ptdls_sta->tdls_sta_state |= TDLS_ALIVE_STATE; //Record the tdls sta with lowest signal strength - if( (ptdlsinfo->sta_maximum == _TRUE) && (ptdls_sta->alive_count >= 1) ) + if( (ptdlsinfo->sta_maximum == true) && (ptdls_sta->alive_count >= 1) ) { if( _rtw_memcmp(ptdlsinfo->ss_record.macaddr, empty_addr, ETH_ALEN) ) { @@ -1052,7 +1052,7 @@ sint On_TDLS_Dis_Rsp(_adapter *adapter, union recv_frame *precv_frame) } else { - if( ptdlsinfo->sta_maximum == _TRUE) + if( ptdlsinfo->sta_maximum == true) { if( _rtw_memcmp( ptdlsinfo->ss_record.macaddr, empty_addr, ETH_ALEN ) ) { @@ -1122,7 +1122,7 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame) -PAYLOAD_TYPE_LEN -FIXED_IE; - if(ptdlsinfo->ap_prohibited == _TRUE) + if(ptdlsinfo->ap_prohibited == true) { goto exit; } @@ -1192,7 +1192,7 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame) ppairwise_cipher=prsnie+10; _rtw_memcpy(&pairwise_count, (u16*)(ppairwise_cipher-2), 1); for(k=0;kdata, 6) == _FALSE) + if(_rtw_memcmp(get_bssid(pmlmepriv), pIE->data, 6) == false) { //not in the same BSS ptdls_sta->stat_code=7; @@ -1275,7 +1275,7 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame) _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); if( ptdlsinfo->sta_cnt == (NUM_STA - 2) ) // -2: AP + BC/MC sta { - ptdlsinfo->sta_maximum = _TRUE; + ptdlsinfo->sta_maximum = true; } #ifdef CONFIG_WFD @@ -1380,7 +1380,7 @@ sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame) ppairwise_cipher=prsnie+10; _rtw_memcpy(&pairwise_count, (u16*)(ppairwise_cipher-2), 2); for(k=0;kdata + 12; - if( (MacAddr_isBcst(dst) == _FALSE) && (_rtw_memcmp(myid(&(adapter->eeprompriv)), dst, 6) == _FALSE) ) + if( (MacAddr_isBcst(dst) == false) && (_rtw_memcmp(myid(&(adapter->eeprompriv)), dst, 6) == false) ) { goto exit; } @@ -1716,7 +1716,7 @@ sint On_TDLS_Peer_Traffic_Rsp(_adapter *adapter, union recv_frame *precv_frame) xmitframe_plist = get_next(xmitframe_phead); //transmit buffered frames - while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE) + while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == false) { pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); xmitframe_plist = get_next(xmitframe_plist); @@ -1731,7 +1731,7 @@ sint On_TDLS_Peer_Traffic_Rsp(_adapter *adapter, union recv_frame *precv_frame) pxmitframe->attrib.eosp = 1; } //pxmitframe->attrib.triggered = 1; //maybe doesn't need in TDLS - if(adapter->HalFunc.hal_xmit(adapter, pxmitframe) == _TRUE) + if(adapter->HalFunc.hal_xmit(adapter, pxmitframe) == true) { rtw_os_xmit_complete(adapter, pxmitframe); } @@ -1987,7 +1987,7 @@ void wfd_ie_tdls(_adapter * padapter, u8 *pframe, u32 *pktlen ) // Value: // Associated BSSID - if ( check_fwstate( pmlmepriv, _FW_LINKED) == _TRUE ) + if ( check_fwstate( pmlmepriv, _FW_LINKED) == true ) { _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); } @@ -2880,7 +2880,7 @@ int update_sgi_tdls(_adapter *padapter, struct sta_info *psta) return psta_ht->sgi; } else - return _FALSE; + return false; } u32 update_mask_tdls(_adapter *padapter, struct sta_info *psta) diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index 302a843..879f8f2 100755 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -77,10 +77,10 @@ int cckrates_included(unsigned char *rate, int ratelen) { if ( (((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) || (((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22) ) - return _TRUE; + return true; } - return _FALSE; + return false; } @@ -92,10 +92,10 @@ int cckratesonly_included(unsigned char *rate, int ratelen) { if ( (((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) && (((rate[i]) & 0x7f) != 11) && (((rate[i]) & 0x7f) != 22) ) - return _FALSE; + return false; } - return _TRUE; + return true; } unsigned char networktype_to_raid(unsigned char network_type) @@ -158,11 +158,11 @@ u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int ratelen network_type = WIRELESS_11_24N; } - if ((cckratesonly_included(rate, ratelen)) == _TRUE) + if ((cckratesonly_included(rate, ratelen)) == true) { network_type |= WIRELESS_11B; } - else if((cckrates_included(rate, ratelen)) == _TRUE) + else if((cckrates_included(rate, ratelen)) == true) { network_type |= WIRELESS_11BG; } @@ -251,12 +251,12 @@ int is_basicrate(struct adapter *padapter, unsigned char rate) { if (rate == ratetbl_val_2wifirate(val)) { - return _TRUE; + return true; } } } - return _FALSE; + return false; } unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *rateset); @@ -282,7 +282,7 @@ unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *rateset) default: rate = ratetbl_val_2wifirate(rate); - if (is_basicrate(padapter, rate) == _TRUE) + if (is_basicrate(padapter, rate) == true) { rate |= IEEE80211_BASIC_RATE_MASK; } @@ -355,19 +355,19 @@ void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen) void Save_DM_Func_Flag(struct adapter *padapter) { - u8 bSaveFlag = _TRUE; + u8 bSaveFlag = true; rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag)); } void Restore_DM_Func_Flag(struct adapter *padapter) { - u8 bSaveFlag = _FALSE; + u8 bSaveFlag = false; rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag)); } void Switch_DM_Func(struct adapter *padapter, u32 mode, u8 enable) { - if(enable == _TRUE) + if(enable == true) rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_SET, (u8 *)(&mode)); else rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode)); @@ -588,7 +588,7 @@ int is_client_associated_to_ap(struct adapter *padapter) if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE)) { - return _TRUE; + return true; } else { @@ -603,7 +603,7 @@ int is_client_associated_to_ibss(struct adapter *padapter) if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE)) { - return _TRUE; + return true; } else { @@ -625,7 +625,7 @@ int is_IBSS_empty(struct adapter *padapter) } } - return _TRUE; + return true; } @@ -759,7 +759,7 @@ void flush_all_cam_entry(struct adapter *padapter) struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); //if(check_buddy_mlmeinfo_state(padapter, _HW_STATE_NOLINK_)) - if(check_buddy_fwstate(padapter, _FW_LINKED) == _FALSE) + if(check_buddy_fwstate(padapter, _FW_LINKED) == false) { rtw_hal_set_hwreg(padapter, HW_VAR_CAM_INVALID_ALL, 0); } @@ -782,10 +782,10 @@ void flush_all_cam_entry(struct adapter *padapter) cam_id = 4; } //clear_cam_entry(padapter, cam_id); - rtw_clearstakey_cmd(padapter, (u8*)psta, cam_id, _FALSE); + rtw_clearstakey_cmd(padapter, (u8*)psta, cam_id, false); } } - else if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + else if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { //clear cam when ap free per sta_info } @@ -824,7 +824,7 @@ int WFD_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) { pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); DBG_8192C( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); - return( _TRUE ); + return( true ); } } else @@ -851,7 +851,7 @@ int WMM_param_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) pmlmeinfo->WMM_enable = 1; _rtw_memcpy(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_element)); - return _TRUE; + return true; /*if (pregpriv->wifi_spec == 1) { @@ -864,7 +864,7 @@ int WMM_param_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) { pmlmeinfo->WMM_enable = 1; _rtw_rtw_memcpy(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_element)); - return _TRUE; + return true; } } else @@ -963,13 +963,13 @@ void WMMOnAssocRsp(struct adapter *padapter) //compare CW and AIFS if((edca[j] & 0xFFFF) < (edca[i] & 0xFFFF)) { - change_inx = _TRUE; + change_inx = true; } else if((edca[j] & 0xFFFF) == (edca[i] & 0xFFFF)) { //compare TXOP if((edca[j] >> 16) > (edca[i] >> 16)) - change_inx = _TRUE; + change_inx = true; } if(change_inx) @@ -982,7 +982,7 @@ void WMMOnAssocRsp(struct adapter *padapter) inx[i] = inx[j]; inx[j] = tmp; - change_inx = _FALSE; + change_inx = false; } } } @@ -1011,7 +1011,7 @@ static void bwmode_update_check(struct adapter *padapter, PNDIS_802_11_VARIABLE_ if(!pIE) return; - if(phtpriv->ht_option == _FALSE) return; + if(phtpriv->ht_option == false) return; if(pIE->Length > sizeof(struct HT_info_element)) return; @@ -1047,7 +1047,7 @@ static void bwmode_update_check(struct adapter *padapter, PNDIS_802_11_VARIABLE_ if((new_bwmode!= pmlmeext->cur_bwmode) || (new_ch_offset!=pmlmeext->cur_ch_offset)) { - pmlmeinfo->bwmode_updated = _TRUE; + pmlmeinfo->bwmode_updated = true; pmlmeext->cur_bwmode = new_bwmode; pmlmeext->cur_ch_offset = new_ch_offset; @@ -1057,11 +1057,11 @@ static void bwmode_update_check(struct adapter *padapter, PNDIS_802_11_VARIABLE_ } else { - pmlmeinfo->bwmode_updated = _FALSE; + pmlmeinfo->bwmode_updated = false; } - if(_TRUE == pmlmeinfo->bwmode_updated) + if(true == pmlmeinfo->bwmode_updated) { struct sta_info *psta; WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); @@ -1090,7 +1090,7 @@ static void bwmode_update_check(struct adapter *padapter, PNDIS_802_11_VARIABLE_ } - //pmlmeinfo->bwmode_updated = _FALSE;//bwmode_updated done, reset it! + //pmlmeinfo->bwmode_updated = false;//bwmode_updated done, reset it! } #endif //CONFIG_80211N_HT @@ -1110,7 +1110,7 @@ void HT_caps_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) if(pIE==NULL) return; - if(phtpriv->ht_option == _FALSE) return; + if(phtpriv->ht_option == false) return; pmlmeinfo->HT_caps_enable = 1; @@ -1193,7 +1193,7 @@ void HT_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) if(pIE==NULL) return; - if(phtpriv->ht_option == _FALSE) return; + if(phtpriv->ht_option == false) return; if(pIE->Length > sizeof(struct HT_info_element)) @@ -1309,14 +1309,14 @@ int check_ap_tdls_prohibited(u8 *pframe, u8 pkt_len) if(pkt_len < 5) { - return _FALSE; + return false; } pframe += 4; if( (*pframe) & tdls_prohibited_bit ) - return _TRUE; + return true; - return _FALSE; + return false; } #endif //CONFIG_TDLS @@ -1342,8 +1342,8 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) unsigned short ht_cap_info; unsigned char ht_info_infos_0; - if (is_client_associated_to_ap(Adapter) == _FALSE) - return _TRUE; + if (is_client_associated_to_ap(Adapter) == false) + return true; len = packet_len - sizeof(struct rtw_ieee80211_hdr_3addr); @@ -1352,10 +1352,10 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) return _FAIL; } - if (_rtw_memcmp(cur_network->network.MacAddress, pbssid, 6) == _FALSE) { + if (_rtw_memcmp(cur_network->network.MacAddress, pbssid, 6) == false) { DBG_871X("Oops: rtw_check_network_encrypt linked but recv other bssid bcn\n" MAC_FMT MAC_FMT, MAC_ARG(pbssid), MAC_ARG(cur_network->network.MacAddress)); - return _TRUE; + return true; } bssid = (WLAN_BSSID_EX *)rtw_zmalloc(sizeof(WLAN_BSSID_EX)); @@ -1426,12 +1426,12 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) /* checking SSID */ if ((p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _SSID_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_)) == NULL) { DBG_871X("%s marc: cannot find SSID for survey event\n", __func__); - hidden_ssid = _TRUE; + hidden_ssid = true; } else { - hidden_ssid = _FALSE; + hidden_ssid = false; } - if((NULL != p) && (_FALSE == hidden_ssid && (*(p + 1)))) { + if((NULL != p) && (false == hidden_ssid && (*(p + 1)))) { _rtw_memcpy(bssid->Ssid.Ssid, (p + 2), *(p + 1)); bssid->Ssid.SsidLength = *(p + 1); } else { @@ -1444,7 +1444,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) bssid->Ssid.SsidLength, cur_network->network.Ssid.Ssid, cur_network->network.Ssid.SsidLength)); - if (_rtw_memcmp(bssid->Ssid.Ssid, cur_network->network.Ssid.Ssid, 32) == _FALSE || + if (_rtw_memcmp(bssid->Ssid.Ssid, cur_network->network.Ssid.Ssid, 32) == false || bssid->Ssid.SsidLength != cur_network->network.Ssid.SsidLength) { if (bssid->Ssid.Ssid[0] != '\0' && bssid->Ssid.SsidLength != 0) { /* not hidden ssid */ DBG_871X("%s(), SSID is not match return FAIL\n", __func__); @@ -1558,8 +1558,8 @@ void update_beacon_info(struct adapter *padapter, u8 *pframe, uint pkt_len, stru break; #ifdef CONFIG_TDLS case _EXT_CAP_IE_: - if( check_ap_tdls_prohibited(pIE->data, pIE->Length) == _TRUE ) - ptdlsinfo->ap_prohibited = _TRUE; + if( check_ap_tdls_prohibited(pIE->data, pIE->Length) == true ) + ptdlsinfo->ap_prohibited = true; break; #endif //CONFIG_TDLS default: @@ -1619,14 +1619,14 @@ unsigned int is_ap_in_tkip(struct adapter *padapter) case _VENDOR_SPECIFIC_IE_: if ((_rtw_memcmp(pIE->data, RTW_WPA_OUI, 4)) && (_rtw_memcmp((pIE->data + 12), WPA_TKIP_CIPHER, 4))) { - return _TRUE; + return true; } break; case _RSN_IE_2_: if (_rtw_memcmp((pIE->data + 8), RSN_TKIP_CIPHER, 4)) { - return _TRUE; + return true; } default: @@ -1636,11 +1636,11 @@ unsigned int is_ap_in_tkip(struct adapter *padapter) i += (pIE->Length + 2); } - return _FALSE; + return false; } else { - return _FALSE; + return false; } } @@ -1664,13 +1664,13 @@ unsigned int should_forbid_n_rate(struct adapter * padapter) if (_rtw_memcmp(pIE->data, RTW_WPA_OUI, 4) && ((_rtw_memcmp((pIE->data + 12), WPA_CIPHER_SUITE_CCMP, 4)) || (_rtw_memcmp((pIE->data + 16), WPA_CIPHER_SUITE_CCMP, 4)))) - return _FALSE; + return false; break; case _RSN_IE_2_: if ((_rtw_memcmp((pIE->data + 8), RSN_CIPHER_SUITE_CCMP, 4)) || (_rtw_memcmp((pIE->data + 12), RSN_CIPHER_SUITE_CCMP, 4))) - return _FALSE; + return false; default: break; @@ -1679,11 +1679,11 @@ unsigned int should_forbid_n_rate(struct adapter * padapter) i += (pIE->Length + 2); } - return _TRUE; + return true; } else { - return _FALSE; + return false; } } @@ -1707,11 +1707,11 @@ unsigned int is_ap_in_wep(struct adapter *padapter) { case _VENDOR_SPECIFIC_IE_: if (_rtw_memcmp(pIE->data, RTW_WPA_OUI, 4)) - return _FALSE; + return false; break; case _RSN_IE_2_: - return _FALSE; + return false; default: break; @@ -1720,11 +1720,11 @@ unsigned int is_ap_in_wep(struct adapter *padapter) i += (pIE->Length + 2); } - return _TRUE; + return true; } else { - return _FALSE; + return false; } } @@ -2048,13 +2048,13 @@ void update_IOT_info(struct adapter *padapter) pmlmeinfo->turboMode_cts2self = 0; pmlmeinfo->turboMode_rtsen = 1; //disable high power - Switch_DM_Func(padapter, (~DYNAMIC_BB_DYNAMIC_TXPWR), _FALSE); + Switch_DM_Func(padapter, (~DYNAMIC_BB_DYNAMIC_TXPWR), false); break; case HT_IOT_PEER_REALTEK: //rtw_write16(padapter, 0x4cc, 0xffff); //rtw_write16(padapter, 0x546, 0x01c0); //disable high power - Switch_DM_Func(padapter, (~DYNAMIC_BB_DYNAMIC_TXPWR), _FALSE); + Switch_DM_Func(padapter, (~DYNAMIC_BB_DYNAMIC_TXPWR), false); break; default: pmlmeinfo->turboMode_cts2self = 0; @@ -2079,7 +2079,7 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap) { // Short Preamble if(pmlmeinfo->preamble_mode != PREAMBLE_SHORT) // PREAMBLE_LONG or PREAMBLE_AUTO { - ShortPreamble = _TRUE; + ShortPreamble = true; pmlmeinfo->preamble_mode = PREAMBLE_SHORT; rtw_hal_set_hwreg( Adapter, HW_VAR_ACK_PREAMBLE, (u8 *)&ShortPreamble ); } @@ -2088,7 +2088,7 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap) { // Long Preamble if(pmlmeinfo->preamble_mode != PREAMBLE_LONG) // PREAMBLE_SHORT or PREAMBLE_AUTO { - ShortPreamble = _FALSE; + ShortPreamble = false; pmlmeinfo->preamble_mode = PREAMBLE_LONG; rtw_hal_set_hwreg( Adapter, HW_VAR_ACK_PREAMBLE, (u8 *)&ShortPreamble ); } @@ -2166,11 +2166,11 @@ void update_wireless_mode(struct adapter *padapter) network_type = WIRELESS_11_24N; } - if ((cckratesonly_included(rate, ratelen)) == _TRUE) + if ((cckratesonly_included(rate, ratelen)) == true) { network_type |= WIRELESS_11B; } - else if((cckrates_included(rate, ratelen)) == _TRUE) + else if((cckrates_included(rate, ratelen)) == true) { network_type |= WIRELESS_11BG; } @@ -2278,7 +2278,7 @@ void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr) preorder_ctrl->indicate_seq = 0xffff; #endif - preorder_ctrl->enable =(pmlmeinfo->bAcceptAddbaReq == _TRUE)? _TRUE :_FALSE; + preorder_ctrl->enable =(pmlmeinfo->bAcceptAddbaReq == true)? true :false; } } @@ -2329,13 +2329,13 @@ int rtw_handle_dualmac(struct adapter *adapter, bool init) #ifdef CONFIG_DUALMAC_CONCURRENT if (dvobj->InterfaceNumber == 0) { //set adapter_type/iface type - adapter->isprimary = _TRUE; + adapter->isprimary = true; adapter->adapter_type = PRIMARY_struct adapter; adapter->iface_type = IFACE_PORT0; DBG_871X("%s(): PRIMARY_struct adapter\n",__FUNCTION__); } else { //set adapter_type/iface type - adapter->isprimary = _FALSE; + adapter->isprimary = false; adapter->adapter_type = SECONDARY_struct adapter; adapter->iface_type = IFACE_PORT1; DBG_871X("%s(): SECONDARY_struct adapter\n",__FUNCTION__); diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index 577baa9..4664445 100755 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -170,7 +170,7 @@ _func_enter_; pxmitbuf->priv_data = NULL; pxmitbuf->padapter = padapter; - pxmitbuf->ext_tag = _FALSE; + pxmitbuf->ext_tag = false; /* pxmitbuf->pallocated_buf = rtw_zmalloc(MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ); @@ -259,7 +259,7 @@ _func_enter_; pxmitbuf->priv_data = NULL; pxmitbuf->padapter = padapter; - pxmitbuf->ext_tag = _TRUE; + pxmitbuf->ext_tag = true; /* pxmitbuf->pallocated_buf = rtw_zmalloc(max_xmit_extbuf_size); @@ -306,7 +306,7 @@ _func_enter_; pxmitpriv->voq_cnt = 0; #ifdef CONFIG_XMIT_ACK - pxmitpriv->ack_tx = _FALSE; + pxmitpriv->ack_tx = false; _rtw_mutex_init(&pxmitpriv->ack_tx_mutex); rtw_sctx_init(&pxmitpriv->ack_tx_ops, 0); #endif @@ -488,10 +488,10 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame * } else { - while (_TRUE) + while (true) { //IOT action - if((pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_ATHEROS) && (pattrib->ampdu_en==_TRUE) && + if((pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_ATHEROS) && (pattrib->ampdu_en==true) && (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_ )) { pattrib->vcs_mode = CTS_TO_SELF; @@ -532,7 +532,7 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame * //to do list: check MIMO power save condition. //check AMPDU aggregation for TXOP - if(pattrib->ampdu_en==_TRUE) + if(pattrib->ampdu_en==true) { pattrib->vcs_mode = RTS_CTS; break; @@ -566,16 +566,16 @@ static void update_attrib_phy_info(struct pkt_attrib *pattrib, struct sta_info * pattrib->bwmode = psta->htpriv.bwmode; pattrib->ch_offset = psta->htpriv.ch_offset; pattrib->sgi= psta->htpriv.sgi; - pattrib->ampdu_en = _FALSE; + pattrib->ampdu_en = false; #endif //CONFIG_80211N_HT //if(pattrib->ht_en && psta->htpriv.ampdu_enable) //{ // if(psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority)) - // pattrib->ampdu_en = _TRUE; + // pattrib->ampdu_en = true; //} - pattrib->retry_ctrl = _FALSE; + pattrib->retry_ctrl = false; } @@ -664,8 +664,8 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib pattrib->pctrl = 0; - if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) { + if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) || + (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) { _rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); } @@ -743,7 +743,7 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib res =_FAIL; goto exit; } - else if((check_fwstate(pmlmepriv, WIFI_AP_STATE)==_TRUE)&&(!(psta->state & _FW_LINKED))) + else if((check_fwstate(pmlmepriv, WIFI_AP_STATE)==true)&&(!(psta->state & _FW_LINKED))) { res =_FAIL; goto exit; @@ -795,17 +795,17 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib //pattrib->priority = 5; //force to used VI queue, for testing - if (psta->ieee8021x_blocked == _TRUE) + if (psta->ieee8021x_blocked == true) { - RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\n psta->ieee8021x_blocked == _TRUE \n")); + RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\n psta->ieee8021x_blocked == true \n")); pattrib->encrypt = 0; - if((pattrib->ether_type != 0x888e) && (check_fwstate(pmlmepriv, WIFI_MP_STATE) == _FALSE)) + if((pattrib->ether_type != 0x888e) && (check_fwstate(pmlmepriv, WIFI_MP_STATE) == false)) { - RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\npsta->ieee8021x_blocked == _TRUE, pattrib->ether_type(%.4x) != 0x888e\n",pattrib->ether_type)); + RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\npsta->ieee8021x_blocked == true, pattrib->ether_type(%.4x) != 0x888e\n",pattrib->ether_type)); #ifdef DBG_TX_DROP_FRAME - DBG_871X("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == _TRUE, pattrib->ether_type(%04x) != 0x888e\n", __FUNCTION__,pattrib->ether_type); + DBG_871X("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == true, pattrib->ether_type(%04x) != 0x888e\n", __FUNCTION__,pattrib->ether_type); #endif res = _FAIL; goto exit; @@ -888,27 +888,27 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib pattrib->encrypt, padapter->securitypriv.sw_encrypt)); if (pattrib->encrypt && - ((padapter->securitypriv.sw_encrypt == _TRUE) || (psecuritypriv->hw_decrypted == _FALSE))) + ((padapter->securitypriv.sw_encrypt == true) || (psecuritypriv->hw_decrypted == false))) { - pattrib->bswenc = _TRUE; + pattrib->bswenc = true; RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_, - ("update_attrib: encrypt=%d securitypriv.hw_decrypted=%d bswenc=_TRUE\n", + ("update_attrib: encrypt=%d securitypriv.hw_decrypted=%d bswenc=true\n", pattrib->encrypt, padapter->securitypriv.sw_encrypt)); } else { - pattrib->bswenc = _FALSE; - RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("update_attrib: bswenc=_FALSE\n")); + pattrib->bswenc = false; + RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("update_attrib: bswenc=false\n")); } #ifdef CONFIG_CONCURRENT_MODE if((pattrib->encrypt && bmcast) || (pattrib->encrypt ==_WEP40_) || (pattrib->encrypt ==_WEP104_)) { - pattrib->bswenc = _TRUE;//force using sw enc. + pattrib->bswenc = true;//force using sw enc. } #endif #ifdef CONFIG_WAPI_SUPPORT if(pattrib->encrypt == _SMS4_) - pattrib->bswenc = _FALSE; + pattrib->bswenc = false; #endif rtw_set_tx_chksum_offload(pkt, pattrib); @@ -979,7 +979,7 @@ _func_enter_; if(bmcst) { - if(_rtw_memcmp(psecuritypriv->dot118021XGrptxmickey[psecuritypriv->dot118021XGrpKeyid].skey, null_key, 16)==_TRUE){ + if(_rtw_memcmp(psecuritypriv->dot118021XGrptxmickey[psecuritypriv->dot118021XGrpKeyid].skey, null_key, 16)==true){ //DbgPrint("\nxmitframe_addmic:stainfo->dot11tkiptxmickey==0\n"); //rtw_msleep_os(10); return _FAIL; @@ -989,7 +989,7 @@ _func_enter_; } else { - if(_rtw_memcmp(&stainfo->dot11tkiptxmickey.skey[0],null_key, 16)==_TRUE){ + if(_rtw_memcmp(&stainfo->dot11tkiptxmickey.skey[0],null_key, 16)==true){ //DbgPrint("\nxmitframe_addmic:stainfo->dot11tkiptxmickey==0\n"); //rtw_msleep_os(10); return _FAIL; @@ -1117,7 +1117,7 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat struct rtw_ieee80211_hdr *pwlanhdr = (struct rtw_ieee80211_hdr *)hdr; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct qos_priv *pqospriv = &pmlmepriv->qospriv; - u8 qos_option = _FALSE; + u8 qos_option = false; #ifdef CONFIG_TDLS struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct sta_priv *pstapriv = &padapter->stapriv; @@ -1163,7 +1163,7 @@ _func_enter_; if (pattrib->subtype & WIFI_DATA_TYPE) { - if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE)) { + if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true)) { //to_ds = 1, fr_ds = 0; #ifdef CONFIG_TDLS if((ptdlsinfo->setup_state == TDLS_LINKED_STATE)){ @@ -1193,10 +1193,10 @@ _func_enter_; } if (pqospriv->qos_option) - qos_option = _TRUE; + qos_option = true; } - else if ((check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) ) { + else if ((check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) ) { //to_ds = 0, fr_ds = 1; SetFrDs(fctrl); _rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); @@ -1204,16 +1204,16 @@ _func_enter_; _rtw_memcpy(pwlanhdr->addr3, pattrib->src, ETH_ALEN); if(psta->qos_option) - qos_option = _TRUE; + qos_option = true; } - else if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) { + else if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) || + (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) { _rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); _rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); _rtw_memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN); if(psta->qos_option) - qos_option = _TRUE; + qos_option = true; } else { RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("fw_state:%x is not allowed to xmit frame\n", get_fwstate(pmlmepriv))); @@ -1264,11 +1264,11 @@ _func_enter_; if(pattrib->ht_en && psta->htpriv.ampdu_enable) { if(psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority)) - pattrib->ampdu_en = _TRUE; + pattrib->ampdu_en = true; } //re-check if enable ampdu by BA_starting_seqctrl - if(pattrib->ampdu_en == _TRUE) + if(pattrib->ampdu_en == true) { u16 tx_seq; @@ -1278,19 +1278,19 @@ _func_enter_; if(SN_LESS(pattrib->seqnum, tx_seq)) { //DBG_871X("tx ampdu seqnum(%d) < tx_seq(%d)\n", pattrib->seqnum, tx_seq); - pattrib->ampdu_en = _FALSE;//AGG BK + pattrib->ampdu_en = false;//AGG BK } else if(SN_EQUAL(pattrib->seqnum, tx_seq)) { psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (tx_seq+1)&0xfff; - pattrib->ampdu_en = _TRUE;//AGG EN + pattrib->ampdu_en = true;//AGG EN } else { //DBG_871X("tx ampdu over run\n"); psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (pattrib->seqnum+1)&0xfff; - pattrib->ampdu_en = _TRUE;//AGG EN + pattrib->ampdu_en = true;//AGG EN } } @@ -1340,10 +1340,10 @@ s32 rtw_txframes_pending(struct adapter *padapter) { struct xmit_priv *pxmitpriv = &padapter->xmitpriv; - return ((_rtw_queue_empty(&pxmitpriv->be_pending) == _FALSE) || - (_rtw_queue_empty(&pxmitpriv->bk_pending) == _FALSE) || - (_rtw_queue_empty(&pxmitpriv->vi_pending) == _FALSE) || - (_rtw_queue_empty(&pxmitpriv->vo_pending) == _FALSE)); + return ((_rtw_queue_empty(&pxmitpriv->be_pending) == false) || + (_rtw_queue_empty(&pxmitpriv->bk_pending) == false) || + (_rtw_queue_empty(&pxmitpriv->vi_pending) == false) || + (_rtw_queue_empty(&pxmitpriv->vo_pending) == false)); } s32 rtw_txframes_sta_ac_pending(struct adapter *padapter, struct pkt_attrib *pattrib) @@ -1858,7 +1858,7 @@ _func_enter_; frg_inx++; - if (bmcst || (rtw_endofpktfile(&pktfile) == _TRUE)) + if (bmcst || (rtw_endofpktfile(&pktfile) == true)) { pattrib->nr_frags = frg_inx; @@ -1889,7 +1889,7 @@ _func_enter_; xmitframe_swencrypt(padapter, pxmitframe); - if(bmcst == _FALSE) + if(bmcst == false) update_attrib_vcs_info(padapter, pxmitframe); else pattrib->vcs_mode = NONE_VCS; @@ -1945,7 +1945,7 @@ _func_enter_; goto xmitframe_coalesce_success; //IGTK key is not install, it may not support 802.11w - if(padapter->securitypriv.binstallBIPkey != _TRUE) + if(padapter->securitypriv.binstallBIPkey != true) { DBG_871X("no instll BIP key\n"); goto xmitframe_coalesce_success; @@ -2264,7 +2264,7 @@ _func_enter_; _enter_critical(&pfree_queue->lock, &irqL); - if(_rtw_queue_empty(pfree_queue) == _TRUE) { + if(_rtw_queue_empty(pfree_queue) == true) { pxmitbuf = NULL; } else { @@ -2286,7 +2286,7 @@ _func_enter_; pxmitbuf->priv_data = NULL; - //pxmitbuf->ext_tag = _TRUE; + //pxmitbuf->ext_tag = true; if (pxmitbuf->sctx) { DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__); @@ -2344,7 +2344,7 @@ _func_enter_; _enter_critical(&pfree_xmitbuf_queue->lock, &irqL); - if(_rtw_queue_empty(pfree_xmitbuf_queue) == _TRUE) { + if(_rtw_queue_empty(pfree_xmitbuf_queue) == true) { pxmitbuf = NULL; } else { @@ -2366,7 +2366,7 @@ _func_enter_; //DBG_871X("alloc, free_xmitbuf_cnt=%d\n", pxmitpriv->free_xmitbuf_cnt); pxmitbuf->priv_data = NULL; - //pxmitbuf->ext_tag = _FALSE; + //pxmitbuf->ext_tag = false; if (pxmitbuf->sctx) { DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__); rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC); @@ -2485,7 +2485,7 @@ _func_enter_; _enter_critical_bh(&pfree_xmit_queue->lock, &irqL); - if (_rtw_queue_empty(pfree_xmit_queue) == _TRUE) { + if (_rtw_queue_empty(pfree_xmit_queue) == true) { RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_alloc_xmitframe:%d\n", pxmitpriv->free_xmitframe_cnt)); pxframe = NULL; } else { @@ -2520,7 +2520,7 @@ _func_enter_; _enter_critical_bh(&queue->lock, &irqL); - if (_rtw_queue_empty(queue) == _TRUE) { + if (_rtw_queue_empty(queue) == true) { RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_alloc_xmitframe_ext:%d\n", pxmitpriv->free_xframe_ext_cnt)); pxframe = NULL; } else { @@ -2643,7 +2643,7 @@ _func_enter_; phead = get_list_head(pframequeue); plist = get_next(phead); - while (rtw_end_of_queue_search(phead, plist) == _FALSE) + while (rtw_end_of_queue_search(phead, plist) == false) { pxmitframe = LIST_CONTAINOR(plist, struct xmit_frame, list); @@ -2679,7 +2679,7 @@ static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, str xmitframe_phead = get_list_head(pframe_queue); xmitframe_plist = get_next(xmitframe_phead); - while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE) + while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == false) { pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); @@ -2748,7 +2748,7 @@ _func_enter_; sta_phead = get_list_head(phwxmit->sta_queue); sta_plist = get_next(sta_phead); - while ((rtw_end_of_queue_search(sta_phead, sta_plist)) == _FALSE) + while ((rtw_end_of_queue_search(sta_phead, sta_plist)) == false) { ptxservq= LIST_CONTAINOR(sta_plist, struct tx_servq, tx_pending); @@ -2985,7 +2985,7 @@ int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb) struct sk_buff *skb = *pskb; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; _irqL irqL; - //if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) + //if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true) { void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb); int res, is_vlan_tag=0, i, do_nat25=1; @@ -3191,7 +3191,7 @@ static void do_queue_select(struct adapter *padapter, struct pkt_attrib *pattrib RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("### do_queue_select priority=%d ,qsel = %d\n",pattrib->priority ,qsel)); #ifdef CONFIG_CONCURRENT_MODE -// if (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == _TRUE) +// if (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == true) // qsel = 7;// #endif @@ -3250,7 +3250,7 @@ s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt) rcu_read_unlock(); #endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) - if( br_port && check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) + if( br_port && check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true) { res = rtw_br_client_tx(padapter, ppkt); if (res == -1) @@ -3290,7 +3290,7 @@ s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt) #ifdef CONFIG_AP_MODE _enter_critical_bh(&pxmitpriv->lock, &irqL0); - if(xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe) == _TRUE) + if(xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe) == true) { _exit_critical_bh(&pxmitpriv->lock, &irqL0); return 1; @@ -3298,7 +3298,7 @@ s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt) _exit_critical_bh(&pxmitpriv->lock, &irqL0); #endif - if (rtw_hal_xmit(padapter, pxmitframe) == _FALSE) + if (rtw_hal_xmit(padapter, pxmitframe) == false) return 1; return 0; @@ -3307,7 +3307,7 @@ s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt) #ifdef CONFIG_TDLS sint xmitframe_enqueue_for_tdls_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe) { - sint ret=_FALSE; + sint ret=false; _irqL irqL; struct sta_info *ptdls_sta=NULL; @@ -3323,7 +3323,7 @@ sint xmitframe_enqueue_for_tdls_sleeping_sta(struct adapter *padapter, struct xm if(pattrib->triggered==1) { - ret = _TRUE; + ret = true; return ret; } @@ -3367,7 +3367,7 @@ sint xmitframe_enqueue_for_tdls_sleeping_sta(struct adapter *padapter, struct xm //transmit TDLS PTI via AP rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_SD_PTI); } - ret = _TRUE; + ret = true; } @@ -3384,7 +3384,7 @@ sint xmitframe_enqueue_for_tdls_sleeping_sta(struct adapter *padapter, struct xm sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe) { _irqL irqL; - sint ret=_FALSE; + sint ret=false; struct sta_info *psta=NULL; struct sta_priv *pstapriv = &padapter->stapriv; struct pkt_attrib *pattrib = &pxmitframe->attrib; @@ -3400,7 +3400,7 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr } #endif //CONFIG_TDLS - if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _FALSE) + if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == false) return ret; if(pattrib->psta) @@ -3416,13 +3416,13 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr if(psta==NULL) { DBG_871X("%s, psta==NUL\n", __func__); - return _FALSE; + return false; } if(!(psta->state &_FW_LINKED)) { DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state); - return _FALSE; + return false; } if(pattrib->triggered==1) @@ -3460,11 +3460,11 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr //DBG_871X("enqueue, sq_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap); - update_beacon(padapter, _TIM_IE_, NULL, _FALSE);//tx bc/mc packets after upate bcn + update_beacon(padapter, _TIM_IE_, NULL, false);//tx bc/mc packets after upate bcn //_exit_critical_bh(&psta->sleep_q.lock, &irqL); - ret = _TRUE; + ret = true; } @@ -3525,7 +3525,7 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr { //DBG_871X("sleepq_len==1, update BCNTIM\n"); //upate BCN for TIM IE - update_beacon(padapter, _TIM_IE_, NULL, _FALSE); + update_beacon(padapter, _TIM_IE_, NULL, false); } } @@ -3536,7 +3536,7 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr // wakeup_sta_to_xmit(padapter, psta); //} - ret = _TRUE; + ret = true; } @@ -3561,7 +3561,7 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc phead = get_list_head(pframequeue); plist = get_next(phead); - while (rtw_end_of_queue_search(phead, plist) == _FALSE) + while (rtw_end_of_queue_search(phead, plist) == false) { pxmitframe = LIST_CONTAINOR(plist, struct xmit_frame, list); @@ -3569,7 +3569,7 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc ret = xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe); - if(_TRUE == ret) + if(true == ret) { pattrib = &pxmitframe->attrib; @@ -3580,7 +3580,7 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc } else { - //DBG_871X("xmitframe_enqueue_for_sleeping_sta return _FALSE\n"); + //DBG_871X("xmitframe_enqueue_for_sleeping_sta return false\n"); } } @@ -3669,7 +3669,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) xmitframe_phead = get_list_head(&psta->sleep_q); xmitframe_plist = get_next(xmitframe_phead); - while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE) + while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == false) { pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); @@ -3723,7 +3723,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) /* _exit_critical_bh(&psta->sleep_q.lock, &irqL); - if(rtw_hal_xmit(padapter, pxmitframe) == _TRUE) + if(rtw_hal_xmit(padapter, pxmitframe) == true) { rtw_os_xmit_complete(padapter, pxmitframe); } @@ -3743,7 +3743,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) xmitframe_phead = get_list_head(&psta_bmc->sleep_q); xmitframe_plist = get_next(xmitframe_phead); - while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE) + while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == false) { pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); @@ -3761,7 +3761,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) pxmitframe->attrib.triggered = 1; /* _exit_critical_bh(&psta_bmc->sleep_q.lock, &irqL); - if(rtw_hal_xmit(padapter, pxmitframe) == _TRUE) + if(rtw_hal_xmit(padapter, pxmitframe) == true) { rtw_os_xmit_complete(padapter, pxmitframe); } @@ -3824,7 +3824,7 @@ _exit: { //update_BCNTIM(padapter); //printk("%s => call update_beacon\n",__FUNCTION__); - update_beacon(padapter, _TIM_IE_, NULL, _FALSE); + update_beacon(padapter, _TIM_IE_, NULL, false); } } @@ -3845,7 +3845,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst xmitframe_phead = get_list_head(&psta->sleep_q); xmitframe_plist = get_next(xmitframe_phead); - while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE) + while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == false) { pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); @@ -3894,7 +3894,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst pxmitframe->attrib.triggered = 1; /* - if(rtw_hal_xmit(padapter, pxmitframe) == _TRUE) + if(rtw_hal_xmit(padapter, pxmitframe) == true) { rtw_os_xmit_complete(padapter, pxmitframe); } @@ -3916,7 +3916,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst //DBG_871X("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap); //upate BCN for TIM IE //update_BCNTIM(padapter); - update_beacon(padapter, _TIM_IE_, NULL, _FALSE); + update_beacon(padapter, _TIM_IE_, NULL, false); //update_mask = BIT(0); } @@ -3961,7 +3961,7 @@ struct xmit_buf* dequeue_pending_xmitbuf( _enter_critical_bh(&pqueue->lock, &irql); - if (_rtw_queue_empty(pqueue) == _FALSE) + if (_rtw_queue_empty(pqueue) == false) { _list *plist, *phead; @@ -3990,7 +3990,7 @@ struct xmit_buf* dequeue_pending_xmitbuf_under_survey( _enter_critical_bh(&pqueue->lock, &irql); - if (_rtw_queue_empty(pqueue) == _FALSE) + if (_rtw_queue_empty(pqueue) == false) { _list *plist, *phead; u8 type; @@ -4032,10 +4032,10 @@ sint check_pending_xmitbuf( pqueue = &pxmitpriv->pending_xmitbuf_queue; - if(_rtw_queue_empty(pqueue) == _FALSE) - return _TRUE; + if(_rtw_queue_empty(pqueue) == false) + return true; else - return _FALSE; + return false; } thread_return rtw_xmit_thread(thread_context context) @@ -4099,9 +4099,9 @@ bool rtw_sctx_chk_waring_status(int status) case RTW_SCTX_DONE_DRV_STOP: case RTW_SCTX_DONE_DEV_REMOVE: - return _TRUE; + return true; default: - return _FALSE; + return false; } } @@ -4206,7 +4206,7 @@ int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms) { c2h_evt_clear(adapter); } - else if (ccx_id_filter(check_ccx & 0x0F) == _TRUE) + else if (ccx_id_filter(check_ccx & 0x0F) == true) { c2h_evt_hdl(adapter, NULL, ccx_id_filter); if (pack_tx_ops->status != RTW_SCTX_SUBMITTED) diff --git a/hal/HalPhyRf_8188e.c b/hal/HalPhyRf_8188e.c index e4e6c7f..473d360 100755 --- a/hal/HalPhyRf_8188e.c +++ b/hal/HalPhyRf_8188e.c @@ -2771,7 +2771,7 @@ void phy_SetRFPathSwitch_8188E( #if (DM_ODM_SUPPORT_TYPE == ODM_MP) if(!pAdapter->bHWInitReady) #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) - if(pAdapter->hw_init_completed == _FALSE) + if(pAdapter->hw_init_completed == false) #endif { u1Byte u1bTmp; diff --git a/hal/HalPwrSeqCmd.c b/hal/HalPwrSeqCmd.c index f38a8c5..7104bfe 100755 --- a/hal/HalPwrSeqCmd.c +++ b/hal/HalPwrSeqCmd.c @@ -52,7 +52,7 @@ u8 HalPwrSeqCmdParsing( WLAN_PWR_CFG PwrSeqCmd[]) { WLAN_PWR_CFG PwrCfgCmd = {0}; - u8 bPollingBit = _FALSE; + u8 bPollingBit = false; u32 AryIdx = 0; u8 value = 0; u32 offset = 0; @@ -100,20 +100,20 @@ u8 HalPwrSeqCmdParsing( case PWR_CMD_POLLING: RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_POLLING\n")); - bPollingBit = _FALSE; + bPollingBit = false; offset = GET_PWR_CFG_OFFSET(PwrCfgCmd); do { value = rtw_read8(padapter, offset); value &= GET_PWR_CFG_MASK(PwrCfgCmd); if (value == (GET_PWR_CFG_VALUE(PwrCfgCmd) & GET_PWR_CFG_MASK(PwrCfgCmd))) - bPollingBit = _TRUE; + bPollingBit = true; else rtw_udelay_os(10); if (pollingCount++ > maxPollingCnt) { DBG_871X("Fail to polling Offset[%#x]\n", offset); - return _FALSE; + return false; } } while (!bPollingBit); @@ -130,7 +130,7 @@ u8 HalPwrSeqCmdParsing( case PWR_CMD_END: // When this command is parsed, end the process RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_END\n")); - return _TRUE; + return true; break; default: @@ -142,5 +142,5 @@ u8 HalPwrSeqCmdParsing( AryIdx++;//Add Array Index }while(1); - return _TRUE; + return true; } diff --git a/hal/hal_com.c b/hal/hal_com.c index 321616a..22900b9 100755 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -84,16 +84,16 @@ hal_com_get_channel_plan( u8 swConfig; u8 chnlPlan; - swConfig = _TRUE; + swConfig = true; if (!AutoLoadFail) { if (!rtw_is_channel_plan_valid(sw_channel_plan)) - swConfig = _FALSE; + swConfig = false; if (hw_channel_plan & EEPROM_CHANNEL_PLAN_BY_HW_MASK) - swConfig = _FALSE; + swConfig = false; } - if (swConfig == _TRUE) + if (swConfig == true) chnlPlan = sw_channel_plan; else chnlPlan = hw_channel_plan & (~EEPROM_CHANNEL_PLAN_BY_HW_MASK); @@ -289,9 +289,9 @@ Hal_MappingOutPipe( { struct registry_priv *pregistrypriv = &pAdapter->registrypriv; - BOOLEAN bWIFICfg = (pregistrypriv->wifi_spec) ?_TRUE:_FALSE; + BOOLEAN bWIFICfg = (pregistrypriv->wifi_spec) ?true:false; - BOOLEAN result = _TRUE; + BOOLEAN result = true; switch(NumOutPipe) { @@ -305,7 +305,7 @@ Hal_MappingOutPipe( _OneOutPipeMapping(pAdapter); break; default: - result = _FALSE; + result = false; break; } diff --git a/hal/hal_intf.c b/hal/hal_intf.c index 9b55dd4..2436d6b 100755 --- a/hal/hal_intf.c +++ b/hal/hal_intf.c @@ -101,28 +101,28 @@ uint rtw_hal_init(struct adapter *padapter) int i; #ifdef CONFIG_DUALMAC_CONCURRENT - if(padapter->hw_init_completed == _TRUE) + if(padapter->hw_init_completed == true) { - DBG_871X("rtw_hal_init: hw_init_completed == _TRUE\n"); + DBG_871X("rtw_hal_init: hw_init_completed == true\n"); return status; } // before init mac0, driver must init mac1 first to avoid usb rx error. - if((padapter->pbuddy_adapter != NULL) && (padapter->DualMacConcurrent == _TRUE) + if((padapter->pbuddy_adapter != NULL) && (padapter->DualMacConcurrent == true) && (padapter->adapter_type == PRIMARY_ADAPTER)) { - if(padapter->pbuddy_adapter->hw_init_completed == _TRUE) + if(padapter->pbuddy_adapter->hw_init_completed == true) { - DBG_871X("rtw_hal_init: pbuddy_adapter hw_init_completed == _TRUE\n"); + DBG_871X("rtw_hal_init: pbuddy_adapter hw_init_completed == true\n"); } else { status = padapter->HalFunc.hal_init(padapter->pbuddy_adapter); if(status == _SUCCESS){ - padapter->pbuddy_adapter->hw_init_completed = _TRUE; + padapter->pbuddy_adapter->hw_init_completed = true; } else{ - padapter->pbuddy_adapter->hw_init_completed = _FALSE; + padapter->pbuddy_adapter->hw_init_completed = false; RT_TRACE(_module_hal_init_c_,_drv_err_,("rtw_hal_init: hal__init fail(pbuddy_adapter)\n")); DBG_871X("rtw_hal_init: hal__init fail(pbuddy_adapter)\n"); return status; @@ -136,7 +136,7 @@ uint rtw_hal_init(struct adapter *padapter) if(status == _SUCCESS){ for (i = 0; iiface_nums; i++) { padapter = dvobj->padapters[i]; - padapter->hw_init_completed = _TRUE; + padapter->hw_init_completed = true; } if (padapter->registrypriv.notch_filter == 1) @@ -150,7 +150,7 @@ uint rtw_hal_init(struct adapter *padapter) else{ for (i = 0; iiface_nums; i++) { padapter = dvobj->padapters[i]; - padapter->hw_init_completed = _FALSE; + padapter->hw_init_completed = false; } DBG_871X("rtw_hal_init: hal__init fail\n"); } @@ -178,7 +178,7 @@ _func_enter_; if(status == _SUCCESS){ for (i = 0; iiface_nums; i++) { padapter = dvobj->padapters[i]; - padapter->hw_init_completed = _FALSE; + padapter->hw_init_completed = false; } } else @@ -287,7 +287,7 @@ s32 rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmit if(padapter->HalFunc.hal_xmitframe_enqueue) return padapter->HalFunc.hal_xmitframe_enqueue(padapter, pxmitframe); - return _FALSE; + return false; } s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe) @@ -295,7 +295,7 @@ s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe) if(padapter->HalFunc.hal_xmit) return padapter->HalFunc.hal_xmit(padapter, pxmitframe); - return _FALSE; + return false; } s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe) @@ -309,17 +309,17 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe) _rtw_memcpy(pmgntframe->attrib.ra, pwlanhdr->addr1, ETH_ALEN); #ifdef CONFIG_IEEE80211W - if(padapter->securitypriv.binstallBIPkey == _TRUE) + if(padapter->securitypriv.binstallBIPkey == true) { if(IS_MCAST(pmgntframe->attrib.ra)) { pmgntframe->attrib.encrypt = _BIP_; - //pmgntframe->attrib.bswenc = _TRUE; + //pmgntframe->attrib.bswenc = true; } else { pmgntframe->attrib.encrypt = _AES_; - pmgntframe->attrib.bswenc = _TRUE; + pmgntframe->attrib.bswenc = true; } rtw_mgmt_xmitframe_coalesce(padapter, pmgntframe->pkt, pmgntframe); } @@ -367,7 +367,7 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level) pmlmepriv = &(padapter->mlmepriv); - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { add_RATid(padapter, psta, rssi_level); } @@ -464,7 +464,7 @@ u8 rtw_hal_antdiv_before_linked(struct adapter *padapter) { if(padapter->HalFunc.AntDivBeforeLinkHandler) return padapter->HalFunc.AntDivBeforeLinkHandler(padapter); - return _FALSE; + return false; } void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src) { @@ -528,7 +528,7 @@ u8 rtw_hal_sreset_get_wifi_status(struct adapter *padapter) bool rtw_hal_sreset_inprogress(struct adapter *padapter) { - bool inprogress = _FALSE; + bool inprogress = false; padapter = GET_PRIMARY_ADAPTER(padapter); diff --git a/hal/odm.c b/hal/odm.c index 4e24fd6..3565c67 100755 --- a/hal/odm.c +++ b/hal/odm.c @@ -1907,8 +1907,8 @@ odm_DIGInit( //pDM_DigTable->CurMultiSTAConnectState = DIG_MultiSTA_DISCONNECT; pDM_DigTable->RssiLowThresh = DM_DIG_THRESH_LOW; pDM_DigTable->RssiHighThresh = DM_DIG_THRESH_HIGH; - pDM_DigTable->FALowThresh = DM_FALSEALARM_THRESH_LOW; - pDM_DigTable->FAHighThresh = DM_FALSEALARM_THRESH_HIGH; + pDM_DigTable->FALowThresh = DMfalseALARM_THRESH_LOW; + pDM_DigTable->FAHighThresh = DMfalseALARM_THRESH_HIGH; if(pDM_Odm->BoardType & (ODM_BOARD_EXT_PA|ODM_BOARD_EXT_LNA)) { pDM_DigTable->rx_gain_range_max = DM_DIG_MAX_NIC; @@ -2627,8 +2627,8 @@ odm_DIGInit( //pDM_DigTable->CurMultiSTAConnectState = DIG_MultiSTA_DISCONNECT; pDM_DigTable->RssiLowThresh = DM_DIG_THRESH_LOW; pDM_DigTable->RssiHighThresh = DM_DIG_THRESH_HIGH; - pDM_DigTable->FALowThresh = DM_FALSEALARM_THRESH_LOW; - pDM_DigTable->FAHighThresh = DM_FALSEALARM_THRESH_HIGH; + pDM_DigTable->FALowThresh = DMfalseALARM_THRESH_LOW; + pDM_DigTable->FAHighThresh = DMfalseALARM_THRESH_HIGH; if(pDM_Odm->BoardType & (ODM_BOARD_EXT_LNA | ODM_BOARD_EXT_PA)) { pDM_DigTable->rx_gain_range_max = DM_DIG_MAX_NIC; @@ -3601,9 +3601,9 @@ odm_RateAdaptiveMaskInit( #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) pOdmRA->Type = DM_Type_ByDriver; if (pOdmRA->Type == DM_Type_ByDriver) - pDM_Odm->bUseRAMask = _TRUE; + pDM_Odm->bUseRAMask = true; else - pDM_Odm->bUseRAMask = _FALSE; + pDM_Odm->bUseRAMask = false; #endif @@ -4038,12 +4038,12 @@ odm_DynamicTxPowerInit( struct adapter *Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; - pdmpriv->bDynamicTxPowerEnable = _FALSE; + pdmpriv->bDynamicTxPowerEnable = false; #if (RTL8192C_SUPPORT==1) #ifdef CONFIG_INTEL_PROXIM - if((pHalData->BoardType == BOARD_USB_High_PA)||(Adapter->proximity.proxim_support==_TRUE)) + if((pHalData->BoardType == BOARD_USB_High_PA)||(Adapter->proximity.proxim_support==true)) #else if(pHalData->BoardType == BOARD_USB_High_PA) #endif @@ -4051,7 +4051,7 @@ odm_DynamicTxPowerInit( { //odm_SavePowerIndex(Adapter); odm_DynamicTxPowerSavePowerIndex(pDM_Odm); - pdmpriv->bDynamicTxPowerEnable = _TRUE; + pdmpriv->bDynamicTxPowerEnable = true; } else #endif @@ -4369,7 +4369,7 @@ odm_DynamicTxPower_92C( return; #ifdef CONFIG_INTEL_PROXIM - if(Adapter->proximity.proxim_on== _TRUE){ + if(Adapter->proximity.proxim_on== true){ struct proximity_priv *prox_priv=Adapter->proximity.proximity_priv; // Intel set fixed tx power printk("\n %s Adapter->proximity.proxim_on=%d prox_priv->proxim_modeinfo->power_output=%d \n",__FUNCTION__,Adapter->proximity.proxim_on,prox_priv->proxim_modeinfo->power_output); @@ -4410,7 +4410,7 @@ odm_DynamicTxPower_92C( #endif { // STA not connected and AP not connected - if((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) && + if((check_fwstate(pmlmepriv, _FW_LINKED) != true) && (pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) { //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any \n")); @@ -4423,7 +4423,7 @@ odm_DynamicTxPower_92C( return; } - if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) // Default port + if(check_fwstate(pmlmepriv, _FW_LINKED) == true) // Default port { UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB; } @@ -4645,7 +4645,7 @@ odm_DynamicTxPower_92D( #endif // If dynamic high power is disabled. - if( (pdmpriv->bDynamicTxPowerEnable != _TRUE) || + if( (pdmpriv->bDynamicTxPowerEnable != true) || (!(podmpriv->SupportAbility& ODM_BB_DYNAMIC_TXPWR)) ) { pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal; @@ -4653,7 +4653,7 @@ odm_DynamicTxPower_92D( } // STA not connected and AP not connected - if((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) && + if((check_fwstate(pmlmepriv, _FW_LINKED) != true) && (pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) { //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any \n")); @@ -4665,7 +4665,7 @@ odm_DynamicTxPower_92D( return; } - if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) // Default port + if(check_fwstate(pmlmepriv, _FW_LINKED) == true) // Default port { UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB; } @@ -4723,7 +4723,7 @@ odm_DynamicTxPower_92D( pHalData->DynamicTxHighPowerLvl = Adapter->DualMacDMSPControl.CurTxHighLvlForAnotherMacOfDMSP; PHY_SetTxPowerLevel8192D(Adapter, pHalData->CurrentChannel); pHalData->DynamicTxHighPowerLvl = HighPowerLvlBackForMac0; - Adapter->DualMacDMSPControl.bChangeTxHighPowerLvlForAnotherMacOfDMSP = _FALSE; + Adapter->DualMacDMSPControl.bChangeTxHighPowerLvlForAnotherMacOfDMSP = false; } } #endif @@ -4748,7 +4748,7 @@ odm_DynamicTxPower_92D( if(Adapter->bSlaveOfDMSP) { //ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() bslave case \n")); - BuddyAdapter->DualMacDMSPControl.bChangeTxHighPowerLvlForAnotherMacOfDMSP = _TRUE; + BuddyAdapter->DualMacDMSPControl.bChangeTxHighPowerLvlForAnotherMacOfDMSP = true; BuddyAdapter->DualMacDMSPControl.CurTxHighLvlForAnotherMacOfDMSP = pHalData->DynamicTxHighPowerLvl; } else @@ -4939,7 +4939,7 @@ IN struct adapter *pAdapter //1 1.Determine the minimum RSSI - if((pDM_Odm->bLinked != _TRUE) && + if((pDM_Odm->bLinked != true) && (pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) pdmpriv->MinUndecoratedPWDBForDM = 0; else @@ -4961,10 +4961,10 @@ odm_RSSIMonitorCheckCE( u8 sta_cnt=0; u32 PWDB_rssi[NUM_STA]={0};//[0~15]:MACID, [16~31]:PWDB_rssi - if(pDM_Odm->bLinked != _TRUE) + if(pDM_Odm->bLinked != true) return; - //if(check_fwstate(&Adapter->mlmepriv, WIFI_AP_STATE|WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == _TRUE) + //if(check_fwstate(&Adapter->mlmepriv, WIFI_AP_STATE|WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == true) { #if 1 struct sta_info *psta; @@ -5005,7 +5005,7 @@ odm_RSSIMonitorCheckCE( phead = &(pstapriv->sta_hash[i]); plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); @@ -5046,7 +5046,7 @@ odm_RSSIMonitorCheckCE( for(i=0; i< sta_cnt; i++) { if(PWDB_rssi[i] != (0)){ - if(pHalData->fw_ractrl == _TRUE)// Report every sta's RSSI to FW + if(pHalData->fw_ractrl == true)// Report every sta's RSSI to FW { #if(RTL8192D_SUPPORT==1) FillH2CCmd92D(Adapter, H2C_RSSI_REPORT, 3, (u8 *)(&PWDB_rssi[i])); @@ -5230,22 +5230,22 @@ odm_TXPowerTrackingThermalMeterInit( ODM_RT_TRACE(pDM_Odm,COMP_POWER_TRACKING, DBG_LOUD, ("pMgntInfo->bTXPowerTracking = %d\n", pMgntInfo->bTXPowerTracking)); #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) { - pDM_Odm->RFCalibrateInfo.bTXPowerTracking = _TRUE; + pDM_Odm->RFCalibrateInfo.bTXPowerTracking = true; pDM_Odm->RFCalibrateInfo.TXPowercount = 0; - pDM_Odm->RFCalibrateInfo.bTXPowerTrackingInit = _FALSE; + pDM_Odm->RFCalibrateInfo.bTXPowerTrackingInit = false; //#if (MP_DRIVER != 1) //for mp driver, turn off txpwrtracking as default if ( *(pDM_Odm->mp_mode) != 1) - pDM_Odm->RFCalibrateInfo.TxPowerTrackControl = _TRUE; + pDM_Odm->RFCalibrateInfo.TxPowerTrackControl = true; //#endif//#if (MP_DRIVER != 1) MSG_8192C("pDM_Odm TxPowerTrackControl = %d\n", pDM_Odm->RFCalibrateInfo.TxPowerTrackControl); } #elif (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) #ifdef RTL8188E_SUPPORT { - pDM_Odm->RFCalibrateInfo.bTXPowerTracking = _TRUE; + pDM_Odm->RFCalibrateInfo.bTXPowerTracking = true; pDM_Odm->RFCalibrateInfo.TXPowercount = 0; - pDM_Odm->RFCalibrateInfo.bTXPowerTrackingInit = _FALSE; - pDM_Odm->RFCalibrateInfo.TxPowerTrackControl = _TRUE; + pDM_Odm->RFCalibrateInfo.bTXPowerTrackingInit = false; + pDM_Odm->RFCalibrateInfo.TxPowerTrackControl = true; } #endif #endif @@ -6229,7 +6229,7 @@ void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext) { PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext; struct adapter *padapter = pDM_Odm->Adapter; - if(padapter->net_closed == _TRUE) + if(padapter->net_closed == true) return; odm_SwAntDivChkAntSwitch(pDM_Odm, SWAW_STEP_DETERMINE); } @@ -7145,7 +7145,7 @@ odm_EdcaTurboCheckCE( u32 edca_param; u64 cur_tx_bytes = 0; u64 cur_rx_bytes = 0; - u8 bbtchange = _FALSE; + u8 bbtchange = false; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); struct xmit_priv *pxmitpriv = &(Adapter->xmitpriv); struct recv_priv *precvpriv = &(Adapter->recvpriv); @@ -7220,7 +7220,7 @@ odm_EdcaTurboCheckCE( pDM_Odm->DM_EDCA_Table.prv_traffic_idx = trafficIndex; } - pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = _TRUE; + pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = true; } else { // // Turn Off EDCA turbo here. @@ -7229,13 +7229,13 @@ odm_EdcaTurboCheckCE( if(pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA) { rtw_write32(Adapter, REG_EDCA_BE_PARAM, pHalData->AcParam_BE); - pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = _FALSE; + pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = false; } } dm_CheckEdcaTurbo_EXIT: // Set variables for next time. - precvpriv->bIsAnyNonBEPkts = _FALSE; + precvpriv->bIsAnyNonBEPkts = false; pxmitpriv->last_tx_bytes = pxmitpriv->tx_bytes; precvpriv->last_rx_bytes = precvpriv->rx_bytes; #endif diff --git a/hal/odm.h b/hal/odm.h index 7f1c0b6..a5e71d2 100755 --- a/hal/odm.h +++ b/hal/odm.h @@ -211,7 +211,7 @@ typedef struct _Dynamic_Power_Saving_ }PS_T,*pPS_T; -typedef struct _FALSE_ALARM_STATISTICS{ +typedef struct false_ALARM_STATISTICS{ u4Byte Cnt_Parity_Fail; u4Byte Cnt_Rate_Illegal; u4Byte Cnt_Crc8_fail; @@ -1477,8 +1477,8 @@ typedef enum tag_DIG_Connect_Definition #define DM_DIG_THRESH_HIGH 40 #define DM_DIG_THRESH_LOW 35 -#define DM_FALSEALARM_THRESH_LOW 400 -#define DM_FALSEALARM_THRESH_HIGH 1000 +#define DMfalseALARM_THRESH_LOW 400 +#define DMfalseALARM_THRESH_HIGH 1000 #define DM_DIG_MAX_NIC 0x4A #define DM_DIG_MIN_NIC 0x1e //0x22//0x1c diff --git a/hal/odm_RTL8188E.c b/hal/odm_RTL8188E.c index 182287f..c8ae27d 100755 --- a/hal/odm_RTL8188E.c +++ b/hal/odm_RTL8188E.c @@ -631,7 +631,7 @@ odm_FastAntTrainingCallback( #if (DM_ODM_SUPPORT_TYPE == ODM_CE) struct adapter *padapter = pDM_Odm->Adapter; - if(padapter->net_closed == _TRUE) + if(padapter->net_closed == true) return; //if(*pDM_Odm->pbNet_closed == TRUE) // return; @@ -768,7 +768,7 @@ void odm_FastAntTrainingCallback(void *FunctionContext) { PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext; struct adapter *padapter = pDM_Odm->Adapter; - if(padapter->net_closed == _TRUE) + if(padapter->net_closed == true) return; odm_FastAntTraining(pDM_Odm); } diff --git a/hal/odm_types.h b/hal/odm_types.h index c831ed0..fa43fde 100755 --- a/hal/odm_types.h +++ b/hal/odm_types.h @@ -140,8 +140,8 @@ typedef enum _RT_SPINLOCK_TYPE{ #define DEV_BUS_TYPE RT_PCI_INTERFACE - #define _TRUE 1 - #define _FALSE 0 + #define true 1 + #define false 0 #elif (DM_ODM_SUPPORT_TYPE == ODM_ADSL) @@ -167,8 +167,8 @@ typedef enum _RT_SPINLOCK_TYPE{ #define DEV_BUS_TYPE RT_PCI_INTERFACE - #define _TRUE 1 - #define _FALSE 0 + #define true 1 + #define false 0 #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) #include @@ -212,8 +212,8 @@ typedef enum _RT_SPINLOCK_TYPE{ - #define TRUE _TRUE - #define FALSE _FALSE + #define TRUE true + #define FALSE false #define SET_TX_DESC_ANTSEL_A_88E(__pTxDesc, __Value) SET_BITS_TO_LE_4BYTE(__pTxDesc+8, 24, 1, __Value) diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index 78e429d..c8c27dd 100755 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -41,7 +41,7 @@ static u8 _is_fw_read_cmd_down(struct adapter* padapter, u8 msgbox_num) { - u8 read_down = _FALSE; + u8 read_down = false; int retry_cnts = 100; u8 valid; @@ -51,7 +51,7 @@ static u8 _is_fw_read_cmd_down(struct adapter* padapter, u8 msgbox_num) do{ valid = rtw_read8(padapter,REG_HMETFR) & BIT(msgbox_num); if(0 == valid ){ - read_down = _TRUE; + read_down = true; } #ifdef CONFIG_WOWLAN rtw_msleep_os(2); @@ -75,7 +75,7 @@ static u8 _is_fw_read_cmd_down(struct adapter* padapter, u8 msgbox_num) ******************************************/ static s32 FillH2CCmd_88E(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer) { - u8 bcmd_down = _FALSE; + u8 bcmd_down = false; s32 retry_cnts = 100; u8 h2c_box_num; u32 msgbox_addr; @@ -91,7 +91,7 @@ _func_enter_; padapter = GET_PRIMARY_ADAPTER(padapter); pHalData = GET_HAL_DATA(padapter); - if(padapter->bFWReady == _FALSE) + if(padapter->bFWReady == false) { DBG_8192C("FillH2CCmd_88E(): return H2C cmd because fw is not ready\n"); return ret; @@ -105,7 +105,7 @@ _func_enter_; if (CmdLen > RTL88E_MAX_CMD_LEN) { goto exit; } - if (padapter->bSurpriseRemoved == _TRUE) + if (padapter->bSurpriseRemoved == true) goto exit; //pay attention to if race condition happened in H2C cmd setting. @@ -150,7 +150,7 @@ _func_enter_; rtw_write32(padapter,msgbox_addr, h2c_cmd); #endif - bcmd_down = _TRUE; + bcmd_down = true; // DBG_8192C("MSG_BOX:%d,CmdLen(%d), reg:0x%x =>h2c_cmd:0x%x, reg:0x%x =>h2c_cmd_ex:0x%x ..\n" // ,pHalData->LastHMEBoxNum ,CmdLen,msgbox_addr,h2c_cmd,msgbox_ex_addr,h2c_cmd_ex); @@ -196,7 +196,7 @@ u8 rtl8192c_set_FwSelectSuspend_cmd(struct adapter *padapter ,u8 bfwpoll, u16 pe struct H2C_SS_RFOFF_PARAM param; DBG_8192C("==>%s bfwpoll(%x)\n",__FUNCTION__,bfwpoll); param.gpio_period = period;//Polling GPIO_11 period time - param.ROFOn = (_TRUE == bfwpoll)?1:0; + param.ROFOn = (true == bfwpoll)?1:0; FillH2CCmd_88E(padapter, SELECTIVE_SUSPEND_ROF_CMD, sizeof(param), (u8*)(¶m)); return res; } @@ -208,7 +208,7 @@ u8 rtl8188e_set_rssi_cmd(struct adapter*padapter, u8 *param) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); _func_enter_; - if(pHalData->fw_ractrl == _TRUE){ + if(pHalData->fw_ractrl == true){ }else{ DBG_8192C("==>%s fw dont support RA \n",__FUNCTION__); res=_FAIL; @@ -225,7 +225,7 @@ u8 rtl8188e_set_raid_cmd(struct adapter*padapter, u32 mask) u8 res=_SUCCESS; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); _func_enter_; - if(pHalData->fw_ractrl == _TRUE){ + if(pHalData->fw_ractrl == true){ _rtw_memset(buf, 0, 3); mask = cpu_to_le32( mask ); _rtw_memcpy(buf, &mask, 3); @@ -251,7 +251,7 @@ void rtl8188e_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); //struct dm_priv *pdmpriv = &pHalData->dmpriv; - u8 macid, init_rate, raid, shortGIrate=_FALSE; + u8 macid, init_rate, raid, shortGIrate=false; macid = arg&0x1f; @@ -268,9 +268,9 @@ void rtl8188e_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi init_rate = get_highest_rate_idx(bitmap&0x0fffffff)&0x3f; - shortGIrate = (arg&BIT(5)) ? _TRUE:_FALSE; + shortGIrate = (arg&BIT(5)) ? true:false; - if (shortGIrate==_TRUE) + if (shortGIrate==true) init_rate |= BIT(6); @@ -569,7 +569,7 @@ void ConstructNullFunctionData( SetSeqNum(pwlanhdr, 0); - if (bQoS == _TRUE) { + if (bQoS == true) { struct rtw_ieee80211_hdr_3addr_qos *pwlanqoshdr; SetFrameSubType(pframe, WIFI_QOS_DATA_NULL); @@ -760,7 +760,7 @@ static void ConstructARPResponse( psta = rtw_get_stainfo(&padapter->stapriv, get_my_bssid(&(pmlmeinfo->network))); if (psta != NULL) { - if(_rtw_memcmp(&psta->dot11tkiptxmickey.skey[0],null_key, 16)==_TRUE){ + if(_rtw_memcmp(&psta->dot11tkiptxmickey.skey[0],null_key, 16)==true){ DBG_871X("%s(): STA dot11tkiptxmickey==0\n",__FUNCTION__); } //start to calculate the mic code @@ -895,7 +895,7 @@ static void SetFwRsvdPagePkt(struct adapter *padapter, BOOLEAN bDLFinished) //3 (2) ps-poll *1 page RsvdPageLoc.LocPsPoll = PageNum; ConstructPSPoll(padapter, &ReservedPagePacket[BufIndex], &PSPollLength); - rtl8188e_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], PSPollLength, _TRUE, _FALSE); + rtl8188e_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], PSPollLength, true, false); PageNeed = (u8)PageNum_128(TxDescLen + PSPollLength); PageNum += PageNeed; @@ -909,8 +909,8 @@ static void SetFwRsvdPagePkt(struct adapter *padapter, BOOLEAN bDLFinished) &ReservedPagePacket[BufIndex], &NullDataLength, get_my_bssid(&pmlmeinfo->network), - _FALSE, 0, 0, _FALSE); - rtl8188e_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], NullDataLength, _FALSE, _FALSE); + false, 0, 0, false); + rtl8188e_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], NullDataLength, false, false); PageNeed = (u8)PageNum_128(TxDescLen + NullDataLength); PageNum += PageNeed; @@ -924,8 +924,8 @@ static void SetFwRsvdPagePkt(struct adapter *padapter, BOOLEAN bDLFinished) &ReservedPagePacket[BufIndex], &QosNullLength, get_my_bssid(&pmlmeinfo->network), - _TRUE, 0, 0, _FALSE); - rtl8188e_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], QosNullLength, _FALSE, _FALSE); + true, 0, 0, false); + rtl8188e_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], QosNullLength, false, false); PageNeed = (u8)PageNum_128(TxDescLen + QosNullLength); PageNum += PageNeed; @@ -942,7 +942,7 @@ static void SetFwRsvdPagePkt(struct adapter *padapter, BOOLEAN bDLFinished) &ARPLegnth, currentip ); - rtl8188e_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], ARPLegnth, _FALSE, _FALSE); + rtl8188e_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], ARPLegnth, false, false); switch (psecuritypriv->dot11PrivacyAlgrthm) { @@ -1013,8 +1013,8 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus) struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct sta_info *psta = NULL; #endif - BOOLEAN bSendBeacon=_FALSE; - BOOLEAN bcn_valid = _FALSE; + BOOLEAN bSendBeacon=false; + BOOLEAN bcn_valid = false; u8 DLBcnCount=0; u32 poll = 0; @@ -1048,7 +1048,7 @@ _func_enter_; if(pHalData->RegFwHwTxQCtrl&BIT6) { DBG_871X("HalDownloadRSVDPage(): There is an Adapter is sending beacon.\n"); - bSendBeacon = _TRUE; + bSendBeacon = true; } // Set FWHW_TXQ_CTRL 0x422[6]=0 to tell Hw the packet is not a real beacon frame. @@ -1062,7 +1062,7 @@ _func_enter_; do { // download rsvd page. - SetFwRsvdPagePkt(padapter, _FALSE); + SetFwRsvdPagePkt(padapter, false); DLBcnCount++; do { @@ -1099,7 +1099,7 @@ _func_enter_; poll = 0; do { - SetFwRsvdPagePkt(padapter, _TRUE); + SetFwRsvdPagePkt(padapter, true); DLBcnCount++; do @@ -1310,7 +1310,7 @@ int reset_tsf(struct adapter *Adapter, u8 reset_port ) reset_cnt_after = rtw_read8(Adapter, reg_reset_tsf_cnt); } - return(loop_cnt >= 10) ? _FAIL : _TRUE; + return(loop_cnt >= 10) ? _FAIL : true; } @@ -1386,19 +1386,19 @@ _func_enter_; if(enable){ pwowlan_parm.mode |=FW_WOWLAN_FUN_EN; - pwrpriv->wowlan_magic =_TRUE; + pwrpriv->wowlan_magic =true; if (psecpriv->dot11PrivacyAlgrthm == _WEP40_ || psecpriv->dot11PrivacyAlgrthm == _WEP104_) - pwrpriv->wowlan_unicast =_TRUE; + pwrpriv->wowlan_unicast =true; - if(pwrpriv->wowlan_pattern ==_TRUE){ + if(pwrpriv->wowlan_pattern ==true){ pwowlan_parm.mode |= FW_WOWLAN_PATTERN_MATCH; DBG_871X_LEVEL(_drv_info_, "%s 2.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode ); } - if(pwrpriv->wowlan_magic ==_TRUE){ + if(pwrpriv->wowlan_magic ==true){ pwowlan_parm.mode |=FW_WOWLAN_MAGIC_PKT; DBG_871X_LEVEL(_drv_info_, "%s 3.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode ); } - if(pwrpriv->wowlan_unicast ==_TRUE){ + if(pwrpriv->wowlan_unicast ==true){ pwowlan_parm.mode |=FW_WOWLAN_UNICAST; DBG_871X_LEVEL(_drv_info_, "%s 4.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode ); } @@ -1455,7 +1455,7 @@ _func_enter_; res = FillH2CCmd_88E(padapter, H2C_COM_REMOTE_WAKE_CTRL, 3, (u8 *)&pwowlan_parm); } else { - pwrpriv->wowlan_magic =_FALSE; + pwrpriv->wowlan_magic =false; #ifdef CONFIG_GPIO_WAKEUP rtl8188es_set_output_gpio(padapter, gpio_wake_pin, !gpio_high_active); #endif //CONFIG_GPIO_WAKEUP diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index 257fff4..f370581 100755 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -58,7 +58,7 @@ dm_CheckStatistics( static void dm_CheckPbcGPIO(struct adapter *padapter) { u8 tmp1byte; - u8 bPbcPressed = _FALSE; + u8 bPbcPressed = false; if(!padapter->registrypriv.hw_wps_pbc) return; @@ -81,9 +81,9 @@ static void dm_CheckPbcGPIO(struct adapter *padapter) if (tmp1byte&HAL_8188E_HW_GPIO_WPS_BIT) { - bPbcPressed = _TRUE; + bPbcPressed = true; } - if( _TRUE == bPbcPressed) + if( true == bPbcPressed) { // Here we only set bPbcPressed to true // After trigger PBC, the variable will be set to false @@ -310,9 +310,9 @@ rtl8188e_HalDmWatchDog( IN struct adapter *Adapter ) { - BOOLEAN bFwCurrentInPSMode = _FALSE; - BOOLEAN bFwPSAwake = _TRUE; - u8 hw_init_completed = _FALSE; + BOOLEAN bFwCurrentInPSMode = false; + BOOLEAN bFwPSAwake = true; + u8 hw_init_completed = false; PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); @@ -324,7 +324,7 @@ rtl8188e_HalDmWatchDog( hw_init_completed = Adapter->hw_init_completed; - if (hw_init_completed == _FALSE) + if (hw_init_completed == false) goto skip_dm; #ifdef CONFIG_LPS @@ -336,10 +336,10 @@ rtl8188e_HalDmWatchDog( // Fw is under p2p powersaving mode, driver should stop dynamic mechanism. // modifed by thomas. 2011.06.11. if(Adapter->wdinfo.p2p_ps_mode) - bFwPSAwake = _FALSE; + bFwPSAwake = false; #endif //CONFIG_P2P_PS - if( (hw_init_completed == _TRUE) + if( (hw_init_completed == true) && ((!bFwCurrentInPSMode) && bFwPSAwake)) { // @@ -350,30 +350,30 @@ rtl8188e_HalDmWatchDog( //ODM - if (hw_init_completed == _TRUE) + if (hw_init_completed == true) { - u8 bLinked=_FALSE; - u8 bsta_state = _FALSE; + u8 bLinked=false; + u8 bsta_state = false; #ifdef CONFIG_DISABLE_ODM pHalData->odmpriv.SupportAbility = 0; #endif if(rtw_linked_check(Adapter)) - bLinked = _TRUE; + bLinked = true; #ifdef CONFIG_CONCURRENT_MODE if(pbuddy_adapter && rtw_linked_check(pbuddy_adapter)) - bLinked = _TRUE; + bLinked = true; #endif //CONFIG_CONCURRENT_MODE ODM_CmnInfoUpdate(&pHalData->odmpriv ,ODM_CMNINFO_LINK, bLinked); if (check_fwstate(&Adapter->mlmepriv, WIFI_STATION_STATE)) - bsta_state = _TRUE; + bsta_state = true; #ifdef CONFIG_CONCURRENT_MODE if(pbuddy_adapter && check_fwstate(&pbuddy_adapter->mlmepriv, WIFI_STATION_STATE)) - bsta_state = _TRUE; + bsta_state = true; #endif //CONFIG_CONCURRENT_MODE ODM_CmnInfoUpdate(&pHalData->odmpriv ,ODM_CMNINFO_STATION_STATE, bsta_state); @@ -451,12 +451,12 @@ u8 AntDivBeforeLink8188E(struct adapter *Adapter ) if(pHalData->AntDivCfg==0) { //DBG_8192C("odm_AntDivBeforeLink8192C(): No AntDiv Mechanism.\n"); - return _FALSE; + return false; } - if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) + if(check_fwstate(pmlmepriv, _FW_LINKED) == true) { - return _FALSE; + return false; } @@ -466,14 +466,14 @@ u8 AntDivBeforeLink8188E(struct adapter *Adapter ) pDM_SWAT_Table->CurAntenna = (pDM_SWAT_Table->CurAntenna==Antenna_A)?Antenna_B:Antenna_A; //PHY_SetBBReg(Adapter, rFPGA0_XA_RFInterfaceOE, 0x300, pDM_SWAT_Table->CurAntenna); - rtw_antenna_select_cmd(Adapter, pDM_SWAT_Table->CurAntenna, _FALSE); + rtw_antenna_select_cmd(Adapter, pDM_SWAT_Table->CurAntenna, false); //DBG_8192C("%s change antenna to ANT_( %s ).....\n",__FUNCTION__, (pDM_SWAT_Table->CurAntenna==Antenna_A)?"A":"B"); - return _TRUE; + return true; } else { pDM_SWAT_Table->SWAS_NoLink_State = 0; - return _FALSE; + return false; } } diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c index 2ac4003..be46e3b 100755 --- a/hal/rtl8188e_hal_init.c +++ b/hal/rtl8188e_hal_init.c @@ -41,9 +41,9 @@ static void iol_mode_enable(struct adapter *padapter, u8 enable) //DBG_871X("%s reg_0xf0:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0xf0, reg_0xf0|SW_OFFLOAD_EN); rtw_write8(padapter, REG_SYS_CFG, reg_0xf0|SW_OFFLOAD_EN); - if(padapter->bFWReady == _FALSE) + if(padapter->bFWReady == false) { - printk("bFWReady == _FALSE call reset 8051...\n"); + printk("bFWReady == false call reset 8051...\n"); _8051Reset88E(padapter); } @@ -723,7 +723,7 @@ void _MCUIO_Reset88E(struct adapter *padapter,u8 bReset) { u8 u1bTmp; - if(bReset==_TRUE){ + if(bReset==true){ // Reset MCU IO Wrapper- sugggest by SD1-Gimmy u1bTmp = rtw_read8(padapter, REG_RSV_CTRL+1); rtw_write8(padapter,REG_RSV_CTRL+1, (u1bTmp&(~BIT3))); @@ -738,10 +738,10 @@ void _8051Reset88E(struct adapter *padapter) { u8 u1bTmp; - _MCUIO_Reset88E(padapter,_TRUE); + _MCUIO_Reset88E(padapter,true); u1bTmp = rtw_read8(padapter, REG_SYS_FUNC_EN+1); rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp&(~BIT2)); - _MCUIO_Reset88E(padapter,_FALSE); + _MCUIO_Reset88E(padapter,false); rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp|(BIT2)); DBG_871X("=====> _8051Reset88E(): 8051 reset success .\n"); @@ -845,7 +845,7 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter) // RT_TRACE(_module_hal_init_c_, _drv_err_, ("rtl8723a_FirmwareDownload: %s\n", pFwImageFileName)); #ifdef CONFIG_FILE_FWIMG - if(rtw_is_file_readable(rtw_fw_file_path) == _TRUE) + if(rtw_is_file_readable(rtw_fw_file_path) == true) { DBG_871X("%s accquire FW from file:%s\n", __FUNCTION__, rtw_fw_file_path); pFirmware->eFWSource = FW_SOURCE_IMG_FILE; @@ -920,7 +920,7 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter) _8051Reset88E(padapter); } - _FWDownloadEnable(padapter, _TRUE); + _FWDownloadEnable(padapter, true); fwdl_start_time = rtw_get_current_time(); while(1) { //reset the FWDL chksum @@ -933,7 +933,7 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter) ) break; } - _FWDownloadEnable(padapter, _FALSE); + _FWDownloadEnable(padapter, false); DBG_871X("%s writeFW_retry:%u, time after fwdl_start_time:%ums\n", __FUNCTION__ , writeFW_retry @@ -977,7 +977,7 @@ void rtl8188e_InitializeFirmwareVars(struct adapter *padapter) struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); // Init Fw LPS related. - pwrpriv->bFwCurrentInPSMode = _FALSE; + pwrpriv->bFwCurrentInPSMode = false; // Init H2C counter. by tynli. 2009.12.09. pHalData->LastHMEBoxNum = 0; } @@ -1000,7 +1000,7 @@ SetFwRelatedForWoWLAN8188ES( { int status=_FAIL; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); - u8 bRecover = _FALSE; + u8 bRecover = false; // // 1. Before WoWLAN we need to re-download WoWLAN Fw. // @@ -1022,7 +1022,7 @@ void rtl8188e_InitializeFirmwareVars(struct adapter *padapter) PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter); // Init Fw LPS related. - adapter_to_pwrctl(padapter)->bFwCurrentInPSMode = _FALSE; + adapter_to_pwrctl(padapter)->bFwCurrentInPSMode = false; // Init H2C counter. by tynli. 2009.12.09. pHalData->LastHMEBoxNum = 0; @@ -1084,7 +1084,7 @@ hal_EfusePowerSwitch_RTL8188E( u8 tempval; u16 tmpV16; - if (PwrState == _TRUE) + if (PwrState == true) { rtw_write8(pAdapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_ON); @@ -1108,7 +1108,7 @@ hal_EfusePowerSwitch_RTL8188E( rtw_write16(pAdapter,REG_SYS_CLKR,tmpV16); } - if(bWrite == _TRUE) + if(bWrite == true) { // Enable LDO 2.5V before read/write action tempval = rtw_read8(pAdapter, EFUSE_TEST+3); @@ -1121,7 +1121,7 @@ hal_EfusePowerSwitch_RTL8188E( { rtw_write8(pAdapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_OFF); - if(bWrite == _TRUE){ + if(bWrite == true){ // Disable LDO 2.5V after read/write action tempval = rtw_read8(pAdapter, EFUSE_TEST+3); rtw_write8(pAdapter, EFUSE_TEST+3, (tempval & 0x7F)); @@ -1149,7 +1149,7 @@ static bool efuse_read_phymap( u8 *pos = pbuf; u16 limit = *size; u16 addr = 0; - bool reach_end = _FALSE; + bool reach_end = false; // // Refresh efuse init map as all 0xFF. @@ -1162,7 +1162,7 @@ static bool efuse_read_phymap( // while(addr < limit) { - ReadEFuseByte(Adapter, addr, pos, _FALSE); + ReadEFuseByte(Adapter, addr, pos, false); if(*pos != 0xFF) { pos++; @@ -1170,7 +1170,7 @@ static bool efuse_read_phymap( } else { - reach_end = _TRUE; + reach_end = true; break; } } @@ -1383,14 +1383,14 @@ Hal_EfuseSwitchToBank( IN BOOLEAN bPseudoTest ) { - BOOLEAN bRet = _FALSE; + BOOLEAN bRet = false; u32 value32=0; //RTPRINT(FEEPROM, EFUSE_PG, ("Efuse switch bank to %d\n", bank)); if(bPseudoTest) { fakeEfuseBank = bank; - bRet = _TRUE; + bRet = true; } else { @@ -1398,7 +1398,7 @@ Hal_EfuseSwitchToBank( INCLUDE_MULTI_FUNC_BT(pAdapter)) { value32 = rtw_read32(pAdapter, EFUSE_TEST); - bRet = _TRUE; + bRet = true; switch(bank) { case 0: @@ -1415,13 +1415,13 @@ Hal_EfuseSwitchToBank( break; default: value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_WIFI_SEL_0); - bRet = _FALSE; + bRet = false; break; } rtw_write32(pAdapter, EFUSE_TEST, value32); } else - bRet = _TRUE; + bRet = true; } return bRet; } @@ -1468,7 +1468,7 @@ ReadEFuseByIC( exit: #ifdef DBG_IOL_READ_EFUSE_MAP - if(_rtw_memcmp(logical_map, Adapter->eeprompriv.efuse_eeprom_data, 0x130) == _FALSE) + if(_rtw_memcmp(logical_map, Adapter->eeprompriv.efuse_eeprom_data, 0x130) == false) { int i; DBG_871X("%s compare first 0x130 byte fail\n", __FUNCTION__); @@ -1784,7 +1784,7 @@ static u16 hal_EfuseGetCurrentSize_8188e(IN struct adapter *pAdapter, IN BOOLEAN bPseudoTest) { - int bContinual = _TRUE; + int bContinual = true; u16 efuse_addr = 0; u8 hoffset=0,hworden=0; @@ -1833,7 +1833,7 @@ hal_EfuseGetCurrentSize_8188e(IN struct adapter *pAdapter, } else { - bContinual = _FALSE ; + bContinual = false ; } } @@ -1894,8 +1894,8 @@ hal_EfusePgPacketRead_8188e( { u8 ReadState = PG_STATE_HEADER; - int bContinual = _TRUE; - int bDataEmpty = _TRUE ; + int bContinual = true; + int bDataEmpty = true ; u8 efuse_data,word_cnts = 0; u16 efuse_addr = 0; @@ -1908,9 +1908,9 @@ hal_EfusePgPacketRead_8188e( EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAX_SECTION, (void *)&max_section, bPseudoTest); if(data==NULL) - return _FALSE; + return false; if(offset>max_section) - return _FALSE; + return false; _rtw_memset((void *)data, 0xff, sizeof(u8)*PGPKT_DATA_SIZE); _rtw_memset((void *)tmpdata, 0xff, sizeof(u8)*PGPKT_DATA_SIZE); @@ -1951,7 +1951,7 @@ hal_EfusePgPacketRead_8188e( hworden = efuse_data & 0x0F; } word_cnts = Efuse_CalculateWordCnts(hworden); - bDataEmpty = _TRUE ; + bDataEmpty = true ; if(hoffset==offset) { @@ -1962,11 +1962,11 @@ hal_EfusePgPacketRead_8188e( tmpdata[tmpidx] = efuse_data; if(efuse_data!=0xff) { - bDataEmpty = _FALSE; + bDataEmpty = false; } } } - if(bDataEmpty==_FALSE){ + if(bDataEmpty==false){ ReadState = PG_STATE_DATA; }else{//read next header efuse_addr = efuse_addr + (word_cnts*2)+1; @@ -1980,7 +1980,7 @@ hal_EfusePgPacketRead_8188e( } else{ - bContinual = _FALSE ; + bContinual = false ; } } //------- Data section Read ------------- @@ -1995,9 +1995,9 @@ hal_EfusePgPacketRead_8188e( if( (data[0]==0xff) &&(data[1]==0xff) && (data[2]==0xff) && (data[3]==0xff) && (data[4]==0xff) &&(data[5]==0xff) && (data[6]==0xff) && (data[7]==0xff)) - return _FALSE; + return false; else - return _TRUE; + return true; } @@ -2072,7 +2072,7 @@ hal_EfuseFixHeaderProcess( PgWriteSuccess = Efuse_PgPacketWrite(pAdapter, pFixPkt->offset, badworden, originaldata, bPseudoTest); if(!PgWriteSuccess) - return _FALSE; + return false; else efuse_addr = Efuse_GetCurrentSize(pAdapter, efuseType, bPseudoTest); } @@ -2086,7 +2086,7 @@ hal_EfuseFixHeaderProcess( efuse_addr = efuse_addr + (pFixPkt->word_cnts*2) +1; } *pAddr = efuse_addr; - return _TRUE; + return true; } static BOOLEAN @@ -2097,7 +2097,7 @@ hal_EfusePgPacketWrite2ByteHeader( IN PPGPKT_STRUCT pTargetPkt, IN BOOLEAN bPseudoTest) { - BOOLEAN bRet=_FALSE, bContinual=_TRUE; + BOOLEAN 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; @@ -2117,7 +2117,7 @@ hal_EfusePgPacketWrite2ByteHeader( if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) { //RTPRINT(FEEPROM, EFUSE_PG, ("Repeat over limit for pg_header!!\n")); - return _FALSE; + return false; } efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest); @@ -2139,7 +2139,7 @@ hal_EfusePgPacketWrite2ByteHeader( if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) { //RTPRINT(FEEPROM, EFUSE_PG, ("Repeat over limit for ext_header!!\n")); - return _FALSE; + return false; } efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest); @@ -2151,7 +2151,7 @@ hal_EfusePgPacketWrite2ByteHeader( if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) { //RTPRINT(FEEPROM, EFUSE_PG, ("Repeat over limit for word_en!!\n")); - return _FALSE; + return false; } else { @@ -2167,11 +2167,11 @@ hal_EfusePgPacketWrite2ByteHeader( fixPkt.word_en = tmp_header & 0x0F; fixPkt.word_cnts = Efuse_CalculateWordCnts(fixPkt.word_en); if(!hal_EfuseFixHeaderProcess(pAdapter, efuseType, &fixPkt, &efuse_addr, bPseudoTest)) - return _FALSE; + return false; } else { - bRet = _TRUE; + bRet = true; break; } } @@ -2194,7 +2194,7 @@ hal_EfusePgPacketWrite1ByteHeader( IN PPGPKT_STRUCT pTargetPkt, IN BOOLEAN bPseudoTest) { - BOOLEAN bRet=_FALSE; + BOOLEAN bRet=false; u8 pg_header=0, tmp_header=0; u16 efuse_addr=*pAddr; u8 repeatcnt=0; @@ -2209,7 +2209,7 @@ hal_EfusePgPacketWrite1ByteHeader( { if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) { - return _FALSE; + return false; } efuse_OneByteWrite(pAdapter,efuse_addr, pg_header, bPseudoTest); efuse_OneByteRead(pAdapter,efuse_addr, &tmp_header, bPseudoTest); @@ -2217,7 +2217,7 @@ hal_EfusePgPacketWrite1ByteHeader( if(pg_header == tmp_header) { - bRet = _TRUE; + bRet = true; } else { @@ -2227,7 +2227,7 @@ hal_EfusePgPacketWrite1ByteHeader( fixPkt.word_en = tmp_header & 0x0F; fixPkt.word_cnts = Efuse_CalculateWordCnts(fixPkt.word_en); if(!hal_EfuseFixHeaderProcess(pAdapter, efuseType, &fixPkt, &efuse_addr, bPseudoTest)) - return _FALSE; + return false; } *pAddr = efuse_addr; @@ -2242,7 +2242,7 @@ hal_EfusePgPacketWriteData( IN PPGPKT_STRUCT pTargetPkt, IN BOOLEAN bPseudoTest) { - BOOLEAN bRet=_FALSE; + BOOLEAN bRet=false; u16 efuse_addr=*pAddr; u8 badworden=0; u32 PgWriteSuccess=0; @@ -2253,7 +2253,7 @@ hal_EfusePgPacketWriteData( { // write ok //RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfusePgPacketWriteData ok!!\n")); - return _TRUE; + return true; } else { @@ -2263,9 +2263,9 @@ hal_EfusePgPacketWriteData( PgWriteSuccess = Efuse_PgPacketWrite(pAdapter, pTargetPkt->offset, badworden, pTargetPkt->data, bPseudoTest); if(!PgWriteSuccess) - return _FALSE; + return false; else - return _TRUE; + return true; } return bRet; @@ -2279,7 +2279,7 @@ hal_EfusePgPacketWriteHeader( IN PPGPKT_STRUCT pTargetPkt, IN BOOLEAN bPseudoTest) { - BOOLEAN bRet=_FALSE; + BOOLEAN bRet=false; if(pTargetPkt->offset >= EFUSE_MAX_SECTION_BASE) { @@ -2328,9 +2328,9 @@ wordEnMatched( *pWden = match_word_en; if(match_word_en != 0xf) - return _TRUE; + return true; else - return _FALSE; + return false; } static BOOLEAN @@ -2341,13 +2341,13 @@ hal_EfuseCheckIfDatafollowed( IN BOOLEAN bPseudoTest ) { - BOOLEAN bRet=_FALSE; + BOOLEAN bRet=false; u8 i, efuse_data; for(i=0; i<(word_cnts*2) ; i++) { if(efuse_OneByteRead(pAdapter, (startAddr+i) ,&efuse_data, bPseudoTest)&&(efuse_data != 0xFF)) - bRet = _TRUE; + bRet = true; } return bRet; @@ -2362,7 +2362,7 @@ hal_EfusePartialWriteCheck( IN BOOLEAN bPseudoTest ) { - BOOLEAN bRet=_FALSE; + BOOLEAN 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; @@ -2400,7 +2400,7 @@ hal_EfusePartialWriteCheck( { if(startAddr >= efuse_max_available_len) { - bRet = _FALSE; + bRet = false; break; } @@ -2414,7 +2414,7 @@ hal_EfusePartialWriteCheck( if(ALL_WORDS_DISABLED(efuse_data)) { //RTPRINT(FEEPROM, EFUSE_PG, ("Error condition, all words disabled")); - bRet = _FALSE; + bRet = false; break; } else @@ -2449,7 +2449,7 @@ hal_EfusePartialWriteCheck( if(!PgWriteSuccess) { - bRet = _FALSE; // write fail, return + bRet = false; // write fail, return break; } } @@ -2471,7 +2471,7 @@ hal_EfusePartialWriteCheck( // not used header, 0xff *pAddr = startAddr; //RTPRINT(FEEPROM, EFUSE_PG, ("Started from unused header offset=%d\n", startAddr)); - bRet = _TRUE; + bRet = true; break; } } @@ -2488,7 +2488,7 @@ hal_EfusePgCheckAvailableAddr( u16 efuse_max_available_len=0; //Change to check TYPE_EFUSE_MAP_LEN ,beacuse 8188E raw 256,logic map over 256. - EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&efuse_max_available_len, _FALSE); + EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&efuse_max_available_len, false); //EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&efuse_max_available_len, bPseudoTest); //RTPRINT(FEEPROM, EFUSE_PG, ("efuse_max_available_len = %d\n", efuse_max_available_len)); @@ -2496,9 +2496,9 @@ hal_EfusePgCheckAvailableAddr( if(Efuse_GetCurrentSize(pAdapter, efuseType, bPseudoTest) >= efuse_max_available_len) { //RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfusePgCheckAvailableAddr error!!\n")); - return _FALSE; + return false; } - return _TRUE; + return true; } static void @@ -2533,20 +2533,20 @@ hal_EfusePgPacketWrite_BT( u8 efuseType=EFUSE_BT; if(!hal_EfusePgCheckAvailableAddr(pAdapter, efuseType, bPseudoTest)) - return _FALSE; + return false; hal_EfuseConstructPGPkt(offset, word_en, pData, &targetPkt); if(!hal_EfusePartialWriteCheck(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) - return _FALSE; + return false; if(!hal_EfusePgPacketWriteHeader(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) - return _FALSE; + return false; if(!hal_EfusePgPacketWriteData(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) - return _FALSE; + return false; - return _TRUE; + return true; } static BOOLEAN @@ -2563,20 +2563,20 @@ hal_EfusePgPacketWrite_8188e( u8 efuseType=EFUSE_WIFI; if(!hal_EfusePgCheckAvailableAddr(pAdapter, efuseType, bPseudoTest)) - return _FALSE; + return false; hal_EfuseConstructPGPkt(offset, word_en, pData, &targetPkt); if(!hal_EfusePartialWriteCheck(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) - return _FALSE; + return false; if(!hal_EfusePgPacketWriteHeader(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) - return _FALSE; + return false; if(!hal_EfusePgPacketWriteData(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) - return _FALSE; + return false; - return _TRUE; + return true; } @@ -2962,7 +2962,7 @@ Hal_InitPGData88E(struct adapter *padapter) u32 i; u16 value16; - if(_FALSE == pEEPROM->bautoload_fail_flag) + if(false == pEEPROM->bautoload_fail_flag) { // autoload OK. if (is_boot_from_eeprom(padapter)) { @@ -2976,16 +2976,16 @@ Hal_InitPGData88E(struct adapter *padapter) else { // Read EFUSE real map to shadow. - EFUSE_ShadowMapUpdate(padapter, EFUSE_WIFI, _FALSE); + EFUSE_ShadowMapUpdate(padapter, EFUSE_WIFI, false); } } else {//autoload fail RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("AutoLoad Fail reported from CR9346!!\n")); -// pHalData->AutoloadFailFlag = _TRUE; +// pHalData->AutoloadFailFlag = true; //update to default value 0xFF if (!is_boot_from_eeprom(padapter)) - EFUSE_ShadowMapUpdate(padapter, EFUSE_WIFI, _FALSE); + EFUSE_ShadowMapUpdate(padapter, EFUSE_WIFI, false); } } @@ -3005,11 +3005,11 @@ Hal_EfuseParseIDCode88E( if (EEPROMId != RTL_EEPROM_ID) { DBG_8192C("EEPROM ID(%#x) is invalid!!\n", EEPROMId); - pEEPROM->bautoload_fail_flag = _TRUE; + pEEPROM->bautoload_fail_flag = true; } else { - pEEPROM->bautoload_fail_flag = _FALSE; + pEEPROM->bautoload_fail_flag = false; } DBG_871X("EEPROM ID=0x%04x\n", EEPROMId); @@ -3208,11 +3208,11 @@ Hal_GetChnlGroup88E( OUT u8* pGroup ) { - u8 bIn24G=_TRUE; + u8 bIn24G=true; if(chnl<=14) { - bIn24G=_TRUE; + bIn24G=true; if (chnl < 3) // Chanel 1-2 *pGroup = 0; @@ -3233,7 +3233,7 @@ Hal_GetChnlGroup88E( } else { - bIn24G=_FALSE; + bIn24G=false; if (chnl <=40) *pGroup = 0; @@ -3282,15 +3282,15 @@ void Hal_ReadPowerSavingMode88E( u8 tmpvalue; if(AutoLoadFail){ - pwrctl->bHWPowerdown = _FALSE; - pwrctl->bSupportRemoteWakeup = _FALSE; + pwrctl->bHWPowerdown = false; + pwrctl->bSupportRemoteWakeup = false; } else { //hw power down mode selection , 0:rf-off / 1:power down if(padapter->registrypriv.hwpdn_mode==2) - pwrctl->bHWPowerdown = (hwinfo[EEPROM_RF_FEATURE_OPTION_88E] & BIT4)?_TRUE:_FALSE; + pwrctl->bHWPowerdown = (hwinfo[EEPROM_RF_FEATURE_OPTION_88E] & BIT4)?true:false; else pwrctl->bHWPowerdown = padapter->registrypriv.hwpdn_mode; @@ -3298,7 +3298,7 @@ void Hal_ReadPowerSavingMode88E( // decide hw if support remote wakeup function // if hw supported, 8051 (SIE) will generate WeakUP signal( D+/D- toggle) when autoresume - pwrctl->bSupportRemoteWakeup = (hwinfo[EEPROM_USB_OPTIONAL_FUNCTION0] & BIT1)?_TRUE :_FALSE; + pwrctl->bSupportRemoteWakeup = (hwinfo[EEPROM_USB_OPTIONAL_FUNCTION0] & BIT1)?true :false; DBG_8192C("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,bSupportRemoteWakeup(%x)\n",__FUNCTION__, pwrctl->bHWPwrPindetect, pwrctl->bHWPowerdown, pwrctl->bSupportRemoteWakeup); @@ -3560,7 +3560,7 @@ Hal_ReadThermalMeter_88E( if(pHalData->EEPROMThermalMeter == 0xff || AutoloadFail) { - pHalData->bAPKThermalMeterIgnore = _TRUE; + pHalData->bAPKThermalMeterIgnore = true; pHalData->EEPROMThermalMeter = EEPROM_Default_ThermalMeter_88E; } @@ -3588,11 +3588,11 @@ BOOLEAN HalDetectPwrDownMode88E(struct adapter *Adapter) // 2010/08/25 MH INF priority > PDN Efuse value. if(tmpvalue & BIT(4) && pwrctrlpriv->reg_pdnmode) { - pHalData->pwrdown = _TRUE; + pHalData->pwrdown = true; } else { - pHalData->pwrdown = _FALSE; + pHalData->pwrdown = false; } DBG_8192C("HalDetectPwrDownMode(): PDN=%d\n", pHalData->pwrdown); @@ -3603,7 +3603,7 @@ BOOLEAN HalDetectPwrDownMode88E(struct adapter *Adapter) #ifdef CONFIG_WOWLAN void Hal_DetectWoWMode(struct adapter *pAdapter) { - adapter_to_pwrctl(pAdapter)->bSupportRemoteWakeup = _TRUE; + adapter_to_pwrctl(pAdapter)->bSupportRemoteWakeup = true; DBG_871X("%s\n", __func__); } #endif @@ -3619,7 +3619,7 @@ void Hal_ReadRFGainOffset( // // BB_RF Gain Offset from EEPROM // - //res = rtw_efuse_access(Adapter, _FALSE, 0, EFUSE_MAX_SIZE, buff); + //res = rtw_efuse_access(Adapter, false, 0, EFUSE_MAX_SIZE, buff); if(!AutoloadFail ){ Adapter->eeprompriv.EEPROMRFGainOffset = PROMContent[EEPROM_RF_GAIN_OFFSET_88E]; Adapter->eeprompriv.EEPROMRFGainVal=EFUSE_Read1Byte(Adapter, EEPROM_RF_GAIN_VAL_88E); diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c index 095c43e..fec772b 100755 --- a/hal/rtl8188e_phycfg.c +++ b/hal/rtl8188e_phycfg.c @@ -89,7 +89,7 @@ sic_IsSICReady( IN struct adapter *Adapter ) { - BOOLEAN bRet=_FALSE; + BOOLEAN bRet=false; u32 retryCnt=0; u8 sic_cmd=0xff; @@ -98,11 +98,11 @@ sic_IsSICReady( if(retryCnt++ >= SIC_MAX_POLL_CNT) { //RTPRINT(FPHY, (PHY_SICR|PHY_SICW), ("[SIC], sic_IsSICReady() return FALSE\n")); - return _FALSE; + return false; } //if(RT_SDIO_CANNOT_IO(Adapter)) - // return _FALSE; + // return false; sic_cmd = rtw_read8(Adapter, SIC_CMD_REG); //sic_cmd = PlatformEFIORead1Byte(Adapter, SIC_CMD_REG); @@ -111,7 +111,7 @@ sic_IsSICReady( #endif //RTPRINT(FPHY, (PHY_SICR|PHY_SICW), ("[SIC], sic_IsSICReady(), readback 0x%x=0x%x\n", SIC_CMD_REG, sic_cmd)); if(sic_cmd == SIC_CMD_READY) - return _TRUE; + return true; else { rtw_msleep_os(1); @@ -253,7 +253,7 @@ SIC_SetBBReg( //RTPRINT(FPHY, PHY_SICW, ("[SIC], SIC_SetBBReg() start\n")); /* - while(PlatformAtomicExchange(&pHalData->bChangeBBInProgress, _TRUE) == _TRUE) + while(PlatformAtomicExchange(&pHalData->bChangeBBInProgress, true) == true) { BBWaitCounter ++; delay_ms(10); // 1 ms @@ -280,7 +280,7 @@ SIC_SetBBReg( sic_Write4Byte(Adapter, RegAddr, Data); - //PlatformAtomicExchange(&pHalData->bChangeBBInProgress, _FALSE); + //PlatformAtomicExchange(&pHalData->bChangeBBInProgress, false); //RTPRINT(FPHY, PHY_SICW, ("[SIC], SIC_SetBBReg() end\n")); } @@ -298,7 +298,7 @@ SIC_QueryBBReg( //RTPRINT(FPHY, PHY_SICR, ("[SIC], SIC_QueryBBReg() start\n")); /* - while(PlatformAtomicExchange(&pHalData->bChangeBBInProgress, _TRUE) == _TRUE) + while(PlatformAtomicExchange(&pHalData->bChangeBBInProgress, true) == true) { BBWaitCounter ++; delay_ms(10); // 10 ms @@ -318,7 +318,7 @@ SIC_QueryBBReg( //RTPRINT(FPHY, PHY_SICR, ("[SIC], SIC_QueryBBReg(), 0x%x=0x%x\n", RegAddr, OriginalValue)); //RTPRINT(FPHY, PHY_SICR, ("[SIC], SIC_QueryBBReg() end\n")); - //PlatformAtomicExchange(&pHalData->bChangeBBInProgress, _FALSE); + //PlatformAtomicExchange(&pHalData->bChangeBBInProgress, false); return (ReturnValue); } @@ -355,7 +355,7 @@ SIC_LedOff( { // When SIC is enabled, led pin will be used as debug pin, // so don't execute led function when SIC is enabled. - return _TRUE; + return true; } #endif @@ -1453,7 +1453,7 @@ phy_BB8188E_Config_ParaFile( // // 2. If EEPROM or EFUSE autoload OK, We must config by PHY_REG_PG.txt // - if (pEEPROM->bautoload_fail_flag == _FALSE) + if (pEEPROM->bautoload_fail_flag == false) { pHalData->pwrGroupCnt = 0; @@ -2279,7 +2279,7 @@ PHY_UpdateTxPowerDbm8188E( //Adapter->HalFunc.SetTxPowerLevelHandler(Adapter, pHalData->CurrentChannel);//gtest:todo - return _TRUE; + return true; } @@ -2346,7 +2346,7 @@ _PHY_SetBWMode92C( if(pHalData->rf_chip == RF_PSEUDO_11N) { - //pHalData->SetBWModeInProgress= _FALSE; + //pHalData->SetBWModeInProgress= false; return; } @@ -2588,10 +2588,10 @@ PHY_SwChnl8188E( // Call after initialization IN u8 channel ) { - //struct adapter *Adapter = ADJUST_TO_ADAPTIVE_ADAPTER(pAdapter, _TRUE); + //struct adapter *Adapter = ADJUST_TO_ADAPTIVE_ADAPTER(pAdapter, true); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u8 tmpchannel = pHalData->CurrentChannel; - BOOLEAN bResult = _TRUE; + BOOLEAN bResult = true; if(pHalData->rf_chip == RF_PSEUDO_11N) { @@ -2678,7 +2678,7 @@ phy_SwChnlStepByStep( OUT u32 *delay ) { - return _TRUE; + return true; } @@ -2698,14 +2698,14 @@ phy_SetSwChnlCmdArray( if(CmdTable == NULL) { //RT_ASSERT(FALSE, ("phy_SetSwChnlCmdArray(): CmdTable cannot be NULL.\n")); - return _FALSE; + return false; } if(CmdTableIdx >= CmdTableSz) { //RT_ASSERT(FALSE, // ("phy_SetSwChnlCmdArray(): Access invalid index, please check size of the table, CmdTableIdx:%ld, CmdTableSz:%ld\n", // CmdTableIdx, CmdTableSz)); - return _FALSE; + return false; } pCmd = CmdTable + CmdTableIdx; @@ -2714,7 +2714,7 @@ phy_SetSwChnlCmdArray( pCmd->Para2 = Para2; pCmd->msDelay = msDelay; - return _TRUE; + return true; } @@ -2812,7 +2812,7 @@ PHY_CheckIsLegalRfPath8192C( IN struct adapter *pAdapter, IN u32 eRFPath) { - BOOLEAN rtValue = _TRUE; + BOOLEAN rtValue = true; // NOt check RF Path now.! return rtValue; @@ -2861,7 +2861,7 @@ static BOOLEAN _PHY_QueryRFPathSwitch( ) { // if(is2T) -// return _TRUE; +// return true; if(!pAdapter->hw_init_completed) { @@ -2872,16 +2872,16 @@ static BOOLEAN _PHY_QueryRFPathSwitch( if(is2T) { if(PHY_QueryBBReg(pAdapter, rFPGA0_XB_RFInterfaceOE, BIT5|BIT6) == 0x01) - return _TRUE; + return true; else - return _FALSE; + return false; } else { if(PHY_QueryBBReg(pAdapter, rFPGA0_XA_RFInterfaceOE, 0x300) == 0x02) - return _TRUE; + return true; else - return _FALSE; + return false; } } diff --git a/hal/rtl8188e_rf6052.c b/hal/rtl8188e_rf6052.c index 2503972..2ff6e21 100755 --- a/hal/rtl8188e_rf6052.c +++ b/hal/rtl8188e_rf6052.c @@ -169,12 +169,12 @@ rtl8188e_PHY_RF6052SetCckTxPower( struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; //PMGNT_INFO pMgntInfo=&Adapter->MgntInfo; u32 TxAGC[2]={0, 0}, tmpval=0,pwrtrac_value; - BOOLEAN TurboScanOff = _FALSE; + BOOLEAN TurboScanOff = false; u8 idx1, idx2; u8* ptr; u8 direction; //FOR CE ,must disable turbo scan - TurboScanOff = _TRUE; + TurboScanOff = true; if(pmlmeext->sitesurvey_res.state == SCAN_PROCESS) @@ -182,7 +182,7 @@ rtl8188e_PHY_RF6052SetCckTxPower( TxAGC[RF_PATH_A] = 0x3f3f3f3f; TxAGC[RF_PATH_B] = 0x3f3f3f3f; - TurboScanOff = _TRUE;//disable turbo scan + TurboScanOff = true;//disable turbo scan if(TurboScanOff) { @@ -834,7 +834,7 @@ PHY_RFShadowWrite( IN u32 Data) { RF_Shadow[eRFPath][Offset].Value = (Data & bRFRegOffsetMask); - RF_Shadow[eRFPath][Offset].Driver_Write = _TRUE; + RF_Shadow[eRFPath][Offset].Driver_Write = true; } /* PHY_RFShadowWrite */ @@ -847,21 +847,21 @@ PHY_RFShadowCompare( { u32 reg; // Check if we need to check the register - if (RF_Shadow[eRFPath][Offset].Compare == _TRUE) + if (RF_Shadow[eRFPath][Offset].Compare == true) { reg = PHY_QueryRFReg(Adapter, eRFPath, Offset, bRFRegOffsetMask); // Compare shadow and real rf register for 20bits!! if (RF_Shadow[eRFPath][Offset].Value != reg) { // Locate error position. - RF_Shadow[eRFPath][Offset].ErrorOrNot = _TRUE; + RF_Shadow[eRFPath][Offset].ErrorOrNot = true; //RT_TRACE(COMP_INIT, DBG_LOUD, //("PHY_RFShadowCompare RF-%d Addr%02lx Err = %05lx\n", //eRFPath, Offset, reg)); } return RF_Shadow[eRFPath][Offset].ErrorOrNot ; } - return _FALSE; + return false; } /* PHY_RFShadowCompare */ @@ -872,10 +872,10 @@ PHY_RFShadowRecorver( IN u32 Offset) { // Check if the address is error - if (RF_Shadow[eRFPath][Offset].ErrorOrNot == _TRUE) + if (RF_Shadow[eRFPath][Offset].ErrorOrNot == true) { // Check if we need to recorver the register. - if (RF_Shadow[eRFPath][Offset].Recorver == _TRUE) + if (RF_Shadow[eRFPath][Offset].Recorver == true) { PHY_SetRFReg(Adapter, eRFPath, Offset, bRFRegOffsetMask, RF_Shadow[eRFPath][Offset].Value); @@ -963,9 +963,9 @@ PHY_RFShadowCompareFlagSetAll( { // 2008/11/20 MH For S3S4 test, we only check reg 26/27 now!!!! if (Offset != 0x26 && Offset != 0x27) - PHY_RFShadowCompareFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, _FALSE); + PHY_RFShadowCompareFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, false); else - PHY_RFShadowCompareFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, _TRUE); + PHY_RFShadowCompareFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, true); } } @@ -985,9 +985,9 @@ PHY_RFShadowRecorverFlagSetAll( { // 2008/11/20 MH For S3S4 test, we only check reg 26/27 now!!!! if (Offset != 0x26 && Offset != 0x27) - PHY_RFShadowRecorverFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, _FALSE); + PHY_RFShadowRecorverFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, false); else - PHY_RFShadowRecorverFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, _TRUE); + PHY_RFShadowRecorverFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, true); } } @@ -1005,10 +1005,10 @@ PHY_RFShadowRefresh( for (Offset = 0; Offset <= RF6052_MAX_REG; Offset++) { RF_Shadow[eRFPath][Offset].Value = 0; - RF_Shadow[eRFPath][Offset].Compare = _FALSE; - RF_Shadow[eRFPath][Offset].Recorver = _FALSE; - RF_Shadow[eRFPath][Offset].ErrorOrNot = _FALSE; - RF_Shadow[eRFPath][Offset].Driver_Write = _FALSE; + RF_Shadow[eRFPath][Offset].Compare = false; + RF_Shadow[eRFPath][Offset].Recorver = false; + RF_Shadow[eRFPath][Offset].ErrorOrNot = false; + RF_Shadow[eRFPath][Offset].Driver_Write = false; } } diff --git a/hal/rtl8188e_rxdesc.c b/hal/rtl8188e_rxdesc.c index 60d623a..ca1d1bc 100755 --- a/hal/rtl8188e_rxdesc.c +++ b/hal/rtl8188e_rxdesc.c @@ -278,9 +278,9 @@ void update_recvframe_phyinfo_88e( struct sta_info *psta; //_irqL irqL; - pkt_info.bPacketMatchBSSID =_FALSE; - pkt_info.bPacketToSelf = _FALSE; - pkt_info.bPacketBeacon = _FALSE; + pkt_info.bPacketMatchBSSID =false; + pkt_info.bPacketToSelf = false; + pkt_info.bPacketBeacon = false; wlanhdr = get_recvframe_data(precvframe); @@ -293,7 +293,7 @@ void update_recvframe_phyinfo_88e( pkt_info.bPacketBeacon = pkt_info.bPacketMatchBSSID && (GetFrameSubType(wlanhdr) == WIFI_BEACON); if(pkt_info.bPacketBeacon){ - if(check_fwstate(&padapter->mlmepriv, WIFI_STATION_STATE) == _TRUE){ + if(check_fwstate(&padapter->mlmepriv, WIFI_STATION_STATE) == true){ sa = padapter->mlmepriv.cur_network.network.MacAddress; } else @@ -319,7 +319,7 @@ void update_recvframe_phyinfo_88e( precvframe->u.hdr.psta = NULL; if (pkt_info.bPacketMatchBSSID && - (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == _TRUE)) + (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == true)) { if (psta) { @@ -330,7 +330,7 @@ void update_recvframe_phyinfo_88e( } else if (pkt_info.bPacketToSelf || pkt_info.bPacketBeacon) { - if (check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == _TRUE) + if (check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == true) { if (psta) { diff --git a/hal/rtl8188e_xmit.c b/hal/rtl8188e_xmit.c index 53f6e6e..12e01a7 100755 --- a/hal/rtl8188e_xmit.c +++ b/hal/rtl8188e_xmit.c @@ -66,19 +66,19 @@ void handle_txrpt_ccx_88e(struct adapter *adapter, u8 *buf) void _dbg_dump_tx_info(struct adapter *padapter,int frame_tag,struct tx_desc *ptxdesc) { u8 bDumpTxPkt; - u8 bDumpTxDesc = _FALSE; + u8 bDumpTxDesc = false; rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DUMP_TXPKT, &(bDumpTxPkt)); if(bDumpTxPkt ==1){//dump txdesc for data frame DBG_871X("dump tx_desc for data frame\n"); if((frame_tag&0x0f) == DATA_FRAMETAG){ - bDumpTxDesc = _TRUE; + bDumpTxDesc = true; } } else if(bDumpTxPkt ==2){//dump txdesc for mgnt frame DBG_871X("dump tx_desc for mgnt frame\n"); if((frame_tag&0x0f) == MGNT_FRAMETAG){ - bDumpTxDesc = _TRUE; + bDumpTxDesc = true; } } else if(bDumpTxPkt ==3){//dump early info diff --git a/hal/rtl8188eu_led.c b/hal/rtl8188eu_led.c index 041b1f7..2836b1f 100755 --- a/hal/rtl8188eu_led.c +++ b/hal/rtl8188eu_led.c @@ -50,7 +50,7 @@ SwLedOn( u8 LedCfg; //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); - if( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)) + if( (padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true)) { return; } @@ -70,7 +70,7 @@ SwLedOn( break; } - pLed->bLedOn = _TRUE; + pLed->bLedOn = true; } @@ -87,7 +87,7 @@ SwLedOff( u8 LedCfg; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); - if((padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)) + if((padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true)) { goto exit; } @@ -98,7 +98,7 @@ SwLedOff( switch(pLed->LedPin) { case LED_PIN_LED0: - if(pHalData->bLedOpenDrain == _TRUE) // Open-drain arrangement for controlling the LED) + if(pHalData->bLedOpenDrain == true) // Open-drain arrangement for controlling the LED) { LedCfg &= 0x90; // Set to software control. rtw_write8(padapter, REG_LEDCFG2, (LedCfg|BIT3)); @@ -121,7 +121,7 @@ SwLedOff( break; } exit: - pLed->bLedOn = _FALSE; + pLed->bLedOn = false; } diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c index 5b92228..823a26e 100755 --- a/hal/rtl8188eu_xmit.c +++ b/hal/rtl8188eu_xmit.c @@ -113,7 +113,7 @@ void rtl8188e_fill_fake_txdesc( ptxdesc->txdw3 |= cpu_to_le32((8 <<28)); //set bit3 to 1. Suugested by TimChen. 2009.12.29. } - if (_TRUE == IsBTQosNull) + if (true == IsBTQosNull) { ptxdesc->txdw2 |= cpu_to_le32(BIT(23)); // BT NULL } @@ -243,7 +243,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag if (padapter->registrypriv.mp_mode == 0) { if((!bagg_pkt) &&(urb_zero_packet_chk(padapter, sz)==0))//(sz %512) != 0 - //if((!bagg_pkt) &&(rtw_usb_bulk_size_boundary(padapter,TXDESC_SIZE+sz)==_FALSE)) + //if((!bagg_pkt) &&(rtw_usb_bulk_size_boundary(padapter,TXDESC_SIZE+sz)==false)) { ptxdesc = (struct tx_desc *)(pmem+PACKET_OFFSET_SZ); //DBG_8192C("==> non-agg-pkt,shift pointer...\n"); @@ -305,7 +305,7 @@ if (padapter->registrypriv.mp_mode == 0) fill_txdesc_sectype(pattrib, ptxdesc); - if(pattrib->ampdu_en==_TRUE){ + if(pattrib->ampdu_en==true){ ptxdesc->txdw2 |= cpu_to_le32(AGG_EN);//AGG EN //SET_TX_DESC_MAX_AGG_NUM_88E(pDesc, 0x1F); @@ -446,13 +446,13 @@ if (padapter->registrypriv.mp_mode == 0) //offset 20 ptxdesc->txdw5 |= cpu_to_le32(RTY_LMT_EN);//retry limit enable - if(pattrib->retry_ctrl == _TRUE) + if(pattrib->retry_ctrl == true) ptxdesc->txdw5 |= cpu_to_le32(0x00180000);//retry limit = 6 else ptxdesc->txdw5 |= cpu_to_le32(0x00300000);//retry limit = 12 #ifdef CONFIG_INTEL_PROXIM - if((padapter->proximity.proxim_on==_TRUE)&&(pattrib->intel_proxim==_TRUE)){ + if((padapter->proximity.proxim_on==true)&&(pattrib->intel_proxim==true)){ DBG_871X("\n %s pattrib->rate=%d\n",__FUNCTION__,pattrib->rate); ptxdesc->txdw5 |= cpu_to_le32( pattrib->rate); } @@ -540,7 +540,7 @@ s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter) return _FAIL; } - ret = (padapter->bDriverStopped == _TRUE) || (padapter->bSurpriseRemoved == _TRUE); + ret = (padapter->bDriverStopped == true) || (padapter->bSurpriseRemoved == true); if (ret) { RT_TRACE(_module_hal_xmit_c_, _drv_notice_, ("%s: bDriverStopped(%d) bSurpriseRemoved(%d)!\n", @@ -548,7 +548,7 @@ s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter) return _FAIL; } - if(check_pending_xmitbuf(pxmitpriv) == _FALSE) + if(check_pending_xmitbuf(pxmitpriv) == false) return _SUCCESS; #ifdef CONFIG_LPS_LCLK @@ -622,7 +622,7 @@ static s32 rtw_dump_xframe(struct adapter *padapter, struct xmit_frame *pxmitfra sz = pattrib->last_txcmdsz; } - pull = update_txdesc(pxmitframe, mem_addr, sz, _FALSE); + pull = update_txdesc(pxmitframe, mem_addr, sz, false); if(pull) { @@ -726,7 +726,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv); if (pxmitbuf == NULL){ //DBG_871X("%s #1, connot alloc xmitbuf!!!! \n",__FUNCTION__); - return _FALSE; + return false; } } @@ -740,7 +740,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm // no more xmit frame, release xmit buffer //DBG_8192C("no more xmit frame ,return\n"); rtw_free_xmitbuf(pxmitpriv, pxmitbuf); - return _FALSE; + return false; } #ifndef IDEA_CONDITION @@ -774,7 +774,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm pxmitframe->pkt_offset = 1; // first frame of aggregation, reserve offset #endif - if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == _FALSE) { + if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == false) { DBG_871X("%s coalesce 1st xmitframe failed \n",__FUNCTION__); continue; } @@ -848,7 +848,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm xmitframe_phead = get_list_head(&ptxservq->sta_pending); xmitframe_plist = get_next(xmitframe_phead); - while (rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist) == _FALSE) + while (rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist) == false) { pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); xmitframe_plist = get_next(xmitframe_plist); @@ -898,7 +898,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm // pxmitframe->pxmitbuf = pxmitbuf; pxmitframe->buf_addr = pxmitbuf->pbuf + pbuf; - if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == _FALSE) { + if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == false) { DBG_871X("%s coalesce failed \n",__FUNCTION__); rtw_free_xmitframe(pxmitpriv, pxmitframe); continue; @@ -909,7 +909,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm rtw_os_xmit_complete(padapter, pxmitframe); // (len - TXDESC_SIZE) == pxmitframe->attrib.last_txcmdsz - update_txdesc(pxmitframe, pxmitframe->buf_addr, pxmitframe->attrib.last_txcmdsz,_TRUE); + update_txdesc(pxmitframe, pxmitframe->buf_addr, pxmitframe->attrib.last_txcmdsz,true); // don't need xmitframe any more rtw_free_xmitframe(pxmitpriv, pxmitframe); @@ -938,7 +938,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm }//end while( aggregate same priority and same DA(AP or STA) frames) - if (_rtw_queue_empty(&ptxservq->sta_pending) == _TRUE) + if (_rtw_queue_empty(&ptxservq->sta_pending) == true) rtw_list_delete(&ptxservq->tx_pending); _exit_critical_bh(&pxmitpriv->lock, &irqL); @@ -962,7 +962,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm } #endif // CONFIG_USE_USB_BUFFER_ALLOC_TX - update_txdesc(pfirstframe, pfirstframe->buf_addr, pfirstframe->attrib.last_txcmdsz,_TRUE); + update_txdesc(pfirstframe, pfirstframe->buf_addr, pfirstframe->attrib.last_txcmdsz,true); #ifdef CONFIG_TX_EARLY_MODE //prepare EM info for first frame, agg_num value start from 1 @@ -988,7 +988,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm rtw_free_xmitframe(pxmitpriv, pfirstframe); - return _TRUE; + return true; } #else @@ -1011,7 +1011,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv); if(!pxmitbuf) { - return _FALSE; + return false; } } @@ -1058,14 +1058,14 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm else { rtw_free_xmitbuf(pxmitpriv, pxmitbuf); - return _FALSE; + return false; } break; }while(0/*xcnt < (NR_XMITFRAME >> 3)*/); - return _TRUE; + return true; } #endif @@ -1090,8 +1090,8 @@ static s32 xmitframe_direct(struct adapter *padapter, struct xmit_frame *pxmitfr /* * Return - * _TRUE dump packet directly - * _FALSE enqueue packet + * true dump packet directly + * false enqueue packet */ static s32 pre_xmitframe(struct adapter *padapter, struct xmit_frame *pxmitframe) { @@ -1117,11 +1117,11 @@ static s32 pre_xmitframe(struct adapter *padapter, struct xmit_frame *pxmitframe } - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) goto enqueue; #ifdef CONFIG_CONCURRENT_MODE - if (check_fwstate(pbuddy_mlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) + if (check_fwstate(pbuddy_mlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) goto enqueue; #endif @@ -1140,7 +1140,7 @@ static s32 pre_xmitframe(struct adapter *padapter, struct xmit_frame *pxmitframe rtw_free_xmitframe(pxmitpriv, pxmitframe); } - return _TRUE; + return true; enqueue: res = rtw_xmitframe_enqueue(padapter, pxmitframe); @@ -1153,10 +1153,10 @@ enqueue: // Trick, make the statistics correct pxmitpriv->tx_pkts--; pxmitpriv->tx_drop++; - return _TRUE; + return true; } - return _FALSE; + return false; } s32 rtl8188eu_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe) @@ -1166,8 +1166,8 @@ s32 rtl8188eu_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe) /* * Return - * _TRUE dump packet directly ok - * _FALSE temporary can't transmit packets to hardware + * true dump packet directly ok + * false temporary can't transmit packets to hardware */ s32 rtl8188eu_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe) { diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index b591a75..56143d2 100755 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -87,7 +87,7 @@ static BOOLEAN HalUsbSetQueuePipeMapping8188EUsb( ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); - BOOLEAN result = _FALSE; + BOOLEAN result = false; _ConfigNormalChipOutEP_8188E(pAdapter, NumOutPipe); @@ -114,7 +114,7 @@ void rtl8188eu_interface_configure(struct adapter *padapter) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); - if (pdvobjpriv->ishighspeed == _TRUE) + if (pdvobjpriv->ishighspeed == true) { pHalData->UsbBulkOutSize = USB_HIGH_SPEED_BULK_SIZE;//512 bytes } @@ -146,11 +146,11 @@ void rtl8188eu_interface_configure(struct adapter *padapter) static u32 InitPowerOn_rtl8188eu(struct adapter *padapter) { u16 value16; - u8 bMacPwrCtrlOn=_FALSE; + u8 bMacPwrCtrlOn=false; // HW Power on sequence rtw_hal_get_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); - if(bMacPwrCtrlOn == _TRUE) + if(bMacPwrCtrlOn == true) return _SUCCESS; if(!HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK, Rtl8188E_NIC_PWR_ON_FLOW)) @@ -172,7 +172,7 @@ static u32 InitPowerOn_rtl8188eu(struct adapter *padapter) rtw_write16(padapter, REG_CR, value16); - bMacPwrCtrlOn = _TRUE; + bMacPwrCtrlOn = true; rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); return _SUCCESS; @@ -854,7 +854,7 @@ usb_AggSettingTxUpdate( u32 value32; if(Adapter->registrypriv.wifi_spec) - pHalData->UsbTxAggMode = _FALSE; + pHalData->UsbTxAggMode = false; if(pHalData->UsbTxAggMode){ value32 = rtw_read32(Adapter, REG_TDECTRL); @@ -983,7 +983,7 @@ InitUsbAggregationSetting( usb_AggSettingRxUpdate(Adapter); // 201/12/10 MH Add for USB agg mode dynamic switch. - pHalData->UsbRxHighSpeedMode = _FALSE; + pHalData->UsbRxHighSpeedMode = false; } void HalRxAggr8188EUsb( @@ -1068,7 +1068,7 @@ _InitRFType( pHalData->rf_chip = RF_6052; - if(_FALSE == is92CU){ + if(false == is92CU){ pHalData->rf_type = RF_1T1R; DBG_8192C("Set RF Chip ID to RF_6052 and RF type to 1T1R.\n"); return; @@ -1193,7 +1193,7 @@ HwSuspendModeEnable_88eu( // to disable HW suspend mode for IPS/radio_off. // //RT_TRACE(COMP_RF, DBG_LOUD, ("HwSuspendModeEnable92Cu = %d\n", Type)); - if (Type == _FALSE) + if (Type == false) { reg |= BIT14; //RT_TRACE(COMP_RF, DBG_LOUD, ("REG_GPIO_MUXCFG = %x\n", reg)); @@ -1367,14 +1367,14 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN); _ps_open_RF(Adapter); if(pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized){ -// PHY_IQCalibrate(padapter, _TRUE); - PHY_IQCalibrate_8188E(Adapter,_TRUE); +// PHY_IQCalibrate(padapter, true); + PHY_IQCalibrate_8188E(Adapter,true); } else { -// PHY_IQCalibrate(padapter, _FALSE); - PHY_IQCalibrate_8188E(Adapter,_FALSE); - pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = _TRUE; +// PHY_IQCalibrate(padapter, false); + PHY_IQCalibrate_8188E(Adapter,false); + pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = true; } // dm_CheckTXPowerTracking(padapter); @@ -1397,7 +1397,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_PW_ON); pHalData->CurrentChannel = 6;//default set to 6 - if(pwrctrlpriv->reg_rfoff == _TRUE){ + if(pwrctrlpriv->reg_rfoff == true){ pwrctrlpriv->rf_pwrstate = rf_off; } @@ -1436,20 +1436,20 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_DOWNLOAD_FW); { #ifdef CONFIG_WOWLAN - status = rtl8188e_FirmwareDownload(Adapter, _FALSE); + status = rtl8188e_FirmwareDownload(Adapter, false); #else status = rtl8188e_FirmwareDownload(Adapter); #endif //CONFIG_WOWLAN if (status != _SUCCESS) { DBG_871X("%s: Download Firmware failed!!\n", __FUNCTION__); - Adapter->bFWReady = _FALSE; - pHalData->fw_ractrl = _FALSE; + Adapter->bFWReady = false; + pHalData->fw_ractrl = false; return status; } else { RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("Initializepadapter8192CSdio(): Download Firmware Success!!\n")); - Adapter->bFWReady = _TRUE; - pHalData->fw_ractrl = _FALSE; + Adapter->bFWReady = true; + pHalData->fw_ractrl = false; } } @@ -1524,7 +1524,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC02); InitUsbAggregationSetting(Adapter); _InitOperationMode(Adapter);//todo _InitBeaconParameters(Adapter); - _InitBeaconMaxError(Adapter, _TRUE); + _InitBeaconMaxError(Adapter, true); // // Init CR MACTXEN, MACRXEN after setting RxFF boundary REG_TRXFF_BNDY to patch @@ -1684,12 +1684,12 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_IQK); if(pwrctrlpriv->rf_pwrstate == rf_on) { if(pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized){ - PHY_IQCalibrate_8188E(Adapter,_TRUE); + PHY_IQCalibrate_8188E(Adapter,true); } else { - PHY_IQCalibrate_8188E(Adapter,_FALSE); - pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = _TRUE; + PHY_IQCalibrate_8188E(Adapter,false); + pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = true; } HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_PW_TRACK); @@ -1754,10 +1754,10 @@ void hal_poweroff_rtl8188eu( u8 val8; u16 val16; u32 val32; - u8 bMacPwrCtrlOn=_FALSE; + u8 bMacPwrCtrlOn=false; rtw_hal_get_hwreg(Adapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); - if(bMacPwrCtrlOn == _FALSE) + if(bMacPwrCtrlOn == false) return ; RT_TRACE(COMP_INIT, DBG_LOUD, ("%s\n",__FUNCTION__)); @@ -1821,9 +1821,9 @@ void hal_poweroff_rtl8188eu( val8 = rtw_read8(Adapter, REG_GPIO_IO_SEL+1); rtw_write8(Adapter, REG_GPIO_IO_SEL+1, val8|0x0F);//Reg0x43 rtw_write32(Adapter, REG_BB_PAD_CTRL, 0x00080808);//set LNA ,TRSW,EX_PA Pin to output mode - bMacPwrCtrlOn = _FALSE; + bMacPwrCtrlOn = false; rtw_hal_set_hwreg(Adapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); - Adapter->bFWReady = _FALSE; + Adapter->bFWReady = false; } static void rtl8188eu_hw_power_down(struct adapter *padapter) @@ -1858,7 +1858,7 @@ u32 rtl8188eu_hal_deinit(struct adapter *Adapter) else #endif { - if(Adapter->hw_init_completed == _TRUE){ + if(Adapter->hw_init_completed == true){ hal_poweroff_rtl8188eu(Adapter); if((pwrctl->bHWPwrPindetect ) && (pwrctl->bHWPowerdown)) @@ -1898,7 +1898,7 @@ _func_enter_; precvbuf = (struct recv_buf *)precvpriv->precv_buf; for(i=0; iff_hwaddr, 0, (unsigned char *)precvbuf) == _FALSE ) + if(_read_port(pintfhdl, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf) == false ) { RT_TRACE(_module_hci_hal_init_c_,_drv_err_,("usb_rx_init: usb_read_port error \n")); status = _FAIL; @@ -1917,7 +1917,7 @@ _func_enter_; goto exit; } _read_interrupt = pintfhdl->io_ops._read_interrupt; - if(_read_interrupt(pintfhdl, RECV_INT_IN_ADDR) == _FALSE ) + if(_read_interrupt(pintfhdl, RECV_INT_IN_ADDR) == false ) { RT_TRACE(_module_hci_hal_init_c_,_drv_err_,("usb_rx_init: usb_read_interrupt error \n")); status = _FAIL; @@ -1990,7 +1990,7 @@ _ReadLEDSetting( struct led_priv *pledpriv = &(Adapter->ledpriv); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); #ifdef CONFIG_SW_LED - pledpriv->bRegUseLed = _TRUE; + pledpriv->bRegUseLed = true; switch(pHalData->CustomerID) { @@ -1998,7 +1998,7 @@ _ReadLEDSetting( pledpriv->LedStrategy = SW_LED_MODE1; break; } - pHalData->bLedOpenDrain = _TRUE;// Support Open-drain arrangement for controlling the LED. Added by Roger, 2009.10.16. + pHalData->bLedOpenDrain = true;// Support Open-drain arrangement for controlling the LED. Added by Roger, 2009.10.16. #else // HW LED pledpriv->LedStrategy = HW_LED; #endif //CONFIG_SW_LED @@ -2149,7 +2149,7 @@ static u32 Hal_readPGDataFromConfigFile( fp = filp_open("/system/etc/wifi/wifi_efuse.map", O_RDWR, 0644); if (IS_ERR(fp)) { - pEEPROM->bloadfile_fail_flag = _TRUE; + pEEPROM->bloadfile_fail_flag = true; DBG_871X("Error, Efuse configure file doesn't exist.\n"); return _FAIL; } @@ -2169,7 +2169,7 @@ static u32 Hal_readPGDataFromConfigFile( filp_close(fp, NULL); - pEEPROM->bloadfile_fail_flag = _FALSE; + pEEPROM->bloadfile_fail_flag = false; return _SUCCESS; } @@ -2196,7 +2196,7 @@ Hal_ReadMACAddrFromFile_8188EU( fp = filp_open("/data/wifimac.txt", O_RDWR, 0644); if (IS_ERR(fp)) { - pEEPROM->bloadmac_fail_flag = _TRUE; + pEEPROM->bloadmac_fail_flag = true; DBG_871X("Error, wifi mac address file doesn't exist.\n"); } else { fs = get_fs(); @@ -2224,7 +2224,7 @@ Hal_ReadMACAddrFromFile_8188EU( } DBG_871X("\n"); set_fs(fs); - pEEPROM->bloadmac_fail_flag = _FALSE; + pEEPROM->bloadmac_fail_flag = false; filp_close(fp, NULL); } @@ -2289,8 +2289,8 @@ static void _ReadPROMContent( /* check system boot selection */ eeValue = rtw_read8(Adapter, REG_9346CR); - pEEPROM->EepromOrEfuse = (eeValue & BOOT_FROM_EEPROM) ? _TRUE : _FALSE; - pEEPROM->bautoload_fail_flag = (eeValue & EEPROM_EN) ? _FALSE : _TRUE; + pEEPROM->EepromOrEfuse = (eeValue & BOOT_FROM_EEPROM) ? true : false; + pEEPROM->bautoload_fail_flag = (eeValue & EEPROM_EN) ? false : true; DBG_8192C("Boot from %s, Autoload %s !\n", (pEEPROM->EepromOrEfuse ? "EEPROM" : "EFUSE"), @@ -2452,11 +2452,11 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8* val) #ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT rtw_write8(Adapter, REG_DRVERLYINT, 0x05);//restore early int time to 5ms - UpdateInterruptMask8188EU(Adapter,_TRUE, 0, IMR_BCNDMAINT0_88E); + UpdateInterruptMask8188EU(Adapter,true, 0, IMR_BCNDMAINT0_88E); #endif // CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT #ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR - UpdateInterruptMask8188EU(Adapter,_TRUE ,0, (IMR_TBDER_88E|IMR_TBDOK_88E)); + UpdateInterruptMask8188EU(Adapter,true ,0, (IMR_TBDER_88E|IMR_TBDOK_88E)); #endif// CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR #endif //CONFIG_INTERRUPT_BASED_TXBCN @@ -2479,11 +2479,11 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8* val) { #ifdef CONFIG_INTERRUPT_BASED_TXBCN #ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT - UpdateInterruptMask8188EU(Adapter,_TRUE ,IMR_BCNDMAINT0_88E, 0); + UpdateInterruptMask8188EU(Adapter,true ,IMR_BCNDMAINT0_88E, 0); #endif//CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT #ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR - UpdateInterruptMask8188EU(Adapter,_TRUE ,(IMR_TBDER_88E|IMR_TBDOK_88E), 0); + UpdateInterruptMask8188EU(Adapter,true ,(IMR_TBDER_88E|IMR_TBDOK_88E), 0); #endif//CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR #endif //CONFIG_INTERRUPT_BASED_TXBCN @@ -2535,7 +2535,7 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8* val) #ifdef CONFIG_TSF_RESET_OFFLOAD // Reset TSF for STA+AP concurrent mode if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) { - if (reset_tsf(Adapter, IFACE_PORT1) == _FALSE) + if (reset_tsf(Adapter, IFACE_PORT1) == false) DBG_871X("ERROR! %s()-%d: Reset port1 TSF fail\n", __FUNCTION__, __LINE__); } @@ -2564,11 +2564,11 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8* val) #ifdef CONFIG_INTERRUPT_BASED_TXBCN #ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT rtw_write8(Adapter, REG_DRVERLYINT, 0x05);//restore early int time to 5ms - UpdateInterruptMask8188EU(Adapter,_TRUE, 0, IMR_BCNDMAINT0_88E); + UpdateInterruptMask8188EU(Adapter,true, 0, IMR_BCNDMAINT0_88E); #endif//CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT #ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR - UpdateInterruptMask8188EU(Adapter,_TRUE ,0, (IMR_TBDER_88E|IMR_TBDOK_88E)); + UpdateInterruptMask8188EU(Adapter,true ,0, (IMR_TBDER_88E|IMR_TBDOK_88E)); #endif //CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR #endif //CONFIG_INTERRUPT_BASED_TXBCN @@ -2590,11 +2590,11 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8* val) #ifdef CONFIG_INTERRUPT_BASED_TXBCN #ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT - UpdateInterruptMask8188EU(Adapter,_TRUE ,IMR_BCNDMAINT0_88E, 0); + UpdateInterruptMask8188EU(Adapter,true ,IMR_BCNDMAINT0_88E, 0); #endif//CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT #ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR - UpdateInterruptMask8188EU(Adapter,_TRUE ,(IMR_TBDER_88E|IMR_TBDOK_88E), 0); + UpdateInterruptMask8188EU(Adapter,true ,(IMR_TBDER_88E|IMR_TBDOK_88E), 0); #endif//CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR #endif //CONFIG_INTERRUPT_BASED_TXBCN @@ -2647,7 +2647,7 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8* val) #ifdef CONFIG_TSF_RESET_OFFLOAD // Reset TSF for STA+AP concurrent mode if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) { - if (reset_tsf(Adapter, IFACE_PORT0) == _FALSE) + if (reset_tsf(Adapter, IFACE_PORT0) == false) DBG_871X("ERROR! %s()-%d: Reset port0 TSF fail\n", __FUNCTION__, __LINE__); } @@ -2774,7 +2774,7 @@ static void hw_var_set_correct_tsf(struct adapter *Adapter, u8 variable, u8* val rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)|BIT(3)); #ifdef CONFIG_TSF_RESET_OFFLOAD // Update buddy port's TSF(TBTT) if it is SoftAP for beacon TX issue! - if (reset_tsf(Adapter, IFACE_PORT0) == _FALSE) + if (reset_tsf(Adapter, IFACE_PORT0) == false) DBG_871X("ERROR! %s()-%d: Reset port0 TSF fail\n", __FUNCTION__, __LINE__); @@ -2808,7 +2808,7 @@ static void hw_var_set_correct_tsf(struct adapter *Adapter, u8 variable, u8* val rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)|BIT(3)); #ifdef CONFIG_TSF_RESET_OFFLOAD // Update buddy port's TSF if it is SoftAP for beacon TX issue! - if (reset_tsf(Adapter, IFACE_PORT1) == _FALSE) + if (reset_tsf(Adapter, IFACE_PORT1) == false) DBG_871X("ERROR! %s()-%d: Reset port1 TSF fail\n", __FUNCTION__, __LINE__); #endif // CONFIG_TSF_RESET_OFFLOAD @@ -2941,7 +2941,7 @@ static void hw_var_set_mlme_join(struct adapter *Adapter, u8 variable, u8* val) else rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)|RCR_CBSSID_DATA|RCR_CBSSID_BCN); - if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) { RetryLimit = (pHalData->CustomerID == RT_CID_CCX) ? 7 : 48; } @@ -3169,7 +3169,7 @@ _func_enter_; struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - if ((is_client_associated_to_ap(Adapter) == _TRUE) || + if ((is_client_associated_to_ap(Adapter) == true) || ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) ) { //enable to rx data frame @@ -3232,7 +3232,7 @@ _func_enter_; rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)|RCR_CBSSID_DATA|RCR_CBSSID_BCN); } - if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) { RetryLimit = (pHalData->CustomerID == RT_CID_CCX) ? 7 : 48; } @@ -3561,7 +3561,7 @@ _func_enter_; // saving sequence. 2010.06.07. Added by tynli. Suggested by SD3 yschang. if( (psmode != PS_MODE_ACTIVE) && (!IS_92C_SERIAL(pHalData->VersionID))) { - ODM_RF_Saving(podmpriv, _TRUE); + ODM_RF_Saving(podmpriv, true); } rtl8188e_set_FwPwrMode_cmd(Adapter, psmode); } @@ -3682,7 +3682,7 @@ _func_enter_; //keep sn Adapter->xmitpriv.nqos_ssn = rtw_read16(Adapter,REG_NQOS_SEQ); - if(pwrpriv->bkeepfwalive != _TRUE) + if(pwrpriv->bkeepfwalive != true) { //RX DMA stop rtw_write32(Adapter,REG_RXPKT_NUM,(rtw_read32(Adapter,REG_RXPKT_NUM)|RW_RELEASE_EN)); @@ -3739,10 +3739,10 @@ _func_enter_; case WOWLAN_ENABLE: DBG_871X_LEVEL(_drv_always_, "WOWLAN_ENABLE\n"); - SetFwRelatedForWoWLAN8188ES(Adapter, _TRUE); + SetFwRelatedForWoWLAN8188ES(Adapter, true); //Set Pattern - //if(adapter_to_pwrctl(Adapter)->wowlan_pattern==_TRUE) + //if(adapter_to_pwrctl(Adapter)->wowlan_pattern==true) // rtw_wowlan_reload_pattern(Adapter); //RX DMA stop @@ -3801,7 +3801,7 @@ _func_enter_; if (mstatus & BIT1) printk("System did not release RX_DMA\n"); else - SetFwRelatedForWoWLAN8188ES(Adapter, _FALSE); + SetFwRelatedForWoWLAN8188ES(Adapter, false); rtw_msleep_os(2); if(!(adapter_to_pwrctl(Adapter)->wowlan_wake_reason & FWDecisionDisconnect)) @@ -3857,7 +3857,7 @@ _func_enter_; break; case HW_VAR_BCN_VALID: //BCN_VALID, BIT16 of REG_TDECTRL = BIT0 of REG_TDECTRL+2 - val[0] = (BIT0 & rtw_read8(Adapter, REG_TDECTRL+2))?_TRUE:_FALSE; + val[0] = (BIT0 & rtw_read8(Adapter, REG_TDECTRL+2))?true:false; break; case HW_VAR_DM_FLAG: val[0] = podmpriv->SupportAbility; @@ -3872,7 +3872,7 @@ _func_enter_; { // If it is in HW/SW Radio OFF or IPS state, we do not check Fw LPS Leave, // because Fw is unload. - val[0] = _TRUE; + val[0] = true; } else { @@ -3880,9 +3880,9 @@ _func_enter_; valRCR = rtw_read32(Adapter, REG_RCR); valRCR &= 0x00070000; if(valRCR) - val[0] = _FALSE; + val[0] = false; else - val[0] = _TRUE; + val[0] = true; } } break; @@ -3898,7 +3898,7 @@ _func_enter_; *val = pHalData->bMacPwrCtrlOn; break; case HW_VAR_CHK_HI_QUEUE_EMPTY: - *val = ((rtw_read32(Adapter, REG_HGQ_INFORMATION)&0x0000ff00)==0) ? _TRUE:_FALSE; + *val = ((rtw_read32(Adapter, REG_HGQ_INFORMATION)&0x0000ff00)==0) ? true:false; break; case HW_VAR_READ_LLT_TAB: @@ -3958,7 +3958,7 @@ GetHalDefVar8188EUsb( } } #else //V4 branch - if(check_fwstate(&Adapter->mlmepriv, WIFI_STATION_STATE) == _TRUE){ + if(check_fwstate(&Adapter->mlmepriv, WIFI_STATION_STATE) == true){ *((int *)pValue) = pHalData->dmpriv.UndecoratedSmoothedPWDB; } else{ @@ -3968,7 +3968,7 @@ GetHalDefVar8188EUsb( break; case HAL_DEF_IS_SUPPORT_ANT_DIV: #ifdef CONFIG_ANTENNA_DIVERSITY - *((u8 *)pValue) = (pHalData->AntDivCfg==0)?_FALSE:_TRUE; + *((u8 *)pValue) = (pHalData->AntDivCfg==0)?false:true; #endif break; case HAL_DEF_CURRENT_ANTENNA: @@ -4020,19 +4020,19 @@ GetHalDefVar8188EUsb( { u8 entry_id = *((u8*)pValue); u8 i; - u8 bLinked = _FALSE; + u8 bLinked = false; #ifdef CONFIG_CONCURRENT_MODE struct adapter *pbuddy_adapter = Adapter->pbuddy_adapter; #endif //CONFIG_CONCURRENT_MODE - //if(check_fwstate(&Adapter->mlmepriv, _FW_LINKED)== _TRUE) + //if(check_fwstate(&Adapter->mlmepriv, _FW_LINKED)== true) if(rtw_linked_check(Adapter)) - bLinked = _TRUE; + bLinked = true; #ifdef CONFIG_CONCURRENT_MODE if(pbuddy_adapter && rtw_linked_check(pbuddy_adapter)) - bLinked = _TRUE; + bLinked = true; #endif if(bLinked){ @@ -4193,7 +4193,7 @@ void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rssi_level u8 init_rate=0; u8 networkType, raid; u32 mask,rate_bitmap; - u8 shortGIrate = _FALSE; + u8 shortGIrate = false; int supportRateNum = 0; struct sta_info *psta; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -4230,7 +4230,7 @@ void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rssi_level if (support_short_GI(padapter, &(pmlmeinfo->HT_caps))) { - shortGIrate = _TRUE; + shortGIrate = true; } break; @@ -4273,7 +4273,7 @@ void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rssi_level init_rate = get_highest_rate_idx(mask)&0x3f; - if(pHalData->fw_ractrl == _TRUE) + if(pHalData->fw_ractrl == true) { u8 arg = 0; @@ -4282,13 +4282,13 @@ void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rssi_level arg |= BIT(7); - if (shortGIrate==_TRUE) + if (shortGIrate==true) arg |= BIT(5); mask |= ((raid<<28)&0xf0000000); DBG_871X("update raid entry, mask=0x%x, arg=0x%x\n", mask, arg); psta->ra_mask=mask; #ifdef CONFIG_INTEL_PROXIM - if(padapter->proximity.proxim_on ==_TRUE){ + if(padapter->proximity.proxim_on ==true){ arg &= ~BIT(6); } else { @@ -4373,7 +4373,7 @@ void SetBeaconRelatedRegisters8188EUsb(struct adapter *padapter) rtw_write8(padapter, REG_RXTSF_OFFSET_CCK, 0x50); rtw_write8(padapter, REG_RXTSF_OFFSET_OFDM, 0x50); - _BeaconFunctionEnable(padapter, _TRUE, _TRUE); + _BeaconFunctionEnable(padapter, true, true); ResumeTxBeacon(padapter); @@ -4400,14 +4400,14 @@ static void rtl8188eu_init_default_value(struct adapter * padapter) //init default value - pHalData->fw_ractrl = _FALSE; + pHalData->fw_ractrl = false; if(!pwrctrlpriv->bkeepfwalive) pHalData->LastHMEBoxNum = 0; //init dm default value - pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = _FALSE; + pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = false; pHalData->odmpriv.RFCalibrateInfo.TM_Trigger = 0;//for IQK - //pdmpriv->binitialized = _FALSE; + //pdmpriv->binitialized = false; // pdmpriv->prv_traffic_idx = 3; // pdmpriv->initialize = 0; pHalData->pwrGroupCnt = 0; @@ -4419,7 +4419,7 @@ static void rtl8188eu_init_default_value(struct adapter * padapter) static u8 rtl8188eu_ps_func(struct adapter *Adapter,HAL_INTF_PS_FUNC efunc_id, u8 *val) { - u8 bResult = _TRUE; + u8 bResult = true; switch(efunc_id){ #if defined(CONFIG_AUTOSUSPEND) && defined(SUPPORT_HW_RFOFF_DETECTED) diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c index 05bea46..6549cac 100755 --- a/hal/usb_ops_linux.c +++ b/hal/usb_ops_linux.c @@ -131,7 +131,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u if (status < 0) { if(status == (-ESHUTDOWN) || status == -ENODEV ) { - padapter->bSurpriseRemoved = _TRUE; + padapter->bSurpriseRemoved = true; } else { #ifdef DBG_CONFIG_ERROR_DETECT { @@ -151,8 +151,8 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u } } - if(rtw_inc_and_chk_continual_io_error(pdvobjpriv) == _TRUE ){ - padapter->bSurpriseRemoved = _TRUE; + if(rtw_inc_and_chk_continual_io_error(pdvobjpriv) == true ){ + padapter->bSurpriseRemoved = true; break; } @@ -412,7 +412,7 @@ void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pbuf) if(check_fwstate(pmlmepriv, WIFI_AP_STATE)) { //send_beacon(padapter); - if(pmlmepriv->update_bcn == _TRUE) + if(pmlmepriv->update_bcn == true) { //tx_beacon_hdl(padapter, NULL); set_tx_beacon_cmd(padapter); @@ -422,7 +422,7 @@ void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pbuf) if(check_buddy_fwstate(padapter, WIFI_AP_STATE)) { //send_beacon(padapter); - if(padapter->pbuddy_adapter->mlmepriv.update_bcn == _TRUE) + if(padapter->pbuddy_adapter->mlmepriv.update_bcn == true) { //tx_beacon_hdl(padapter, NULL); set_tx_beacon_cmd(padapter->pbuddy_adapter); @@ -495,10 +495,10 @@ static void usb_read_interrupt_complete(struct urb *purb, struct pt_regs *regs) case -EPIPE: case -ENODEV: case -ESHUTDOWN: - //padapter->bSurpriseRemoved=_TRUE; + //padapter->bSurpriseRemoved=true; RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=TRUE\n")); case -ENOENT: - padapter->bDriverStopped=_TRUE; + padapter->bDriverStopped=true; RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=TRUE\n")); break; case -EPROTO: @@ -565,7 +565,7 @@ static s32 pre_recv_entry(union recv_frame *precvframe, struct recv_stat *prxsta paddr1 = GetAddr1Ptr(precvframe->u.hdr.rx_data); - if(IS_MCAST(paddr1) == _FALSE)//unicast packets + if(IS_MCAST(paddr1) == false)//unicast packets { //primary_myid = myid(&primary_padapter->eeprompriv); secondary_myid = myid(&secondary_padapter->eeprompriv); @@ -581,9 +581,9 @@ static s32 pre_recv_entry(union recv_frame *precvframe, struct recv_stat *prxsta } else // Handle BC/MC Packets { - u8 clone = _TRUE; + u8 clone = true; - if(_TRUE == clone) { + if(true == clone) { //clone/copy to if2 u8 shift_sz = 0; u32 alloc_sz, skb_len; @@ -897,7 +897,7 @@ void rtl8188eu_recv_tasklet(void *priv) while (NULL != (precvbuf = rtw_dequeue_recvbuf(&precvpriv->recv_buf_pending_queue))) { - if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE)) + if ((padapter->bDriverStopped == true)||(padapter->bSurpriseRemoved== true)) { DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved \n"); @@ -956,8 +956,8 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) DBG_8192C("###=> usb_read_port_complete => urb status(%d)\n", purb->status); - if(rtw_inc_and_chk_continual_io_error(adapter_to_dvobj(padapter)) == _TRUE ){ - padapter->bSurpriseRemoved = _TRUE; + if(rtw_inc_and_chk_continual_io_error(adapter_to_dvobj(padapter)) == true ){ + padapter->bSurpriseRemoved = true; } switch(purb->status) { @@ -965,10 +965,10 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) case -EPIPE: case -ENODEV: case -ESHUTDOWN: - //padapter->bSurpriseRemoved=_TRUE; + //padapter->bSurpriseRemoved=true; RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=TRUE\n")); case -ENOENT: - padapter->bDriverStopped=_TRUE; + padapter->bDriverStopped=true; RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=TRUE\n")); break; case -EPROTO: @@ -1296,7 +1296,7 @@ void rtl8188eu_recv_tasklet(void *priv) while (NULL != (pskb = skb_dequeue(&precvpriv->rx_skb_queue))) { - if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE)) + if ((padapter->bDriverStopped == true)||(padapter->bSurpriseRemoved== true)) { DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved \n"); rtw_skb_free(pskb); @@ -1333,7 +1333,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete!!!\n")); //_enter_critical(&precvpriv->lock, &irqL); - //precvbuf->irp_pending=_FALSE; + //precvbuf->irp_pending=false; //precvpriv->rx_pending_cnt --; //_exit_critical(&precvpriv->lock, &irqL); @@ -1350,7 +1350,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", padapter->bDriverStopped, padapter->bSurpriseRemoved)); #ifdef CONFIG_PREALLOC_RECV_SKB - precvbuf->reuse = _TRUE; + precvbuf->reuse = true; #else if(precvbuf->pskb){ DBG_8192C("==> free skb(%p)\n",precvbuf->pskb); @@ -1367,7 +1367,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) if ((purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)) { RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete: (purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)\n")); - precvbuf->reuse = _TRUE; + precvbuf->reuse = true; rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); DBG_8192C("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__); } @@ -1383,7 +1383,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) tasklet_schedule(&precvpriv->recv_tasklet); precvbuf->pskb = NULL; - precvbuf->reuse = _FALSE; + precvbuf->reuse = false; rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); } } @@ -1393,8 +1393,8 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) DBG_8192C("###=> usb_read_port_complete => urb status(%d)\n", purb->status); - if(rtw_inc_and_chk_continual_io_error(adapter_to_dvobj(padapter)) == _TRUE ){ - padapter->bSurpriseRemoved = _TRUE; + if(rtw_inc_and_chk_continual_io_error(adapter_to_dvobj(padapter)) == true ){ + padapter->bSurpriseRemoved = true; } switch(purb->status) { @@ -1402,10 +1402,10 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) case -EPIPE: case -ENODEV: case -ESHUTDOWN: - //padapter->bSurpriseRemoved=_TRUE; + //padapter->bSurpriseRemoved=true; RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=TRUE\n")); case -ENOENT: - padapter->bDriverStopped=_TRUE; + padapter->bDriverStopped=true; RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=TRUE\n")); break; case -EPROTO: @@ -1419,7 +1419,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) pHalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL; } #endif - precvbuf->reuse = _TRUE; + precvbuf->reuse = true; rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); break; case -EINPROGRESS: @@ -1462,11 +1462,11 @@ _func_enter_; } #ifdef CONFIG_PREALLOC_RECV_SKB - if((precvbuf->reuse == _FALSE) || (precvbuf->pskb == NULL)) + if((precvbuf->reuse == false) || (precvbuf->pskb == NULL)) { if (NULL != (precvbuf->pskb = skb_dequeue(&precvpriv->free_recv_skb_queue))) { - precvbuf->reuse = _TRUE; + precvbuf->reuse = true; } } #endif @@ -1477,7 +1477,7 @@ _func_enter_; rtl8188eu_init_recvbuf(adapter, precvbuf); //re-assign for linux based on skb - if((precvbuf->reuse == _FALSE) || (precvbuf->pskb == NULL)) + if((precvbuf->reuse == false) || (precvbuf->pskb == NULL)) { precvbuf->pskb = rtw_skb_alloc(MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ); @@ -1506,12 +1506,12 @@ _func_enter_; precvbuf->pend = skb_end_pointer(precvbuf->pskb); precvbuf->pbuf = precvbuf->pskb->data; - precvbuf->reuse = _FALSE; + precvbuf->reuse = false; } //_enter_critical(&precvpriv->lock, &irqL); //precvpriv->rx_pending_cnt++; - //precvbuf->irp_pending = _TRUE; + //precvbuf->irp_pending = true; //_exit_critical(&precvpriv->lock, &irqL); precvpriv->rx_pending_cnt++; @@ -1549,16 +1549,16 @@ _func_exit_; void rtl8188eu_xmit_tasklet(void *priv) { - int ret = _FALSE; + int ret = false; struct adapter *padapter = (struct adapter*)priv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; - if(check_fwstate(&padapter->mlmepriv, _FW_UNDER_SURVEY) == _TRUE) + if(check_fwstate(&padapter->mlmepriv, _FW_UNDER_SURVEY) == true) return; while(1) { - if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE) || (padapter->bWritePortCancel == _TRUE)) + if ((padapter->bDriverStopped == true)||(padapter->bSurpriseRemoved== true) || (padapter->bWritePortCancel == true)) { DBG_8192C("xmit_tasklet => bDriverStopped or bSurpriseRemoved or bWritePortCancel\n"); break; @@ -1566,7 +1566,7 @@ void rtl8188eu_xmit_tasklet(void *priv) ret = rtl8188eu_xmitframe_complete(padapter, pxmitpriv, NULL); - if(ret==_FALSE) + if(ret==false) break; } diff --git a/include/Hal8188EPhyCfg.h b/include/Hal8188EPhyCfg.h index 2ddaea4..b4579f6 100755 --- a/include/Hal8188EPhyCfg.h +++ b/include/Hal8188EPhyCfg.h @@ -362,7 +362,7 @@ storePwrIndexDiffRateOffset( // 2) "#define RTL8723_FPGA_VERIFICATION 1" in Precomp.h.WlanE.Windows // 3) "#define RTL8190_Download_Firmware_From_Header 0" in Precomp.h.WlanE.Windows if needed. // -#if (RTL8188E_SUPPORT == 1) && (RTL8188E_FPGA_TRUE_PHY_VERIFICATION == 1) +#if (RTL8188E_SUPPORT == 1) && (RTL8188E_FPGAtrue_PHY_VERIFICATION == 1) #define SIC_ENABLE 1 #define SIC_HW_SUPPORT 1 #else diff --git a/include/HalVerDef.h b/include/HalVerDef.h index fe09740..2fc098f 100755 --- a/include/HalVerDef.h +++ b/include/HalVerDef.h @@ -20,8 +20,8 @@ #ifndef __HAL_VERSION_DEF_H__ #define __HAL_VERSION_DEF_H__ -#define TRUE _TRUE -#define FALSE _FALSE +#define TRUE true +#define FALSE false // HAL_IC_TYPE_E typedef enum tag_HAL_IC_Type_Definition diff --git a/include/autoconf.h b/include/autoconf.h index df53fdf..5fea6ce 100755 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -25,7 +25,7 @@ #define CONFIG_ODM_REFRESH_RAMASK #define CONFIG_PHY_SETTING_WITH_ODM //for FPGA VERIFICATION config -#define RTL8188E_FPGA_TRUE_PHY_VERIFICATION 0 +#define RTL8188E_FPGAtrue_PHY_VERIFICATION 0 //***** temporarily flag ******* /* diff --git a/include/basic_types.h b/include/basic_types.h index d1e4c9f..b52e59d 100755 --- a/include/basic_types.h +++ b/include/basic_types.h @@ -26,18 +26,6 @@ #define SUCCESS 0 #define FAIL (-1) -#ifndef TRUE - #define _TRUE 1 -#else - #define _TRUE TRUE -#endif - -#ifndef FALSE - #define _FALSE 0 -#else - #define _FALSE FALSE -#endif - #include #define IN #define OUT diff --git a/include/ieee80211.h b/include/ieee80211.h index aabcaf6..97d55b8 100755 --- a/include/ieee80211.h +++ b/include/ieee80211.h @@ -186,19 +186,19 @@ enum NETWORK_TYPE #define SUPPORTED_24G_NETTYPE_MSK (WIRELESS_11B | WIRELESS_11G | WIRELESS_11_24N) #define SUPPORTED_5G_NETTYPE_MSK (WIRELESS_11A | WIRELESS_11_5N) -#define IsSupported24G(NetType) ((NetType) & SUPPORTED_24G_NETTYPE_MSK ? _TRUE : _FALSE) -#define IsSupported5G(NetType) ((NetType) & SUPPORTED_5G_NETTYPE_MSK ? _TRUE : _FALSE) +#define IsSupported24G(NetType) ((NetType) & SUPPORTED_24G_NETTYPE_MSK ? true : false) +#define IsSupported5G(NetType) ((NetType) & SUPPORTED_5G_NETTYPE_MSK ? true : false) #define IsEnableHWCCK(NetType) IsSupported24G(NetType) -#define IsEnableHWOFDM(NetType) ((NetType) & (WIRELESS_11G|WIRELESS_11_24N|SUPPORTED_5G_NETTYPE_MSK) ? _TRUE : _FALSE) +#define IsEnableHWOFDM(NetType) ((NetType) & (WIRELESS_11G|WIRELESS_11_24N|SUPPORTED_5G_NETTYPE_MSK) ? true : false) #define IsSupportedRxCCK(NetType) IsEnableHWCCK(NetType) #define IsSupportedRxOFDM(NetType) IsEnableHWOFDM(NetType) #define IsSupportedRxMCS(NetType) IsEnableHWOFDM(NetType) -#define IsSupportedTxCCK(NetType) ((NetType) & (WIRELESS_11B) ? _TRUE : _FALSE) -#define IsSupportedTxOFDM(NetType) ((NetType) & (WIRELESS_11G|WIRELESS_11A) ? _TRUE : _FALSE) -#define IsSupportedTxMCS(NetType) ((NetType) & (WIRELESS_11_24N|WIRELESS_11_5N) ? _TRUE : _FALSE) +#define IsSupportedTxCCK(NetType) ((NetType) & (WIRELESS_11B) ? true : false) +#define IsSupportedTxOFDM(NetType) ((NetType) & (WIRELESS_11G|WIRELESS_11A) ? true : false) +#define IsSupportedTxMCS(NetType) ((NetType) & (WIRELESS_11_24N|WIRELESS_11_5N) ? true : false) typedef struct ieee_param { diff --git a/include/mp_custom_oid.h b/include/mp_custom_oid.h index 7d52831..33068d5 100755 --- a/include/mp_custom_oid.h +++ b/include/mp_custom_oid.h @@ -98,7 +98,7 @@ // by Owen for RTL8185 Phy Status Report Utility -#define OID_RT_UTILITY_FALSE_ALARM_COUNTERS 0xFF818580 +#define OID_RT_UTILITYfalse_ALARM_COUNTERS 0xFF818580 #define OID_RT_UTILITY_SELECT_DEBUG_MODE 0xFF818581 #define OID_RT_UTILITY_SELECT_SUBCARRIER_NUMBER 0xFF818582 #define OID_RT_UTILITY_GET_RSSI_STATUS 0xFF818583 diff --git a/include/osdep_service.h b/include/osdep_service.h index 9a8f5f7..6fdcc34 100755 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -29,13 +29,6 @@ #define RTW_RX_HANDLED 2 //#define RTW_STATUS_TIMEDOUT -110 -#undef _TRUE -#define _TRUE 1 - -#undef _FALSE -#define _FALSE 0 - - #include #include #include @@ -280,7 +273,7 @@ __inline static void _set_timer(_timer *ptimer,u32 delay_time) __inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled) { del_timer_sync(ptimer); - *bcancelled= _TRUE;//TRUE ==1; FALSE==0 + *bcancelled= true;//TRUE ==1; FALSE==0 } #define RTW_TIMER_HDL_ARGS void *FunctionContext diff --git a/include/rtl8188e_spec.h b/include/rtl8188e_spec.h index b0e3b91..08a4a63 100755 --- a/include/rtl8188e_spec.h +++ b/include/rtl8188e_spec.h @@ -409,15 +409,15 @@ //RXERR_RPT #define RXERR_TYPE_OFDM_PPDU 0 -#define RXERR_TYPE_OFDM_FALSE_ALARM 1 +#define RXERR_TYPE_OFDMfalse_ALARM 1 #define RXERR_TYPE_OFDM_MPDU_OK 2 #define RXERR_TYPE_OFDM_MPDU_FAIL 3 #define RXERR_TYPE_CCK_PPDU 4 -#define RXERR_TYPE_CCK_FALSE_ALARM 5 +#define RXERR_TYPE_CCKfalse_ALARM 5 #define RXERR_TYPE_CCK_MPDU_OK 6 #define RXERR_TYPE_CCK_MPDU_FAIL 7 #define RXERR_TYPE_HT_PPDU 8 -#define RXERR_TYPE_HT_FALSE_ALARM 9 +#define RXERR_TYPE_HTfalse_ALARM 9 #define RXERR_TYPE_HT_MPDU_TOTAL 10 #define RXERR_TYPE_HT_MPDU_OK 11 #define RXERR_TYPE_HT_MPDU_FAIL 12 @@ -678,8 +678,8 @@ Default: 00b. #define TOTAL_CAM_ENTRY 32 #define HALF_CAM_ENTRY 16 -#define CAM_CONFIG_USEDK _TRUE -#define CAM_CONFIG_NO_USEDK _FALSE +#define CAM_CONFIG_USEDK true +#define CAM_CONFIG_NO_USEDK false #define CAM_WRITE BIT16 #define CAM_READ 0x00000000 diff --git a/include/rtl8192c_spec.h b/include/rtl8192c_spec.h index 01233b2..f811d25 100755 --- a/include/rtl8192c_spec.h +++ b/include/rtl8192c_spec.h @@ -556,8 +556,8 @@ Default: 00b. #define TOTAL_CAM_ENTRY 32 #define HALF_CAM_ENTRY 16 -#define CAM_CONFIG_USEDK _TRUE -#define CAM_CONFIG_NO_USEDK _FALSE +#define CAM_CONFIG_USEDK true +#define CAM_CONFIG_NO_USEDK false #define CAM_WRITE BIT16 #define CAM_READ 0x00000000 @@ -1600,15 +1600,15 @@ Current IOREG MAP //2 RXERR_RPT #define RXERR_TYPE_OFDM_PPDU 0 -#define RXERR_TYPE_OFDM_FALSE_ALARM 1 +#define RXERR_TYPE_OFDMfalse_ALARM 1 #define RXERR_TYPE_OFDM_MPDU_OK 2 #define RXERR_TYPE_OFDM_MPDU_FAIL 3 #define RXERR_TYPE_CCK_PPDU 4 -#define RXERR_TYPE_CCK_FALSE_ALARM 5 +#define RXERR_TYPE_CCKfalse_ALARM 5 #define RXERR_TYPE_CCK_MPDU_OK 6 #define RXERR_TYPE_CCK_MPDU_FAIL 7 #define RXERR_TYPE_HT_PPDU 8 -#define RXERR_TYPE_HT_FALSE_ALARM 9 +#define RXERR_TYPE_HTfalse_ALARM 9 #define RXERR_TYPE_HT_MPDU_TOTAL 10 #define RXERR_TYPE_HT_MPDU_OK 11 #define RXERR_TYPE_HT_MPDU_FAIL 12 diff --git a/include/rtl8192d_spec.h b/include/rtl8192d_spec.h index fc8da72..7173377 100755 --- a/include/rtl8192d_spec.h +++ b/include/rtl8192d_spec.h @@ -574,8 +574,8 @@ Default: 00b. #define TOTAL_CAM_ENTRY 32 #define HALF_CAM_ENTRY 16 -#define CAM_CONFIG_USEDK _TRUE -#define CAM_CONFIG_NO_USEDK _FALSE +#define CAM_CONFIG_USEDK true +#define CAM_CONFIG_NO_USEDK false #define CAM_WRITE BIT16 #define CAM_READ 0x00000000 @@ -1559,15 +1559,15 @@ Current IOREG MAP //2 RXERR_RPT #define RXERR_TYPE_OFDM_PPDU 0 -#define RXERR_TYPE_OFDM_FALSE_ALARM 1 +#define RXERR_TYPE_OFDMfalse_ALARM 1 #define RXERR_TYPE_OFDM_MPDU_OK 2 #define RXERR_TYPE_OFDM_MPDU_FAIL 3 #define RXERR_TYPE_CCK_PPDU 4 -#define RXERR_TYPE_CCK_FALSE_ALARM 5 +#define RXERR_TYPE_CCKfalse_ALARM 5 #define RXERR_TYPE_CCK_MPDU_OK 6 #define RXERR_TYPE_CCK_MPDU_FAIL 7 #define RXERR_TYPE_HT_PPDU 8 -#define RXERR_TYPE_HT_FALSE_ALARM 9 +#define RXERR_TYPE_HTfalse_ALARM 9 #define RXERR_TYPE_HT_MPDU_TOTAL 10 #define RXERR_TYPE_HT_MPDU_OK 11 #define RXERR_TYPE_HT_MPDU_FAIL 12 diff --git a/include/rtw_mlme.h b/include/rtw_mlme.h index 7b86911..1de1ed3 100755 --- a/include/rtw_mlme.h +++ b/include/rtw_mlme.h @@ -366,7 +366,7 @@ struct wifidirect_info{ struct tdls_ss_record{ //signal strength record u8 macaddr[ETH_ALEN]; u8 RxPWDBAll; - u8 is_tdls_sta; // _TRUE: direct link sta, _FALSE: else + u8 is_tdls_sta; // true: direct link sta, false: else }; struct tdls_info{ @@ -653,9 +653,9 @@ __inline static u8 *get_bssid(struct mlme_priv *pmlmepriv) __inline static sint check_fwstate(struct mlme_priv *pmlmepriv, sint state) { if (pmlmepriv->fw_state & state) - return _TRUE; + return true; - return _FALSE; + return false; } __inline static sint get_fwstate(struct mlme_priv *pmlmepriv) @@ -675,7 +675,7 @@ __inline static void set_fwstate(struct mlme_priv *pmlmepriv, sint state) pmlmepriv->fw_state |= state; //FOR HW integration if(_FW_UNDER_SURVEY==state){ - pmlmepriv->bScanInProcess = _TRUE; + pmlmepriv->bScanInProcess = true; } } @@ -684,7 +684,7 @@ __inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state) pmlmepriv->fw_state &= ~state; //FOR HW integration if(_FW_UNDER_SURVEY==state){ - pmlmepriv->bScanInProcess = _FALSE; + pmlmepriv->bScanInProcess = false; } } @@ -697,7 +697,7 @@ __inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state) _irqL irqL; _enter_critical_bh(&pmlmepriv->lock, &irqL); - if (check_fwstate(pmlmepriv, state) == _TRUE) + if (check_fwstate(pmlmepriv, state) == true) pmlmepriv->fw_state ^= state; _exit_critical_bh(&pmlmepriv->lock, &irqL); } @@ -775,7 +775,7 @@ void rtw_clear_scan_deny(struct adapter *adapter); void rtw_set_scan_deny_timer_hdl(struct adapter *adapter); void rtw_set_scan_deny(struct adapter *adapter, u32 ms); #else -#define rtw_is_scan_deny(adapter) _FALSE +#define rtw_is_scan_deny(adapter) false #define rtw_clear_scan_deny(adapter) do {} while (0) #define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0) #define rtw_set_scan_deny(adapter, ms) do {} while (0) diff --git a/include/rtw_mp.h b/include/rtw_mp.h index 9bd4016..fa99803 100755 --- a/include/rtw_mp.h +++ b/include/rtw_mp.h @@ -409,8 +409,8 @@ struct bb_reg_param { }; //======================================================================= -#define LOWER _TRUE -#define RAISE _FALSE +#define LOWER true +#define RAISE false /* Hardware Registers */ #define BB_REG_BASE_ADDR 0x800 diff --git a/include/rtw_pwrctrl.h b/include/rtw_pwrctrl.h index 258bdbe..c01d403 100755 --- a/include/rtw_pwrctrl.h +++ b/include/rtw_pwrctrl.h @@ -163,7 +163,7 @@ typedef enum _rt_rf_power_state #define RT_RF_LPS_DISALBE_2R BIT(30) // When LPS is on, disable 2R if no packet is received or transmittd. #define RT_RF_LPS_LEVEL_ASPM BIT(31) // LPS with ASPM -#define RT_IN_PS_LEVEL(ppsc, _PS_FLAG) ((ppsc->cur_ps_level & _PS_FLAG) ? _TRUE : _FALSE) +#define RT_IN_PS_LEVEL(ppsc, _PS_FLAG) ((ppsc->cur_ps_level & _PS_FLAG) ? true : false) #define RT_CLEAR_PS_LEVEL(ppsc, _PS_FLAG) (ppsc->cur_ps_level &= (~(_PS_FLAG))) #define RT_SET_PS_LEVEL(ppsc, _PS_FLAG) (ppsc->cur_ps_level |= _PS_FLAG) @@ -354,8 +354,8 @@ void rtw_set_do_late_resume(struct pwrctrl_priv *pwrpriv, bool enable); void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv); void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv); #else -#define rtw_is_earlysuspend_registered(pwrpriv) _FALSE -#define rtw_is_do_late_resume(pwrpriv) _FALSE +#define rtw_is_earlysuspend_registered(pwrpriv) false +#define rtw_is_do_late_resume(pwrpriv) false #define rtw_set_do_late_resume(pwrpriv, enable) do {} while (0) #define rtw_register_early_suspend(pwrpriv) do {} while (0) #define rtw_unregister_early_suspend(pwrpriv) do {} while (0) diff --git a/include/rtw_security.h b/include/rtw_security.h index 27c7f4f..1eef205 100755 --- a/include/rtw_security.h +++ b/include/rtw_security.h @@ -167,7 +167,7 @@ struct security_priv s32 sw_encrypt;//from registry_priv s32 sw_decrypt;//from registry_priv - s32 hw_decrypted;//if the rx packets is hw_decrypted==_FALSE, it means the hw has not been ready. + s32 hw_decrypted;//if the rx packets is hw_decrypted==false, it means the hw has not been ready. //keeps the auth_type & enc_status from upper layer ioctl(wpa_supplicant or wzc) diff --git a/include/usb_ops.h b/include/usb_ops.h index e55aa1a..868e27f 100755 --- a/include/usb_ops.h +++ b/include/usb_ops.h @@ -63,13 +63,13 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops); static inline u8 rtw_usb_bulk_size_boundary(struct adapter * padapter,int buf_len) { - u8 rst = _TRUE; + u8 rst = true; struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); - if (pdvobjpriv->ishighspeed == _TRUE) - rst = (0 == (buf_len) % USB_HIGH_SPEED_BULK_SIZE)?_TRUE:_FALSE; + if (pdvobjpriv->ishighspeed == true) + rst = (0 == (buf_len) % USB_HIGH_SPEED_BULK_SIZE)?true:false; else - rst = (0 == (buf_len) % USB_FULL_SPEED_BULK_SIZE)?_TRUE:_FALSE; + rst = (0 == (buf_len) % USB_FULL_SPEED_BULK_SIZE)?true:false; return rst; } diff --git a/include/wifi.h b/include/wifi.h index fb351f6..4682eb0 100755 --- a/include/wifi.h +++ b/include/wifi.h @@ -366,9 +366,9 @@ enum WIFI_REG_DOMAIN { __inline static int IS_MCAST(unsigned char *da) { if ((*da) & 0x01) - return _TRUE; + return true; else - return _FALSE; + return false; } @@ -449,9 +449,9 @@ __inline static unsigned char * get_hdr_bssid(unsigned char *pframe) __inline static int IsFrameTypeCtrl(unsigned char *pframe) { if(WIFI_CTRL_TYPE == GetFrameType(pframe)) - return _TRUE; + return true; else - return _FALSE; + return false; } /*----------------------------------------------------------------------------- Below is for the security related definition diff --git a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c index 14c784a..0c1c60e 100755 --- a/os_dep/ioctl_cfg80211.c +++ b/os_dep/ioctl_cfg80211.c @@ -430,7 +430,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl notify_ielen = pnetwork->network.IELength-_FIXED_IE_LENGTH_; //We've set wiphy's signal_type as CFG80211_SIGNAL_TYPE_MBM: signal strength in mBm (100*dBm) - if ( check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE && + if ( check_fwstate(pmlmepriv, _FW_LINKED)== true && is_same_network(&pmlmepriv->cur_network.network, &pnetwork->network, 0)) { notify_signal = 100*translate_percentage_to_dbm(padapter->recvpriv.signal_strength);//dbm } else { @@ -533,7 +533,7 @@ exit: Check the given bss is valid by kernel API cfg80211_get_bss() @padapter : the given adapter - return _TRUE if bss is valid, _FALSE for not found. + return true if bss is valid, false for not found. */ int rtw_cfg80211_check_bss(struct adapter *padapter) { @@ -543,7 +543,7 @@ int rtw_cfg80211_check_bss(struct adapter *padapter) u32 freq; if (!(pnetwork) || !(padapter->rtw_wdev)) - return _FALSE; + return false; if (pnetwork->Configuration.DSConfig <= RTW_CH_MAX_2G_CHANNEL) freq = rtw_ieee80211_channel_to_frequency(pnetwork->Configuration.DSConfig, IEEE80211_BAND_2GHZ); @@ -580,7 +580,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter) WLAN_BSSID_EX *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network); struct wlan_network *scanned = pmlmepriv->cur_network_scanned; - if(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==_TRUE) + if(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==true) { _rtw_memcpy(&cur_network->network, pnetwork, sizeof(WLAN_BSSID_EX)); @@ -602,8 +602,8 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter) if(scanned == NULL) rtw_warn_on(1); - if (_rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(NDIS_802_11_SSID)) == _TRUE - && _rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(NDIS_802_11_MAC_ADDRESS)) == _TRUE + if (_rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(NDIS_802_11_SSID)) == true + && _rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(NDIS_802_11_MAC_ADDRESS)) == true ) { if (!rtw_cfg80211_inform_bss(padapter,scanned)) { DBG_871X(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter)); @@ -651,7 +651,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter) return; } - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) return; #ifdef CONFIG_P2P @@ -678,8 +678,8 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter) goto check_bss; } - if (_rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(NDIS_802_11_MAC_ADDRESS)) == _TRUE - && _rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(NDIS_802_11_SSID)) == _TRUE + if (_rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(NDIS_802_11_MAC_ADDRESS)) == true + && _rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(NDIS_802_11_SSID)) == true ) { if (!rtw_cfg80211_inform_bss(padapter,scanned)) { DBG_871X(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter)); @@ -757,7 +757,7 @@ void rtw_cfg80211_indicate_disconnect(struct adapter *padapter) return; } - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) return; #ifdef CONFIG_P2P @@ -1046,7 +1046,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa _rtw_memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); _rtw_memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); - psecuritypriv->busetkipkey = _TRUE; + psecuritypriv->busetkipkey = true; } else if(strcmp(param->u.crypt.alg, "CCMP") == 0) @@ -1066,7 +1066,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psecuritypriv->dot118021XGrpKeyid = param->u.crypt.idx; - psecuritypriv->binstallGrpkey = _TRUE; + psecuritypriv->binstallGrpkey = true; psecuritypriv->dot11PrivacyAlgrthm = psecuritypriv->dot118021XGrpPrivacy;//!!! @@ -1075,7 +1075,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa pbcmc_sta=rtw_get_bcmc_stainfo(padapter); if(pbcmc_sta) { - pbcmc_sta->ieee8021x_blocked = _FALSE; + pbcmc_sta->ieee8021x_blocked = false; pbcmc_sta->dot118021XPrivacy= psecuritypriv->dot118021XGrpPrivacy;//rx will use bmc_sta's dot118021XPrivacy } @@ -1114,7 +1114,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa _rtw_memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); _rtw_memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); - psecuritypriv->busetkipkey = _TRUE; + psecuritypriv->busetkipkey = true; } else if(strcmp(param->u.crypt.alg, "CCMP") == 0) @@ -1133,9 +1133,9 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa set_pairwise_key(padapter, psta); - psta->ieee8021x_blocked = _FALSE; + psta->ieee8021x_blocked = false; - psta->bpairwise_key_installed = _TRUE; + psta->bpairwise_key_installed = true; } else//group key??? @@ -1161,7 +1161,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa _rtw_memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); _rtw_memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); - psecuritypriv->busetkipkey = _TRUE; + psecuritypriv->busetkipkey = true; } else if(strcmp(param->u.crypt.alg, "CCMP") == 0) @@ -1177,7 +1177,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psecuritypriv->dot118021XGrpKeyid = param->u.crypt.idx; - psecuritypriv->binstallGrpkey = _TRUE; + psecuritypriv->binstallGrpkey = true; psecuritypriv->dot11PrivacyAlgrthm = psecuritypriv->dot118021XGrpPrivacy;//!!! @@ -1186,7 +1186,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa pbcmc_sta=rtw_get_bcmc_stainfo(padapter); if(pbcmc_sta) { - pbcmc_sta->ieee8021x_blocked = _FALSE; + pbcmc_sta->ieee8021x_blocked = false; pbcmc_sta->dot118021XPrivacy= psecuritypriv->dot118021XGrpPrivacy;//rx will use bmc_sta's dot118021XPrivacy } @@ -1287,7 +1287,7 @@ _func_enter_; psecuritypriv->dot11DefKeylen[wep_key_idx] = wep_key_len; - rtw_set_key(padapter, psecuritypriv, wep_key_idx, 0,_TRUE); + rtw_set_key(padapter, psecuritypriv, wep_key_idx, 0,true); goto exit; } @@ -1299,7 +1299,7 @@ _func_enter_; //DBG_8192C("%s, : dot11AuthAlgrthm == dot11AuthAlgrthm_8021X \n", __func__); - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_MP_STATE) == _TRUE) //sta mode + if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_MP_STATE) == true) //sta mode { psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv)); if (psta == NULL) { @@ -1310,7 +1310,7 @@ _func_enter_; { //Jeff: don't disable ieee8021x_blocked while clearing key if (strcmp(param->u.crypt.alg, "none") != 0) - psta->ieee8021x_blocked = _FALSE; + psta->ieee8021x_blocked = false; if((padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption2Enabled)|| @@ -1332,14 +1332,14 @@ _func_enter_; _rtw_memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); _rtw_memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); - padapter->securitypriv.busetkipkey=_FALSE; + padapter->securitypriv.busetkipkey=false; //_set_timer(&padapter->securitypriv.tkip_timer, 50); } //DEBUG_ERR((" param->u.crypt.key_len=%d\n",param->u.crypt.key_len)); DBG_871X(" ~~~~set sta key:unicastkey\n"); - rtw_setstakey_cmd(padapter, (unsigned char *)psta, _TRUE, _TRUE); + rtw_setstakey_cmd(padapter, (unsigned char *)psta, true, true); } else//group key { @@ -1348,18 +1348,18 @@ _func_enter_; _rtw_memcpy(padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); _rtw_memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[16]),8); _rtw_memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[24]),8); - padapter->securitypriv.binstallGrpkey = _TRUE; + padapter->securitypriv.binstallGrpkey = true; //DEBUG_ERR((" param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); DBG_871X(" ~~~~set sta key:groupkey\n"); padapter->securitypriv.dot118021XGrpKeyid = param->u.crypt.idx; #ifdef CONFIG_CONCURRENT_MODE if (padapter->adapter_type == PRIMARY_ADAPTER) - rtw_set_key(padapter,&padapter->securitypriv,param->u.crypt.idx, 1,_TRUE); + rtw_set_key(padapter,&padapter->securitypriv,param->u.crypt.idx, 1,true); else DBG_871X_LEVEL(_drv_always_, "second interface do not set cam.\n"); #else - rtw_set_key(padapter,&padapter->securitypriv,param->u.crypt.idx, 1,_TRUE); + rtw_set_key(padapter,&padapter->securitypriv,param->u.crypt.idx, 1,true); #endif } #ifdef CONFIG_IEEE80211W @@ -1374,7 +1374,7 @@ _func_enter_; printk(" %02x ", padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey[no]); DBG_871X("\n");*/ padapter->securitypriv.dot11wBIPKeyid = param->u.crypt.idx; - padapter->securitypriv.binstallBIPkey = _TRUE; + padapter->securitypriv.binstallBIPkey = true; DBG_871X(" ~~~~set sta key:IGKT\n"); } #endif //CONFIG_IEEE80211W @@ -1401,7 +1401,7 @@ _func_enter_; { //Jeff: don't disable ieee8021x_blocked while clearing key if (strcmp(param->u.crypt.alg, "none") != 0) - pbcmc_sta->ieee8021x_blocked = _FALSE; + pbcmc_sta->ieee8021x_blocked = false; if((padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption2Enabled)|| (padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption3Enabled)) @@ -1593,11 +1593,11 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev, _rtw_memcpy(param->u.crypt.key, (void *)params->key, params->key_len); } - if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) { ret = rtw_cfg80211_set_encryption(ndev, param, param_len); } - else if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + else if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { #ifdef CONFIG_AP_MODE if(mac_addr) @@ -1739,7 +1739,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy, { struct wlan_network *cur_network = &(pmlmepriv->cur_network); - if (_rtw_memcmp((void *)mac, cur_network->network.MacAddress, ETH_ALEN) == _FALSE) { + if (_rtw_memcmp((void *)mac, cur_network->network.MacAddress, ETH_ALEN) == false) { DBG_871X("%s, mismatch bssid="MAC_FMT"\n", __func__, MAC_ARG(cur_network->network.MacAddress)); ret = -ENOENT; goto exit; @@ -1809,11 +1809,11 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy, struct wifidirect_info *pwdinfo= &(padapter->wdinfo); #endif int ret = 0; - u8 change = _FALSE; + u8 change = false; DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); - if(adapter_to_dvobj(padapter)->processing_dev_remove == _TRUE) + if(adapter_to_dvobj(padapter)->processing_dev_remove == true) { ret= -EPERM; goto exit; @@ -1850,7 +1850,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy, if(old_type != type) { - change = _TRUE; + change = true; pmlmeext->action_public_rxseq = 0xffff; pmlmeext->action_public_dialog_token = 0xff; } @@ -1900,14 +1900,14 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy, rtw_wdev->iftype = type; - if (rtw_set_802_11_infrastructure_mode(padapter, networkType) ==_FALSE) + if (rtw_set_802_11_infrastructure_mode(padapter, networkType) ==false) { rtw_wdev->iftype = old_type; ret = -EPERM; goto exit; } - rtw_setopmode_cmd(padapter, networkType,_TRUE); + rtw_setopmode_cmd(padapter, networkType,true); exit: @@ -1974,14 +1974,14 @@ void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter) while(1) { - if (rtw_end_of_queue_search(phead,plist)== _TRUE) + if (rtw_end_of_queue_search(phead,plist)== true) break; pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); //report network only if the current channel set contains the channel to which this network belongs if(rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0 - && _TRUE == rtw_validate_ssid(&(pnetwork->network.Ssid)) + && true == rtw_validate_ssid(&(pnetwork->network.Ssid)) ) { //ev=translate_scan(padapter, a, pnetwork, ev, stop); @@ -1995,7 +1995,7 @@ void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter) _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); //call this after other things have been done - rtw_cfg80211_indicate_scan_done(wdev_to_priv(padapter->rtw_wdev), _FALSE); + rtw_cfg80211_indicate_scan_done(wdev_to_priv(padapter->rtw_wdev), false); } static int rtw_cfg80211_set_probe_req_wpsp2pie(struct adapter *padapter, char *buf, int len) @@ -2124,7 +2124,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy , struct cfg80211_scan_request *request) { int i; - u8 _status = _FALSE; + u8 _status = false; int ret = 0; struct adapter *padapter = wiphy_to_adapter(wiphy); struct mlme_priv *pmlmepriv= &padapter->mlmepriv; @@ -2143,7 +2143,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); struct cfg80211_ssid *ssids = request->ssids; int social_channel = 0, j = 0; - bool need_indicate_scan_done = _FALSE; + bool need_indicate_scan_done = false; #ifdef CONFIG_CONCURRENT_MODE PADAPTER pbuddy_adapter = NULL; struct mlme_priv *pbuddy_mlmepriv = NULL; @@ -2164,13 +2164,13 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy pwdev_priv->scan_request = request; _exit_critical_bh(&pwdev_priv->scan_req_lock, &irqL); - if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { #ifdef CONFIG_DEBUG_CFG80211 DBG_871X("%s under WIFI_AP_STATE\n", __FUNCTION__); #endif - if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS|_FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) + if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS|_FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) { DBG_8192C("%s, fwstate=0x%x\n", __func__, pmlmepriv->fw_state); @@ -2179,13 +2179,13 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy DBG_8192C("AP mode process WPS \n"); } - need_indicate_scan_done = _TRUE; + need_indicate_scan_done = true; goto check_need_indicate_scan_done; } } if(_FAIL == rtw_pwr_wakeup(padapter)) { - need_indicate_scan_done = _TRUE; + need_indicate_scan_done = true; goto check_need_indicate_scan_done; } @@ -2200,7 +2200,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) { rtw_p2p_enable(padapter, P2P_ROLE_DEVICE); - wdev_to_priv(padapter->rtw_wdev)->p2p_enabled = _TRUE; + wdev_to_priv(padapter->rtw_wdev)->p2p_enabled = true; } else { @@ -2228,49 +2228,49 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy rtw_cfg80211_set_probe_req_wpsp2pie(padapter, (u8 *)request->ie, request->ie_len ); } - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) { DBG_8192C("%s, fwstate=0x%x\n", __func__, pmlmepriv->fw_state); - need_indicate_scan_done = _TRUE; + need_indicate_scan_done = true; goto check_need_indicate_scan_done; - } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) { + } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true) { DBG_8192C("%s, fwstate=0x%x\n", __func__, pmlmepriv->fw_state); ret = -EBUSY; goto check_need_indicate_scan_done; } - if (pmlmepriv->LinkDetectInfo.bBusyTraffic == _TRUE) + if (pmlmepriv->LinkDetectInfo.bBusyTraffic == true) { - DBG_8192C("%s, bBusyTraffic == _TRUE\n", __func__); - need_indicate_scan_done = _TRUE; + DBG_8192C("%s, bBusyTraffic == true\n", __func__); + need_indicate_scan_done = true; goto check_need_indicate_scan_done; } if (rtw_is_scan_deny(padapter)){ DBG_871X(FUNC_ADPT_FMT ": scan deny\n", FUNC_ADPT_ARG(padapter)); - need_indicate_scan_done = _TRUE; + need_indicate_scan_done = true; goto check_need_indicate_scan_done; } #ifdef CONFIG_CONCURRENT_MODE - if(pbuddy_mlmepriv && (pbuddy_mlmepriv->LinkDetectInfo.bBusyTraffic == _TRUE)) + if(pbuddy_mlmepriv && (pbuddy_mlmepriv->LinkDetectInfo.bBusyTraffic == true)) { - DBG_8192C("%s, bBusyTraffic == _TRUE at buddy_intf\n", __func__); - need_indicate_scan_done = _TRUE; + DBG_8192C("%s, bBusyTraffic == true at buddy_intf\n", __func__); + need_indicate_scan_done = true; goto check_need_indicate_scan_done; } if (check_buddy_fwstate(padapter, - _FW_UNDER_SURVEY|_FW_UNDER_LINKING|WIFI_UNDER_WPS) == _TRUE) + _FW_UNDER_SURVEY|_FW_UNDER_LINKING|WIFI_UNDER_WPS) == true) { if(check_buddy_fwstate(padapter, _FW_UNDER_SURVEY)) { DBG_8192C("scanning_via_buddy_intf\n"); - pmlmepriv->scanning_via_buddy_intf = _TRUE; + pmlmepriv->scanning_via_buddy_intf = true; } DBG_8192C("buddy_intf's mlme state:0x%x\n", pbuddy_mlmepriv->fw_state); - need_indicate_scan_done = _TRUE; + need_indicate_scan_done = true; goto check_need_indicate_scan_done; } #endif @@ -2282,7 +2282,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) && !rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE)) { rtw_p2p_set_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH); - rtw_free_network_queue(padapter, _TRUE); + rtw_free_network_queue(padapter, true); if(social_channel == 0) rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE); @@ -2331,7 +2331,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy _exit_critical_bh(&pmlmepriv->lock, &irqL); - if(_status == _FALSE) + if(_status == false) { ret = -1; } @@ -2724,7 +2724,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel || padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_WTMIC_ || padapter->securitypriv.dot11PrivacyAlgrthm == _AES_) //WPS open need to enable multicast - //|| check_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS) == _TRUE) + //|| check_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS) == true) rtw_hal_set_hwreg(padapter, HW_VAR_OFF_RCR_AM, null_addr); RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, @@ -2759,12 +2759,12 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev, } #ifdef CONFIG_CONCURRENT_MODE - if (check_buddy_fwstate(padapter, _FW_UNDER_LINKING) == _TRUE) { + if (check_buddy_fwstate(padapter, _FW_UNDER_LINKING) == true) { DBG_8192C("%s, but buddy_intf is under linking\n", __FUNCTION__); ret = -EINVAL; goto exit; } - if (check_buddy_fwstate(padapter, _FW_UNDER_SURVEY) == _TRUE) { + if (check_buddy_fwstate(padapter, _FW_UNDER_SURVEY) == true) { rtw_scan_abort(padapter->pbuddy_adapter); } #endif //CONFIG_CONCURRENT_MODE @@ -2796,7 +2796,7 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev, ret = rtw_cfg80211_set_auth_type(psecuritypriv, NL80211_AUTHTYPE_OPEN_SYSTEM); rtw_set_802_11_authentication_mode(padapter, psecuritypriv->ndisauthtype); - if (rtw_set_802_11_ssid(padapter, &ndis_ssid) == _FALSE) + if (rtw_set_802_11_ssid(padapter, &ndis_ssid) == false) { ret = -1; goto exit; @@ -2823,22 +2823,22 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, NDIS_802_11_SSID ndis_ssid; u8 *dst_ssid, *src_ssid; u8 *dst_bssid, *src_bssid; - //u8 matched_by_bssid=_FALSE; - //u8 matched_by_ssid=_FALSE; - u8 matched=_FALSE; + //u8 matched_by_bssid=false; + //u8 matched_by_ssid=false; + u8 matched=false; struct adapter *padapter = wiphy_to_adapter(wiphy); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct security_priv *psecuritypriv = &padapter->securitypriv; _queue *queue = &pmlmepriv->scanned_queue; - padapter->mlmepriv.not_indic_disco = _TRUE; + padapter->mlmepriv.not_indic_disco = true; DBG_871X("=>"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_871X("privacy=%d, key=%p, key_len=%d, key_idx=%d\n", sme->privacy, sme->key, sme->key_len, sme->key_idx); - if(wdev_to_priv(padapter->rtw_wdev)->block == _TRUE) + if(wdev_to_priv(padapter->rtw_wdev)->block == true) { ret = -EBUSY; DBG_871X("%s wdev_priv.block is set\n", __FUNCTION__); @@ -2847,7 +2847,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, #ifdef CONFIG_PLATFORM_MSTAR printk("MStar Android!\n"); - if((wdev_to_priv(padapter->rtw_wdev))->bandroid_scan == _FALSE) + if((wdev_to_priv(padapter->rtw_wdev))->bandroid_scan == false) { #ifdef CONFIG_P2P struct wifidirect_info *pwdinfo= &(padapter->wdinfo); @@ -2872,12 +2872,12 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, } #ifdef CONFIG_CONCURRENT_MODE - if (check_buddy_fwstate(padapter, _FW_UNDER_LINKING) == _TRUE) { + if (check_buddy_fwstate(padapter, _FW_UNDER_LINKING) == true) { DBG_8192C("%s, but buddy_intf is under linking\n", __FUNCTION__); ret = -EINVAL; goto exit; } - if (check_buddy_fwstate(padapter, _FW_UNDER_SURVEY) == _TRUE) { + if (check_buddy_fwstate(padapter, _FW_UNDER_SURVEY) == true) { rtw_scan_abort(padapter->pbuddy_adapter); } #endif @@ -2905,12 +2905,12 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, DBG_8192C("bssid="MAC_FMT"\n", MAC_ARG(sme->bssid)); - if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) { + if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true) { ret = -EBUSY; DBG_8192C("%s, fw_state=0x%x, goto exit\n", __FUNCTION__, pmlmepriv->fw_state); goto exit; } - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) { rtw_scan_abort(padapter); } @@ -2955,7 +2955,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, goto exit; if (sme->crypto.n_ciphers_pairwise) { - ret = rtw_cfg80211_set_cipher(psecuritypriv, sme->crypto.ciphers_pairwise[0], _TRUE); + ret = rtw_cfg80211_set_cipher(psecuritypriv, sme->crypto.ciphers_pairwise[0], true); if (ret < 0) goto exit; } @@ -3022,7 +3022,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, goto exit; } - ret = rtw_cfg80211_set_cipher(psecuritypriv, sme->crypto.cipher_group, _FALSE); + ret = rtw_cfg80211_set_cipher(psecuritypriv, sme->crypto.cipher_group, false); if (ret < 0) return ret; @@ -3046,7 +3046,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, //rtw_set_802_11_encryption_mode(padapter, padapter->securitypriv.ndisencryptstatus); - if (rtw_set_802_11_connect(padapter, (void *)sme->bssid, &ndis_ssid) == _FALSE) { + if (rtw_set_802_11_connect(padapter, (void *)sme->bssid, &ndis_ssid) == false) { ret = -1; goto exit; } @@ -3057,7 +3057,7 @@ exit: DBG_8192C("<=%s, ret %d\n",__FUNCTION__, ret); - padapter->mlmepriv.not_indic_disco = _FALSE; + padapter->mlmepriv.not_indic_disco = false; return ret; } @@ -3069,7 +3069,7 @@ static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev, DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); - padapter->mlmepriv.not_indic_disco = _TRUE; + padapter->mlmepriv.not_indic_disco = true; rtw_set_roaming(padapter, 0); @@ -3077,7 +3077,7 @@ static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev, { rtw_scan_abort(padapter); LeaveAllPowerSaveMode(padapter); - rtw_disassoc_cmd(padapter, 500, _FALSE); + rtw_disassoc_cmd(padapter, 500, false); DBG_871X("%s...call rtw_indicate_disconnect\n", __FUNCTION__); @@ -3086,7 +3086,7 @@ static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev, rtw_free_assoc_resources(padapter, 1); } - padapter->mlmepriv.not_indic_disco = _FALSE; + padapter->mlmepriv.not_indic_disco = false; return 0; } @@ -3148,29 +3148,29 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy, struct net_device *netdev, struct cfg80211_pmksa *pmksa) { - u8 index,blInserted = _FALSE; + u8 index,blInserted = false; struct adapter *padapter = wiphy_to_adapter(wiphy); struct security_priv *psecuritypriv = &padapter->securitypriv; u8 strZeroMacAddress[ ETH_ALEN ] = { 0x00 }; DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev)); - if ( _rtw_memcmp((void *)pmksa->bssid, strZeroMacAddress, ETH_ALEN ) == _TRUE ) + if ( _rtw_memcmp((void *)pmksa->bssid, strZeroMacAddress, ETH_ALEN ) == true ) return -EINVAL; - blInserted = _FALSE; + blInserted = false; //overwrite PMKID for(index=0 ; indexPMKIDList[index].Bssid, (void *)pmksa->bssid, ETH_ALEN) ==_TRUE ) + if( _rtw_memcmp( psecuritypriv->PMKIDList[index].Bssid, (void *)pmksa->bssid, ETH_ALEN) ==true ) { // BSSID is matched, the same AP => rewrite with new PMKID. DBG_871X(FUNC_NDEV_FMT" BSSID exists in the PMKList.\n", FUNC_NDEV_ARG(netdev)); _rtw_memcpy( psecuritypriv->PMKIDList[index].PMKID, (void *)pmksa->pmkid, WLAN_PMKID_LEN); - psecuritypriv->PMKIDList[index].bUsed = _TRUE; + psecuritypriv->PMKIDList[index].bUsed = true; psecuritypriv->PMKIDIndex = index+1; - blInserted = _TRUE; + blInserted = true; break; } } @@ -3184,7 +3184,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy, _rtw_memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, (void *)pmksa->bssid, ETH_ALEN); _rtw_memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].PMKID, (void *)pmksa->pmkid, WLAN_PMKID_LEN); - psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].bUsed = _TRUE; + psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].bUsed = true; psecuritypriv->PMKIDIndex++ ; if(psecuritypriv->PMKIDIndex==16) { @@ -3199,7 +3199,7 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy, struct net_device *netdev, struct cfg80211_pmksa *pmksa) { - u8 index, bMatched = _FALSE; + u8 index, bMatched = false; struct adapter *padapter = wiphy_to_adapter(wiphy); struct security_priv *psecuritypriv = &padapter->securitypriv; @@ -3207,17 +3207,17 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy, for(index=0 ; indexPMKIDList[index].Bssid, (void *)pmksa->bssid, ETH_ALEN) ==_TRUE ) + if( _rtw_memcmp( psecuritypriv->PMKIDList[index].Bssid, (void *)pmksa->bssid, ETH_ALEN) ==true ) { // BSSID is matched, the same AP => Remove this PMKID information and reset it. _rtw_memset( psecuritypriv->PMKIDList[index].Bssid, 0x00, ETH_ALEN ); _rtw_memset( psecuritypriv->PMKIDList[index].PMKID, 0x00, WLAN_PMKID_LEN ); - psecuritypriv->PMKIDList[index].bUsed = _FALSE; - bMatched = _TRUE; + psecuritypriv->PMKIDList[index].bUsed = false; + bMatched = true; break; } } - if(_FALSE == bMatched) + if(false == bMatched) { DBG_871X(FUNC_NDEV_FMT" do not have matched BSSID\n" , FUNC_NDEV_ARG(netdev)); @@ -3459,7 +3459,7 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de u8 category, action; int type = -1; - if (rtw_action_frame_parse(buf, len, &category, &action) == _FALSE) { + if (rtw_action_frame_parse(buf, len, &category, &action) == false) { DBG_8192C(FUNC_NDEV_FMT" frame_control:0x%x\n", FUNC_NDEV_ARG(ndev), le16_to_cpu(((struct rtw_ieee80211_hdr_3addr *)buf)->frame_ctl)); goto fail; @@ -3468,7 +3468,7 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de DBG_8192C("RTW_Tx:da="MAC_FMT" via "FUNC_NDEV_FMT"\n", MAC_ARG(GetAddr1Ptr(buf)), FUNC_NDEV_ARG(ndev)); #ifdef CONFIG_P2P - if((type = rtw_p2p_check_frames(padapter, buf, len, _TRUE)) >= 0) + if((type = rtw_p2p_check_frames(padapter, buf, len, true)) >= 0) goto dump; #endif if (category == RTW_WLAN_CATEGORY_PUBLIC) @@ -3486,7 +3486,7 @@ dump: //update attribute pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - pattrib->retry_ctrl = _FALSE; + pattrib->retry_ctrl = false; _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); @@ -3500,7 +3500,7 @@ dump: pwfd_info = padapter->wdinfo.wfd_info; - if ( _TRUE == pwfd_info->wfd_enable ) + if ( true == pwfd_info->wfd_enable ) { rtw_append_wfd_ie( padapter, pframe, &len ); } @@ -3741,7 +3741,7 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_l uint len, wps_ielen=0; uint p2p_ielen=0; u8 *p2p_ie; - u8 got_p2p_ie = _FALSE; + u8 got_p2p_ie = false; struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); //struct sta_priv *pstapriv = &padapter->stapriv; @@ -3749,7 +3749,7 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_l DBG_8192C("%s beacon_head_len=%zu, beacon_tail_len=%zu\n", __FUNCTION__, head_len, tail_len); - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != true) return -EINVAL; if(head_len<24) @@ -3787,13 +3787,13 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_l struct wifidirect_info *pwdinfo= &(adapter->wdinfo); DBG_8192C("got p2p_ie, len=%d\n", p2p_ielen); - got_p2p_ie = _TRUE; + got_p2p_ie = true; if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) { DBG_8192C("Enable P2P function for the first time\n"); rtw_p2p_enable(adapter, P2P_ROLE_GO); - wdev_to_priv(adapter->rtw_wdev)->p2p_enabled = _TRUE; + wdev_to_priv(adapter->rtw_wdev)->p2p_enabled = true; } else { @@ -3815,7 +3815,7 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_l { #ifdef CONFIG_P2P //check p2p if enable - if(got_p2p_ie == _TRUE) + if(got_p2p_ie == true) { struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct wifidirect_info *pwdinfo= &(adapter->wdinfo); @@ -3856,7 +3856,7 @@ static int cfg80211_rtw_set_beacon(struct wiphy *wiphy, struct net_device *ndev, DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); - pmlmeext->bstart_bss = _TRUE; + pmlmeext->bstart_bss = true; cfg80211_rtw_add_beacon(wiphy, ndev, info); @@ -3953,7 +3953,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev DBG_871X("+"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); - if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != _TRUE) + if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true) { DBG_8192C("%s, fw_state != FW_LINKED|WIFI_AP_STATE\n", __func__); return -EINVAL; @@ -3988,7 +3988,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev plist = get_next(phead); //check asoc_queue - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); @@ -3996,9 +3996,9 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev if(_rtw_memcmp((void *)mac, psta->hwaddr, ETH_ALEN)) { - if(psta->dot8021xalg == 1 && psta->bpairwise_key_installed == _FALSE) + if(psta->dot8021xalg == 1 && psta->bpairwise_key_installed == false) { - DBG_8192C("%s, sta's dot8021xalg = 1 and key_installed = _FALSE\n", __func__); + DBG_8192C("%s, sta's dot8021xalg = 1 and key_installed = false\n", __func__); } else { @@ -4008,7 +4008,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev pstapriv->asoc_list_cnt--; //_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); - updated = ap_free_sta(padapter, psta, _TRUE, WLAN_REASON_DEAUTH_LEAVING); + updated = ap_free_sta(padapter, psta, true, WLAN_REASON_DEAUTH_LEAVING); //_enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); psta = NULL; @@ -4118,7 +4118,7 @@ void rtw_cfg80211_rx_action_p2p(struct adapter *padapter, u8 *pmgmt_frame, uint DBG_8192C("RTW_Rx:cur_ch=%d\n", channel); #ifdef CONFIG_P2P - type = rtw_p2p_check_frames(padapter, pmgmt_frame, frame_len, _FALSE); + type = rtw_p2p_check_frames(padapter, pmgmt_frame, frame_len, false); if (type >= 0) goto indicate; #endif @@ -4150,7 +4150,7 @@ void rtw_cfg80211_rx_p2p_action_public(struct adapter *padapter, u8 *pmgmt_frame DBG_8192C("RTW_Rx:cur_ch=%d\n", channel); #ifdef CONFIG_P2P - type = rtw_p2p_check_frames(padapter, pmgmt_frame, frame_len, _FALSE); + type = rtw_p2p_check_frames(padapter, pmgmt_frame, frame_len, false); if (type >= 0) { switch (type) { case P2P_GO_NEGO_CONF: @@ -4454,11 +4454,11 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy, struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; u8 remain_ch = (u8) ieee80211_frequency_to_channel(channel->center_freq); - u8 ready_on_channel = _FALSE; + u8 ready_on_channel = false; DBG_871X(FUNC_ADPT_FMT" ch:%u duration:%d\n", FUNC_ADPT_ARG(padapter), remain_ch, duration); - if(pcfg80211_wdinfo->is_ro_ch == _TRUE) + if(pcfg80211_wdinfo->is_ro_ch == true) { DBG_8192C("%s, cancel ro ch timer\n", __func__); @@ -4471,7 +4471,7 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy, p2p_protocol_wk_hdl(padapter, P2P_RO_CH_WK); } - pcfg80211_wdinfo->is_ro_ch = _TRUE; + pcfg80211_wdinfo->is_ro_ch = true; if(_FAIL == rtw_pwr_wakeup(padapter)) { err = -EFAULT; @@ -4494,7 +4494,7 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy, if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) { rtw_p2p_enable(padapter, P2P_ROLE_DEVICE); - wdev_to_priv(padapter->rtw_wdev)->p2p_enabled = _TRUE; + wdev_to_priv(padapter->rtw_wdev)->p2p_enabled = true; padapter->wdinfo.listen_channel = remain_ch; } else @@ -4545,14 +4545,14 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy, } } - ready_on_channel = _TRUE; + ready_on_channel = true; //pmlmeext->cur_channel = remain_ch; //set_channel_bwmode(padapter, remain_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); }else #endif //CONFIG_CONCURRENT_MODE if(remain_ch != rtw_get_oper_ch(padapter) ) { - ready_on_channel = _TRUE; + ready_on_channel = true; //pmlmeext->cur_channel = remain_ch; //set_channel_bwmode(padapter, remain_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); } @@ -4570,7 +4570,7 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy, ATOMIC_SET(&pwdev_priv->ro_ch_to, 0); #endif - if(ready_on_channel == _TRUE) + if(ready_on_channel == true) { if ( !check_fwstate(&padapter->mlmepriv, _FW_LINKED ) ) { @@ -4591,7 +4591,7 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy, exit: if (err) - pcfg80211_wdinfo->is_ro_ch = _FALSE; + pcfg80211_wdinfo->is_ro_ch = false; return err; } @@ -4612,7 +4612,7 @@ static s32 cfg80211_rtw_cancel_remain_on_channel(struct wiphy *wiphy, DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); - if (pcfg80211_wdinfo->is_ro_ch == _TRUE) { + if (pcfg80211_wdinfo->is_ro_ch == true) { DBG_8192C("%s, cancel ro ch timer\n", __func__); _cancel_timer_ex(&padapter->cfg80211_wdinfo.remain_on_ch_timer); #ifdef CONFIG_CONCURRENT_MODE @@ -4627,7 +4627,7 @@ static s32 cfg80211_rtw_cancel_remain_on_channel(struct wiphy *wiphy, DBG_8192C("%s, role=%d, p2p_state=%d\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo)); #endif } - pcfg80211_wdinfo->is_ro_ch = _FALSE; + pcfg80211_wdinfo->is_ro_ch = false; return err; } @@ -4640,7 +4640,7 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *b struct pkt_attrib *pattrib; unsigned char *pframe; int ret = _FAIL; - bool ack = _TRUE; + bool ack = true; struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); @@ -4662,10 +4662,10 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *b rtw_scan_abort(padapter->pbuddy_adapter); #endif /* CONFIG_CONCURRENT_MODE */ - if (padapter->cfg80211_wdinfo.is_ro_ch == _TRUE) { + if (padapter->cfg80211_wdinfo.is_ro_ch == true) { //DBG_8192C("%s, cancel ro ch timer\n", __func__); //_cancel_timer_ex(&padapter->cfg80211_wdinfo.remain_on_ch_timer); - //padapter->cfg80211_wdinfo.is_ro_ch = _FALSE; + //padapter->cfg80211_wdinfo.is_ro_ch = false; #ifdef CONFIG_CONCURRENT_MODE if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED )) { @@ -4736,7 +4736,7 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *b //update attribute pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - pattrib->retry_ctrl = _FALSE; + pattrib->retry_ctrl = false; _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); @@ -4757,7 +4757,7 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *b pwfd_info = padapter->wdinfo.wfd_info; - if ( _TRUE == pwfd_info->wfd_enable ) + if ( true == pwfd_info->wfd_enable ) { rtw_append_wfd_ie( padapter, pframe, &pattrib->pktlen ); } @@ -4768,7 +4768,7 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *b if (dump_mgntframe_and_wait_ack(padapter, pmgntframe) != _SUCCESS) { - ack = _FALSE; + ack = false; ret = _FAIL; #ifdef CONFIG_DEBUG_CFG80211 @@ -4834,7 +4834,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, int tx_ret; u32 dump_limit = RTW_MAX_MGMT_TX_CNT; u32 dump_cnt = 0; - bool ack = _TRUE; + bool ack = true; #if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) struct ieee80211_channel *chan = params->chan; const u8 *buf = params->buf; @@ -4874,7 +4874,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, cfg80211_action_tx_status(ndev, *cookie, buf, len, ack, GFP_KERNEL); #endif - if (rtw_action_frame_parse(buf, len, &category, &action) == _FALSE) { + if (rtw_action_frame_parse(buf, len, &category, &action) == false) { DBG_8192C(FUNC_ADPT_FMT" frame_control:0x%x\n", FUNC_ADPT_ARG(padapter), le16_to_cpu(((struct rtw_ieee80211_hdr_3addr *)buf)->frame_ctl)); goto exit; @@ -4882,7 +4882,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, DBG_8192C("RTW_Tx:tx_ch=%d, da="MAC_FMT"\n", tx_ch, MAC_ARG(GetAddr1Ptr(buf))); #ifdef CONFIG_P2P - if((type = rtw_p2p_check_frames(padapter, buf, len, _TRUE)) >= 0) { + if((type = rtw_p2p_check_frames(padapter, buf, len, true)) >= 0) { goto dump; } #endif @@ -4986,7 +4986,7 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf, _rtw_memcpy(pmlmepriv->wps_beacon_ie, wps_ie, wps_ielen); pmlmepriv->wps_beacon_ie_len = wps_ielen; - update_beacon(padapter, _VENDOR_SPECIFIC_IE_, wps_oui, _TRUE); + update_beacon(padapter, _VENDOR_SPECIFIC_IE_, wps_oui, true); } @@ -5049,7 +5049,7 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf, } #endif //CONFIG_WFD - pmlmeext->bstart_bss = _TRUE; + pmlmeext->bstart_bss = true; } @@ -5139,7 +5139,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu #ifdef CONFIG_P2P if((p2p_ie=rtw_get_p2p_ie(buf, len, NULL, &p2p_ielen))) { - u8 is_GO = _FALSE; + u8 is_GO = false; u32 attr_contentlen = 0; u16 cap_attr=0; @@ -5155,14 +5155,14 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu cap_attr = le16_to_cpu(cap_attr); grp_cap = (u8)((cap_attr >> 8)&0xff); - is_GO = (grp_cap&BIT(0)) ? _TRUE:_FALSE; + is_GO = (grp_cap&BIT(0)) ? true:false; if(is_GO) DBG_8192C("Got P2P Capability Attr, grp_cap=0x%x, is_GO\n", grp_cap); } - if(is_GO == _FALSE) + if(is_GO == false) { if(pmlmepriv->p2p_probe_resp_ie) { @@ -5373,7 +5373,7 @@ static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum #define MAX_BIT_RATE_40MHZ_MCS15 300 /* Mbps */ #define MAX_BIT_RATE_40MHZ_MCS7 150 /* Mbps */ - ht_cap->ht_supported = _TRUE; + ht_cap->ht_supported = true; ht_cap->cap = IEEE80211_HT_CAP_SUP_WIDTH_20_40 | IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_SGI_20 | @@ -5584,17 +5584,17 @@ int rtw_wdev_alloc(struct adapter *padapter, struct device *dev) pwdev_priv->scan_request = NULL; _rtw_spinlock_init(&pwdev_priv->scan_req_lock); - pwdev_priv->p2p_enabled = _FALSE; - pwdev_priv->provdisc_req_issued = _FALSE; + pwdev_priv->p2p_enabled = false; + pwdev_priv->provdisc_req_issued = false; rtw_wdev_invit_info_init(&pwdev_priv->invit_info); rtw_wdev_nego_info_init(&pwdev_priv->nego_info); - pwdev_priv->bandroid_scan = _FALSE; + pwdev_priv->bandroid_scan = false; if(padapter->registrypriv.power_mgnt != PS_MODE_ACTIVE) - pwdev_priv->power_mgmt = _TRUE; + pwdev_priv->power_mgmt = true; else - pwdev_priv->power_mgmt = _FALSE; + pwdev_priv->power_mgmt = false; #ifdef CONFIG_CONCURRENT_MODE ATOMIC_SET(&pwdev_priv->switch_ch_to, 1); @@ -5643,7 +5643,7 @@ void rtw_wdev_unregister(struct wireless_dev *wdev) pwdev_priv = wdev_to_priv(wdev); - rtw_cfg80211_indicate_scan_done(pwdev_priv, _TRUE); + rtw_cfg80211_indicate_scan_done(pwdev_priv, true); if (pwdev_priv->pmon_ndev) { DBG_8192C("%s, unregister monitor interface\n", __func__); diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index 4c451e8..7bf6b55 100755 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -218,7 +218,7 @@ void rtw_indicate_wx_assoc_event(struct adapter *padapter) wrqu.ap_addr.sa_family = ARPHRD_ETHER; - if(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==_TRUE ) + if(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==true ) _rtw_memcpy(wrqu.ap_addr.sa_data, pnetwork->MacAddress, ETH_ALEN); else _rtw_memcpy(wrqu.ap_addr.sa_data, pmlmepriv->cur_network.network.MacAddress, ETH_ALEN); @@ -253,11 +253,11 @@ uint rtw_is_cckrates_included(u8 *rate) { if ( (((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) || (((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22) ) - return _TRUE; + return true; i++; } - return _FALSE; + return false; } uint rtw_is_cckratesonly_included(u8 *rate) @@ -268,11 +268,11 @@ uint rtw_is_cckratesonly_included(u8 *rate) { if ( (((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) && (((rate[i]) & 0x7f) != 11) && (((rate[i]) & 0x7f) != 22) ) - return _FALSE; + return false; i++; } - return _TRUE; + return true; } */ @@ -286,7 +286,7 @@ static char *translate_scan(struct adapter *padapter, u32 ht_ielen = 0; char custom[MAX_CUSTOM_LEN]; char *p; - u16 max_rate=0, rate, ht_cap=_FALSE; + u16 max_rate=0, rate, ht_cap=false; u32 i = 0; char *current_val; long rssi; @@ -309,7 +309,7 @@ static char *translate_scan(struct adapter *padapter, { if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) { - u32 blnGotP2PIE = _FALSE; + u32 blnGotP2PIE = false; // User is doing the P2P device discovery // The prefix of SSID should be "DIRECT-" and the IE should contains the P2P IE. @@ -324,18 +324,18 @@ static char *translate_scan(struct adapter *padapter, // Verifying the P2P IE if ( rtw_get_p2p_ie( pnetwork->network.IEs, pnetwork->network.IELength, NULL, &p2pielen) ) { - blnGotP2PIE = _TRUE; + blnGotP2PIE = true; } } else { // Beacon or Probe Respones // Verifying the P2P IE if ( rtw_get_p2p_ie( &pnetwork->network.IEs[12], pnetwork->network.IELength - 12, NULL, &p2pielen) ) { - blnGotP2PIE = _TRUE; + blnGotP2PIE = true; } } } - if ( blnGotP2PIE == _FALSE ) + if ( blnGotP2PIE == false ) { return start; } @@ -346,7 +346,7 @@ static char *translate_scan(struct adapter *padapter, #ifdef CONFIG_WFD if ( SCAN_RESULT_WFD_TYPE == pwdinfo->wfd_info->scan_result_type ) { - u32 blnGotWFD = _FALSE; + u32 blnGotWFD = false; u8 wfd_ie[ 128 ] = { 0x00 }; uint wfd_ielen = 0; @@ -363,7 +363,7 @@ static char *translate_scan(struct adapter *padapter, if ( ( wfd_devinfo[ 1 ] & 0x03 ) == WFD_DEVINFO_SOURCE ) { // If this device is Miracast PSink device, the scan reuslt should just provide the Miracast source. - blnGotWFD = _TRUE; + blnGotWFD = true; } } else if ( pwdinfo->wfd_info->wfd_device_type == WFD_DEVINFO_SOURCE ) @@ -373,13 +373,13 @@ static char *translate_scan(struct adapter *padapter, { // If this device is Miracast source device, the scan reuslt should just provide the Miracast PSink. // Todo: How about the SSink?! - blnGotWFD = _TRUE; + blnGotWFD = true; } } } } - if ( blnGotWFD == _FALSE ) + if ( blnGotWFD == false ) { return start; } @@ -406,7 +406,7 @@ static char *translate_scan(struct adapter *padapter, if(p && ht_ielen>0) { struct rtw_ieee80211_ht_cap *pht_capie; - ht_cap = _TRUE; + ht_cap = true; pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2); _rtw_memcpy(&mcs_rate , pht_capie->supp_mcs_set, 2); bw_40MHz = (le16_to_cpu(pht_capie->cap_info) & IEEE80211_HT_CAP_SUP_WIDTH) ? 1 : 0; @@ -415,24 +415,24 @@ static char *translate_scan(struct adapter *padapter, /* Add the protocol name */ iwe.cmd = SIOCGIWNAME; - if ((rtw_is_cckratesonly_included((u8*)&pnetwork->network.SupportedRates)) == _TRUE) { - if(ht_cap == _TRUE) + if ((rtw_is_cckratesonly_included((u8*)&pnetwork->network.SupportedRates)) == true) { + if(ht_cap == true) snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn"); else snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11b"); - } else if ((rtw_is_cckrates_included((u8*)&pnetwork->network.SupportedRates)) == _TRUE) { - if(ht_cap == _TRUE) + } else if ((rtw_is_cckrates_included((u8*)&pnetwork->network.SupportedRates)) == true) { + if(ht_cap == true) snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn"); else snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bg"); } else { if(pnetwork->network.Configuration.DSConfig > 14) { - if(ht_cap == _TRUE) + if(ht_cap == true) snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11an"); else snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11a"); } else { - if(ht_cap == _TRUE) + if(ht_cap == true) snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn"); else snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11g"); @@ -489,7 +489,7 @@ static char *translate_scan(struct adapter *padapter, i++; } - if(ht_cap == _TRUE) { + if(ht_cap == true) { if(mcs_rate&0x8000) { //MCS15 max_rate = (bw_40MHz) ? ((short_GI)?300:270):((short_GI)?144:130); @@ -644,7 +644,7 @@ static char *translate_scan(struct adapter *padapter, #endif ; - if ( check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE && + if ( check_fwstate(pmlmepriv, _FW_LINKED)== true && is_same_network(&pmlmepriv->cur_network.network, &pnetwork->network, 0)) { ss = padapter->recvpriv.signal_strength; sq = padapter->recvpriv.signal_qual; @@ -871,7 +871,7 @@ _func_enter_; _rtw_memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength); psecuritypriv->dot11DefKeylen[wep_key_idx]=pwep->KeyLength; - rtw_set_key(padapter, psecuritypriv, wep_key_idx, 0,_TRUE); + rtw_set_key(padapter, psecuritypriv, wep_key_idx, 0,true); } goto exit; @@ -882,7 +882,7 @@ _func_enter_; struct sta_info * psta,*pbcmc_sta; struct sta_priv * pstapriv = &padapter->stapriv; - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_MP_STATE) == _TRUE) //sta mode + if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_MP_STATE) == true) //sta mode { psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv)); if (psta == NULL) { @@ -892,7 +892,7 @@ _func_enter_; { //Jeff: don't disable ieee8021x_blocked while clearing key if (strcmp(param->u.crypt.alg, "none") != 0) - psta->ieee8021x_blocked = _FALSE; + psta->ieee8021x_blocked = false; if((padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption2Enabled)|| (padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption3Enabled)) @@ -910,14 +910,14 @@ _func_enter_; _rtw_memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); _rtw_memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); - padapter->securitypriv.busetkipkey=_FALSE; + padapter->securitypriv.busetkipkey=false; //_set_timer(&padapter->securitypriv.tkip_timer, 50); } //DEBUG_ERR((" param->u.crypt.key_len=%d\n",param->u.crypt.key_len)); DBG_871X(" ~~~~set sta key:unicastkey\n"); - rtw_setstakey_cmd(padapter, (unsigned char *)psta, _TRUE, _TRUE); + rtw_setstakey_cmd(padapter, (unsigned char *)psta, true, true); } else//group key { @@ -931,13 +931,13 @@ _func_enter_; _rtw_memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[16]),8); _rtw_memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[24]),8); } - padapter->securitypriv.binstallGrpkey = _TRUE; + padapter->securitypriv.binstallGrpkey = true; //DEBUG_ERR((" param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); DBG_871X(" ~~~~set sta key:groupkey\n"); padapter->securitypriv.dot118021XGrpKeyid = param->u.crypt.idx; - rtw_set_key(padapter,&padapter->securitypriv,param->u.crypt.idx, 1,_TRUE); + rtw_set_key(padapter,&padapter->securitypriv,param->u.crypt.idx, 1,true); } #ifdef CONFIG_IEEE80211W else if(strcmp(param->u.crypt.alg, "BIP") == 0) @@ -951,7 +951,7 @@ _func_enter_; printk(" %02x ", padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey[no]); printk("\n");*/ padapter->securitypriv.dot11wBIPKeyid = param->u.crypt.idx; - padapter->securitypriv.binstallBIPkey = _TRUE; + padapter->securitypriv.binstallBIPkey = true; DBG_871X(" ~~~~set sta key:IGKT\n"); } #endif //CONFIG_IEEE80211W @@ -975,7 +975,7 @@ _func_enter_; { //Jeff: don't disable ieee8021x_blocked while clearing key if (strcmp(param->u.crypt.alg, "none") != 0) - pbcmc_sta->ieee8021x_blocked = _FALSE; + pbcmc_sta->ieee8021x_blocked = false; if((padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption2Enabled)|| (padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption3Enabled)) @@ -1190,7 +1190,7 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie { eid = buf[cnt]; - if((eid==_VENDOR_SPECIFIC_IE_)&&(_rtw_memcmp(&buf[cnt+2], wps_oui, 4)==_TRUE)) + if((eid==_VENDOR_SPECIFIC_IE_)&&(_rtw_memcmp(&buf[cnt+2], wps_oui, 4)==true)) { DBG_871X("SET WPS_IE\n"); @@ -1221,7 +1221,7 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie || padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_WTMIC_ || padapter->securitypriv.dot11PrivacyAlgrthm == _AES_) //WPS open need to enable multicast - //|| check_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS) == _TRUE) + //|| check_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS) == true) rtw_hal_set_hwreg(padapter, HW_VAR_OFF_RCR_AM, null_addr); RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, @@ -1243,7 +1243,7 @@ static int rtw_wx_get_name(struct net_device *dev, u16 cap; u32 ht_ielen = 0; char *p; - u8 ht_cap=_FALSE; + u8 ht_cap=false; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network; NDIS_802_11_RATES_EX* prates = NULL; @@ -1252,27 +1252,27 @@ static int rtw_wx_get_name(struct net_device *dev, _func_enter_; - if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == _TRUE) + if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == true) { //parsing HT_CAP_IE p = rtw_get_ie(&pcur_bss->IEs[12], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->IELength-12); if(p && ht_ielen>0) { - ht_cap = _TRUE; + ht_cap = true; } prates = &pcur_bss->SupportedRates; - if (rtw_is_cckratesonly_included((u8*)prates) == _TRUE) + if (rtw_is_cckratesonly_included((u8*)prates) == true) { - if(ht_cap == _TRUE) + if(ht_cap == true) snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bn"); else snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11b"); } - else if ((rtw_is_cckrates_included((u8*)prates)) == _TRUE) + else if ((rtw_is_cckrates_included((u8*)prates)) == true) { - if(ht_cap == _TRUE) + if(ht_cap == true) snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bgn"); else snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bg"); @@ -1281,14 +1281,14 @@ static int rtw_wx_get_name(struct net_device *dev, { if(pcur_bss->Configuration.DSConfig > 14) { - if(ht_cap == _TRUE) + if(ht_cap == true) snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11an"); else snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11a"); } else { - if(ht_cap == _TRUE) + if(ht_cap == true) snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11gn"); else snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11g"); @@ -1328,7 +1328,7 @@ static int rtw_wx_get_freq(struct net_device *dev, struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network; - if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) + if(check_fwstate(pmlmepriv, _FW_LINKED) == true) { //wrqu->freq.m = ieee80211_wlan_frequencies[pcur_bss->Configuration.DSConfig-1] * 100000; wrqu->freq.m = rtw_ch2freq(pcur_bss->Configuration.DSConfig) * 100000; @@ -1359,7 +1359,7 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a, goto exit; } - if (padapter->hw_init_completed==_FALSE){ + if (padapter->hw_init_completed==false){ ret = -EPERM; goto exit; } @@ -1377,7 +1377,7 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a, case IW_MODE_MASTER: networkType = Ndis802_11APMode; DBG_871X("set_mode = IW_MODE_MASTER\n"); - //rtw_setopmode_cmd(padapter, networkType,_TRUE); + //rtw_setopmode_cmd(padapter, networkType,true); break; case IW_MODE_INFRA: networkType = Ndis802_11Infrastructure; @@ -1393,22 +1393,22 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a, /* if(Ndis802_11APMode == networkType) { - rtw_setopmode_cmd(padapter, networkType,_TRUE); + rtw_setopmode_cmd(padapter, networkType,true); } else { - rtw_setopmode_cmd(padapter, Ndis802_11AutoUnknown,_TRUE); + rtw_setopmode_cmd(padapter, Ndis802_11AutoUnknown,true); } */ - if (rtw_set_802_11_infrastructure_mode(padapter, networkType) ==_FALSE){ + if (rtw_set_802_11_infrastructure_mode(padapter, networkType) ==false){ ret = -EPERM; goto exit; } - rtw_setopmode_cmd(padapter, networkType,_TRUE); + rtw_setopmode_cmd(padapter, networkType,true); exit: @@ -1428,17 +1428,17 @@ static int rtw_wx_get_mode(struct net_device *dev, struct iw_request_info *a, _func_enter_; - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) + if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) { wrqu->mode = IW_MODE_INFRA; } - else if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE)) + else if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) || + (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true)) { wrqu->mode = IW_MODE_ADHOC; } - else if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + else if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { wrqu->mode = IW_MODE_MASTER; } @@ -1459,8 +1459,8 @@ static int rtw_wx_set_pmkid(struct net_device *dev, union iwreq_data *wrqu, char *extra) { struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); - u8 j,blInserted = _FALSE; - int intReturn = _FALSE; + u8 j,blInserted = false; + int intReturn = false; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct security_priv *psecuritypriv = &padapter->securitypriv; struct iw_pmksa* pPMK = ( struct iw_pmksa* ) extra; @@ -1484,28 +1484,28 @@ static int rtw_wx_set_pmkid(struct net_device *dev, if ( pPMK->cmd == IW_PMKSA_ADD ) { DBG_871X( "[rtw_wx_set_pmkid] IW_PMKSA_ADD!\n" ); - if ( _rtw_memcmp( strIssueBssid, strZeroMacAddress, ETH_ALEN ) == _TRUE ) + if ( _rtw_memcmp( strIssueBssid, strZeroMacAddress, ETH_ALEN ) == true ) { return( intReturn ); } else { - intReturn = _TRUE; + intReturn = true; } - blInserted = _FALSE; + blInserted = false; //overwrite PMKID for(j=0 ; jPMKIDList[j].Bssid, strIssueBssid, ETH_ALEN) ==_TRUE ) + if( _rtw_memcmp( psecuritypriv->PMKIDList[j].Bssid, strIssueBssid, ETH_ALEN) ==true ) { // BSSID is matched, the same AP => rewrite with new PMKID. DBG_871X( "[rtw_wx_set_pmkid] BSSID exists in the PMKList.\n" ); _rtw_memcpy( psecuritypriv->PMKIDList[j].PMKID, pPMK->pmkid, IW_PMKID_LEN); - psecuritypriv->PMKIDList[ j ].bUsed = _TRUE; + psecuritypriv->PMKIDList[ j ].bUsed = true; psecuritypriv->PMKIDIndex = j+1; - blInserted = _TRUE; + blInserted = true; break; } } @@ -1519,7 +1519,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev, _rtw_memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, strIssueBssid, ETH_ALEN); _rtw_memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].PMKID, pPMK->pmkid, IW_PMKID_LEN); - psecuritypriv->PMKIDList[ psecuritypriv->PMKIDIndex ].bUsed = _TRUE; + psecuritypriv->PMKIDList[ psecuritypriv->PMKIDIndex ].bUsed = true; psecuritypriv->PMKIDIndex++ ; if(psecuritypriv->PMKIDIndex==16) { @@ -1530,13 +1530,13 @@ static int rtw_wx_set_pmkid(struct net_device *dev, else if ( pPMK->cmd == IW_PMKSA_REMOVE ) { DBG_871X( "[rtw_wx_set_pmkid] IW_PMKSA_REMOVE!\n" ); - intReturn = _TRUE; + intReturn = true; for(j=0 ; jPMKIDList[j].Bssid, strIssueBssid, ETH_ALEN) ==_TRUE ) + if( _rtw_memcmp( psecuritypriv->PMKIDList[j].Bssid, strIssueBssid, ETH_ALEN) ==true ) { // BSSID is matched, the same AP => Remove this PMKID information and reset it. _rtw_memset( psecuritypriv->PMKIDList[ j ].Bssid, 0x00, ETH_ALEN ); - psecuritypriv->PMKIDList[ j ].bUsed = _FALSE; + psecuritypriv->PMKIDList[ j ].bUsed = false; break; } } @@ -1546,7 +1546,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev, DBG_871X( "[rtw_wx_set_pmkid] IW_PMKSA_FLUSH!\n" ); _rtw_memset( &psecuritypriv->PMKIDList[ 0 ], 0x00, sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); psecuritypriv->PMKIDIndex = 0; - intReturn = _TRUE; + intReturn = true; } return( intReturn ); } @@ -1563,7 +1563,7 @@ static int rtw_wx_get_sens(struct net_device *dev, * 20110311 Commented by Jeff * For rockchip platform's wpa_driver_wext_get_rssi */ - if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { + if(check_fwstate(pmlmepriv, _FW_LINKED) == true) { //wrqu->sens.value=-padapter->recvpriv.signal_strength; wrqu->sens.value=-padapter->recvpriv.rssi; //DBG_871X("%s: %d\n", __FUNCTION__, wrqu->sens.value); @@ -1738,7 +1738,7 @@ static int rtw_wx_set_wap(struct net_device *dev, */ #ifdef CONFIG_CONCURRENT_MODE - if (check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) + if (check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) { DBG_871X("set bssid, but buddy_intf is under scanning or linking\n"); @@ -1749,7 +1749,7 @@ static int rtw_wx_set_wap(struct net_device *dev, #endif #ifdef CONFIG_DUALMAC_CONCURRENT - if (dc_check_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)== _TRUE) + if (dc_check_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)== true) { DBG_871X("set bssid, but buddy_intf is under scanning or linking\n"); ret = -EINVAL; @@ -1781,7 +1781,7 @@ static int rtw_wx_set_wap(struct net_device *dev, while (1) { - if ((rtw_end_of_queue_search(phead, pmlmepriv->pscanned)) == _TRUE) + if ((rtw_end_of_queue_search(phead, pmlmepriv->pscanned)) == true) break; pnetwork = LIST_CONTAINOR(pmlmepriv->pscanned, struct wlan_network, list); @@ -1792,7 +1792,7 @@ static int rtw_wx_set_wap(struct net_device *dev, src_bssid = temp->sa_data; - if ((_rtw_memcmp(dst_bssid, src_bssid, ETH_ALEN)) == _TRUE) + if ((_rtw_memcmp(dst_bssid, src_bssid, ETH_ALEN)) == true) { if(!rtw_set_802_11_infrastructure_mode(padapter, pnetwork->network.InfrastructureMode)) { @@ -1809,7 +1809,7 @@ static int rtw_wx_set_wap(struct net_device *dev, rtw_set_802_11_authentication_mode(padapter, authmode); //set_802_11_encryption_mode(padapter, padapter->securitypriv.ndisencryptstatus); - if (rtw_set_802_11_bssid(padapter, temp->sa_data) == _FALSE) { + if (rtw_set_802_11_bssid(padapter, temp->sa_data) == false) { ret = -1; goto exit; } @@ -1838,9 +1838,9 @@ static int rtw_wx_get_wap(struct net_device *dev, _func_enter_; - if ( ((check_fwstate(pmlmepriv, _FW_LINKED)) == _TRUE) || - ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == _TRUE) || - ((check_fwstate(pmlmepriv, WIFI_AP_STATE)) == _TRUE) ) + if ( ((check_fwstate(pmlmepriv, _FW_LINKED)) == true) || + ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == true) || + ((check_fwstate(pmlmepriv, WIFI_AP_STATE)) == true) ) { _rtw_memcpy(wrqu->ap_addr.sa_data, pcur_bss->MacAddress, ETH_ALEN); @@ -1894,7 +1894,7 @@ static int rtw_wx_set_mlme(struct net_device *dev, static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a, union iwreq_data *wrqu, char *extra) { - u8 _status = _FALSE; + u8 _status = false; int ret = 0; struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv= &padapter->mlmepriv; @@ -1927,7 +1927,7 @@ _func_enter_; goto exit; } - if (padapter->hw_init_completed==_FALSE){ + if (padapter->hw_init_completed==false){ ret = -1; goto exit; } @@ -1935,9 +1935,9 @@ _func_enter_; // When Busy Traffic, driver do not site survey. So driver return success. // wpa_supplicant will not issue SIOCSIWSCAN cmd again after scan timeout. // modify by thomas 2011-02-22. - if (pmlmepriv->LinkDetectInfo.bBusyTraffic == _TRUE + if (pmlmepriv->LinkDetectInfo.bBusyTraffic == true #ifdef CONFIG_CONCURRENT_MODE - || rtw_get_buddy_bBusyTraffic(padapter) == _TRUE + || rtw_get_buddy_bBusyTraffic(padapter) == true #endif //CONFIG_CONCURRENT_MODE ) { @@ -1945,7 +1945,7 @@ _func_enter_; goto exit; } - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) { indicate_wx_scan_complete_event(padapter); goto exit; @@ -1970,12 +1970,12 @@ _func_enter_; #ifdef CONFIG_CONCURRENT_MODE if (check_buddy_fwstate(padapter, - _FW_UNDER_SURVEY|_FW_UNDER_LINKING|WIFI_UNDER_WPS) == _TRUE) + _FW_UNDER_SURVEY|_FW_UNDER_LINKING|WIFI_UNDER_WPS) == true) { if(check_buddy_fwstate(padapter, _FW_UNDER_SURVEY)) { DBG_871X("scanning_via_buddy_intf\n"); - pmlmepriv->scanning_via_buddy_intf = _TRUE; + pmlmepriv->scanning_via_buddy_intf = true; } indicate_wx_scan_complete_event(padapter); @@ -1985,7 +1985,7 @@ _func_enter_; #endif #ifdef CONFIG_DUALMAC_CONCURRENT - if (dc_check_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)== _TRUE) + if (dc_check_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)== true) { indicate_wx_scan_complete_event(padapter); goto exit; @@ -2015,7 +2015,7 @@ _func_enter_; rtw_p2p_set_pre_state( pwdinfo, rtw_p2p_state( pwdinfo ) ); rtw_p2p_set_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH); rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_FULL); - rtw_free_network_queue(padapter, _TRUE); + rtw_free_network_queue(padapter, true); } #endif //CONFIG_P2P @@ -2052,7 +2052,7 @@ _func_enter_; #endif if( wrqu->data.length >= WEXT_CSCAN_HEADER_SIZE - && _rtw_memcmp(extra, WEXT_CSCAN_HEADER, WEXT_CSCAN_HEADER_SIZE) == _TRUE + && _rtw_memcmp(extra, WEXT_CSCAN_HEADER, WEXT_CSCAN_HEADER_SIZE) == true ) { int len = wrqu->data.length -WEXT_CSCAN_HEADER_SIZE; @@ -2125,7 +2125,7 @@ _func_enter_; _status = rtw_set_802_11_bssid_list_scan(padapter, NULL, 0); } - if(_status == _FALSE) + if(_status == false) ret = -1; exit: @@ -2202,9 +2202,9 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, /* #ifdef CONFIG_CONCURRENT_MODE - if(pmlmepriv->scanning_via_buddy_intf == _TRUE) + if(pmlmepriv->scanning_via_buddy_intf == true) { - pmlmepriv->scanning_via_buddy_intf = _FALSE;//reset + pmlmepriv->scanning_via_buddy_intf = false;//reset // change pointers to buddy interface padapter = pbuddy_adapter; @@ -2221,7 +2221,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, #endif ; - while (check_fwstate(pmlmepriv, wait_status) == _TRUE) + while (check_fwstate(pmlmepriv, wait_status) == true) { return -EAGAIN; } @@ -2233,7 +2233,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, ; #ifdef CONFIG_DUALMAC_CONCURRENT - while(dc_check_fwstate(padapter, wait_status)== _TRUE) + while(dc_check_fwstate(padapter, wait_status)== true) { rtw_msleep_os(30); cnt++; @@ -2242,7 +2242,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, } #endif // CONFIG_DUALMAC_CONCURRENT - while(check_fwstate(pmlmepriv, wait_status) == _TRUE) + while(check_fwstate(pmlmepriv, wait_status) == true) { rtw_msleep_os(30); cnt++; @@ -2258,7 +2258,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, while(1) { - if (rtw_end_of_queue_search(phead,plist)== _TRUE) + if (rtw_end_of_queue_search(phead,plist)== true) break; if((stop - ev) < SCAN_ITEM_SIZE) { @@ -2270,7 +2270,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, //report network only if the current channel set contains the channel to which this network belongs if(rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0 - && _TRUE == rtw_validate_ssid(&(pnetwork->network.Ssid)) + && true == rtw_validate_ssid(&(pnetwork->network.Ssid)) ) { ev=translate_scan(padapter, a, pnetwork, ev, stop); @@ -2311,7 +2311,7 @@ static int rtw_wx_set_essid(struct net_device *dev, struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _queue *queue = &pmlmepriv->scanned_queue; _list *phead; - s8 status = _TRUE; + s8 status = true; struct wlan_network *pnetwork = NULL; NDIS_802_11_AUTHENTICATION_MODE authmode; NDIS_802_11_SSID ndis_ssid; @@ -2336,7 +2336,7 @@ static int rtw_wx_set_essid(struct net_device *dev, */ #ifdef CONFIG_CONCURRENT_MODE - if (check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) + if (check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) { DBG_871X("set ssid, but buddy_intf is under scanning or linking\n"); @@ -2347,7 +2347,7 @@ static int rtw_wx_set_essid(struct net_device *dev, #endif #ifdef CONFIG_DUALMAC_CONCURRENT - if (dc_check_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)== _TRUE) + if (dc_check_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)== true) { DBG_871X("set bssid, but buddy_intf is under scanning or linking\n"); ret = -EINVAL; @@ -2414,7 +2414,7 @@ static int rtw_wx_set_essid(struct net_device *dev, pmlmepriv->pscanned = get_next(phead); while (1) { - if (rtw_end_of_queue_search(phead, pmlmepriv->pscanned) == _TRUE) { + if (rtw_end_of_queue_search(phead, pmlmepriv->pscanned) == true) { RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_warning_, ("rtw_wx_set_essid: scan_q is empty, set ssid to check if scanning again!\n")); @@ -2431,19 +2431,19 @@ static int rtw_wx_set_essid(struct net_device *dev, ("rtw_wx_set_essid: dst_ssid=%s\n", pnetwork->network.Ssid.Ssid)); - if ((_rtw_memcmp(dst_ssid, src_ssid, ndis_ssid.SsidLength) == _TRUE) && + if ((_rtw_memcmp(dst_ssid, src_ssid, ndis_ssid.SsidLength) == true) && (pnetwork->network.Ssid.SsidLength==ndis_ssid.SsidLength)) { RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, ("rtw_wx_set_essid: find match, set infra mode\n")); - if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) { if(pnetwork->network.InfrastructureMode != pmlmepriv->cur_network.network.InfrastructureMode) continue; } - if (rtw_set_802_11_infrastructure_mode(padapter, pnetwork->network.InfrastructureMode) == _FALSE) + if (rtw_set_802_11_infrastructure_mode(padapter, pnetwork->network.InfrastructureMode) == false) { ret = -1; _exit_critical_bh(&queue->lock, &irqL); @@ -2458,7 +2458,7 @@ static int rtw_wx_set_essid(struct net_device *dev, ("set ssid: set_802_11_auth. mode=%d\n", authmode)); rtw_set_802_11_authentication_mode(padapter, authmode); //set_802_11_encryption_mode(padapter, padapter->securitypriv.ndisencryptstatus); - if (rtw_set_802_11_ssid(padapter, &ndis_ssid) == _FALSE) { + if (rtw_set_802_11_ssid(padapter, &ndis_ssid) == false) { ret = -1; goto exit; } @@ -2490,8 +2490,8 @@ static int rtw_wx_get_essid(struct net_device *dev, _func_enter_; - if ( (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) + if ( (check_fwstate(pmlmepriv, _FW_LINKED) == true) || + (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) { len = pcur_bss->Ssid.SsidLength; @@ -2860,7 +2860,7 @@ static int rtw_wx_set_enc(struct net_device *dev, _rtw_memcpy(wep.KeyMaterial, keybuf, wep.KeyLength); - if (rtw_set_802_11_add_wep(padapter, &wep) == _FALSE) { + if (rtw_set_802_11_add_wep(padapter, &wep) == false) { if(rf_on == pwrpriv->rf_pwrstate ) ret = -EOPNOTSUPP; goto exit; @@ -2885,9 +2885,9 @@ static int rtw_wx_get_enc(struct net_device *dev, _func_enter_; - if(check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) + if(check_fwstate(pmlmepriv, _FW_LINKED) != true) { - if(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != _TRUE) + if(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != true) { erq->length = 0; erq->flags |= IW_ENCODE_DISABLED; @@ -3057,11 +3057,11 @@ static int rtw_wx_set_auth(struct net_device *dev, { if ( param->value ) { // wpa_supplicant is enabling the tkip countermeasure. - padapter->securitypriv.btkip_countermeasure = _TRUE; + padapter->securitypriv.btkip_countermeasure = true; } else { // wpa_supplicant is disabling the tkip countermeasure. - padapter->securitypriv.btkip_countermeasure = _FALSE; + padapter->securitypriv.btkip_countermeasure = false; } break; } @@ -3104,7 +3104,7 @@ static int rtw_wx_set_auth(struct net_device *dev, */ if(check_fwstate(&padapter->mlmepriv, _FW_LINKED)) { LeaveAllPowerSaveMode(padapter); - rtw_disassoc_cmd(padapter, 500, _FALSE); + rtw_disassoc_cmd(padapter, 500, false); DBG_871X("%s...call rtw_indicate_disconnect\n ",__FUNCTION__); rtw_indicate_disconnect(padapter); rtw_free_assoc_resources(padapter, 1); @@ -3790,7 +3790,7 @@ static int rtw_get_ap_info(struct net_device *dev, goto exit; } - while((check_fwstate(pmlmepriv, (_FW_UNDER_SURVEY|_FW_UNDER_LINKING))) == _TRUE) + while((check_fwstate(pmlmepriv, (_FW_UNDER_SURVEY|_FW_UNDER_LINKING))) == true) { rtw_msleep_os(30); cnt++; @@ -3822,7 +3822,7 @@ static int rtw_get_ap_info(struct net_device *dev, while(1) { - if (rtw_end_of_queue_search(phead,plist)== _TRUE) + if (rtw_end_of_queue_search(phead,plist)== true) break; @@ -3837,7 +3837,7 @@ static int rtw_get_ap_info(struct net_device *dev, } - if(_rtw_memcmp(bssid, pnetwork->network.MacAddress, ETH_ALEN) == _TRUE)//BSSID match, then check if supporting wpa/wpa2 + if(_rtw_memcmp(bssid, pnetwork->network.MacAddress, ETH_ALEN) == true)//BSSID match, then check if supporting wpa/wpa2 { DBG_871X("BSSID:" MAC_FMT "\n", MAC_ARG(bssid)); @@ -4462,7 +4462,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev, while (1) { - if (rtw_end_of_queue_search(phead, plist) == _TRUE) break; + if (rtw_end_of_queue_search(phead, plist) == true) break; pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); if (_rtw_memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) @@ -4538,7 +4538,7 @@ static int rtw_p2p_get_peer_wfd_preferred_connection(struct net_device *dev, DBG_871X( "[%s] wfd_pc = %d\n", __FUNCTION__, pwdinfo->wfd_info->wfd_pc ); wrqu->data.length = strlen( extra ); - pwdinfo->wfd_info->wfd_pc = _FALSE; // Reset the WFD preferred connection to P2P + pwdinfo->wfd_info->wfd_pc = false; // Reset the WFD preferred connection to P2P return ret; } @@ -4557,7 +4557,7 @@ static int rtw_p2p_get_peer_wfd_session_available(struct net_device *dev, DBG_871X( "[%s] wfd_sa = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_session_avail ); wrqu->data.length = strlen( extra ); - pwdinfo->wfd_info->peer_session_avail = _TRUE; // Reset the WFD session available + pwdinfo->wfd_info->peer_session_avail = true; // Reset the WFD session available return ret; } @@ -4598,7 +4598,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev, while (1) { - if (rtw_end_of_queue_search(phead, plist) == _TRUE) break; + if (rtw_end_of_queue_search(phead, plist) == true) break; pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); if (_rtw_memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) @@ -4690,7 +4690,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev, while (1) { - if (rtw_end_of_queue_search(phead, plist) == _TRUE) break; + if (rtw_end_of_queue_search(phead, plist) == true) break; pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); if (_rtw_memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) @@ -4768,7 +4768,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev, while (1) { - if (rtw_end_of_queue_search(phead, plist) == _TRUE) break; + if (rtw_end_of_queue_search(phead, plist) == true) break; pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); if (_rtw_memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) @@ -4842,7 +4842,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev, while (1) { - if (rtw_end_of_queue_search(phead, plist) == _TRUE) break; + if (rtw_end_of_queue_search(phead, plist) == true) break; pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); if (_rtw_memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) @@ -4952,7 +4952,7 @@ static int rtw_p2p_connect(struct net_device *dev, while(1) { - if (rtw_end_of_queue_search(phead,plist)== _TRUE) + if (rtw_end_of_queue_search(phead,plist)== true) break; pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); @@ -4982,7 +4982,7 @@ static int rtw_p2p_connect(struct net_device *dev, pwdinfo->nego_req_info.peer_channel_num[ 0 ] = uintPeerChannel; _rtw_memcpy( pwdinfo->nego_req_info.peerDevAddr, pnetwork->network.MacAddress, ETH_ALEN ); - pwdinfo->nego_req_info.benable = _TRUE; + pwdinfo->nego_req_info.benable = true; _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); if ( rtw_p2p_state(pwdinfo) != P2P_STATE_GONEGO_OK ) @@ -5083,7 +5083,7 @@ static int rtw_p2p_invite_req(struct net_device *dev, else { // Reset the content of struct tx_invite_req_info - pinvite_req_info->benable = _FALSE; + pinvite_req_info->benable = false; _rtw_memset( pinvite_req_info->go_bssid, 0x00, ETH_ALEN ); _rtw_memset( pinvite_req_info->go_ssid, 0x00, WLAN_SSID_MAXLEN ); pinvite_req_info->ssidlen = 0x00; @@ -5104,7 +5104,7 @@ static int rtw_p2p_invite_req(struct net_device *dev, while(1) { - if (rtw_end_of_queue_search(phead,plist)== _TRUE) + if (rtw_end_of_queue_search(phead,plist)== true) break; pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); @@ -5167,16 +5167,16 @@ static int rtw_p2p_invite_req(struct net_device *dev, wfd_devinfo_field = RTW_GET_BE16(wfd_devinfo); if ( wfd_devinfo_field & WFD_DEVINFO_SESSION_AVAIL ) { - pwfd_info->peer_session_avail = _TRUE; + pwfd_info->peer_session_avail = true; } else { - pwfd_info->peer_session_avail = _FALSE; + pwfd_info->peer_session_avail = false; } } } - if ( _FALSE == pwfd_info->peer_session_avail ) + if ( false == pwfd_info->peer_session_avail ) { DBG_871X( "[%s] WFD Session not avaiable!\n", __FUNCTION__ ); goto exit; @@ -5202,7 +5202,7 @@ static int rtw_p2p_invite_req(struct net_device *dev, // Store the GO's ssid pinvite_req_info->ssidlen = wrqu->data.length - 36; _rtw_memcpy( pinvite_req_info->go_ssid, &extra[ 36 ], (u32) pinvite_req_info->ssidlen ); - pinvite_req_info->benable = _TRUE; + pinvite_req_info->benable = true; pinvite_req_info->peer_ch = uintPeerChannel; rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo)); @@ -5298,15 +5298,15 @@ static int rtw_p2p_set_persistent(struct net_device *dev, { if ( extra[ 0 ] == '0' ) // Disable the persistent group function. { - pwdinfo->persistent_supported = _FALSE; + pwdinfo->persistent_supported = false; } else if ( extra[ 0 ] == '1' ) // Enable the persistent group function. { - pwdinfo->persistent_supported = _TRUE; + pwdinfo->persistent_supported = true; } else { - pwdinfo->persistent_supported = _FALSE; + pwdinfo->persistent_supported = false; } } printk( "[%s] persistent_supported = %d\n", __FUNCTION__, pwdinfo->persistent_supported ); @@ -5442,7 +5442,7 @@ static int rtw_p2p_set_pc(struct net_device *dev, while(1) { - if (rtw_end_of_queue_search(phead,plist)== _TRUE) + if (rtw_end_of_queue_search(phead,plist)== true) break; pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); @@ -5507,11 +5507,11 @@ static int rtw_p2p_set_pc(struct net_device *dev, wfd_devinfo_field = RTW_GET_BE16(wfd_devinfo); if ( wfd_devinfo_field & WFD_DEVINFO_PC_TDLS ) { - pwfd_info->wfd_pc = _TRUE; + pwfd_info->wfd_pc = true; } else { - pwfd_info->wfd_pc = _FALSE; + pwfd_info->wfd_pc = false; } } } @@ -5616,9 +5616,9 @@ static int rtw_p2p_set_wfd_enable(struct net_device *dev, struct wifidirect_info *pwdinfo= &(padapter->wdinfo); if(*extra == '0' ) - pwdinfo->wfd_info->wfd_enable = _FALSE; + pwdinfo->wfd_info->wfd_enable = false; else if(*extra == '1') - pwdinfo->wfd_info->wfd_enable = _TRUE; + pwdinfo->wfd_info->wfd_enable = true; DBG_871X( "[%s] wfd_enable = %d\n", __FUNCTION__, pwdinfo->wfd_info->wfd_enable ); @@ -5674,15 +5674,15 @@ static int rtw_p2p_set_sa(struct net_device *dev, { if ( extra[ 0 ] == '0' ) // Disable the session available. { - pwdinfo->session_available = _FALSE; + pwdinfo->session_available = false; } else if ( extra[ 0 ] == '1' ) // Enable the session available. { - pwdinfo->session_available = _TRUE; + pwdinfo->session_available = true; } else { - pwdinfo->session_available = _FALSE; + pwdinfo->session_available = false; } } printk( "[%s] session available = %d\n", __FUNCTION__, pwdinfo->session_available ); @@ -5743,7 +5743,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, else { #ifdef CONFIG_INTEL_WIDI - if(check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE){ + if(check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true){ DBG_871X( "[%s] WiFi is under survey!\n", __FUNCTION__ ); return ret; } @@ -5755,7 +5755,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, _rtw_memset( &pwdinfo->tx_prov_disc_info.ssid, 0x00, sizeof( NDIS_802_11_SSID ) ); pwdinfo->tx_prov_disc_info.peer_channel_num[ 0 ] = 0; pwdinfo->tx_prov_disc_info.peer_channel_num[ 1 ] = 0; - pwdinfo->tx_prov_disc_info.benable = _FALSE; + pwdinfo->tx_prov_disc_info.benable = false; } for( jj = 0, kk = 0; jj < ETH_ALEN; jj++, kk += 3 ) @@ -5792,7 +5792,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, while(1) { - if (rtw_end_of_queue_search(phead,plist)== _TRUE) + if (rtw_end_of_queue_search(phead,plist)== true) break; if( uintPeerChannel != 0 ) @@ -5883,16 +5883,16 @@ static int rtw_p2p_prov_disc(struct net_device *dev, wfd_devinfo_field = RTW_GET_BE16(wfd_devinfo); if ( wfd_devinfo_field & WFD_DEVINFO_SESSION_AVAIL ) { - pwfd_info->peer_session_avail = _TRUE; + pwfd_info->peer_session_avail = true; } else { - pwfd_info->peer_session_avail = _FALSE; + pwfd_info->peer_session_avail = false; } } } - if ( _FALSE == pwfd_info->peer_session_avail ) + if ( false == pwfd_info->peer_session_avail ) { DBG_871X( "[%s] WFD Session not avaiable!\n", __FUNCTION__ ); goto exit; @@ -5910,7 +5910,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, _rtw_memcpy( pwdinfo->tx_prov_disc_info.peerIFAddr, pnetwork->network.MacAddress, ETH_ALEN ); _rtw_memcpy( pwdinfo->tx_prov_disc_info.peerDevAddr, peerMAC, ETH_ALEN ); pwdinfo->tx_prov_disc_info.peer_channel_num[0] = ( u16 ) uintPeerChannel; - pwdinfo->tx_prov_disc_info.benable = _TRUE; + pwdinfo->tx_prov_disc_info.benable = true; rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo)); rtw_p2p_set_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ); @@ -5962,7 +5962,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, #ifdef CONFIG_INTEL_WIDI rtw_p2p_set_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH); rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE); - rtw_free_network_queue(padapter, _TRUE); + rtw_free_network_queue(padapter, true); _enter_critical_bh(&pmlmepriv->lock, &irqL); rtw_sitesurvey_cmd(padapter, NULL, 0, NULL, 0); _exit_critical_bh(&pmlmepriv->lock, &irqL); @@ -6334,7 +6334,7 @@ static int rtw_rereg_nd_name(struct net_device *dev, goto exit; } - if(_rtw_memcmp(rereg_priv->old_ifname, "disable%d", 9) == _TRUE) { + if(_rtw_memcmp(rereg_priv->old_ifname, "disable%d", 9) == true) { padapter->ledpriv.bRegUseLed= rereg_priv->old_bRegUseLed; rtw_hal_sw_led_init(padapter); /* rtw_ips_mode_req(&padapter->pwrctrlpriv, rereg_priv->old_ips_mode); */ @@ -6343,16 +6343,16 @@ static int rtw_rereg_nd_name(struct net_device *dev, strncpy(rereg_priv->old_ifname, new_ifname, IFNAMSIZ); rereg_priv->old_ifname[IFNAMSIZ-1] = 0; - if(_rtw_memcmp(new_ifname, "disable%d", 9) == _TRUE) { + if(_rtw_memcmp(new_ifname, "disable%d", 9) == true) { DBG_871X("%s disable\n", __FUNCTION__); // free network queue for Android's timming issue - rtw_free_network_queue(padapter, _TRUE); + rtw_free_network_queue(padapter, true); // close led rtw_led_control(padapter, LED_CTL_POWER_OFF); rereg_priv->old_bRegUseLed = padapter->ledpriv.bRegUseLed; - padapter->ledpriv.bRegUseLed= _FALSE; + padapter->ledpriv.bRegUseLed= false; rtw_hal_sw_led_deinit(padapter); /* @@ -6810,7 +6810,7 @@ static int rtw_dbg_port(struct net_device *dev, phead = &(pstapriv->sta_hash[i]); plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); @@ -6871,7 +6871,7 @@ static int rtw_dbg_port(struct net_device *dev, phead = &(pstapriv->sta_hash[i]); plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); @@ -7584,7 +7584,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, _rtw_memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); _rtw_memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); - psecuritypriv->busetkipkey = _TRUE; + psecuritypriv->busetkipkey = true; } else if(strcmp(param->u.crypt.alg, "CCMP") == 0) @@ -7604,7 +7604,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, psecuritypriv->dot118021XGrpKeyid = param->u.crypt.idx; - psecuritypriv->binstallGrpkey = _TRUE; + psecuritypriv->binstallGrpkey = true; psecuritypriv->dot11PrivacyAlgrthm = psecuritypriv->dot118021XGrpPrivacy;//!!! @@ -7613,7 +7613,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, pbcmc_sta=rtw_get_bcmc_stainfo(padapter); if(pbcmc_sta) { - pbcmc_sta->ieee8021x_blocked = _FALSE; + pbcmc_sta->ieee8021x_blocked = false; pbcmc_sta->dot118021XPrivacy= psecuritypriv->dot118021XGrpPrivacy;//rx will use bmc_sta's dot118021XPrivacy } @@ -7652,7 +7652,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, _rtw_memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); _rtw_memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); - psecuritypriv->busetkipkey = _TRUE; + psecuritypriv->busetkipkey = true; } else if(strcmp(param->u.crypt.alg, "CCMP") == 0) @@ -7671,7 +7671,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, set_pairwise_key(padapter, psta); - psta->ieee8021x_blocked = _FALSE; + psta->ieee8021x_blocked = false; } else//group key??? @@ -7697,7 +7697,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, _rtw_memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); _rtw_memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); - psecuritypriv->busetkipkey = _TRUE; + psecuritypriv->busetkipkey = true; } else if(strcmp(param->u.crypt.alg, "CCMP") == 0) @@ -7713,7 +7713,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, psecuritypriv->dot118021XGrpKeyid = param->u.crypt.idx; - psecuritypriv->binstallGrpkey = _TRUE; + psecuritypriv->binstallGrpkey = true; psecuritypriv->dot11PrivacyAlgrthm = psecuritypriv->dot118021XGrpPrivacy;//!!! @@ -7722,7 +7722,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, pbcmc_sta=rtw_get_bcmc_stainfo(padapter); if(pbcmc_sta) { - pbcmc_sta->ieee8021x_blocked = _FALSE; + pbcmc_sta->ieee8021x_blocked = false; pbcmc_sta->dot118021XPrivacy= psecuritypriv->dot118021XGrpPrivacy;//rx will use bmc_sta's dot118021XPrivacy } @@ -7754,7 +7754,7 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int DBG_871X("%s, len=%d\n", __FUNCTION__, len); - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != true) return -EINVAL; _rtw_memcpy(&pstapriv->max_num_sta, param->u.bcn_ie.reserved, 2); @@ -7803,7 +7803,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param) DBG_871X("rtw_add_sta(aid=%d)=" MAC_FMT "\n", param->u.add_sta.aid, MAC_ARG(param->sta_addr)); - if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != _TRUE) + if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true) { return -EINVAL; } @@ -7854,17 +7854,17 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param) //chec 802.11n ht cap. if(WLAN_STA_HT&flags) { - psta->htpriv.ht_option = _TRUE; + psta->htpriv.ht_option = true; psta->qos_option = 1; _rtw_memcpy((void*)&psta->htpriv.ht_cap, (void*)¶m->u.add_sta.ht_cap, sizeof(struct rtw_ieee80211_ht_cap)); } else { - psta->htpriv.ht_option = _FALSE; + psta->htpriv.ht_option = false; } - if(pmlmepriv->htpriv.ht_option == _FALSE) - psta->htpriv.ht_option = _FALSE; + if(pmlmepriv->htpriv.ht_option == false) + psta->htpriv.ht_option = false; #endif @@ -7892,7 +7892,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param) DBG_871X("rtw_del_sta=" MAC_FMT "\n", MAC_ARG(param->sta_addr)); - if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != _TRUE) + if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true) { return -EINVAL; } @@ -7912,11 +7912,11 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param) //DBG_871X("free psta=%p, aid=%d\n", psta, psta->aid); _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); - if(rtw_is_list_empty(&psta->asoc_list)==_FALSE) + if(rtw_is_list_empty(&psta->asoc_list)==false) { rtw_list_delete(&psta->asoc_list); pstapriv->asoc_list_cnt--; - updated = ap_free_sta(padapter, psta, _TRUE, WLAN_REASON_DEAUTH_LEAVING); + updated = ap_free_sta(padapter, psta, true, WLAN_REASON_DEAUTH_LEAVING); } _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); @@ -7950,7 +7950,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par DBG_871X("rtw_ioctl_get_sta_info, sta_addr: " MAC_FMT "\n", MAC_ARG(param_ex->sta_addr)); - if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != _TRUE) + if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true) { return -EINVAL; } @@ -8009,7 +8009,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param) DBG_871X("rtw_get_sta_wpaie, sta_addr: " MAC_FMT "\n", MAC_ARG(param->sta_addr)); - if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != _TRUE) + if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true) { return -EINVAL; } @@ -8064,7 +8064,7 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, DBG_871X("%s, len=%d\n", __FUNCTION__, len); - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != true) return -EINVAL; ie_len = len-12-2;// 12 = param header, 2:no packed @@ -8087,9 +8087,9 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, _rtw_memcpy(pmlmepriv->wps_beacon_ie, param->u.bcn_ie.buf, ie_len); - update_beacon(padapter, _VENDOR_SPECIFIC_IE_, wps_oui, _TRUE); + update_beacon(padapter, _VENDOR_SPECIFIC_IE_, wps_oui, true); - pmlmeext->bstart_bss = _TRUE; + pmlmeext->bstart_bss = true; } @@ -8107,7 +8107,7 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par DBG_871X("%s, len=%d\n", __FUNCTION__, len); - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != true) return -EINVAL; ie_len = len-12-2;// 12 = param header, 2:no packed @@ -8144,7 +8144,7 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par DBG_871X("%s, len=%d\n", __FUNCTION__, len); - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != true) return -EINVAL; ie_len = len-12-2;// 12 = param header, 2:no packed @@ -8186,7 +8186,7 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param, sint ssid_len; u8 ignore_broadcast_ssid; - if(check_fwstate(mlmepriv, WIFI_AP_STATE) != _TRUE) + if(check_fwstate(mlmepriv, WIFI_AP_STATE) != true) return -EPERM; if (param->u.bcn_ie.reserved[0] != 0xea) @@ -8233,7 +8233,7 @@ static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *p struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != true) return -EINVAL; if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && @@ -8255,7 +8255,7 @@ static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *para struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != true) return -EINVAL; if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && @@ -8277,7 +8277,7 @@ static int rtw_ioctl_set_macaddr_acl(struct net_device *dev, struct ieee_param * struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != true) return -EINVAL; rtw_set_macaddr_acl(padapter, param->u.mlme.command); @@ -8298,7 +8298,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p) * so, we just check hw_init_completed */ - if (padapter->hw_init_completed==_FALSE){ + if (padapter->hw_init_completed==false){ ret = -EPERM; goto out; } @@ -8489,7 +8489,7 @@ static int rtw_wx_set_priv(struct net_device *dev, u8 wps_oui[4]={0x0,0x50,0xf2,0x04}; if((_VENDOR_SPECIFIC_IE_ == probereq_wpsie[0]) && - (_rtw_memcmp(&probereq_wpsie[2], wps_oui, 4) ==_TRUE)) + (_rtw_memcmp(&probereq_wpsie[2], wps_oui, 4) ==true)) { cp_sz = probereq_wpsie_len>MAX_WPS_IE_LEN ? MAX_WPS_IE_LEN:probereq_wpsie_len; @@ -8521,7 +8521,7 @@ static int rtw_wx_set_priv(struct net_device *dev, } if( len >= WEXT_CSCAN_HEADER_SIZE - && _rtw_memcmp(ext, WEXT_CSCAN_HEADER, WEXT_CSCAN_HEADER_SIZE) == _TRUE + && _rtw_memcmp(ext, WEXT_CSCAN_HEADER, WEXT_CSCAN_HEADER_SIZE) == true ){ ret = rtw_wx_set_scan(dev, info, awrq, ext); goto FREE_EXT; @@ -8544,7 +8544,7 @@ static int rtw_wx_set_priv(struct net_device *dev, struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct wlan_network *pcur_network = &pmlmepriv->cur_network; - if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { + if(check_fwstate(pmlmepriv, _FW_LINKED) == true) { sprintf(ext, "%s rssi %d", pcur_network->network.Ssid.Ssid, padapter->recvpriv.rssi); } else { sprintf(ext, "OK"); @@ -8631,7 +8631,7 @@ static int rtw_wowlan_ctrl(struct net_device *dev, DBG_871X("+rtw_wowlan_ctrl: %s\n", extra); - if(pwrctrlpriv->bSupportRemoteWakeup==_FALSE){ + if(pwrctrlpriv->bSupportRemoteWakeup==false){ ret = -EPERM; DBG_871X("+rtw_wowlan_ctrl: Device didn't support the remote wakeup!!\n"); goto _rtw_wowlan_ctrl_exit_free; @@ -8645,14 +8645,14 @@ static int rtw_wowlan_ctrl(struct net_device *dev, if (_rtw_memcmp( extra, "enable", 6 )) { - while (pwrctrlpriv->bips_processing == _TRUE) + while (pwrctrlpriv->bips_processing == true) rtw_msleep_os(1); rtw_cancel_all_timer(padapter); - padapter->bDriverStopped = _TRUE; //for stop thread + padapter->bDriverStopped = true; //for stop thread rtw_stop_drv_threads(padapter); - padapter->bDriverStopped = _FALSE; //for 32k command + padapter->bDriverStopped = false; //for 32k command #ifdef CONFIG_LPS rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0); @@ -8670,7 +8670,7 @@ static int rtw_wowlan_ctrl(struct net_device *dev, #ifdef CONFIG_LPS rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0); #endif //CONFIG_LPS - pwrctrlpriv->bFwCurrentInPSMode = _FALSE; + pwrctrlpriv->bFwCurrentInPSMode = false; rtw_hal_disable_interrupt(padapter); @@ -8686,14 +8686,14 @@ static int rtw_wowlan_ctrl(struct net_device *dev, set_sta_rate(padapter, psta); } - padapter->bDriverStopped = _FALSE; + padapter->bDriverStopped = false; DBG_871X("%s: wowmode resuming, DriverStopped:%d\n", __func__, padapter->bDriverStopped); rtw_start_drv_threads(padapter); rtw_hal_enable_interrupt(padapter); _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000); - pwrctrlpriv->bips_processing = _FALSE; + pwrctrlpriv->bips_processing = false; rtw_set_pwr_state_check_timer(pwrctrlpriv); } else { @@ -8896,7 +8896,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, } DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts); - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false); if ((addr + cnts) > max_available_size) { DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); @@ -8923,7 +8923,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, { addr = 0; mapLen = EFUSE_MAX_SIZE; - if (rtw_efuse_access(padapter, _FALSE, addr, mapLen, rawdata) == _FAIL) + if (rtw_efuse_access(padapter, false, addr, mapLen, rawdata) == _FAIL) { DBG_871X("%s: rtw_efuse_access Fail!!\n", __FUNCTION__); err = -EFAULT; @@ -8957,7 +8957,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, cnts = 6; - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false); if ((addr + cnts) > max_available_size) { DBG_871X("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); err = -EFAULT; @@ -8988,7 +8988,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, { cnts = 4; - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false); if ((addr + cnts) > max_available_size) { DBG_871X("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); @@ -9106,7 +9106,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, } DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts); - EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false); if ((addr + cnts) > max_available_size) { DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); @@ -9396,7 +9396,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, setdata[jj] = key_2char2num(tmp[2][kk], tmp[2][kk+1]); } //Change to check TYPE_EFUSE_MAP_LEN ,beacuse 8188E raw 256,logic map over 256. - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_size, false); if ((addr+cnts) > max_available_size) { DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); @@ -9444,7 +9444,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, setrawdata[jj] = key_2char2num(tmp[2][kk], tmp[2][kk+1]); } - if (rtw_efuse_access(padapter, _TRUE, addr, cnts, setrawdata) == _FAIL) + if (rtw_efuse_access(padapter, true, addr, cnts, setrawdata) == _FAIL) { DBG_871X("%s: rtw_efuse_access error!!\n", __FUNCTION__); err = -EFAULT; @@ -9489,7 +9489,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, setdata[jj] = key_2char2num(tmp[1][kk], tmp[1][kk+1]); } //Change to check TYPE_EFUSE_MAP_LEN ,beacuse 8188E raw 256,logic map over 256. - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_size, false); if ((addr+cnts) > max_available_size) { DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); @@ -9533,7 +9533,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, setdata[jj] = key_2char2num(tmp[1][kk], tmp[1][kk+1]); } - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false); if ((addr+cnts) > max_available_size) { DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); @@ -9590,7 +9590,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, setdata[jj] = key_2char2num(tmp[2][kk], tmp[2][kk+1]); } - EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false); if ((addr+cnts) > max_available_size) { DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); @@ -9651,7 +9651,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, { _rtw_memcpy(pEfuseHal->BTEfuseModifiedMap, pEfuseHal->fakeBTEfuseModifiedMap, EFUSE_BT_MAX_MAP_LEN); - EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false); if (max_available_size < 1) { err = -EFAULT; @@ -9667,7 +9667,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, } else if (strcmp(tmp[0], "wlfk2map") == 0) { - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false); if (max_available_size < 1) { err = -EFAULT; @@ -9825,7 +9825,7 @@ static int rtw_tdls_enable(struct net_device *dev, phead = &(pstapriv->sta_hash[index]); plist = get_next(phead); - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) + while ((rtw_end_of_queue_search(phead, plist)) == false) { psta = LIST_CONTAINOR(plist, struct sta_info ,hash_list); @@ -10435,7 +10435,7 @@ static s32 initLoopback(struct adapter *padapter) if (ploopback == NULL) return -ENOMEM; _rtw_init_sema(&ploopback->sema, 0); - ploopback->bstop = _TRUE; + ploopback->bstop = true; ploopback->cnt = 0; ploopback->size = 300; _rtw_memset(ploopback->msg, 0, sizeof(ploopback->msg)); @@ -10465,9 +10465,9 @@ static s32 initpseudoadhoc(struct adapter *padapter) networkType = Ndis802_11IBSS; err = rtw_set_802_11_infrastructure_mode(padapter, networkType); - if (err == _FALSE) return _FAIL; + if (err == false) return _FAIL; - err = rtw_setopmode_cmd(padapter, networkType,_TRUE); + err = rtw_setopmode_cmd(padapter, networkType,true); if (err == _FAIL) return _FAIL; return _SUCCESS; @@ -10489,7 +10489,7 @@ static s32 createpseudoadhoc(struct adapter *padapter) authmode = Ndis802_11AuthModeOpen; err = rtw_set_802_11_authentication_mode(padapter, authmode); - if (err == _FALSE) return _FAIL; + if (err == false) return _FAIL; passoc_ssid = &pmlmepriv->assoc_ssid; _rtw_memset(passoc_ssid, 0, sizeof(NDIS_802_11_SSID)); @@ -10597,8 +10597,8 @@ static struct xmit_frame* createloopbackpkt(struct adapter *padapter, u32 size) // do_queue_select(padapter, pattrib); pattrib->nr_frags = 1; pattrib->encrypt = 0; - pattrib->bswenc = _FALSE; - pattrib->qos_en = _FALSE; + pattrib->bswenc = false; + pattrib->qos_en = false; bmcast = IS_MCAST(pattrib->ra); if (bmcast) { @@ -10709,7 +10709,7 @@ static u8 pktcmp(struct adapter *padapter, u8 *txbuf, u32 txsz, u8 *rxbuf, u32 r u32 drvinfosize; u32 rxpktsize; u8 fcssize; - u8 ret = _FALSE; + u8 ret = false; prxstat = (struct recv_stat*)rxbuf; report.rxdw0 = le32_to_cpu(prxstat->rxdw0); @@ -10730,17 +10730,17 @@ static u8 pktcmp(struct adapter *padapter, u8 *txbuf, u32 txsz, u8 *rxbuf, u32 r if ((txsz - TXDESC_SIZE) != (rxpktsize - fcssize)) { DBG_8192C("%s: ERROR! size not match tx/rx=%d/%d !\n", __func__, txsz - TXDESC_SIZE, rxpktsize - fcssize); - ret = _FALSE; + ret = false; } else { ret = _rtw_memcmp(txbuf + TXDESC_SIZE,\ rxbuf + RXDESC_SIZE + drvinfosize,\ txsz - TXDESC_SIZE); - if (ret == _FALSE) { + if (ret == false) { DBG_8192C("%s: ERROR! pkt content mismatch!\n", __func__); } } - if (ret == _FALSE) + if (ret == false) { DBG_8192C("\n%s: TX PKT total=%d, desc=%d, content=%d\n", __func__, txsz, TXDESC_SIZE, txsz - TXDESC_SIZE); @@ -10814,7 +10814,7 @@ thread_return lbk_thread(thread_context context) _rtw_down_sema(&ploopback->sema); err = pktcmp(padapter, ploopback->txbuf, ploopback->txsize, ploopback->rxbuf, ploopback->rxsize); - if (err == _TRUE) + if (err == true) ok++; else fail++; @@ -10831,7 +10831,7 @@ thread_return lbk_thread(thread_context context) flush_signals(current); } - if ((ploopback->bstop == _TRUE) || + if ((ploopback->bstop == true) || ((ploopback->cnt != 0) && (ploopback->cnt == cnt))) { u32 ok_rate, fail_rate, all; @@ -10845,7 +10845,7 @@ thread_return lbk_thread(thread_context context) } } while (1); - ploopback->bstop = _TRUE; + ploopback->bstop = true; thread_exit(); } @@ -10861,8 +10861,8 @@ static void loopbackTest(struct adapter *padapter, u32 cnt, u32 size, u8* pmsg) if (ploopback) { - if (ploopback->bstop == _FALSE) { - ploopback->bstop = _TRUE; + if (ploopback->bstop == false) { + ploopback->bstop = true; _rtw_up_sema(&ploopback->sema); } len = 0; @@ -10904,7 +10904,7 @@ static void loopbackTest(struct adapter *padapter, u32 cnt, u32 size, u8* pmsg) ploopback = padapter->ploopback; - ploopback->bstop = _FALSE; + ploopback->bstop = false; ploopback->cnt = cnt; ploopback->size = size; ploopback->lbkthread = kthread_run(lbk_thread, padapter, "RTW_LBK_THREAD"); @@ -11226,7 +11226,7 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev) int tmp_qual = 0; int tmp_noise = 0; - if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) != _TRUE) + if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) != true) { piwstats->qual.qual = 0; piwstats->qual.level = 0; diff --git a/os_dep/mlme_linux.c b/os_dep/mlme_linux.c index b78b6de..a393c7f 100755 --- a/os_dep/mlme_linux.c +++ b/os_dep/mlme_linux.c @@ -157,8 +157,8 @@ void rtw_os_indicate_connect(struct adapter *adapter) _func_enter_; #ifdef CONFIG_IOCTL_CFG80211 - if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==_TRUE ) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE ) ) + if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==true ) || + (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==true ) ) { rtw_cfg80211_ibss_indicate_connect(adapter); } diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index beca56a..a1e9db5 100755 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -137,7 +137,7 @@ static int rtw_bt_sco = 3;// 0:Idle, 1:None-SCO, 2:SCO, 3:From Counter, 4.Busy, static int rtw_bt_ampdu =1 ;// 0:Disable BT control A-MPDU, 1:Enable BT control A-MPDU. #endif -static int rtw_AcceptAddbaReq = _TRUE;// 0:Reject AP's Add BA req, 1:Accept AP's Add BA req. +static int rtw_AcceptAddbaReq = true;// 0:Reject AP's Add BA req, 1:Accept AP's Add BA req. static int rtw_antdiv_cfg = 2; // 0:OFF , 1:ON, 2:decide by Efuse config static int rtw_antdiv_type = 0 ; //0:decide by efuse 1: for 88EE, 1Tx and 1RxCG are diversity.(2 Ant with SPDT), 2: for 88EE, 1Tx and 2Rx are diversity.( 2 Ant, Tx and RxCG are both on aux port, RxCS is on main port ), 3: for 88EE, 1Tx and 1RxCG are fixed.(1Ant, Tx and RxCG are both on aux port) @@ -455,13 +455,13 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p) struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct sockaddr *addr = p; - if(padapter->bup == _FALSE) + if(padapter->bup == false) { //DBG_871X("r8711_net_set_mac_address(), MAC=%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3], //addr->sa_data[4], addr->sa_data[5]); _rtw_memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN); //_rtw_memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN); - //padapter->bset_hwaddr = _TRUE; + //padapter->bset_hwaddr = true; } return 0; @@ -716,7 +716,7 @@ u32 rtw_start_drv_threads(struct adapter *padapter) #ifdef CONFIG_CONCURRENT_MODE - if(padapter->isprimary == _TRUE) + if(padapter->isprimary == true) #endif //CONFIG_CONCURRENT_MODE { padapter->cmdThread = kthread_run(rtw_cmd_thread, padapter, "RTW_CMD_THREAD"); @@ -774,7 +774,7 @@ void rtw_stop_drv_threads (struct adapter *padapter) RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_stop_drv_threads\n")); #ifdef CONFIG_CONCURRENT_MODE - if(padapter->isprimary == _TRUE) + if(padapter->isprimary == true) #endif //CONFIG_CONCURRENT_MODE { rtw_stop_cmd_thread(padapter); @@ -836,7 +836,7 @@ u8 rtw_init_default_value(struct adapter *padapter) //ht_priv #ifdef CONFIG_80211N_HT - pmlmepriv->htpriv.ampdu_enable = _FALSE;//set to disabled + pmlmepriv->htpriv.ampdu_enable = false;//set to disabled #endif //security_priv @@ -869,8 +869,8 @@ u8 rtw_init_default_value(struct adapter *padapter) rtw_hal_def_value_init(padapter); //misc. - padapter->bReadPortCancel = _FALSE; - padapter->bWritePortCancel = _FALSE; + padapter->bReadPortCancel = false; + padapter->bWritePortCancel = false; padapter->bRxRSSIDisplay = 0; padapter->bNotifyChannelChange = 0; #ifdef CONFIG_P2P @@ -888,15 +888,15 @@ u8 rtw_reset_drv_sw(struct adapter *padapter) //hal_priv rtw_hal_def_value_init(padapter); - padapter->bReadPortCancel = _FALSE; - padapter->bWritePortCancel = _FALSE; + padapter->bReadPortCancel = false; + padapter->bWritePortCancel = false; padapter->bRxRSSIDisplay = 0; pmlmepriv->scan_interval = SCAN_INTERVAL;// 30*2 sec = 60sec padapter->xmitpriv.tx_pkts = 0; padapter->recvpriv.rx_pkts = 0; - pmlmepriv->LinkDetectInfo.bBusyTraffic = _FALSE; + pmlmepriv->LinkDetectInfo.bBusyTraffic = false; _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY |_FW_UNDER_LINKING); @@ -1214,19 +1214,19 @@ int _netdev_if2_open(struct net_device *pnetdev) DBG_871X("+871x_drv - if2_open, bup=%d\n", padapter->bup); - if(primary_padapter->bup == _FALSE || primary_padapter->hw_init_completed == _FALSE) + if(primary_padapter->bup == false || primary_padapter->hw_init_completed == false) { _netdev_open(primary_padapter->pnetdev); } - if(padapter->bup == _FALSE && primary_padapter->bup == _TRUE && - primary_padapter->hw_init_completed == _TRUE) + if(padapter->bup == false && primary_padapter->bup == true && + primary_padapter->hw_init_completed == true) { int i; - padapter->bDriverStopped = _FALSE; - padapter->bSurpriseRemoved = _FALSE; - padapter->bCardDisableWOHSM = _FALSE; + padapter->bDriverStopped = false; + padapter->bSurpriseRemoved = false; + padapter->bCardDisableWOHSM = false; padapter->bFWReady = primary_padapter->bFWReady; @@ -1252,11 +1252,11 @@ int _netdev_if2_open(struct net_device *pnetdev) rtw_cfg80211_init_wiphy(padapter); #endif - padapter->bup = _TRUE; + padapter->bup = true; } - padapter->net_closed = _FALSE; + padapter->net_closed = false; _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000); @@ -1270,7 +1270,7 @@ int _netdev_if2_open(struct net_device *pnetdev) netdev_if2_open_error: - padapter->bup = _FALSE; + padapter->bup = false; netif_carrier_off(pnetdev); rtw_netif_stop_queue(pnetdev); @@ -1294,7 +1294,7 @@ static int netdev_if2_close(struct net_device *pnetdev) { struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); - padapter->net_closed = _TRUE; + padapter->net_closed = true; if(pnetdev) { @@ -1304,7 +1304,7 @@ static int netdev_if2_close(struct net_device *pnetdev) #ifdef CONFIG_IOCTL_CFG80211 rtw_scan_abort(padapter); - wdev_to_priv(padapter->rtw_wdev)->bandroid_scan = _FALSE; + wdev_to_priv(padapter->rtw_wdev)->bandroid_scan = false; #endif return 0; @@ -1354,14 +1354,14 @@ struct adapter *rtw_drv_if2_init(struct adapter *primary_padapter, void (*set_in _rtw_memcpy(padapter, primary_padapter, sizeof(struct adapter)); // - padapter->bup = _FALSE; - padapter->net_closed = _TRUE; - padapter->hw_init_completed = _FALSE; + padapter->bup = false; + padapter->net_closed = true; + padapter->hw_init_completed = false; padapter->dir_dev = NULL; padapter->dir_odm = NULL; //set adapter_type/iface type - padapter->isprimary = _FALSE; + padapter->isprimary = false; padapter->adapter_type = SECONDARY_ADAPTER; padapter->pbuddy_adapter = primary_padapter; padapter->iface_id = IFACE_ID1; @@ -1497,8 +1497,8 @@ void rtw_drv_if2_stop(struct adapter *if2) */ rtw_cancel_all_timer(padapter); - if (padapter->bup == _TRUE) { - padapter->bDriverStopped = _TRUE; + if (padapter->bup == true) { + padapter->bDriverStopped = true; #ifdef CONFIG_XMIT_ACK if (padapter->xmitpriv.ack_tx) rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP); @@ -1511,7 +1511,7 @@ void rtw_drv_if2_stop(struct adapter *if2) rtw_stop_drv_threads(padapter); - padapter->bup = _FALSE; + padapter->bup = false; } /* #ifdef CONFIG_IOCTL_CFG80211 @@ -1530,7 +1530,7 @@ void netdev_br_init(struct net_device *netdev) rcu_read_lock(); #endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) - //if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) + //if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true) { //struct net_bridge *br = netdev->br_port->br;//->dev->dev_addr; #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) @@ -1644,16 +1644,16 @@ int _netdev_open(struct net_device *pnetdev) RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - dev_open\n")); DBG_871X("+871x_drv - drv_open, bup=%d\n", padapter->bup); - if(pwrctrlpriv->ps_flag == _TRUE){ - padapter->net_closed = _FALSE; + if(pwrctrlpriv->ps_flag == true){ + padapter->net_closed = false; goto netdev_open_normal_process; } - if(padapter->bup == _FALSE) + if(padapter->bup == false) { - padapter->bDriverStopped = _FALSE; - padapter->bSurpriseRemoved = _FALSE; - padapter->bCardDisableWOHSM = _FALSE; + padapter->bDriverStopped = false; + padapter->bSurpriseRemoved = false; + padapter->bCardDisableWOHSM = false; status = rtw_hal_init(padapter); if (status ==_FAIL) @@ -1694,11 +1694,11 @@ int _netdev_open(struct net_device *pnetdev) rtw_led_control(padapter, LED_CTL_NO_LINK); - padapter->bup = _TRUE; + padapter->bup = true; - pwrctrlpriv->bips_processing = _FALSE; + pwrctrlpriv->bips_processing = false; } - padapter->net_closed = _FALSE; + padapter->net_closed = false; _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000); @@ -1723,7 +1723,7 @@ netdev_open_normal_process: #ifdef CONFIG_CONCURRENT_MODE { struct adapter *sec_adapter = padapter->pbuddy_adapter; - if(sec_adapter && (sec_adapter->bup == _FALSE)) + if(sec_adapter && (sec_adapter->bup == false)) _netdev_if2_open(sec_adapter->pnetdev); } #endif @@ -1735,7 +1735,7 @@ netdev_open_normal_process: netdev_open_error: - padapter->bup = _FALSE; + padapter->bup = false; netif_carrier_off(pnetdev); rtw_netif_stop_queue(pnetdev); @@ -1763,13 +1763,13 @@ int netdev_open(struct net_device *pnetdev) static int ips_netdrv_open(struct adapter *padapter) { int status = _SUCCESS; - padapter->net_closed = _FALSE; + padapter->net_closed = false; DBG_871X("===> %s.........\n",__FUNCTION__); - padapter->bDriverStopped = _FALSE; - padapter->bCardDisableWOHSM = _FALSE; - //padapter->bup = _TRUE; + padapter->bDriverStopped = false; + padapter->bCardDisableWOHSM = false; + //padapter->bup = true; status = rtw_hal_init(padapter); if (status ==_FAIL) @@ -1793,7 +1793,7 @@ static int ips_netdrv_open(struct adapter *padapter) return _SUCCESS; netdev_open_error: - //padapter->bup = _FALSE; + //padapter->bup = false; DBG_871X("-ips_netdrv_open - drv_open failure, bup=%d\n", padapter->bup); return _FAIL; @@ -1821,13 +1821,13 @@ void rtw_ips_pwr_down(struct adapter *padapter) u32 start_time = rtw_get_current_time(); DBG_871X("===> rtw_ips_pwr_down...................\n"); - padapter->bCardDisableWOHSM = _TRUE; - padapter->net_closed = _TRUE; + padapter->bCardDisableWOHSM = true; + padapter->net_closed = true; rtw_led_control(padapter, LED_CTL_POWER_OFF); rtw_ips_dev_unload(padapter); - padapter->bCardDisableWOHSM = _FALSE; + padapter->bCardDisableWOHSM = false; DBG_871X("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time)); } #endif @@ -1845,7 +1845,7 @@ void rtw_ips_dev_unload(struct adapter *padapter) } //s5. - if(padapter->bSurpriseRemoved == _FALSE) + if(padapter->bSurpriseRemoved == false) { rtw_hal_deinit(padapter); } @@ -1888,7 +1888,7 @@ int pm_netdev_open(struct net_device *pnetdev,u8 bnormal) int status; - if (_TRUE == bnormal) + if (true == bnormal) status = netdev_open(pnetdev); #ifdef CONFIG_IPS else @@ -1904,19 +1904,19 @@ static int netdev_close(struct net_device *pnetdev) RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - drv_close\n")); - if(adapter_to_pwrctl(padapter)->bInternalAutoSuspend == _TRUE) + if(adapter_to_pwrctl(padapter)->bInternalAutoSuspend == true) { //rtw_pwr_wakeup(padapter); if(adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off) - adapter_to_pwrctl(padapter)->ps_flag = _TRUE; + adapter_to_pwrctl(padapter)->ps_flag = true; } - padapter->net_closed = _TRUE; + padapter->net_closed = true; /* if(!padapter->hw_init_completed) { DBG_871X("(1)871x_drv - drv_close, bup=%d, hw_init_completed=%d\n", padapter->bup, padapter->hw_init_completed); - padapter->bDriverStopped = _TRUE; + padapter->bDriverStopped = true; rtw_dev_unload(padapter); } @@ -1934,13 +1934,13 @@ static int netdev_close(struct net_device *pnetdev) #ifndef CONFIG_ANDROID //s2. LeaveAllPowerSaveMode(padapter); - rtw_disassoc_cmd(padapter, 500, _FALSE); + rtw_disassoc_cmd(padapter, 500, false); //s2-2. indicate disconnect to os rtw_indicate_disconnect(padapter); //s2-3. rtw_free_assoc_resources(padapter, 1); //s2-4. - rtw_free_network_queue(padapter,_TRUE); + rtw_free_network_queue(padapter,true); #endif // Close LED rtw_led_control(padapter, LED_CTL_POWER_OFF); @@ -1960,7 +1960,7 @@ static int netdev_close(struct net_device *pnetdev) #ifdef CONFIG_IOCTL_CFG80211 rtw_scan_abort(padapter); - wdev_to_priv(padapter->rtw_wdev)->bandroid_scan = _FALSE; + wdev_to_priv(padapter->rtw_wdev)->bandroid_scan = false; padapter->rtw_wdev->iftype = NL80211_IFTYPE_MONITOR; //set this at the end #endif //CONFIG_IOCTL_CFG80211 @@ -2291,7 +2291,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter) if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED)) { - rtw_disassoc_cmd(padapter, 0, _FALSE); + rtw_disassoc_cmd(padapter, 0, false); } #ifdef CONFIG_AP_MODE else if(check_fwstate(pmlmepriv, WIFI_AP_STATE)) @@ -2311,7 +2311,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter) #ifdef CONFIG_AUTOSUSPEND if(is_primary_adapter(padapter) && (!adapter_to_pwrctl(padapter)->bInternalAutoSuspend )) #endif - rtw_free_network_queue(padapter, _TRUE); + rtw_free_network_queue(padapter, true); if(check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) rtw_indicate_scan_done(padapter, 1); @@ -2365,10 +2365,10 @@ int rtw_resume_common(struct adapter *padapter) #endif rtw_reset_drv_sw(padapter); - pwrpriv->bkeepfwalive = _FALSE; + pwrpriv->bkeepfwalive = false; DBG_871X("bkeepfwalive(%x)\n",pwrpriv->bkeepfwalive); - if(pm_netdev_open(pnetdev,_TRUE) != 0) { + if(pm_netdev_open(pnetdev,true) != 0) { DBG_871X("%s ==> pm_netdev_open failed \n",__FUNCTION__); ret = -1; return ret; diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 5a495cc..1e383e0 100755 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -608,9 +608,9 @@ int _rtw_memcmp(void *dst, void *src, u32 sz) { //under Linux/GNU/GLibc, the return value of memcmp for two same mem. chunk is 0 if (!(memcmp(dst, src, sz))) - return _TRUE; + return true; else - return _FALSE; + return false; } void _rtw_memset(void *pbuf, int c, u32 sz) @@ -632,9 +632,9 @@ Otherwise, there will be racing condition. u32 rtw_is_list_empty(_list *phead) { if (list_empty(phead)) - return _TRUE; + return true; else - return _FALSE; + return false; } void rtw_list_insert_head(_list *plist, _list *phead) @@ -743,9 +743,9 @@ u32 _rtw_queue_empty(_queue *pqueue) u32 rtw_end_of_queue_search(_list *head, _list *plist) { if (head == plist) - return _TRUE; + return true; else - return _FALSE; + return false; } @@ -1140,14 +1140,14 @@ static int storeToFile(char *path, u8* buf, u32 sz) /* * Test if the specifi @param path is a file and readable * @param path the path of the file to test -* @return _TRUE or _FALSE +* @return true or false */ int rtw_is_file_readable(char *path) { if(isFileReadable(path) == 0) - return _TRUE; + return true; else - return _FALSE; + return false; } /* @@ -1385,22 +1385,22 @@ keep_ori: * rtw_cbuf_full - test if cbuf is full * @cbuf: pointer of struct rtw_cbuf * - * Returns: _TRUE if cbuf is full + * Returns: true if cbuf is full */ inline bool rtw_cbuf_full(struct rtw_cbuf *cbuf) { - return (cbuf->write == cbuf->read-1)? _TRUE : _FALSE; + return (cbuf->write == cbuf->read-1)? true : false; } /** * rtw_cbuf_empty - test if cbuf is empty * @cbuf: pointer of struct rtw_cbuf * - * Returns: _TRUE if cbuf is empty + * Returns: true if cbuf is empty */ inline bool rtw_cbuf_empty(struct rtw_cbuf *cbuf) { - return (cbuf->write == cbuf->read)? _TRUE : _FALSE; + return (cbuf->write == cbuf->read)? true : false; } /** @@ -1409,7 +1409,7 @@ inline bool rtw_cbuf_empty(struct rtw_cbuf *cbuf) * @buf: pointer to push in * * Lock free operation, be careful of the use scheme - * Returns: _TRUE push success + * Returns: true push success */ bool rtw_cbuf_push(struct rtw_cbuf *cbuf, void *buf) { diff --git a/os_dep/recv_linux.c b/os_dep/recv_linux.c index 0e00d4a..cf7be67 100755 --- a/os_dep/recv_linux.c +++ b/os_dep/recv_linux.c @@ -77,7 +77,7 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, struct recv_buf *pre struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); struct usb_device *pusbd = pdvobjpriv->pusbdev; - precvbuf->irp_pending = _FALSE; + precvbuf->irp_pending = false; precvbuf->purb = usb_alloc_urb(0, GFP_KERNEL); if(precvbuf->purb == NULL){ res = _FAIL; @@ -85,7 +85,7 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, struct recv_buf *pre precvbuf->pskb = NULL; - precvbuf->reuse = _FALSE; + precvbuf->reuse = false; precvbuf->pallocated_buf = precvbuf->pbuf = NULL; @@ -154,7 +154,7 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter,u8 bgroup) if( cur_time - psecuritypriv->last_mic_err_time < 60*HZ ) { - psecuritypriv->btkip_countermeasure = _TRUE; + psecuritypriv->btkip_countermeasure = true; psecuritypriv->last_mic_err_time = 0; psecuritypriv->btkip_countermeasure_time = cur_time; } @@ -293,7 +293,7 @@ _func_enter_; RT_TRACE(_module_recv_osdep_c_,_drv_info_,("\n skb->head=%p skb->data=%p skb->tail=%p skb->end=%p skb->len=%d\n", skb->head, skb->data, skb->tail, skb->end, skb->len)); - if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { _pkt *pskb2=NULL; struct sta_info *psta = NULL; @@ -303,7 +303,7 @@ _func_enter_; //DBG_871X("bmcast=%d\n", bmcast); - if(_rtw_memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)==_FALSE) + if(_rtw_memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)==false) { //DBG_871X("not ap psta=%p, addr=%pM\n", psta, pattrib->dst); @@ -359,7 +359,7 @@ _func_enter_; rcu_read_unlock(); #endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) - if( br_port && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) ) + if( br_port && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true) ) { int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb); if (nat25_handle_frame(padapter, skb) == -1) { @@ -471,9 +471,9 @@ void rtw_os_read_port(struct adapter *padapter, struct recv_buf *precvbuf) rtw_skb_free(precvbuf->pskb); precvbuf->pskb = NULL; - precvbuf->reuse = _FALSE; + precvbuf->reuse = false; - if(precvbuf->irp_pending == _FALSE) + if(precvbuf->irp_pending == false) { rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); } diff --git a/os_dep/rtw_android.c b/os_dep/rtw_android.c index 6bc58f8..f7e76e7 100755 --- a/os_dep/rtw_android.c +++ b/os_dep/rtw_android.c @@ -120,7 +120,7 @@ typedef struct android_wifi_priv_cmd { * time (only) in dhd_open, subsequential wifi on will be handled by * wl_android_wifi_on */ -static int g_wifi_on = _TRUE; +static int g_wifi_on = true; static unsigned int oob_irq; @@ -249,7 +249,7 @@ static int rtw_android_get_rssi(struct net_device *net, char *command, int total struct wlan_network *pcur_network = &pmlmepriv->cur_network; int bytes_written = 0; - if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { + if(check_fwstate(pmlmepriv, _FW_LINKED) == true) { bytes_written += snprintf(&command[bytes_written], total_len, "%s rssi %d", pcur_network->network.Ssid.Ssid, padapter->recvpriv.rssi); } @@ -308,7 +308,7 @@ static int rtw_android_set_block(struct net_device *net, char *command, int tota char *block_value = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_BLOCK]) + 1; #ifdef CONFIG_IOCTL_CFG80211 - wdev_to_priv(adapter->rtw_wdev)->block = (*block_value=='0')?_FALSE:_TRUE; + wdev_to_priv(adapter->rtw_wdev)->block = (*block_value=='0')?false:true; #endif return 0; @@ -402,7 +402,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) //rtw_set_scan_mode((struct adapter *)rtw_netdev_priv(net), SCAN_ACTIVE); #ifdef CONFIG_PLATFORM_MSTAR #ifdef CONFIG_IOCTL_CFG80211 - (wdev_to_priv(net->ieee80211_ptr))->bandroid_scan = _TRUE; + (wdev_to_priv(net->ieee80211_ptr))->bandroid_scan = true; #endif //CONFIG_IOCTL_CFG80211 #endif //CONFIG_PLATFORM_MSTAR break; @@ -514,7 +514,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) pwfd_info = &padapter->wfd_info; if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 ) - pwfd_info->wfd_enable = _TRUE; + pwfd_info->wfd_enable = true; break; case ANDROID_WIFI_CMD_WFD_DISABLE: // Commented by Albert 2012/07/24 @@ -523,7 +523,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) pwfd_info = &padapter->wfd_info; if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 ) - pwfd_info->wfd_enable = _FALSE; + pwfd_info->wfd_enable = false; break; case ANDROID_WIFI_CMD_WFD_SET_TCPPORT: // Commented by Albert 2012/07/24 diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index e4c8eb2..240260d 100755 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -59,7 +59,7 @@ static void rtw_dev_shutdown(struct device *dev) for (i = 0; iiface_nums; i++) { adapter = dvobj->padapters[i]; - adapter->bSurpriseRemoved = _TRUE; + adapter->bSurpriseRemoved = true; } ATOMIC_SET(&dvobj->continual_io_error, MAX_CONTINUAL_IO_ERR+1); @@ -288,7 +288,7 @@ _func_enter_; _rtw_mutex_init(&pdvobjpriv->h2c_fwcmd_mutex); _rtw_mutex_init(&pdvobjpriv->setch_mutex); _rtw_mutex_init(&pdvobjpriv->setbw_mutex); - pdvobjpriv->processing_dev_remove = _FALSE; + pdvobjpriv->processing_dev_remove = false; pdvobjpriv->pusbintf = usb_intf ; pusbd = pdvobjpriv->pusbdev = interface_to_usbdev(usb_intf); @@ -346,10 +346,10 @@ _func_enter_; DBG_871X("nr_endpoint=%d, in_num=%d, out_num=%d\n\n", pdvobjpriv->nr_endpoint, pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes); if (pusbd->speed == USB_SPEED_HIGH) { - pdvobjpriv->ishighspeed = _TRUE; + pdvobjpriv->ishighspeed = true; DBG_871X("USB_SPEED_HIGH\n"); } else { - pdvobjpriv->ishighspeed = _FALSE; + pdvobjpriv->ishighspeed = false; DBG_871X("NON USB_SPEED_HIGH\n"); } @@ -436,11 +436,11 @@ static void usb_intf_stop(struct adapter *padapter) RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+usb_intf_stop\n")); //disabel_hw_interrupt - if(padapter->bSurpriseRemoved == _FALSE) + if(padapter->bSurpriseRemoved == false) { //device still exists, so driver can do i/o operation //TODO: - RT_TRACE(_module_hci_intfs_c_,_drv_err_,("SurpriseRemoved==_FALSE\n")); + RT_TRACE(_module_hci_intfs_c_,_drv_err_,("SurpriseRemoved==false\n")); } //cancel in irp @@ -461,11 +461,11 @@ void rtw_dev_unload(struct adapter *padapter) u8 val8; RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_dev_unload\n")); - if(padapter->bup == _TRUE) + if(padapter->bup == true) { DBG_871X("===> rtw_dev_unload\n"); - padapter->bDriverStopped = _TRUE; + padapter->bDriverStopped = true; #ifdef CONFIG_XMIT_ACK if (padapter->xmitpriv.ack_tx) rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP); @@ -483,29 +483,29 @@ void rtw_dev_unload(struct adapter *padapter) //s5. - if(padapter->bSurpriseRemoved == _FALSE) + if(padapter->bSurpriseRemoved == false) { //DBG_871X("r871x_dev_unload()->rtl871x_hal_deinit()\n"); #ifdef CONFIG_WOWLAN - if((adapter_to_pwrctl(padapter)->bSupportRemoteWakeup==_TRUE)&&(adapter_to_pwrctl(padapter)->wowlan_mode==_TRUE)){ - DBG_871X("%s bSupportWakeOnWlan==_TRUE do not run rtw_hal_deinit()\n",__FUNCTION__); + if((adapter_to_pwrctl(padapter)->bSupportRemoteWakeup==true)&&(adapter_to_pwrctl(padapter)->wowlan_mode==true)){ + DBG_871X("%s bSupportWakeOnWlan==true do not run rtw_hal_deinit()\n",__FUNCTION__); } else #endif //CONFIG_WOWLAN { rtw_hal_deinit(padapter); } - padapter->bSurpriseRemoved = _TRUE; + padapter->bSurpriseRemoved = true; } - padapter->bup = _FALSE; + padapter->bup = false; #ifdef CONFIG_WOWLAN - padapter->hw_init_completed=_FALSE; + padapter->hw_init_completed=false; #endif //CONFIG_WOWLAN } else { - RT_TRACE(_module_hci_intfs_c_,_drv_err_,("r871x_dev_unload():padapter->bup == _FALSE\n" )); + RT_TRACE(_module_hci_intfs_c_,_drv_err_,("r871x_dev_unload():padapter->bup == false\n" )); } DBG_871X("<=== rtw_dev_unload\n"); @@ -572,8 +572,8 @@ int rtw_hw_suspend(struct adapter *padapter ) DBG_871X("==> rtw_hw_suspend\n"); _enter_pwrlock(&pwrpriv->lock); - pwrpriv->bips_processing = _TRUE; - //padapter->net_closed = _TRUE; + pwrpriv->bips_processing = true; + //padapter->net_closed = true; //s1. if(pnetdev) { @@ -582,7 +582,7 @@ int rtw_hw_suspend(struct adapter *padapter ) } //s2. - rtw_disassoc_cmd(padapter, 500, _FALSE); + rtw_disassoc_cmd(padapter, 500, false); //s2-2. indicate disconnect to os //rtw_indicate_disconnect(padapter); @@ -608,12 +608,12 @@ int rtw_hw_suspend(struct adapter *padapter ) rtw_free_assoc_resources(padapter, 1); //s2-4. - rtw_free_network_queue(padapter,_TRUE); + rtw_free_network_queue(padapter,true); #ifdef CONFIG_IPS rtw_ips_dev_unload(padapter); #endif pwrpriv->rf_pwrstate = rf_off; - pwrpriv->bips_processing = _FALSE; + pwrpriv->bips_processing = false; _exit_pwrlock(&pwrpriv->lock); } @@ -641,10 +641,10 @@ int rtw_hw_resume(struct adapter *padapter) { DBG_871X("==> rtw_hw_resume\n"); _enter_pwrlock(&pwrpriv->lock); - pwrpriv->bips_processing = _TRUE; + pwrpriv->bips_processing = true; rtw_reset_drv_sw(padapter); - if(pm_netdev_open(pnetdev,_FALSE) != 0) + if(pm_netdev_open(pnetdev,false) != 0) { _exit_pwrlock(&pwrpriv->lock); goto error_exit; @@ -658,11 +658,11 @@ int rtw_hw_resume(struct adapter *padapter) else rtw_netif_wake_queue(pnetdev); - pwrpriv->bkeepfwalive = _FALSE; - pwrpriv->brfoffbyhw = _FALSE; + pwrpriv->bkeepfwalive = false; + pwrpriv->brfoffbyhw = false; pwrpriv->rf_pwrstate = rf_on; - pwrpriv->bips_processing = _FALSE; + pwrpriv->bips_processing = false; _exit_pwrlock(&pwrpriv->lock); } @@ -691,9 +691,9 @@ static void rtw_suspend_wow(struct adapter *padapter) struct wowlan_ioctl_param poidparam; if (check_fwstate(pmlmepriv, _FW_LINKED)) - pwrpriv->wowlan_mode = _TRUE; + pwrpriv->wowlan_mode = true; else - pwrpriv->wowlan_mode = _FALSE; + pwrpriv->wowlan_mode = false; rtw_cancel_all_timer(padapter); LeaveAllPowerSaveMode(padapter); @@ -701,7 +701,7 @@ static void rtw_suspend_wow(struct adapter *padapter) rtw_stop_cmd_thread(padapter); - //padapter->net_closed = _TRUE; + //padapter->net_closed = true; //s1. if(pnetdev) { @@ -709,7 +709,7 @@ static void rtw_suspend_wow(struct adapter *padapter) rtw_netif_stop_queue(pnetdev); } - if(pwrpriv->bSupportRemoteWakeup==_TRUE && pwrpriv->wowlan_mode==_TRUE){ + if(pwrpriv->bSupportRemoteWakeup==true && pwrpriv->wowlan_mode==true){ //set H2C command poidparam.subcode=WOWLAN_ENABLE; padapter->HalFunc.SetHwRegHandler(padapter,HW_VAR_WOWLAN,(u8 *)&poidparam); @@ -717,7 +717,7 @@ static void rtw_suspend_wow(struct adapter *padapter) else { //s2. - rtw_disassoc_cmd(padapter, 0, _FALSE); + rtw_disassoc_cmd(padapter, 0, false); } @@ -742,7 +742,7 @@ static void rtw_suspend_wow(struct adapter *padapter) if(!pwrpriv->bInternalAutoSuspend ) #endif //s2-4. - rtw_free_network_queue(padapter, _TRUE); + rtw_free_network_queue(padapter, true); rtw_dev_unload(padapter); @@ -774,7 +774,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) #ifdef CONFIG_IOL_READ_EFUSE_MAP if(!padapter->bup){ - u8 bMacPwrCtrlOn = _FALSE; + u8 bMacPwrCtrlOn = false; rtw_hal_get_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); if(bMacPwrCtrlOn) rtw_hal_power_off(padapter); @@ -795,15 +795,15 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) // The FW command register update must after MAC and FW init ready. if((padapter->bFWReady) && (pwrpriv->bHWPwrPindetect ) && (padapter->registrypriv.usbss_enable )) { - u8 bOpen = _TRUE; + u8 bOpen = true; rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen); - //rtl8192c_set_FwSelectSuspend_cmd(padapter,_TRUE ,500);//note fw to support hw power down ping detect + //rtl8192c_set_FwSelectSuspend_cmd(padapter,true ,500);//note fw to support hw power down ping detect } #endif #endif } - pwrpriv->bInSuspend = _TRUE; + pwrpriv->bInSuspend = true; _enter_pwrlock(&pwrpriv->lock); #ifdef CONFIG_WOWLAN @@ -814,7 +814,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) #ifdef CONFIG_AUTOSUSPEND pwrpriv->rf_pwrstate = rf_off; - pwrpriv->bips_processing = _FALSE; + pwrpriv->bips_processing = false; #endif _exit_pwrlock(&pwrpriv->lock); @@ -848,9 +848,9 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) #ifdef CONFIG_WOWLAN if (check_fwstate(pmlmepriv, _FW_LINKED)) - pwrpriv->wowlan_mode = _TRUE; + pwrpriv->wowlan_mode = true; else - pwrpriv->wowlan_mode = _FALSE; + pwrpriv->wowlan_mode = false; #endif if((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved)) @@ -867,21 +867,21 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) // The FW command register update must after MAC and FW init ready. if((padapter->bFWReady) && (pwrpriv->bHWPwrPindetect ) && (padapter->registrypriv.usbss_enable )) { - u8 bOpen = _TRUE; + u8 bOpen = true; rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen); - //rtl8192c_set_FwSelectSuspend_cmd(padapter,_TRUE ,500);//note fw to support hw power down ping detect + //rtl8192c_set_FwSelectSuspend_cmd(padapter,true ,500);//note fw to support hw power down ping detect } #endif #endif } - pwrpriv->bInSuspend = _TRUE; + pwrpriv->bInSuspend = true; rtw_cancel_all_timer(padapter); LeaveAllPowerSaveMode(padapter); rtw_stop_cmd_thread(padapter); _enter_pwrlock(&pwrpriv->lock); - //padapter->net_closed = _TRUE; + //padapter->net_closed = true; //s1. if(pnetdev) { @@ -890,7 +890,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) } #ifdef CONFIG_WOWLAN - if(pwrpriv->bSupportRemoteWakeup==_TRUE && pwrpriv->wowlan_mode==_TRUE){ + if(pwrpriv->bSupportRemoteWakeup==true && pwrpriv->wowlan_mode==true){ //set H2C command poidparam.subcode=WOWLAN_ENABLE; padapter->HalFunc.SetHwRegHandler(padapter,HW_VAR_WOWLAN,(u8 *)&poidparam); @@ -899,7 +899,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) #else { //s2. - rtw_disassoc_cmd(padapter, 0, _FALSE); + rtw_disassoc_cmd(padapter, 0, false); } #endif //CONFIG_WOWLAN @@ -924,12 +924,12 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) if(!pwrpriv->bInternalAutoSuspend ) #endif //s2-4. - rtw_free_network_queue(padapter, _TRUE); + rtw_free_network_queue(padapter, true); rtw_dev_unload(padapter); #ifdef CONFIG_AUTOSUSPEND pwrpriv->rf_pwrstate = rf_off; - pwrpriv->bips_processing = _FALSE; + pwrpriv->bips_processing = false; #endif _exit_pwrlock(&pwrpriv->lock); @@ -968,7 +968,7 @@ static int rtw_resume(struct usb_interface *pusb_intf) #endif /* CONFIG_WOWLAN */ ) { /* jeff: bypass resume here, do in late_resume */ - rtw_set_do_late_resume(pwrpriv, _TRUE); + rtw_set_do_late_resume(pwrpriv, true); } else { ret = rtw_resume_process(padapter); } @@ -1011,9 +1011,9 @@ int rtw_resume_process(struct adapter *padapter) #endif DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume ); - if( _TRUE == pwrpriv->bAutoResume ){ - pwrpriv->bInternalAutoSuspend = _FALSE; - pwrpriv->bAutoResume=_FALSE; + if( true == pwrpriv->bAutoResume ){ + pwrpriv->bInternalAutoSuspend = false; + pwrpriv->bAutoResume=false; DBG_871X("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend ); } @@ -1035,24 +1035,24 @@ int rtw_resume_process(struct adapter *padapter) // The FW command register update must after MAC and FW init ready. if((padapter->bFWReady) && (pwrpriv->bHWPwrPindetect) && (padapter->registrypriv.usbss_enable )) { - //rtl8192c_set_FwSelectSuspend_cmd(padapter,_FALSE ,500);//note fw to support hw power down ping detect - u8 bOpen = _FALSE; + //rtl8192c_set_FwSelectSuspend_cmd(padapter,false ,500);//note fw to support hw power down ping detect + u8 bOpen = false; rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen); } #endif #endif #ifdef CONFIG_BT_COEXIST DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume ); - if( _TRUE == pwrpriv->bAutoResume ){ - pwrpriv->bInternalAutoSuspend = _FALSE; - pwrpriv->bAutoResume=_FALSE; + if( true == pwrpriv->bAutoResume ){ + pwrpriv->bInternalAutoSuspend = false; + pwrpriv->bAutoResume=false; DBG_871X("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend ); } #else //#ifdef CONFIG_BT_COEXIST - pwrpriv->bInternalAutoSuspend = _FALSE; + pwrpriv->bInternalAutoSuspend = false; #endif //#ifdef CONFIG_BT_COEXIST - pwrpriv->brfoffbyhw = _FALSE; + pwrpriv->brfoffbyhw = false; } #endif _exit_pwrlock(&pwrpriv->lock); @@ -1068,7 +1068,7 @@ exit: rtw_unlock_suspend(); #endif //CONFIG_RESUME_IN_WORKQUEUE - pwrpriv->bInSuspend = _FALSE; + pwrpriv->bInSuspend = false; DBG_871X("<=== %s return %d.............. in %dms\n", __FUNCTION__ , ret, rtw_get_passing_time_ms(start_time)); @@ -1085,8 +1085,8 @@ void autosuspend_enter(struct adapter* padapter) DBG_871X("==>autosuspend_enter...........\n"); - pwrpriv->bInternalAutoSuspend = _TRUE; - pwrpriv->bips_processing = _TRUE; + pwrpriv->bInternalAutoSuspend = true; + pwrpriv->bips_processing = true; if(rf_off == pwrpriv->change_rfpwrstate ) { @@ -1146,7 +1146,7 @@ int autoresume_enter(struct adapter* padapter) if(rf_off == pwrpriv->rf_pwrstate ) { - pwrpriv->ps_flag = _FALSE; + pwrpriv->ps_flag = false; #ifndef CONFIG_BT_COEXIST #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) if (usb_autopm_get_interface(dvobj->pusbintf) < 0) @@ -1167,7 +1167,7 @@ int autoresume_enter(struct adapter* padapter) DBG_871X("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt); #endif #else //#ifndef CONFIG_BT_COEXIST - pwrpriv->bAutoResume=_TRUE; + pwrpriv->bAutoResume=true; if(0==pwrpriv->autopm_cnt){ #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) if (usb_autopm_get_interface(dvobj->pusbintf) < 0) @@ -1240,14 +1240,14 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, padapter->dvobj = dvobj; dvobj->if1 = padapter; - padapter->bDriverStopped=_TRUE; + padapter->bDriverStopped=true; dvobj->padapters[dvobj->iface_nums++] = padapter; padapter->iface_id = IFACE_ID0; #if defined(CONFIG_CONCURRENT_MODE) || defined(CONFIG_DUALMAC_CONCURRENT) //set adapter_type/iface type for primary padapter - padapter->isprimary = _TRUE; + padapter->isprimary = true; padapter->adapter_type = PRIMARY_ADAPTER; #ifndef CONFIG_HWPORT_SWAP padapter->iface_type = IFACE_PORT0; @@ -1398,7 +1398,7 @@ static void rtw_usb_if1_deinit(struct adapter *if1) struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(if1); if(check_fwstate(pmlmepriv, _FW_LINKED)) - rtw_disassoc_cmd(if1, 0, _FALSE); + rtw_disassoc_cmd(if1, 0, false); #ifdef CONFIG_AP_MODE @@ -1418,7 +1418,7 @@ static void rtw_usb_if1_deinit(struct adapter *if1) rtw_cancel_all_timer(if1); #ifdef CONFIG_WOWLAN - pwrctl->wowlan_mode=_FALSE; + pwrctl->wowlan_mode=false; #endif //CONFIG_WOWLAN rtw_dev_unload(if1); @@ -1677,18 +1677,18 @@ _func_enter_; DBG_871X("+rtw_dev_remove\n"); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+dev_remove()\n")); - dvobj->processing_dev_remove = _TRUE; + dvobj->processing_dev_remove = true; rtw_unregister_netdevs(dvobj); - if(usb_drv->drv_registered == _TRUE) + if(usb_drv->drv_registered == true) { - //DBG_871X("r871xu_dev_remove():padapter->bSurpriseRemoved == _TRUE\n"); - padapter->bSurpriseRemoved = _TRUE; + //DBG_871X("r871xu_dev_remove():padapter->bSurpriseRemoved == true\n"); + padapter->bSurpriseRemoved = true; } /*else { //DBG_871X("r871xu_dev_remove():module removed\n"); - padapter->hw_init_completed = _FALSE; + padapter->hw_init_completed = false; }*/ #if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER) rtw_unregister_early_suspend(dvobj_to_pwrctl(dvobj)); @@ -1777,7 +1777,7 @@ static int __init rtw_drv_entry(void) rtw_suspend_lock_init(); - usb_drv->drv_registered = _TRUE; + usb_drv->drv_registered = true; return usb_register(&usb_drv->usbdrv); } @@ -1786,7 +1786,7 @@ static void __exit rtw_drv_halt(void) RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_halt\n")); DBG_871X("+rtw_drv_halt\n"); - usb_drv->drv_registered = _FALSE; + usb_drv->drv_registered = false; usb_deregister(&usb_drv->usbdrv); #ifdef CONFIG_PLATFORM_ARM_SUNxI diff --git a/os_dep/usb_ops_linux.c b/os_dep/usb_ops_linux.c index 145b4a7..bd59672 100755 --- a/os_dep/usb_ops_linux.c +++ b/os_dep/usb_ops_linux.c @@ -286,11 +286,11 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl) DBG_871X("%s\n", __func__); - padapter->bReadPortCancel = _TRUE; + padapter->bReadPortCancel = true; for (i=0; i < NR_RECVBUFF ; i++) { - precvbuf->reuse = _TRUE; + precvbuf->reuse = true; if (precvbuf->purb) { //DBG_8192C("usb_read_port_cancel : usb_kill_urb \n"); usb_kill_urb(precvbuf->purb); @@ -416,14 +416,14 @@ _func_enter_; } else if (purb->status == -ESHUTDOWN) { RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete: ESHUTDOWN\n")); - padapter->bDriverStopped=_TRUE; + padapter->bDriverStopped=true; RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bDriverStopped=TRUE\n")); goto check_completion; } else { - padapter->bSurpriseRemoved=_TRUE; + padapter->bSurpriseRemoved=true; DBG_8192C("bSurpriseRemoved=TRUE\n"); //rtl8192cu_trigger_gpio_0(padapter); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bSurpriseRemoved=TRUE\n")); @@ -461,7 +461,7 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) _irqL irqL; unsigned int pipe; int status; - u32 ret = _FAIL, bwritezero = _FALSE; + u32 ret = _FAIL, bwritezero = false; PURB purb = NULL; struct adapter *padapter = (struct adapter *)pintfhdl->padapter; struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); @@ -563,7 +563,7 @@ _func_enter_; #ifdef CONFIG_REDUCE_USB_TX_INT if ( (pxmitpriv->free_xmitbuf_cnt%NR_XMITBUFF == 0) - || (pxmitbuf->ext_tag == _TRUE) ) + || (pxmitbuf->ext_tag == true) ) { purb->transfer_flags &= (~URB_NO_INTERRUPT); } else { @@ -600,7 +600,7 @@ _func_enter_; switch (status) { case -ENODEV: - padapter->bDriverStopped=_TRUE; + padapter->bDriverStopped=true; break; default: break; @@ -613,7 +613,7 @@ _func_enter_; // Commented by Albert 2009/10/13 // We add the URB_ZERO_PACKET flag to urb so that the host will send the zero packet automatically. /* - if(bwritezero == _TRUE) + if(bwritezero == true) { usb_bulkout_zero(pintfhdl, addr); } @@ -637,7 +637,7 @@ void usb_write_port_cancel(struct intf_hdl *pintfhdl) DBG_871X("%s \n", __func__); - padapter->bWritePortCancel = _TRUE; + padapter->bWritePortCancel = true; for (i=0; ipkt_len == 0) { _func_exit_; - return _TRUE; + return true; } _func_exit_; - return _FALSE; + return false; } void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib) @@ -293,7 +293,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) plist = get_next(phead); //free sta asoc_queue - while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) { + while ((rtw_end_of_queue_search(phead, plist)) == false) { int stainfo_offset; psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); plist = get_next(plist); @@ -311,9 +311,9 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) continue; /* avoid come from STA1 and send back STA1 */ - if (_rtw_memcmp(psta->hwaddr, &skb->data[6], 6) == _TRUE - || _rtw_memcmp(psta->hwaddr, null_addr, 6) == _TRUE - || _rtw_memcmp(psta->hwaddr, bc_addr, 6) == _TRUE + if (_rtw_memcmp(psta->hwaddr, &skb->data[6], 6) == true + || _rtw_memcmp(psta->hwaddr, null_addr, 6) == true + || _rtw_memcmp(psta->hwaddr, bc_addr, 6) == true ) continue; @@ -332,12 +332,12 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) DBG_871X("%s-%d: rtw_skb_copy() failed!\n", __FUNCTION__, __LINE__); pxmitpriv->tx_drop++; //rtw_skb_free(skb); - return _FALSE; // Caller shall tx this multicast frame via normal way. + return false; // Caller shall tx this multicast frame via normal way. } } rtw_skb_free(skb); - return _TRUE; + return true; } #endif // CONFIG_TX_MCAST2UNI @@ -358,7 +358,7 @@ _func_enter_; RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("+xmit_enry\n")); - if (rtw_if_up(padapter) == _FALSE) { + if (rtw_if_up(padapter) == false) { RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit_entry: rtw_if_up fail\n")); #ifdef DBG_TX_DROP_FRAME DBG_871X("DBG_TX_DROP_FRAME %s if_up fail\n", __FUNCTION__); @@ -370,7 +370,7 @@ _func_enter_; #ifdef CONFIG_TX_MCAST2UNI if ( !rtw_mc2u_disable - && check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE + && check_fwstate(pmlmepriv, WIFI_AP_STATE) == true && ( IP_MCAST_MAC(pkt->data) || ICMPV6_MCAST_MAC(pkt->data) ) && (padapter->registrypriv.wifi_spec == 0) @@ -378,7 +378,7 @@ _func_enter_; { if ( pxmitpriv->free_xmitframe_cnt > (NR_XMITFRAME/4) ) { res = rtw_mlcst2unicst(padapter, pkt); - if (res == _TRUE) { + if (res == true) { goto exit; } } else {