skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-02-08 15:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Replace _FALSE and _TRUE

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-28 20:13:24 -06:00
parent 17d1637977
commit 06334102cd
68 changed files with 2553 additions and 2572 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

244
core/rtw_ap.c
View file

@ -46,7 +46,7 @@ void init_mlme_ap_info(struct adapter *padapter)
//for ACL //for ACL
_rtw_init_queue(&pacl_list->acl_node_q); _rtw_init_queue(&pacl_list->acl_node_q);
//pmlmeext->bstart_bss = _FALSE; //pmlmeext->bstart_bss = false;
start_ap_mode(padapter); start_ap_mode(padapter);
} }
@ -62,8 +62,8 @@ void free_mlme_ap_info(struct adapter *padapter)
//stop_ap_mode(padapter); //stop_ap_mode(padapter);
pmlmepriv->update_bcn = _FALSE; pmlmepriv->update_bcn = false;
pmlmeext->bstart_bss = _FALSE; pmlmeext->bstart_bss = false;
rtw_sta_flush(padapter); rtw_sta_flush(padapter);
@ -93,7 +93,7 @@ static void update_BCNTIM(struct adapter *padapter)
//update TIM IE //update TIM IE
//if(pstapriv->tim_bitmap) //if(pstapriv->tim_bitmap)
if(_TRUE) if(true)
{ {
u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL;
u16 tim_bitmap_le; 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) void rtw_add_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len)
{ {
PNDIS_802_11_VARIABLE_IEs pIE; PNDIS_802_11_VARIABLE_IEs pIE;
u8 bmatch = _FALSE; u8 bmatch = false;
u8 *pie = pnetwork->IEs; u8 *pie = pnetwork->IEs;
u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL;
u32 i, offset, ielen, ie_offset, remainder_ielen = 0; 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; p = (u8 *)pIE;
ielen = pIE->Length; ielen = pIE->Length;
bmatch = _TRUE; bmatch = true;
break; 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 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 #ifdef DBG_EXPIRATION_CHK
DBG_871X("sta:"MAC_FMT", rssi:%d, rx:"STA_PKTS_FMT", expire_to:%u, %s%ssq_len:%u\n" DBG_871X("sta:"MAC_FMT", rssi:%d, rx:"STA_PKTS_FMT", expire_to:%u, %s%ssq_len:%u\n"
, MAC_ARG(psta->hwaddr) , MAC_ARG(psta->hwaddr)
@ -335,7 +335,7 @@ u8 chk_sta_is_alive(struct sta_info *psta)
} }
else else
{ {
ret = _TRUE; ret = true;
} }
sta_update_last_rx_pkts(psta); sta_update_last_rx_pkts(psta);
@ -361,19 +361,19 @@ void expire_timeout_chk(struct adapter *padapter)
//check auth_queue //check auth_queue
#ifdef DBG_EXPIRATION_CHK #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" DBG_871X(FUNC_NDEV_FMT" auth_list, cnt:%u\n"
, FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->auth_list_cnt); , FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->auth_list_cnt);
} }
#endif #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); psta = LIST_CONTAINOR(plist, struct sta_info, auth_list);
plist = get_next(plist); plist = get_next(plist);
#ifdef CONFIG_ATMEL_RC_PATCH #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; continue;
if (psta->flag_atmel_rc) if (psta->flag_atmel_rc)
continue; continue;
@ -413,19 +413,19 @@ void expire_timeout_chk(struct adapter *padapter)
//check asoc_queue //check asoc_queue
#ifdef DBG_EXPIRATION_CHK #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" DBG_871X(FUNC_NDEV_FMT" asoc_list, cnt:%u\n"
, FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->asoc_list_cnt); , FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->asoc_list_cnt);
} }
#endif #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); psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list);
plist = get_next(plist); plist = get_next(plist);
#ifdef CONFIG_ATMEL_RC_PATCH #ifdef CONFIG_ATMEL_RC_PATCH
DBG_871X("%s:%d psta=%p, %02x,%02x||%02x,%02x \n\n", __func__, __LINE__, 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]); 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; continue;
if (psta->flag_atmel_rc) if (psta->flag_atmel_rc)
continue; continue;
@ -487,7 +487,7 @@ void expire_timeout_chk(struct adapter *padapter)
//to update bcn with tim_bitmap for this station //to update bcn with tim_bitmap for this station
pstapriv->tim_bitmap |= BIT(psta->aid); 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) if(!pmlmeext->active_keep_alive_check)
continue; continue;
@ -510,7 +510,7 @@ void expire_timeout_chk(struct adapter *padapter)
pstapriv->asoc_list_cnt--; pstapriv->asoc_list_cnt--;
DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state); 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 else
{ {
@ -546,7 +546,7 @@ if (chk_alive_num) {
psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]); psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]);
#ifdef CONFIG_ATMEL_RC_PATCH #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; continue;
if (psta->flag_atmel_rc) if (psta->flag_atmel_rc)
continue; 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); DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state);
_enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); _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); rtw_list_delete(&psta->asoc_list);
pstapriv->asoc_list_cnt--; 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); _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; int i;
u8 rf_type; u8 rf_type;
u32 init_rate=0; u32 init_rate=0;
unsigned char sta_band = 0, raid, shortGIrate = _FALSE; unsigned char sta_band = 0, raid, shortGIrate = false;
unsigned char limit; unsigned char limit;
unsigned int tx_ra_bitmap=0; unsigned int tx_ra_bitmap=0;
struct ht_priv *psta_ht = NULL; 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 arg |= BIT(7);//support entry 2~31
if (shortGIrate==_TRUE) if (shortGIrate==true)
arg |= BIT(5); arg |= BIT(5);
tx_ra_bitmap |= ((raid<<28)&0xf0000000); 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); rtw_hal_add_ra_tid(padapter, tx_ra_bitmap, arg, rssi_level);
if (shortGIrate==_TRUE) if (shortGIrate==true)
init_rate |= BIT(6); init_rate |= BIT(6);
//set ra_id, init_rate //set ra_id, init_rate
@ -724,7 +724,7 @@ void update_bmc_sta(struct adapter *padapter)
psta->qos_option = 0; psta->qos_option = 0;
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
psta->htpriv.ht_option = _FALSE; psta->htpriv.ht_option = false;
#endif //CONFIG_80211N_HT #endif //CONFIG_80211N_HT
psta->ieee8021x_blocked = 0; 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); //DBG_871X("Add id %d val %08x to ratr for bmc sta\n", psta->aid, tx_ra_bitmap);
//ap mode //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; u8 arg = 0;
@ -776,7 +776,7 @@ void update_bmc_sta(struct adapter *padapter)
arg |= BIT(7); arg |= BIT(7);
//if (shortGIrate==_TRUE) //if (shortGIrate==true)
// arg |= BIT(5); // arg |= BIT(5);
tx_ra_bitmap |= ((raid<<28)&0xf0000000); 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__); DBG_871X("%s\n",__FUNCTION__);
//ap mode //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) if(psecuritypriv->dot11AuthAlgrthm==dot11AuthAlgrthm_8021X)
psta->ieee8021x_blocked = _TRUE; psta->ieee8021x_blocked = true;
else else
psta->ieee8021x_blocked = _FALSE; psta->ieee8021x_blocked = false;
//update sta's cap //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 //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)) 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 // 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 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->bwmode = HT_CHANNEL_WIDTH_20;
phtpriv_sta->ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; 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. //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)) 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 //todo: update wmm, ht cap
//pmlmeinfo->WMM_enable; //pmlmeinfo->WMM_enable;
//pmlmeinfo->HT_enable; //pmlmeinfo->HT_enable;
if(pmlmepriv->qospriv.qos_option) if(pmlmepriv->qospriv.qos_option)
pmlmeinfo->WMM_enable = _TRUE; pmlmeinfo->WMM_enable = true;
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
if(pmlmepriv->htpriv.ht_option) if(pmlmepriv->htpriv.ht_option)
{ {
pmlmeinfo->WMM_enable = _TRUE; pmlmeinfo->WMM_enable = true;
pmlmeinfo->HT_enable = _TRUE; pmlmeinfo->HT_enable = true;
//pmlmeinfo->HT_info_enable = _TRUE; //pmlmeinfo->HT_info_enable = true;
//pmlmeinfo->HT_caps_enable = _TRUE; //pmlmeinfo->HT_caps_enable = true;
update_hw_ht_param(padapter); update_hw_ht_param(padapter);
} }
#endif //#CONFIG_80211N_HT #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. //WEP Key will be set before this function, do not clear CAM.
if ((psecuritypriv->dot11PrivacyAlgrthm != _WEP40_) && (psecuritypriv->dot11PrivacyAlgrthm != _WEP104_)) 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); UpdateBrateTbl(padapter, pnetwork->SupportedRates);
rtw_hal_set_hwreg(padapter, HW_VAR_BASIC_RATE, 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; //u32 initialgain;
@ -1052,7 +1052,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
//disable dynamic functions, such as high power, DIG //disable dynamic functions, such as high power, DIG
//Save_DM_Func_Flag(padapter); //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 #ifdef CONFIG_CONCURRENT_MODE
if(padapter->adapter_type > PRIMARY_ADAPTER) 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; struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
//turn on all dynamic functions on PRIMARY_ADAPTER, dynamic functions only runs at PRIMARY_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)); //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 #endif
{ {
//turn on all dynamic functions //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)); //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); 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 adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; 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; pwdinfo->p2p_group_ssid_len = pnetwork->Ssid.SsidLength;
#endif //CONFIG_P2P #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. #ifndef CONFIG_INTERRUPT_BASED_TXBCN //other case will tx beacon when bcn interrupt coming in.
//issue beacon frame //issue beacon frame
@ -1239,7 +1239,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
//update bc/mc sta_info //update bc/mc sta_info
update_bmc_sta(padapter); 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_caps_ie=NULL;
u8 *pHT_info_ie=NULL; u8 *pHT_info_ie=NULL;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
u16 cap, ht_cap=_FALSE; u16 cap, ht_cap=false;
uint ie_len = 0; uint ie_len = 0;
int group_cipher, pairwise_cipher; int group_cipher, pairwise_cipher;
u8 channel, network_type, supportRate[NDIS_802_11_LENGTH_RATES_EX]; 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); 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; return _FAIL;
@ -1462,7 +1462,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
pHT_caps_ie=p; pHT_caps_ie=p;
ht_cap = _TRUE; ht_cap = true;
network_type |= WIRELESS_11_24N; 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; pmlmepriv->cur_network.network_type = network_type;
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
pmlmepriv->htpriv.ht_option = _FALSE; pmlmepriv->htpriv.ht_option = false;
if( (psecuritypriv->wpa2_pairwise_cipher&WPA_CIPHER_TKIP) || if( (psecuritypriv->wpa2_pairwise_cipher&WPA_CIPHER_TKIP) ||
(psecuritypriv->wpa_pairwise_cipher&WPA_CIPHER_TKIP)) (psecuritypriv->wpa_pairwise_cipher&WPA_CIPHER_TKIP))
{ {
//todo: //todo:
//ht_cap = _FALSE; //ht_cap = false;
} }
//ht_cap //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; pmlmepriv->qospriv.qos_option = 1;
if(pregistrypriv->ampdu_enable==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); 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 psta->state |= WIFI_AP_STATE; //Aries, add,fix bug of flush_cam_entry at STOP AP mode , 0724
rtw_indicate_connect( padapter); 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 bc/mc sta_info
//update_bmc_sta(padapter); //update_bmc_sta(padapter);
@ -1588,7 +1588,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
{ {
_irqL irqL; _irqL irqL;
_list *plist, *phead; _list *plist, *phead;
u8 added = _FALSE; u8 added = false;
int i, ret=0; int i, ret=0;
struct rtw_wlan_acl_node *paclnode; struct rtw_wlan_acl_node *paclnode;
struct sta_priv *pstapriv = &padapter->stapriv; 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); phead = get_list_head(pacl_node_q);
plist = get_next(phead); 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); paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list);
plist = get_next(plist); plist = get_next(plist);
if(_rtw_memcmp(paclnode->addr, addr, ETH_ALEN)) 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__); DBG_871X("%s, sta has been added\n", __func__);
break; break;
} }
@ -1625,7 +1625,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
_exit_critical_bh(&(pacl_node_q->lock), &irqL); _exit_critical_bh(&(pacl_node_q->lock), &irqL);
if(added == _TRUE) if(added == true)
return ret; return ret;
@ -1635,13 +1635,13 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
{ {
paclnode = &pacl_list->aclnode[i]; paclnode = &pacl_list->aclnode[i];
if(paclnode->valid == _FALSE) if(paclnode->valid == false)
{ {
_rtw_init_listhead(&paclnode->list); _rtw_init_listhead(&paclnode->list);
_rtw_memcpy(paclnode->addr, addr, ETH_ALEN); _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)); 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); phead = get_list_head(pacl_node_q);
plist = get_next(phead); 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); paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list);
plist = get_next(plist); plist = get_next(plist);
if(_rtw_memcmp(paclnode->addr, addr, ETH_ALEN)) 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); 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); pmlmeext = &(padapter->mlmeextpriv);
//pmlmeinfo = &(pmlmeext->mlmext_info); //pmlmeinfo = &(pmlmeext->mlmext_info);
if(_FALSE == pmlmeext->bstart_bss) if(false == pmlmeext->bstart_bss)
return; return;
_enter_critical_bh(&pmlmepriv->bcn_update_lock, &irqL); _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; break;
} }
pmlmepriv->update_bcn = _TRUE; pmlmepriv->update_bcn = true;
_exit_critical_bh(&pmlmepriv->bcn_update_lock, &irqL); _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 mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv; struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv;
if(pmlmepriv->htpriv.ht_option == _TRUE) if(pmlmepriv->htpriv.ht_option == true)
return 0; return 0;
//if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed) //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) void associated_clients_update(struct adapter *padapter, u8 updated)
{ {
//update associcated stations cap. //update associcated stations cap.
if(updated == _TRUE) if(updated == true)
{ {
_irqL irqL; _irqL irqL;
_list *phead, *plist; _list *phead, *plist;
@ -2048,7 +2048,7 @@ void associated_clients_update(struct adapter *padapter, u8 updated)
plist = get_next(phead); plist = get_next(phead);
//check asoc_queue //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); 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*/ /* called > TSR LEVEL for USB or SDIO Interface*/
void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) 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_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); 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) && if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
(pmlmepriv->num_sta_no_short_preamble == 1)) { (pmlmepriv->num_sta_no_short_preamble == 1)) {
beacon_updated = _TRUE; beacon_updated = true;
update_beacon(padapter, 0xFF, NULL, _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) && if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
(pmlmepriv->num_sta_no_short_preamble == 0)) { (pmlmepriv->num_sta_no_short_preamble == 0)) {
beacon_updated = _TRUE; beacon_updated = true;
update_beacon(padapter, 0xFF, NULL, _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++; pmlmepriv->num_sta_non_erp++;
if (pmlmepriv->num_sta_non_erp == 1) { if (pmlmepriv->num_sta_non_erp == 1) {
beacon_updated = _TRUE; beacon_updated = true;
update_beacon(padapter, _ERPINFO_IE_, NULL, _TRUE); update_beacon(padapter, _ERPINFO_IE_, NULL, true);
} }
} }
} else { } else {
@ -2115,8 +2115,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
pmlmepriv->num_sta_non_erp--; pmlmepriv->num_sta_non_erp--;
if (pmlmepriv->num_sta_non_erp == 0) { if (pmlmepriv->num_sta_non_erp == 0) {
beacon_updated = _TRUE; beacon_updated = true;
update_beacon(padapter, _ERPINFO_IE_, NULL, _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) && if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
(pmlmepriv->num_sta_no_short_slot_time == 1)) (pmlmepriv->num_sta_no_short_slot_time == 1))
{ {
beacon_updated = _TRUE; beacon_updated = true;
update_beacon(padapter, 0xFF, NULL, _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) && if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
(pmlmepriv->num_sta_no_short_slot_time == 0)) (pmlmepriv->num_sta_no_short_slot_time == 0))
{ {
beacon_updated = _TRUE; beacon_updated = true;
update_beacon(padapter, 0xFF, NULL, _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; psta->no_ht_set = 1;
pmlmepriv->num_sta_no_ht++; pmlmepriv->num_sta_no_ht++;
} }
if(pmlmepriv->htpriv.ht_option == _TRUE) { if(pmlmepriv->htpriv.ht_option == true) {
DBG_871X("%s STA " MAC_FMT DBG_871X("%s STA " MAC_FMT
" - no HT, num of non-HT stations %d\n", " - no HT, num of non-HT stations %d\n",
__FUNCTION__, MAC_ARG(psta->hwaddr), __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) if (rtw_ht_operation_update(padapter) > 0)
{ {
update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, _FALSE); update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, false);
update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, _TRUE); update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);
} }
#endif /* CONFIG_80211N_HT */ #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 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_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); 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 if (pmlmeext->cur_wireless_mode > WIRELESS_11B
&& pmlmepriv->num_sta_no_short_preamble == 0) && pmlmepriv->num_sta_no_short_preamble == 0)
{ {
beacon_updated = _TRUE; beacon_updated = true;
update_beacon(padapter, 0xFF, NULL, _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--; pmlmepriv->num_sta_non_erp--;
if (pmlmepriv->num_sta_non_erp == 0) if (pmlmepriv->num_sta_non_erp == 0)
{ {
beacon_updated = _TRUE; beacon_updated = true;
update_beacon(padapter, _ERPINFO_IE_, NULL, _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 if (pmlmeext->cur_wireless_mode > WIRELESS_11B
&& pmlmepriv->num_sta_no_short_slot_time == 0) && pmlmepriv->num_sta_no_short_slot_time == 0)
{ {
beacon_updated = _TRUE; beacon_updated = true;
update_beacon(padapter, 0xFF, NULL, _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) if (rtw_ht_operation_update(padapter) > 0)
{ {
update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, _FALSE); update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, false);
update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, _TRUE); update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);
} }
#endif /* CONFIG_80211N_HT */ #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) u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16 reason)
{ {
_irqL irqL; _irqL irqL;
u8 beacon_updated = _FALSE; u8 beacon_updated = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct sta_priv *pstapriv = &padapter->stapriv; 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) if(!psta)
return beacon_updated; return beacon_updated;
if (active == _TRUE) if (active == true)
{ {
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
//tear down Rx AMPDU //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 / key
//clear_cam_entry(padapter, (psta->mac_id + 3)); //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); _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); plist = get_next(phead);
/* for each sta in asoc_queue */ /* 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); psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list);
plist = get_next(plist); plist = get_next(plist);
@ -2425,7 +2425,7 @@ int rtw_sta_flush(struct adapter *padapter)
phead = &pstapriv->asoc_list; phead = &pstapriv->asoc_list;
plist = get_next(phead); 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; int stainfo_offset;
psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); 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 each sta in chk_alive_list, call ap_free_sta */
for (i = 0; i < chk_alive_num; i++) { for (i = 0; i < chk_alive_num; i++) {
psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[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); issue_deauth(padapter, bc_addr, WLAN_REASON_DEAUTH_LEAVING);
associated_clients_update(padapter, _TRUE); associated_clients_update(padapter, true);
return ret; return ret;
@ -2479,16 +2479,16 @@ void sta_info_update(struct adapter *padapter, struct sta_info *psta)
//update 802.11n ht cap. //update 802.11n ht cap.
if(WLAN_STA_HT&flags) if(WLAN_STA_HT&flags)
{ {
psta->htpriv.ht_option = _TRUE; psta->htpriv.ht_option = true;
psta->qos_option = 1; psta->qos_option = 1;
} }
else else
{ {
psta->htpriv.ht_option = _FALSE; psta->htpriv.ht_option = false;
} }
if(pmlmepriv->htpriv.ht_option == _FALSE) if(pmlmepriv->htpriv.ht_option == false)
psta->htpriv.ht_option = _FALSE; psta->htpriv.ht_option = false;
#endif #endif
@ -2521,7 +2521,7 @@ void rtw_ap_restore_network(struct adapter *padapter)
char chk_alive_list[NUM_STA]; char chk_alive_list[NUM_STA];
int i; 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); 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_)) (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_))
{ {
/* restore group key, WEP keys is restored in ips_leave() */ /* 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); _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL);
@ -2539,7 +2539,7 @@ void rtw_ap_restore_network(struct adapter *padapter)
phead = &pstapriv->asoc_list; phead = &pstapriv->asoc_list;
plist = get_next(phead); 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; int stainfo_offset;
psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); 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_) || if( (padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) ||
(padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) (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 mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
pmlmepriv->update_bcn = _FALSE; pmlmepriv->update_bcn = false;
//init_mlme_ap_info(padapter); //init_mlme_ap_info(padapter);
pmlmeext->bstart_bss = _FALSE; pmlmeext->bstart_bss = false;
pmlmepriv->num_sta_non_erp = 0; pmlmepriv->num_sta_non_erp = 0;
@ -2599,9 +2599,9 @@ void start_ap_mode(struct adapter *padapter)
#endif //CONFIG_80211N_HT #endif //CONFIG_80211N_HT
pmlmepriv->num_sta_ht_20mhz = 0; pmlmepriv->num_sta_ht_20mhz = 0;
pmlmepriv->olbc = _FALSE; pmlmepriv->olbc = false;
pmlmepriv->olbc_ht = _FALSE; pmlmepriv->olbc_ht = false;
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
pmlmepriv->ht_op_mode = 0; pmlmepriv->ht_op_mode = 0;
@ -2625,7 +2625,7 @@ void start_ap_mode(struct adapter *padapter)
for(i = 0; i < NUM_ACL; i++) for(i = 0; i < NUM_ACL; i++)
{ {
_rtw_init_listhead(&pacl_list->aclnode[i].list); _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; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
_queue *pacl_node_q =&pacl_list->acl_node_q; _queue *pacl_node_q =&pacl_list->acl_node_q;
pmlmepriv->update_bcn = _FALSE; pmlmepriv->update_bcn = false;
pmlmeext->bstart_bss = _FALSE; pmlmeext->bstart_bss = false;
//_rtw_spinlock_free(&pmlmepriv->bcn_update_lock); //_rtw_spinlock_free(&pmlmepriv->bcn_update_lock);
//reset and init security priv , this can refine with rtw_reset_securitypriv //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); _enter_critical_bh(&(pacl_node_q->lock), &irqL);
phead = get_list_head(pacl_node_q); phead = get_list_head(pacl_node_q);
plist = get_next(phead); 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); paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list);
plist = get_next(plist); plist = get_next(plist);
if(paclnode->valid == _TRUE) if(paclnode->valid == true)
{ {
paclnode->valid = _FALSE; paclnode->valid = false;
rtw_list_delete(&paclnode->list); rtw_list_delete(&paclnode->list);

112
core/rtw_cmd.c
View file

@ -124,7 +124,7 @@ exit:
#ifdef CONFIG_C2H_WK #ifdef CONFIG_C2H_WK
_init_workitem(&pevtpriv->c2h_wk, c2h_wk_callback, NULL); _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); pevtpriv->c2h_queue = rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN+1);
#endif #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);
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 #ifdef SUPPORT_HW_RFOFF_DETECTED
//To decide allow or not //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) if(pdrvextra_cmd_parm->ec_id == POWER_SAVING_CTRL_WK_CID)
{ {
//DBG_871X("==>enqueue POWER_SAVING_CTRL_WK_CID\n"); //DBG_871X("==>enqueue POWER_SAVING_CTRL_WK_CID\n");
bAllow = _TRUE; bAllow = true;
} }
} }
} }
#endif #endif
if(cmd_obj->cmdcode == GEN_CMD_CODE(_SetChannelPlan)) if(cmd_obj->cmdcode == GEN_CMD_CODE(_SetChannelPlan))
bAllow = _TRUE; bAllow = true;
if( (pcmdpriv->padapter->hw_init_completed ==_FALSE && bAllow == _FALSE) if( (pcmdpriv->padapter->hw_init_completed ==false && bAllow == false)
|| pcmdpriv->cmdthd_running== _FALSE //com_thread not running || 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__, //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) 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 == 0)
{ {
adapter->cmdpriv.stop_req = 1; adapter->cmdpriv.stop_req = 1;
@ -435,7 +435,7 @@ _func_enter_;
prspbuf = pcmdpriv->rsp_buf; prspbuf = pcmdpriv->rsp_buf;
pcmdpriv->stop_req = 0; pcmdpriv->stop_req = 0;
pcmdpriv->cmdthd_running=_TRUE; pcmdpriv->cmdthd_running=true;
_rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema); _rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema);
RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("start r871x rtw_cmd_thread !!!!\n")); RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("start r871x rtw_cmd_thread !!!!\n"));
@ -447,7 +447,7 @@ _func_enter_;
break; 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", DBG_871X_LEVEL(_drv_always_, "%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
__FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__); __FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__);
@ -475,7 +475,7 @@ _func_enter_;
#endif #endif
_next: _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", DBG_871X_LEVEL(_drv_always_, "%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
__FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__); __FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__);
@ -548,7 +548,7 @@ post_process:
goto _next; goto _next;
} }
pcmdpriv->cmdthd_running=_FALSE; pcmdpriv->cmdthd_running=false;
// free all cmd_obj resources // 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_; _func_enter_;
#ifdef CONFIG_LPS #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); rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1);
} }
#endif #endif
#ifdef CONFIG_P2P_PS #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); p2p_ps_wk_cmd(padapter, P2P_PS_SCAN, 1);
} }
#endif //CONFIG_P2P_PS #endif //CONFIG_P2P_PS
@ -732,7 +732,7 @@ _func_enter_;
return _FAIL; 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__)); 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 //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) 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 // 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. // 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 ); _rtw_memcpy( &pmlmepriv->assoc_bssid[ 0 ], &pnetwork->network.MacAddress[ 0 ], ETH_ALEN );
} }
@ -1270,7 +1270,7 @@ _func_enter_;
} }
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
phtpriv->ht_option = _FALSE; phtpriv->ht_option = false;
if(pregistrypriv->ht_enable) if(pregistrypriv->ht_enable)
{ {
// Added by Albert 2010/06/23 // Added by Albert 2010/06/23
@ -1426,10 +1426,10 @@ _func_enter_;
#endif //CONFIG_TDLS #endif //CONFIG_TDLS
psetstakey_para->algorithm =(unsigned char) psecuritypriv->dot11PrivacyAlgrthm; psetstakey_para->algorithm =(unsigned char) psecuritypriv->dot11PrivacyAlgrthm;
}else{ }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 #ifdef CONFIG_TDLS
if((sta->tdls_sta_state&TDLS_LINKED_STATE)==TDLS_LINKED_STATE) if((sta->tdls_sta_state&TDLS_LINKED_STATE)==TDLS_LINKED_STATE)
_rtw_memcpy(&psetstakey_para->key, sta->tpk.tk, 16); _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 //jeff: set this becasue at least sw key is ready
padapter->securitypriv.busetkipkey=_TRUE; padapter->securitypriv.busetkipkey=true;
if(enqueue) if(enqueue)
{ {
@ -2108,8 +2108,8 @@ static void traffic_status_watchdog(struct adapter *padapter)
u8 bEnterPS; u8 bEnterPS;
#endif #endif
u16 BusyThreshold = 200;// 100; u16 BusyThreshold = 200;// 100;
u8 bBusyTraffic = _FALSE, bTxBusyTraffic = _FALSE, bRxBusyTraffic = _FALSE; u8 bBusyTraffic = false, bTxBusyTraffic = false, bRxBusyTraffic = false;
u8 bHigherBusyTraffic = _FALSE, bHigherBusyRxTraffic = _FALSE, bHigherBusyTxTraffic = _FALSE; u8 bHigherBusyTraffic = false, bHigherBusyRxTraffic = false, bHigherBusyTxTraffic = false;
#ifdef CONFIG_FTP_PROTECT #ifdef CONFIG_FTP_PROTECT
u16 bPktCount = 0; u16 bPktCount = 0;
#endif #endif
@ -2123,7 +2123,7 @@ static void traffic_status_watchdog(struct adapter *padapter)
// //
// Determine if our traffic is busy now // Determine if our traffic is busy now
// //
if((check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) if((check_fwstate(pmlmepriv, _FW_LINKED)== true)
/*&& !MgntInitAdapterInProgress(pMgntInfo)*/) /*&& !MgntInitAdapterInProgress(pMgntInfo)*/)
{ {
// if we raise bBusyTraffic in last watchdog, using lower threshold. // 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 || if( pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold ||
pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold ) pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold )
{ {
bBusyTraffic = _TRUE; bBusyTraffic = true;
if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod)
bRxBusyTraffic = _TRUE; bRxBusyTraffic = true;
else else
bTxBusyTraffic = _TRUE; bTxBusyTraffic = true;
} }
// Higher Tx/Rx data. // Higher Tx/Rx data.
if( pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 4000 || if( pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 4000 ||
pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 4000 ) pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 4000 )
{ {
bHigherBusyTraffic = _TRUE; bHigherBusyTraffic = true;
if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod)
bHigherBusyRxTraffic = _TRUE; bHigherBusyRxTraffic = true;
else else
bHigherBusyTxTraffic = _TRUE; bHigherBusyTxTraffic = true;
} }
#ifdef CONFIG_FTP_PROTECT #ifdef CONFIG_FTP_PROTECT
@ -2196,7 +2196,7 @@ static void traffic_status_watchdog(struct adapter *padapter)
#ifdef CONFIG_LPS #ifdef CONFIG_LPS
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
if (BT_1Ant(padapter) == _FALSE) if (BT_1Ant(padapter) == false)
#endif #endif
{ {
// check traffic for powersaving. // check traffic for powersaving.
@ -2204,11 +2204,11 @@ static void traffic_status_watchdog(struct adapter *padapter)
(pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) ) (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) )
{ {
//DBG_871X("Tx = %d, Rx = %d \n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod); //DBG_871X("Tx = %d, Rx = %d \n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod);
bEnterPS= _FALSE; bEnterPS= false;
} }
else else
{ {
bEnterPS= _TRUE; bEnterPS= true;
} }
// LeisurePS only work in infra mode. // 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_ACTIVE_KEEP_ALIVE_CHECK
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
{ {
expire_timeout_chk(padapter); 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); rtw_hal_sreset_xmit_status_check(padapter);
#endif #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); linked_status_chk(padapter);
traffic_status_watchdog(padapter); traffic_status_watchdog(padapter);
@ -2291,8 +2291,8 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
_func_enter_; _func_enter_;
if((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) if((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)
|| (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE)) || (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true))
{ {
return; return;
} }
@ -2302,11 +2302,11 @@ _func_enter_;
case LPS_CTRL_SCAN: case LPS_CTRL_SCAN:
//DBG_871X("LPS_CTRL_SCAN \n"); //DBG_871X("LPS_CTRL_SCAN \n");
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_WifiScanNotify(padapter, _TRUE); BT_WifiScanNotify(padapter, true);
if (BT_1Ant(padapter) == _FALSE) if (BT_1Ant(padapter) == false)
#endif #endif
{ {
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
{ //connect { //connect
LPS_Leave(padapter); LPS_Leave(padapter);
} }
@ -2331,7 +2331,7 @@ _func_enter_;
mstatus = 0;//disconnect mstatus = 0;//disconnect
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_WifiMediaStatusNotify(padapter, mstatus); BT_WifiMediaStatusNotify(padapter, mstatus);
if (BT_1Ant(padapter) == _FALSE) if (BT_1Ant(padapter) == false)
#endif #endif
{ {
LPS_Leave(padapter); LPS_Leave(padapter);
@ -2343,7 +2343,7 @@ _func_enter_;
pwrpriv->DelayLPSLastTimeStamp = rtw_get_current_time(); pwrpriv->DelayLPSLastTimeStamp = rtw_get_current_time();
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_SpecialPacketNotify(padapter); BT_SpecialPacketNotify(padapter);
if (BT_1Ant(padapter) == _FALSE) if (BT_1Ant(padapter) == false)
#endif #endif
{ {
LPS_Leave(padapter); LPS_Leave(padapter);
@ -2353,7 +2353,7 @@ _func_enter_;
//DBG_871X("LPS_CTRL_LEAVE \n"); //DBG_871X("LPS_CTRL_LEAVE \n");
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_LpsLeave(padapter); BT_LpsLeave(padapter);
if (BT_1Ant(padapter) == _FALSE) if (BT_1Ant(padapter) == false)
#endif #endif
{ {
LPS_Leave(padapter); LPS_Leave(padapter);
@ -2477,14 +2477,14 @@ u8 rtw_antenna_select_cmd(struct adapter*padapter, u8 antenna,u8 enqueue)
struct cmd_obj *ph2c; struct cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 bSupportAntDiv = _FALSE; u8 bSupportAntDiv = false;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_; _func_enter_;
rtw_hal_get_def_var(padapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &(bSupportAntDiv)); 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)); ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
if(ph2c==NULL){ 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); rtw_hal_get_hwreg(padapter, HW_VAR_CHK_HI_QUEUE_EMPTY, &val);
while(_FALSE == val) while(false == val)
{ {
rtw_msleep_os(100); rtw_msleep_os(100);
@ -2660,7 +2660,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter)
pstapriv->tim_bitmap &= ~BIT(0); pstapriv->tim_bitmap &= ~BIT(0);
pstapriv->sta_dz_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 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) { if (c2h_evt_read(adapter, buf) == _SUCCESS) {
c2h_evt = (struct c2h_evt_hdr *)buf; c2h_evt = (struct c2h_evt_hdr *)buf;
if (filter && filter(c2h_evt->id) == _FALSE) if (filter && filter(c2h_evt->id) == false)
goto exit; goto exit;
ret = rtw_hal_c2h_handler(adapter, c2h_evt); ret = rtw_hal_c2h_handler(adapter, c2h_evt);
} }
} else { } else {
if (filter && filter(c2h_evt->id) == _FALSE) if (filter && filter(c2h_evt->id) == false)
goto exit; goto exit;
ret = rtw_hal_c2h_handler(adapter, c2h_evt); 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; struct c2h_evt_hdr *c2h_evt;
c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(adapter); 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)) { while (!rtw_cbuf_empty(evtpriv->c2h_queue)) {
if ((c2h_evt = (struct c2h_evt_hdr *)rtw_cbuf_pop(evtpriv->c2h_queue)) != NULL) { 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; continue;
} }
if (ccx_id_filter(c2h_evt->id) == _TRUE) { if (ccx_id_filter(c2h_evt->id) == true) {
/* Handle CCX report here */ /* Handle CCX report here */
rtw_hal_c2h_handler(adapter, c2h_evt); rtw_hal_c2h_handler(adapter, c2h_evt);
rtw_mfree((u8*)c2h_evt, 16); 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 #endif
@ -2828,7 +2828,7 @@ void event_polling_hdl(struct adapter *padapter, u8 *pbuf, int sz)
{ {
c2h_evt_clear(padapter); 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 = (struct c2h_evt_hdr *)rtw_zmalloc(16)) != NULL) {
if (c2h_evt_read(padapter, (u8 *)c2h_evt) == _SUCCESS) { 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 else
{ {
if (padapter->xmitpriv.ack_tx == _FALSE) if (padapter->xmitpriv.ack_tx == false)
{ {
c2h_evt_clear(padapter); c2h_evt_clear(padapter);
} }
@ -3089,7 +3089,7 @@ _func_enter_;
pnetwork->Length = get_WLAN_BSSID_EX_sz(pnetwork); pnetwork->Length = get_WLAN_BSSID_EX_sz(pnetwork);
_rtw_memcpy(&(pwlan->network), pnetwork, pnetwork->Length); _rtw_memcpy(&(pwlan->network), pnetwork, pnetwork->Length);
//pwlan->fixed = _TRUE; //pwlan->fixed = true;
//rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue); //rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue);
@ -3163,7 +3163,7 @@ _func_enter_;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _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); _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
set_fwstate(pmlmepriv, _FW_LINKED); set_fwstate(pmlmepriv, _FW_LINKED);

2
core/rtw_debug.c
View file

@ -1002,7 +1002,7 @@ int proc_get_all_sta_info(char *page, char **start,
phead = &(pstapriv->sta_hash[i]); phead = &(pstapriv->sta_hash[i]);
plist = get_next(phead); 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); psta = LIST_CONTAINOR(plist, struct sta_info, hash_list);

60
core/rtw_eeprom.c
View file

@ -48,8 +48,8 @@ void shift_out_bits(_adapter * padapter, u16 data, u16 count)
u16 x,mask; u16 x,mask;
_func_enter_; _func_enter_;
if(padapter->bSurpriseRemoved==_TRUE){ if(padapter->bSurpriseRemoved==true){
RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true"));
goto out; goto out;
} }
mask = 0x01 << (count - 1); mask = 0x01 << (count - 1);
@ -62,8 +62,8 @@ _func_enter_;
x &= ~_EEDI; x &= ~_EEDI;
if(data & mask) if(data & mask)
x |= _EEDI; x |= _EEDI;
if(padapter->bSurpriseRemoved==_TRUE){ if(padapter->bSurpriseRemoved==true){
RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true"));
goto out; goto out;
} }
rtw_write8(padapter, EE_9346CR, (u8)x); rtw_write8(padapter, EE_9346CR, (u8)x);
@ -72,8 +72,8 @@ _func_enter_;
down_clk(padapter, &x); down_clk(padapter, &x);
mask = mask >> 1; mask = mask >> 1;
} while(mask); } while(mask);
if(padapter->bSurpriseRemoved==_TRUE){ if(padapter->bSurpriseRemoved==true){
RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true"));
goto out; goto out;
} }
x &= ~_EEDI; x &= ~_EEDI;
@ -86,8 +86,8 @@ u16 shift_in_bits (_adapter * padapter)
{ {
u16 x,d=0,i; u16 x,d=0,i;
_func_enter_; _func_enter_;
if(padapter->bSurpriseRemoved==_TRUE){ if(padapter->bSurpriseRemoved==true){
RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true"));
goto out; goto out;
} }
x = rtw_read8(padapter, EE_9346CR); x = rtw_read8(padapter, EE_9346CR);
@ -99,8 +99,8 @@ _func_enter_;
{ {
d = d << 1; d = d << 1;
up_clk(padapter, &x); up_clk(padapter, &x);
if(padapter->bSurpriseRemoved==_TRUE){ if(padapter->bSurpriseRemoved==true){
RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true"));
goto out; goto out;
} }
x = rtw_read8(padapter, EE_9346CR); x = rtw_read8(padapter, EE_9346CR);
@ -136,14 +136,14 @@ _func_exit_;
u16 wait_eeprom_cmd_done(_adapter* padapter) u16 wait_eeprom_cmd_done(_adapter* padapter)
{ {
u8 x; u8 x;
u16 i,res=_FALSE; u16 i,res=false;
_func_enter_; _func_enter_;
standby(padapter ); standby(padapter );
for (i=0; i<200; i++) for (i=0; i<200; i++)
{ {
x = rtw_read8(padapter, EE_9346CR); x = rtw_read8(padapter, EE_9346CR);
if (x & _EEDO){ if (x & _EEDO){
res=_TRUE; res=true;
goto exit; goto exit;
} }
rtw_udelay_os(CLOCK_RATE); rtw_udelay_os(CLOCK_RATE);
@ -157,24 +157,24 @@ void eeprom_clean(_adapter * padapter)
{ {
u16 x; u16 x;
_func_enter_; _func_enter_;
if(padapter->bSurpriseRemoved==_TRUE){ if(padapter->bSurpriseRemoved==true){
RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true"));
goto out; goto out;
} }
x = rtw_read8(padapter, EE_9346CR); x = rtw_read8(padapter, EE_9346CR);
if(padapter->bSurpriseRemoved==_TRUE){ if(padapter->bSurpriseRemoved==true){
RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true"));
goto out; goto out;
} }
x &= ~(_EECS | _EEDI); x &= ~(_EECS | _EEDI);
rtw_write8(padapter, EE_9346CR, (u8)x); rtw_write8(padapter, EE_9346CR, (u8)x);
if(padapter->bSurpriseRemoved==_TRUE){ if(padapter->bSurpriseRemoved==true){
RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true"));
goto out; goto out;
} }
up_clk(padapter, &x); up_clk(padapter, &x);
if(padapter->bSurpriseRemoved==_TRUE){ if(padapter->bSurpriseRemoved==true){
RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true"));
goto out; goto out;
} }
down_clk(padapter, &x); down_clk(padapter, &x);
@ -227,7 +227,7 @@ _func_enter_;
// write the data to the selected EEPROM word. // write the data to the selected EEPROM word.
shift_out_bits(padapter, data, 16); shift_out_bits(padapter, data, 16);
if (wait_eeprom_cmd_done(padapter ) == _FALSE) if (wait_eeprom_cmd_done(padapter ) == false)
{ {
goto exit; goto exit;
@ -251,15 +251,15 @@ u16 eeprom_read16(_adapter * padapter, u16 reg) //ReadEEprom
u16 data=0; u16 data=0;
_func_enter_; _func_enter_;
if(padapter->bSurpriseRemoved==_TRUE){ if(padapter->bSurpriseRemoved==true){
RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true"));
goto out; goto out;
} }
// select EEPROM, reset bits, set _EECS // select EEPROM, reset bits, set _EECS
x = rtw_read8(padapter, EE_9346CR); x = rtw_read8(padapter, EE_9346CR);
if(padapter->bSurpriseRemoved==_TRUE){ if(padapter->bSurpriseRemoved==true){
RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true"));
goto out; goto out;
} }
@ -291,15 +291,15 @@ void eeprom_read_sz(_adapter * padapter, u16 reg, u8* data, u32 sz)
u16 x, data16; u16 x, data16;
u32 i; u32 i;
_func_enter_; _func_enter_;
if(padapter->bSurpriseRemoved==_TRUE){ if(padapter->bSurpriseRemoved==true){
RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true"));
goto out; goto out;
} }
// select EEPROM, reset bits, set _EECS // select EEPROM, reset bits, set _EECS
x = rtw_read8(padapter, EE_9346CR); x = rtw_read8(padapter, EE_9346CR);
if(padapter->bSurpriseRemoved==_TRUE){ if(padapter->bSurpriseRemoved==true){
RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true"));
goto out; goto out;
} }
@ -361,7 +361,7 @@ _func_enter_;
rbuf[idx] = (u8)(stmp & 0xff); rbuf[idx] = (u8)(stmp & 0xff);
} }
_func_exit_; _func_exit_;
return _TRUE; return true;
} }

82
core/rtw_efuse.c
View file

@ -63,14 +63,14 @@ Efuse_Read1ByteFromFakeContent(
{ {
if(Offset >= EFUSE_MAX_HW_SIZE) if(Offset >= EFUSE_MAX_HW_SIZE)
{ {
return _FALSE; return false;
} }
//DbgPrint("Read fake content, offset = %d\n", Offset); //DbgPrint("Read fake content, offset = %d\n", Offset);
if(fakeEfuseBank == 0) if(fakeEfuseBank == 0)
*Value = fakeEfuseContent[Offset]; *Value = fakeEfuseContent[Offset];
else else
*Value = fakeBTEfuseContent[fakeEfuseBank-1][Offset]; *Value = fakeBTEfuseContent[fakeEfuseBank-1][Offset];
return _TRUE; return true;
} }
BOOLEAN BOOLEAN
@ -86,7 +86,7 @@ Efuse_Write1ByteToFakeContent(
{ {
if(Offset >= EFUSE_MAX_HW_SIZE) if(Offset >= EFUSE_MAX_HW_SIZE)
{ {
return _FALSE; return false;
} }
if(fakeEfuseBank == 0) if(fakeEfuseBank == 0)
fakeEfuseContent[Offset] = Value; fakeEfuseContent[Offset] = Value;
@ -94,7 +94,7 @@ Efuse_Write1ByteToFakeContent(
{ {
fakeBTEfuseContent[fakeEfuseBank-1][Offset] = Value; fakeBTEfuseContent[fakeEfuseBank-1][Offset] = Value;
} }
return _TRUE; return true;
} }
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
@ -305,7 +305,7 @@ EFUSE_Read1Byte(
u32 k=0; u32 k=0;
u16 contentLen=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 if (Address < contentLen) //E-fuse 512Byte
{ {
@ -376,7 +376,7 @@ EFUSE_Write1Byte(
u16 contentLen=0; u16 contentLen=0;
//RT_TRACE(COMP_EFUSE, DBG_LOUD, ("Addr=%x Data =%x\n", Address, Value)); //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 if( Address < contentLen) //E-fuse 512Byte
{ {
@ -442,12 +442,12 @@ efuse_OneByteRead(
if(tmpidx<100) if(tmpidx<100)
{ {
*data=rtw_read8(pAdapter, EFUSE_CTRL); *data=rtw_read8(pAdapter, EFUSE_CTRL);
bResult = _TRUE; bResult = true;
} }
else else
{ {
*data = 0xff; *data = 0xff;
bResult = _FALSE; bResult = false;
} }
return bResult; return bResult;
} }
@ -487,11 +487,11 @@ efuse_OneByteWrite(
if(tmpidx<100) if(tmpidx<100)
{ {
bResult = _TRUE; bResult = true;
} }
else else
{ {
bResult = _FALSE; bResult = false;
} }
return bResult; return bResult;
@ -600,12 +600,12 @@ Efuse_WordEnableDataWrite( IN struct adapter *pAdapter,
static u8 efuse_read8(struct adapter *padapter, u16 address, u8 *value) 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) 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 res = _FAIL ;
u8 (*rw8)(struct adapter *, u16, u8*); 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_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_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
if (start_addr > real_content_len) if (start_addr > real_content_len)
return _FAIL; return _FAIL;
if (_TRUE == bWrite) { if (true == bWrite) {
if ((start_addr + cnts) > max_available_size) if ((start_addr + cnts) > max_available_size)
return _FAIL; return _FAIL;
rw8 = &efuse_write8; rw8 = &efuse_write8;
} else } else
rw8 = &efuse_read8; rw8 = &efuse_read8;
Efuse_PowerSwitch(padapter, bWrite, _TRUE); Efuse_PowerSwitch(padapter, bWrite, true);
// e-fuse one byte read / write // e-fuse one byte read / write
for (i = 0; i < cnts; i++) { 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; if (_FAIL == res) break;
} }
Efuse_PowerSwitch(padapter, bWrite, _FALSE); Efuse_PowerSwitch(padapter, bWrite, false);
return res; 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 efuse_GetMaxSize(struct adapter *padapter)
{ {
u16 max_size; 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; return max_size;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
u8 efuse_GetCurrentSize(struct adapter *padapter, u16 *size) u8 efuse_GetCurrentSize(struct adapter *padapter, u16 *size)
{ {
Efuse_PowerSwitch(padapter, _FALSE, _TRUE); Efuse_PowerSwitch(padapter, false, true);
*size = Efuse_GetCurrentSize(padapter, EFUSE_WIFI, _FALSE); *size = Efuse_GetCurrentSize(padapter, EFUSE_WIFI, false);
Efuse_PowerSwitch(padapter, _FALSE, _FALSE); Efuse_PowerSwitch(padapter, false, false);
return _SUCCESS; return _SUCCESS;
} }
@ -669,16 +669,16 @@ u8 rtw_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data)
{ {
u16 mapLen=0; 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) if ((addr + cnts) > mapLen)
return _FAIL; 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; return _SUCCESS;
} }
@ -687,16 +687,16 @@ u8 rtw_BT_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data)
{ {
u16 mapLen=0; 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) if ((addr + cnts) > mapLen)
return _FAIL; 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; return _SUCCESS;
} }
@ -710,7 +710,7 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data)
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
u16 mapLen=0; 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) if ((addr + cnts) > mapLen)
return _FAIL; 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); ret = rtw_efuse_map_read(padapter, 0, mapLen, map);
if (ret == _FAIL) goto exit; if (ret == _FAIL) goto exit;
Efuse_PowerSwitch(padapter, _TRUE, _TRUE); Efuse_PowerSwitch(padapter, true, true);
offset = (addr >> 3); offset = (addr >> 3);
word_en = 0xF; 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) { 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("offset=%x \n",offset);
DBG_871X("word_en=%x \n",word_en); 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); _rtw_memset(newdata, 0xFF, PGPKT_DATA_SIZE);
} while (1); } while (1);
Efuse_PowerSwitch(padapter, _TRUE, _FALSE); Efuse_PowerSwitch(padapter, true, false);
exit: exit:
@ -808,7 +808,7 @@ u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
u16 mapLen=0; 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) if ((addr + cnts) > mapLen)
return _FAIL; 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); ret = rtw_BT_efuse_map_read(padapter, 0, mapLen, map);
if (ret == _FAIL) goto exit; if (ret == _FAIL) goto exit;
Efuse_PowerSwitch(padapter, _TRUE, _TRUE); Efuse_PowerSwitch(padapter, true, true);
offset = (addr >> 3); offset = (addr >> 3);
word_en = 0xF; 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"); 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; 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); _rtw_memset(newdata, 0xFF, PGPKT_DATA_SIZE);
} while (1); } while (1);
Efuse_PowerSwitch(padapter, _TRUE, _FALSE); Efuse_PowerSwitch(padapter, true, false);
exit: exit:
@ -929,13 +929,13 @@ Efuse_ReadAllMap(
{ {
u16 mapLen=0; 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_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, bPseudoTest);
efuse_ReadEFuse(pAdapter, efuseType, 0, mapLen, Efuse, 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); 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); _rtw_memset(pEEPROM->efuse_eeprom_data, 0xFF, mapLen);
} }
@ -1227,7 +1227,7 @@ Efuse_InitSomeVar(
int isAdaptorInfoFileValid(void) int isAdaptorInfoFileValid(void)
{ {
return _TRUE; return true;
} }
int storeAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv) int storeAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv)

84
core/rtw_ieee80211.c
View file

@ -88,11 +88,11 @@ uint rtw_is_cckrates_included(u8 *rate)
{ {
if ( (((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) || if ( (((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) ||
(((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22) ) (((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22) )
return _TRUE; return true;
i++; i++;
} }
return _FALSE; return false;
} }
uint rtw_is_cckratesonly_included(u8 *rate) 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) && if ( (((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) &&
(((rate[i]) & 0x7f) != 11) && (((rate[i]) & 0x7f) != 22) ) (((rate[i]) & 0x7f) != 11) && (((rate[i]) & 0x7f) != 22) )
return _FALSE; return false;
i++; 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 (channel > 14)
{ {
if ((rtw_is_cckrates_included(rate)) == _TRUE) if ((rtw_is_cckrates_included(rate)) == true)
return WIRELESS_INVALID; return WIRELESS_INVALID;
else else
return WIRELESS_11A; return WIRELESS_11A;
} }
else // could be pure B, pure G, or B/G 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; return WIRELESS_11B;
else if((rtw_is_cckrates_included(rate)) == _TRUE) else if((rtw_is_cckrates_included(rate)) == true)
return WIRELESS_11BG; return WIRELESS_11BG;
else else
return WIRELESS_11G; 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(cnt<in_len) while(cnt<in_len)
{ {
if(eid == in_ie[cnt] if(eid == in_ie[cnt]
&& ( !oui || _rtw_memcmp(&in_ie[cnt+2], oui, oui_len) == _TRUE)) && ( !oui || _rtw_memcmp(&in_ie[cnt+2], oui, oui_len) == true))
{ {
target_ie = &in_ie[cnt]; target_ie = &in_ie[cnt];
@ -481,7 +481,7 @@ _func_enter_;
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
//HT Cap. //HT Cap.
if(((pregistrypriv->wireless_mode&WIRELESS_11_5N)||(pregistrypriv->wireless_mode&WIRELESS_11_24N)) if(((pregistrypriv->wireless_mode&WIRELESS_11_5N)||(pregistrypriv->wireless_mode&WIRELESS_11_24N))
&& (pregistrypriv->ht_enable==_TRUE)) && (pregistrypriv->ht_enable==true))
{ {
//todo: //todo:
} }
@ -512,7 +512,7 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit)
if (pbuf) { if (pbuf) {
//check if oui matches... //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; 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) 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; 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; 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; 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; 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 WPA_CIPHER_WEP104;
return 0; return 0;
@ -577,15 +577,15 @@ int rtw_get_wpa_cipher_suite(u8 *s)
int rtw_get_wpa2_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; 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; 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; 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; 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 WPA_CIPHER_WEP104;
return 0; 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)) || 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; return _FAIL;
} }
@ -771,8 +771,8 @@ _func_enter_;
authmode=in_ie[cnt]; authmode=in_ie[cnt];
//if(authmode==_WAPI_IE_) //if(authmode==_WAPI_IE_)
if(authmode==_WAPI_IE_ && (_rtw_memcmp(&in_ie[cnt+6], wapi_oui1,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)) _rtw_memcmp(&in_ie[cnt+6], wapi_oui2,4)==true))
{ {
if (wapi_ie) { if (wapi_ie) {
_rtw_memcpy(wapi_ie, &in_ie[cnt],in_ie[cnt+1]+2); _rtw_memcpy(wapi_ie, &in_ie[cnt],in_ie[cnt+1]+2);
@ -818,7 +818,7 @@ _func_enter_;
{ {
authmode=in_ie[cnt]; 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)); 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 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}; u8 eid, wps_oui[4]={0x0,0x50,0xf2,0x04};
if(ie_ptr == NULL) return match; if(ie_ptr == NULL) return match;
eid = ie_ptr[0]; 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"); //DBG_8192C("==> found WPS_IE.....\n");
*wps_ielen = ie_ptr[1]+2; *wps_ielen = ie_ptr[1]+2;
match=_TRUE; match=true;
} }
return match; 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]; 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]; 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; *len_attr = 0;
if ( ( wps_ie[0] != _VENDOR_SPECIFIC_IE_ ) || 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; 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(); dump_stack();
return NULL; 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; 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; *len_attr = 0;
if ( !p2p_ie || ( p2p_ie[0] != _VENDOR_SPECIFIC_IE_ ) || 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; return attr_ptr;
} }
@ -1741,7 +1741,7 @@ void dump_wfd_ie(u8 *ie, u32 ie_len)
u8 *wfd_ie; u8 *wfd_ie;
uint wfd_ielen; 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; return;
pos+=6; 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}; u8 eid, wfd_oui[4]={0x50,0x6F,0x9A,0x0A};
match=_FALSE; match=false;
if ( in_len < 0 ) 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]; 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 ) 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; cnt += in_ie[ cnt + 1 ] + 2;
match = _TRUE; match = true;
break; break;
} }
else 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; 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; int match;
match=_FALSE; match=false;
DBG_871X( "[%s] frame_type = %d\n", __FUNCTION__, frame_type ); DBG_871X( "[%s] frame_type = %d\n", __FUNCTION__, frame_type );
switch( 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}; u8 attr_id, wfd_oui[4]={0x50,0x6F,0x9A,0x0A};
match=_FALSE; match=false;
if ( ( wfd_ie[ 0 ] != _VENDOR_SPECIFIC_IE_ ) || 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 ); 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; cnt += attrlen + 3;
match = _TRUE; match = true;
break; break;
} }
else 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) != (RTW_IEEE80211_FTYPE_MGMT|RTW_IEEE80211_STYPE_ACTION)
) )
{ {
return _FALSE; return false;
} }
c = frame_body[0]; 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) if (action)
*action = a; *action = a;
return _TRUE; return true;
} }
static const char *_action_public_str[] = { static const char *_action_public_str[] = {

20
core/rtw_io.c
View file

@ -216,7 +216,7 @@ void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
_func_enter_; _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)); RT_TRACE(_module_rtl871x_io_c_, _drv_info_, ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)", adapter->bDriverStopped, adapter->bSurpriseRemoved));
return; return;
@ -256,7 +256,7 @@ void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
_func_enter_; _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)); RT_TRACE(_module_rtl871x_io_c_, _drv_info_, ("rtw_read_port:bDriverStopped(%d) OR bSurpriseRemoved(%d)", adapter->bDriverStopped, adapter->bSurpriseRemoved));
return; 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 * Increase and check if the continual_io_error of this @param dvobjprive is larger than MAX_CONTINUAL_IO_ERR
* @return _TRUE: * @return true:
* @return _FALSE: * @return false:
*/ */
int rtw_inc_and_chk_continual_io_error(struct dvobj_priv *dvobj) int rtw_inc_and_chk_continual_io_error(struct dvobj_priv *dvobj)
{ {
int ret = _FALSE; int ret = false;
int value; int value;
if( (value=ATOMIC_INC_RETURN(&dvobj->continual_io_error)) > MAX_CONTINUAL_IO_ERR) { 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); DBG_871X("[dvobj:%p][ERROR] continual_io_error:%d > %d\n", dvobj, value, MAX_CONTINUAL_IO_ERR);
ret = _TRUE; ret = true;
} else { } else {
//DBG_871X("[dvobj:%p] continual_io_error:%d\n", dvobj, value); //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; int i;
for (i = 0; i<read_sniff_num; i++) { for (i = 0; i<read_sniff_num; i++) {
if (addr + len > read_sniff_ranges[i][0] && addr <= read_sniff_ranges[i][1]) if (addr + len > 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) bool match_write_sniff_ranges(u16 addr, u16 len)
@ -405,10 +405,10 @@ bool match_write_sniff_ranges(u16 addr, u16 len)
int i; int i;
for (i = 0; i<write_sniff_num; i++) { for (i = 0; i<write_sniff_num; i++) {
if (addr + len > write_sniff_ranges[i][0] && addr <= write_sniff_ranges[i][1]) if (addr + len > 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) u8 dbg_rtw_read8(struct adapter *adapter, u32 addr, const char *caller, const int line)

10
core/rtw_ioctl_rtl.c
View file

@ -604,8 +604,8 @@ NDIS_STATUS oid_rt_get_channel_hdl(struct oid_par_priv* poid_par_priv)
return status; return status;
} }
if ( (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) || if ( (check_fwstate(pmlmepriv, _FW_LINKED) == true) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true))
pnic_Config = &pmlmepriv->cur_network.network.Configuration; pnic_Config = &pmlmepriv->cur_network.network.Configuration;
else else
pnic_Config = &padapter->registrypriv.dev_network.Configuration; 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==2 AdHocMode
// nStatus==3 NotAssociated // nStatus==3 NotAssociated
if(check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) if(check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true)
ulInfo = CHECKINGSTATUS; ulInfo = CHECKINGSTATUS;
else if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) else if(check_fwstate(pmlmepriv, _FW_LINKED) == true)
ulInfo = ASSOCIATED; ulInfo = ASSOCIATED;
else if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)== _TRUE) else if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)== true)
ulInfo = ADHOCMODE; ulInfo = ADHOCMODE;
else else
ulInfo = NOTASSOCIATED ; ulInfo = NOTASSOCIATED ;

228
core/rtw_ioctl_set.c
View file

@ -34,18 +34,18 @@ void indicate_wx_scan_complete_event(struct adapter *padapter);
( \ ( \
( (addr[0] == 0xff) && (addr[1] == 0xff) && \ ( (addr[0] == 0xff) && (addr[1] == 0xff) && \
(addr[2] == 0xff) && (addr[3] == 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 rtw_validate_bssid(u8 *bssid)
{ {
u8 ret = _TRUE; u8 ret = true;
if (is_zero_mac_addr(bssid) if (is_zero_mac_addr(bssid)
|| is_broadcast_mac_addr(bssid) || is_broadcast_mac_addr(bssid)
|| is_multicast_mac_addr(bssid) || is_multicast_mac_addr(bssid)
) { ) {
ret = _FALSE; ret = false;
} }
return ret; return ret;
@ -54,13 +54,13 @@ u8 rtw_validate_bssid(u8 *bssid)
u8 rtw_validate_ssid(NDIS_802_11_SSID *ssid) u8 rtw_validate_ssid(NDIS_802_11_SSID *ssid)
{ {
u8 i; u8 i;
u8 ret=_TRUE; u8 ret=true;
_func_enter_; _func_enter_;
if (ssid->SsidLength > 32) { if (ssid->SsidLength > 32) {
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid length >32\n")); RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid length >32\n"));
ret= _FALSE; ret= false;
goto exit; goto exit;
} }
@ -70,7 +70,7 @@ _func_enter_;
//wifi, printable ascii code must be supported //wifi, printable ascii code must be supported
if(!( (ssid->Ssid[i] >= 0x20) && (ssid->Ssid[i] <= 0x7e) )){ if(!( (ssid->Ssid[i] >= 0x20) && (ssid->Ssid[i] <= 0x7e) )){
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid has nonprintabl ascii\n")); RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid has nonprintabl ascii\n"));
ret= _FALSE; ret= false;
break; break;
} }
} }
@ -107,9 +107,9 @@ _func_enter_;
pmlmepriv->pscanned = plist; 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); _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); _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 //when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empty
//we try to issue sitesurvey firstly //we try to issue sitesurvey firstly
if (pmlmepriv->LinkDetectInfo.bBusyTraffic ==_FALSE if (pmlmepriv->LinkDetectInfo.bBusyTraffic ==false
|| rtw_to_roaming(padapter) > 0 || 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.")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_do_join(): site survey if scanned_queue is empty\n."));
// submit site_survey_cmd // submit site_survey_cmd
if(_SUCCESS!=(ret=rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)) ) { 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.")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_do_join(): site survey return error\n."));
} }
} }
else else
{ {
pmlmepriv->to_join = _FALSE; pmlmepriv->to_join = false;
ret = _FAIL; ret = _FAIL;
} }
@ -142,12 +142,12 @@ _func_enter_;
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
if((select_ret=rtw_select_and_join_from_scanned_queue(pmlmepriv))==_SUCCESS) 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); _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);
} }
else 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 // submit createbss_cmd to change to a ADHOC_MASTER
@ -168,11 +168,11 @@ _func_enter_;
if(rtw_createbss_cmd(padapter)!=_SUCCESS) if(rtw_createbss_cmd(padapter)!=_SUCCESS)
{ {
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>do_goin: rtw_createbss_cmd status FAIL*** \n ")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>do_goin: rtw_createbss_cmd status FAIL*** \n "));
ret = _FALSE; ret = false;
goto exit; 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 ")); 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 //when set_ssid/set_bssid for rtw_do_join(), but there are no desired bss in scanning queue
//we try to issue sitesurvey firstly //we try to issue sitesurvey firstly
if(pmlmepriv->LinkDetectInfo.bBusyTraffic==_FALSE if(pmlmepriv->LinkDetectInfo.bBusyTraffic==false
|| rtw_to_roaming(padapter) > 0 || rtw_to_roaming(padapter) > 0
) )
{ {
//DBG_871X("rtw_do_join() when no desired bss in scanning queue \n"); //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)) ){ 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.")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("do_join(): site survey return error\n."));
} }
} }
else else
{ {
ret = _FAIL; 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)); 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; 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; 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")); 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. goto release_mlme_lock;//it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again.
} else { } 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 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_,("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) )); 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_indicate_disconnect(padapter);
rtw_free_assoc_resources(padapter, 1); 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); _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);
set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);
} }
@ -273,10 +273,10 @@ handle_tkip_countermeasure:
} }
_rtw_memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN); _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) { if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
pmlmepriv->to_join = _TRUE; pmlmepriv->to_join = true;
} }
else { else {
status = rtw_do_join(padapter); status = rtw_do_join(padapter);
@ -308,9 +308,9 @@ _func_enter_;
DBG_871X_LEVEL(_drv_always_, "set ssid [%s] fw_state=0x%08x\n", DBG_871X_LEVEL(_drv_always_, "set ssid [%s] fw_state=0x%08x\n",
ssid->Ssid, get_fwstate(pmlmepriv)); 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_, 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; status = _FAIL;
goto exit; goto exit;
} }
@ -318,37 +318,37 @@ _func_enter_;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
DBG_871X("Set SSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv)); 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; 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; 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_, RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_,
("set_ssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n")); ("set_ssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n"));
if ((pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength) && 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_, RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
("Set SSID is the same ssid, fw_state=0x%08x\n", ("Set SSID is the same ssid, fw_state=0x%08x\n",
get_fwstate(pmlmepriv))); 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 //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_indicate_disconnect(padapter);
rtw_free_assoc_resources(padapter, 1); 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); _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);
set_fwstate(pmlmepriv, WIFI_ADHOC_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_,("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)); 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_indicate_disconnect(padapter);
rtw_free_assoc_resources(padapter, 1); 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); _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);
set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);
} }
@ -390,16 +390,16 @@ handle_tkip_countermeasure:
goto release_mlme_lock; goto release_mlme_lock;
} }
if (rtw_validate_ssid(ssid) == _FALSE) { if (rtw_validate_ssid(ssid) == false) {
status = _FAIL; status = _FAIL;
goto release_mlme_lock; goto release_mlme_lock;
} }
_rtw_memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID)); _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) { if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
pmlmepriv->to_join = _TRUE; pmlmepriv->to_join = true;
} }
else { else {
status = rtw_do_join(padapter); 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; _irqL irqL;
u8 status = _SUCCESS; u8 status = _SUCCESS;
u32 cur_time = 0; u32 cur_time = 0;
bool bssid_valid = _TRUE; bool bssid_valid = true;
bool ssid_valid = _TRUE; bool ssid_valid = true;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_func_enter_; _func_enter_;
if (!ssid || rtw_validate_ssid(ssid) == _FALSE) if (!ssid || rtw_validate_ssid(ssid) == false)
ssid_valid = _FALSE; ssid_valid = false;
if (!bssid || rtw_validate_bssid(bssid) == _FALSE) if (!bssid || rtw_validate_bssid(bssid) == false)
bssid_valid = _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", 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); FUNC_ADPT_ARG(padapter), ssid, ssid_valid, bssid, bssid_valid);
status = _FAIL; status = _FAIL;
goto exit; goto exit;
} }
if(padapter->hw_init_completed==_FALSE){ if(padapter->hw_init_completed==false){
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, 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; status = _FAIL;
goto exit; goto exit;
} }
@ -454,9 +454,9 @@ _func_enter_;
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" fw_state=0x%08x\n", DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" fw_state=0x%08x\n",
FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv)); 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; 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; goto release_mlme_lock;
} }
@ -471,11 +471,11 @@ handle_tkip_countermeasure:
if (bssid && bssid_valid) { if (bssid && bssid_valid) {
_rtw_memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN); _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) { if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
pmlmepriv->to_join = _TRUE; pmlmepriv->to_join = true;
} }
else { else {
status = rtw_do_join(padapter); status = rtw_do_join(padapter);
@ -522,16 +522,16 @@ _func_enter_;
#endif #endif
} }
if((check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) ||(*pold_state==Ndis802_11IBSS)) if((check_fwstate(pmlmepriv, _FW_LINKED)== true) ||(*pold_state==Ndis802_11IBSS))
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) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)== _TRUE) ) (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)== true) )
rtw_free_assoc_resources(padapter, 1); rtw_free_assoc_resources(padapter, 1);
if((*pold_state == Ndis802_11Infrastructure) ||(*pold_state == Ndis802_11IBSS)) 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 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_; _func_exit_;
return _TRUE; return true;
} }
@ -588,11 +588,11 @@ _func_enter_;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _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")); 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); rtw_indicate_disconnect(padapter);
//modify for CONFIG_IEEE80211W, none 11w can use it //modify for CONFIG_IEEE80211W, none 11w can use it
rtw_free_assoc_resources_cmd(padapter); rtw_free_assoc_resources_cmd(padapter);
@ -603,40 +603,40 @@ _func_enter_;
_func_exit_; _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) u8 rtw_set_802_11_bssid_list_scan(struct adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num)
{ {
_irqL irqL; _irqL irqL;
struct mlme_priv *pmlmepriv= &padapter->mlmepriv; struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
u8 res=_TRUE; u8 res=true;
_func_enter_; _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))); 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) { if (padapter == NULL) {
res=_FALSE; res=false;
goto exit; goto exit;
} }
if (padapter->hw_init_completed==_FALSE){ if (padapter->hw_init_completed==false){
res = _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")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n===rtw_set_802_11_bssid_list_scan:hw_init_completed==false===\n"));
goto exit; goto exit;
} }
if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) || if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) ||
(pmlmepriv->LinkDetectInfo.bBusyTraffic == _TRUE)) (pmlmepriv->LinkDetectInfo.bBusyTraffic == true))
{ {
// Scan or linking is in progress, do nothing. // 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))); 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")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n###_FW_UNDER_SURVEY|_FW_UNDER_LINKING\n\n"));
} else { } 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 { } else {
if (rtw_is_scan_deny(padapter)) { if (rtw_is_scan_deny(padapter)) {
@ -683,9 +683,9 @@ _func_enter_;
res=rtw_set_auth(padapter,psecuritypriv); res=rtw_set_auth(padapter,psecuritypriv);
if(res==_SUCCESS) if(res==_SUCCESS)
ret=_TRUE; ret=true;
else else
ret=_FALSE; ret=false;
_func_exit_; _func_exit_;
@ -702,14 +702,14 @@ u8 rtw_set_802_11_add_wep(struct adapter* padapter, NDIS_802_11_WEP *wep){
_func_enter_; _func_enter_;
bdefaultkey=(wep->KeyIndex & 0x40000000) > 0 ? _FALSE : _TRUE; //for ??? bdefaultkey=(wep->KeyIndex & 0x40000000) > 0 ? false : true; //for ???
btransmitkey= (wep->KeyIndex & 0x80000000) > 0 ? _TRUE : _FALSE; //for ??? btransmitkey= (wep->KeyIndex & 0x80000000) > 0 ? true : false; //for ???
keyid=wep->KeyIndex & 0x3fffffff; keyid=wep->KeyIndex & 0x3fffffff;
if(keyid>4) if(keyid>4)
{ {
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("MgntActrtw_set_802_11_add_wep:keyid>4=>fail\n")); 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; 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[9],psecuritypriv->dot11DefKey[keyid].skey[10],psecuritypriv->dot11DefKey[keyid].skey[11],
psecuritypriv->dot11DefKey[keyid].skey[12])); 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) if(res==_FAIL)
ret= _FALSE; ret= false;
exit: exit:
_func_exit_; _func_exit_;
@ -764,7 +764,7 @@ _func_enter_;
if (keyindex >= 0x80000000 || padapter == NULL){ if (keyindex >= 0x80000000 || padapter == NULL){
ret=_FALSE; ret=false;
goto exit; goto exit;
} }
@ -776,7 +776,7 @@ _func_enter_;
_rtw_memset(&psecuritypriv->dot11DefKey[keyindex], 0, 16); _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; 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; uint encryptionalgo;
u8 * pbssid; u8 * pbssid;
struct sta_info *stainfo; struct sta_info *stainfo;
u8 bgroup = _FALSE; u8 bgroup = false;
u8 bgrouptkey = _FALSE;//can be remove later u8 bgrouptkey = false;//can be remove later
u8 ret=_SUCCESS; u8 ret=_SUCCESS;
_func_enter_; _func_enter_;
@ -857,10 +857,10 @@ _func_enter_;
} }
// check BSSID // 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")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("MacAddr_isBcst(key->BSSID)\n"));
ret= _FALSE; ret= false;
goto exit; goto exit;
} }
@ -891,7 +891,7 @@ _func_enter_;
goto exit; goto exit;
} }
bgroup = _FALSE; bgroup = false;
// Check the pairwise key. Added by Annie, 2005-07-06. // Check the pairwise key. Added by Annie, 2005-07-06.
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n")); 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")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,(" IBSS but BSSID is not Broadcast Address.\n"));
ret= _FAIL; ret= _FAIL;
goto exit; goto exit;
@ -970,15 +970,15 @@ _func_enter_;
} }
if(key->KeyIndex & 0x8000000) {//error ??? 0x8000_0000 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_,("------------------------------------------\n") );
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("[Group Key set]\n") ); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("[Group Key set]\n") );
@ -1021,7 +1021,7 @@ _func_enter_;
if(key->KeyIndex & 0x20000000){ if(key->KeyIndex & 0x20000000){
// SetRSC // SetRSC
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ SetRSC+++++\n")); 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; NDIS_802_11_KEY_RSC keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL;
_rtw_memcpy(&padapter->securitypriv.dot11Grprxpn, &keysrc, 8); _rtw_memcpy(&padapter->securitypriv.dot11Grprxpn, &keysrc, 8);
@ -1036,11 +1036,11 @@ _func_enter_;
// Indicate this key idx is used for TX // Indicate this key idx is used for TX
// Save the key in KeyMaterial // Save the key in KeyMaterial
if(bgroup == _TRUE) // Group transmit key if(bgroup == true) // Group transmit key
{ {
int res; int res;
if(bgrouptkey == _TRUE) if(bgrouptkey == true)
{ {
padapter->securitypriv.dot118021XGrpKeyid=(u8)key->KeyIndex; padapter->securitypriv.dot118021XGrpKeyid=(u8)key->KeyIndex;
} }
@ -1086,13 +1086,13 @@ _func_enter_;
key->KeyIndex=key->KeyIndex & 0x03; 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")); 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) if(res==_FAIL)
ret= _FAIL; ret= _FAIL;
@ -1115,7 +1115,7 @@ _func_enter_;
if(encryptionalgo== _TKIP_) if(encryptionalgo== _TKIP_)
{ {
padapter->securitypriv.busetkipkey=_FALSE; padapter->securitypriv.busetkipkey=false;
//_set_timer(&padapter->securitypriv.tkip_timer, 50); //_set_timer(&padapter->securitypriv.tkip_timer, 50);
@ -1142,15 +1142,15 @@ _func_enter_;
//Set key to CAM through H2C command //Set key to CAM through H2C command
if(bgrouptkey)//never go to here 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")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(group)\n"));
} }
else{ 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")); 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; ret= _FAIL;
} }
@ -1169,7 +1169,7 @@ u8 rtw_set_802_11_remove_key(struct adapter* padapter, NDIS_802_11_REMOVE_KEY *k
uint encryptionalgo; uint encryptionalgo;
u8 * pbssid; u8 * pbssid;
struct sta_info *stainfo; 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 keyIndex = (u8)key->KeyIndex & 0x03;
u8 ret=_SUCCESS; u8 ret=_SUCCESS;
@ -1180,7 +1180,7 @@ _func_enter_;
goto exit; goto exit;
} }
if (bgroup == _TRUE) { if (bgroup == true) {
encryptionalgo= padapter->securitypriv.dot118021XGrpPrivacy; encryptionalgo= padapter->securitypriv.dot118021XGrpPrivacy;
// clear group key by index // clear group key by index
//NdisZeroMemory(Adapter->MgntInfo.SecurityInfo.KeyBuf[keyIndex], MAX_WEP_KEY_LEN); //NdisZeroMemory(Adapter->MgntInfo.SecurityInfo.KeyBuf[keyIndex], MAX_WEP_KEY_LEN);
@ -1213,7 +1213,7 @@ exit:
_func_exit_; _func_exit_;
return _TRUE; return true;
} }
@ -1241,8 +1241,8 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)
u32 ht_ielen = 0; u32 ht_ielen = 0;
#endif #endif
if((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) if((check_fwstate(pmlmepriv, _FW_LINKED) != true)
&& (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != _TRUE)) && (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != true))
return 0; return 0;
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT

10
core/rtw_iol.c
View file

@ -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) bool rtw_IOL_applied(struct adapter *adapter)
{ {
if(1 == adapter->registrypriv.fw_iol) if(1 == adapter->registrypriv.fw_iol)
return _TRUE; return true;
if((2 == adapter->registrypriv.fw_iol) && (!adapter_to_dvobj(adapter)->ishighspeed)) if((2 == adapter->registrypriv.fw_iol) && (!adapter_to_dvobj(adapter)->ishighspeed))
return _TRUE; return true;
return _FALSE; return false;
} }
int rtw_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt) 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 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){ if(((pxmit_frame->attrib.pktlen+32)%256) + 8 >= 256){
rtw_IOL_append_END_cmd(pxmit_frame); rtw_IOL_append_END_cmd(pxmit_frame);
pxmit_frame->attrib.pktlen = ((((pxmit_frame->attrib.pktlen+32)/256)+1)*256 ); pxmit_frame->attrib.pktlen = ((((pxmit_frame->attrib.pktlen+32)/256)+1)*256 );
//printk("==> %s, pktlen(%d)\n",__FUNCTION__,pxmit_frame->attrib.pktlen); //printk("==> %s, pktlen(%d)\n",__FUNCTION__,pxmit_frame->attrib.pktlen);
pxmit_frame->attrib.last_txcmdsz = 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; return is_cmd_bndy;
} }

468
core/rtw_led.c
View file

File diff suppressed because it is too large Load diff

278
core/rtw_mlme.c
View file

@ -200,7 +200,7 @@ _func_enter_;
_enter_critical_bh(&queue->lock, &irqL); _enter_critical_bh(&queue->lock, &irqL);
if (_rtw_queue_empty(queue) == _TRUE) if (_rtw_queue_empty(queue) == true)
pnetwork = NULL; pnetwork = NULL;
@ -229,7 +229,7 @@ _func_enter_;
_enter_critical_bh(&free_queue->lock, &irqL); _enter_critical_bh(&free_queue->lock, &irqL);
if (_rtw_queue_empty(free_queue) == _TRUE) { if (_rtw_queue_empty(free_queue) == true) {
pnetwork=NULL; pnetwork=NULL;
goto exit; goto exit;
} }
@ -241,7 +241,7 @@ _func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("_rtw_alloc_network: ptr=%p\n", plist)); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("_rtw_alloc_network: ptr=%p\n", plist));
pnetwork->network_type = 0; pnetwork->network_type = 0;
pnetwork->fixed = _FALSE; pnetwork->fixed = false;
pnetwork->last_scanned = rtw_get_current_time(); pnetwork->last_scanned = rtw_get_current_time();
pnetwork->aid=0; pnetwork->aid=0;
pnetwork->join_res=0; pnetwork->join_res=0;
@ -268,13 +268,13 @@ _func_enter_;
if (pnetwork == NULL) if (pnetwork == NULL)
goto exit; goto exit;
if (pnetwork->fixed == _TRUE) if (pnetwork->fixed == true)
goto exit; goto exit;
curr_time = rtw_get_current_time(); curr_time = rtw_get_current_time();
if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==_TRUE ) || if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==true ) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE ) ) (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==true ) )
lifetime = 1; lifetime = 1;
if (!isfreeall) { if (!isfreeall) {
@ -313,7 +313,7 @@ _func_enter_;
if (pnetwork == NULL) if (pnetwork == NULL)
goto exit; goto exit;
if (pnetwork->fixed == _TRUE) if (pnetwork->fixed == true)
goto exit; goto exit;
//_enter_critical(&free_queue->lock, &irqL); //_enter_critical(&free_queue->lock, &irqL);
@ -362,7 +362,7 @@ _func_enter_;
{ {
pnetwork = LIST_CONTAINOR(plist, struct wlan_network ,list); 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; break;
plist = get_next(plist); plist = get_next(plist);
@ -398,7 +398,7 @@ _func_enter_;
phead = get_list_head(scanned_queue); phead = get_list_head(scanned_queue);
plist = get_next(phead); 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); pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list);
@ -424,12 +424,12 @@ sint rtw_if_up(struct adapter *padapter) {
_func_enter_; _func_enter_;
if( padapter->bDriverStopped || padapter->bSurpriseRemoved || 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)); 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 else
res= _TRUE; res= true;
_func_exit_; _func_exit_;
return res; 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 rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork)
{ {
int ret=_TRUE; int ret=true;
struct security_priv *psecuritypriv = &adapter->securitypriv; struct security_priv *psecuritypriv = &adapter->securitypriv;
if ( (psecuritypriv->dot11PrivacyAlgrthm != _NO_PRIVACY_ ) && if ( (psecuritypriv->dot11PrivacyAlgrthm != _NO_PRIVACY_ ) &&
( pnetwork->network.Privacy == 0 ) ) ( pnetwork->network.Privacy == 0 ) )
{ {
ret=_FALSE; ret=false;
} }
else if((psecuritypriv->dot11PrivacyAlgrthm == _NO_PRIVACY_ ) && else if((psecuritypriv->dot11PrivacyAlgrthm == _NO_PRIVACY_ ) &&
( pnetwork->network.Privacy == 1 ) ) ( pnetwork->network.Privacy == 1 ) )
{ {
ret=_FALSE; ret=false;
} }
else else
{ {
ret=_TRUE; ret=true;
} }
return ret; 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", //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)); // a->Ssid.Ssid,a->Ssid.SsidLength,b->Ssid.Ssid,b->Ssid.SsidLength));
return (a->Ssid.SsidLength == 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) 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); KeBugCheckEx(0x87110000, (ULONG_PTR)dst, (ULONG_PTR)src,(ULONG_PTR)&s_cap, (ULONG_PTR)&d_cap);
return _FALSE; return false;
} }
#endif #endif
@ -629,16 +629,16 @@ _func_exit_;
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
if ((feature == 1) && // 1: P2P supported 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 #endif
return ((src->Ssid.SsidLength == dst->Ssid.SsidLength) && return ((src->Ssid.SsidLength == dst->Ssid.SsidLength) &&
// (src->Configuration.DSConfig == dst->Configuration.DSConfig) && // (src->Configuration.DSConfig == dst->Configuration.DSConfig) &&
( (_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == _TRUE) && ( (_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == true) &&
( (_rtw_memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) == _TRUE) && ( (_rtw_memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) == true) &&
((s_cap & WLAN_CAPABILITY_IBSS) == ((s_cap & WLAN_CAPABILITY_IBSS) ==
(d_cap & WLAN_CAPABILITY_IBSS)) && (d_cap & WLAN_CAPABILITY_IBSS)) &&
((s_cap & WLAN_CAPABILITY_BSS) == ((s_cap & WLAN_CAPABILITY_BSS) ==
@ -661,12 +661,12 @@ _func_enter_;
while(1) while(1)
{ {
if (rtw_end_of_queue_search(phead,plist)== _TRUE) if (rtw_end_of_queue_search(phead,plist)== true)
break; break;
pwlan= LIST_CONTAINOR(plist, struct wlan_network, list); 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)) if (oldest == NULL ||time_after(oldest->last_scanned, pwlan->last_scanned))
oldest = pwlan; oldest = pwlan;
@ -763,9 +763,9 @@ static void update_current_network(struct adapter *adapter, WLAN_BSSID_EX *pnetw
_func_enter_; _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), rtw_update_protection(adapter, (pmlmepriv->cur_network.network.IEs) + sizeof (NDIS_802_11_FIXED_IEs),
pmlmepriv->cur_network.network.IELength); pmlmepriv->cur_network.network.IELength);
} }
@ -808,7 +808,7 @@ _func_enter_;
while(1) while(1)
{ {
if (rtw_end_of_queue_search(phead,plist)== _TRUE) if (rtw_end_of_queue_search(phead,plist)== true)
break; break;
pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); 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 /* If we didn't find a match, then get a new network slot to initialize
* with this beacon's information */ * 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 (!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 */ /* If there are no more slots, expire the oldest */
//list_del_init(&oldest->list); //list_del_init(&oldest->list);
pnetwork = oldest; pnetwork = oldest;
@ -851,7 +851,7 @@ _func_enter_;
_rtw_memcpy(&(pnetwork->network), target, get_WLAN_BSSID_EX_sz(target)); _rtw_memcpy(&(pnetwork->network), target, get_WLAN_BSSID_EX_sz(target));
//pnetwork->last_scanned = rtw_get_current_time(); //pnetwork->last_scanned = rtw_get_current_time();
// variable initialize // variable initialize
pnetwork->fixed = _FALSE; pnetwork->fixed = false;
pnetwork->last_scanned = rtw_get_current_time(); pnetwork->last_scanned = rtw_get_current_time();
pnetwork->network_type = 0; 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 * be already expired. In this case we do the same as we found a new
* net and call the new_net handler * net and call the new_net handler
*/ */
bool update_ie = _TRUE; bool update_ie = true;
pnetwork->last_scanned = rtw_get_current_time(); pnetwork->last_scanned = rtw_get_current_time();
@ -904,10 +904,10 @@ _func_enter_;
if ((target->Reserved[0] != 2) && if ((target->Reserved[0] != 2) &&
(target->Reserved[0] >= pnetwork->network.Reserved[0]) (target->Reserved[0] >= pnetwork->network.Reserved[0])
) { ) {
update_ie = _TRUE; update_ie = true;
} }
else { else {
update_ie = _FALSE; update_ie = false;
} }
update_network(&(pnetwork->network), target,adapter, update_ie); 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]; //u8 wps_ie[512];
uint wps_ielen; uint wps_ielen;
int bselected = _TRUE; int bselected = true;
desired_encmode = psecuritypriv->ndisencryptstatus; desired_encmode = psecuritypriv->ndisencryptstatus;
privacy = pnetwork->network.Privacy; 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) 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 else
{ {
return _FALSE; return false;
} }
} }
if (adapter->registrypriv.wifi_spec == 1) //for correct flow of 8021X to do.... 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; uint ie_len=0;
if ((desired_encmode == Ndis802_11EncryptionDisabled) && (privacy != 0)) if ((desired_encmode == Ndis802_11EncryptionDisabled) && (privacy != 0))
bselected = _FALSE; bselected = false;
if ( psecuritypriv->ndisauthtype == Ndis802_11AuthModeWPA2PSK) { 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_)); 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) { if (p && ie_len>0) {
bselected = _TRUE; bselected = true;
} else { } 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)) { if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy == 0)) {
DBG_871X("desired_encmode: %d, privacy: %d\n", desired_encmode, privacy); 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) 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); _enter_critical_bh(&pmlmepriv->lock, &irqL);
// update IBSS_network 's timestamp // 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"); //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)) 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 // 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 ) if( pnetwork->Ssid.Ssid[0] == 0 )
{ {
@ -1090,7 +1090,7 @@ _func_exit_;
void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
{ {
_irqL irqL; _irqL irqL;
u8 timer_cancelled = _FALSE; u8 timer_cancelled = false;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
#ifdef CONFIG_MLME_EXT #ifdef CONFIG_MLME_EXT
@ -1116,7 +1116,7 @@ _func_enter_;
{ {
//u8 timer_cancelled; //u8 timer_cancelled;
timer_cancelled = _TRUE; timer_cancelled = true;
//_cancel_timer(&pmlmepriv->scan_to_timer, &timer_cancelled); //_cancel_timer(&pmlmepriv->scan_to_timer, &timer_cancelled);
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
@ -1137,11 +1137,11 @@ _func_enter_;
rtw_set_signal_stat_timer(&adapter->recvpriv); rtw_set_signal_stat_timer(&adapter->recvpriv);
#endif #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); 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")); 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; int s_ret;
set_fwstate(pmlmepriv, _FW_UNDER_LINKING); 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))) if(_SUCCESS == (s_ret=rtw_select_and_join_from_scanned_queue(pmlmepriv)))
{ {
_set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);
@ -1210,7 +1210,7 @@ _func_enter_;
rtw_free_assoc_resources(adapter, 1); rtw_free_assoc_resources(adapter, 1);
rtw_indicate_disconnect(adapter); rtw_indicate_disconnect(adapter);
} else { } else {
pmlmepriv->to_join = _TRUE; pmlmepriv->to_join = true;
} }
} }
else else
@ -1229,7 +1229,7 @@ _func_enter_;
_exit_critical_bh(&pmlmepriv->lock, &irqL); _exit_critical_bh(&pmlmepriv->lock, &irqL);
#ifdef CONFIG_P2P_PS #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); p2p_ps_wk_cmd(adapter, P2P_PS_SCAN_DONE, 0);
} }
#endif // CONFIG_P2P_PS #endif // CONFIG_P2P_PS
@ -1369,7 +1369,7 @@ _func_enter_;
pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress); pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress);
if(pwlan) if(pwlan)
{ {
pwlan->fixed = _FALSE; pwlan->fixed = false;
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
if(!rtw_p2p_chk_state(&adapter->wdinfo, P2P_STATE_NONE)) 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")); 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)) 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); struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv);
start = rtw_get_current_time(); start = rtw_get_current_time();
pmlmeext->scan_abort = _TRUE; pmlmeext->scan_abort = true;
while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)
&& rtw_get_passing_time_ms(start) <= 200) { && rtw_get_passing_time_ms(start) <= 200) {
@ -1572,9 +1572,9 @@ void rtw_scan_abort(struct adapter *adapter)
set_survey_timer(pmlmeext, 0); set_survey_timer(pmlmeext, 0);
_set_timer(&pmlmepriv->scan_to_timer, 50); _set_timer(&pmlmepriv->scan_to_timer, 50);
#endif #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) 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 #endif
//sta mode //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 //security related
if(padapter->securitypriv.dot11AuthAlgrthm== dot11AuthAlgrthm_8021X) if(padapter->securitypriv.dot11AuthAlgrthm== dot11AuthAlgrthm_8021X)
{ {
padapter->securitypriv.binstallGrpkey=_FALSE; padapter->securitypriv.binstallGrpkey=false;
padapter->securitypriv.busetkipkey=_FALSE; padapter->securitypriv.busetkipkey=false;
padapter->securitypriv.bgrpkey_handshake=_FALSE; padapter->securitypriv.bgrpkey_handshake=false;
psta->ieee8021x_blocked=_TRUE; psta->ieee8021x_blocked=true;
psta->dot118021XPrivacy=padapter->securitypriv.dot11PrivacyAlgrthm; psta->dot118021XPrivacy=padapter->securitypriv.dot11PrivacyAlgrthm;
_rtw_memset((u8 *)&psta->dot118021x_UncstKey, 0, sizeof (union Keytype)); _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. // And the Wi-Fi driver shouldn't allow the data packet to be tramsmitted.
if ( padapter->securitypriv.wps_ie_len != 0 ) if ( padapter->securitypriv.wps_ie_len != 0 )
{ {
psta->ieee8021x_blocked=_TRUE; psta->ieee8021x_blocked=true;
padapter->securitypriv.wps_ie_len = 0; 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 = &precvpriv->recvreorder_ctrl[i];
preorder_ctrl = &psta->recvreorder_ctrl[i]; preorder_ctrl = &psta->recvreorder_ctrl[i];
preorder_ctrl->enable = _FALSE; preorder_ctrl->enable = false;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, 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 = &precvpriv->recvreorder_ctrl[i];
preorder_ctrl = &bmc_sta->recvreorder_ctrl[i]; preorder_ctrl = &bmc_sta->recvreorder_ctrl[i];
preorder_ctrl->enable = _FALSE; preorder_ctrl->enable = false;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, 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 *pnetwork = (struct wlan_network *)pbuf;
struct wlan_network *cur_network = &(pmlmepriv->cur_network); struct wlan_network *cur_network = &(pmlmepriv->cur_network);
struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL; struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL;
unsigned int the_same_macaddr = _FALSE; unsigned int the_same_macaddr = false;
_func_enter_; _func_enter_;
@ -1816,14 +1816,14 @@ _func_enter_;
//s1. find ptarget_wlan //s1. find ptarget_wlan
if(check_fwstate(pmlmepriv, _FW_LINKED) ) 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); ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress);
} }
else else
{ {
pcur_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress); 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); pcur_sta = rtw_get_stainfo(pstapriv, cur_network->network.MacAddress);
if(pcur_sta){ if(pcur_sta){
@ -1833,8 +1833,8 @@ _func_enter_;
} }
ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.MacAddress); ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.MacAddress);
if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE){ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true){
if(ptarget_wlan) ptarget_wlan->fixed = _TRUE; if(ptarget_wlan) ptarget_wlan->fixed = true;
} }
} }
@ -1842,8 +1842,8 @@ _func_enter_;
else else
{ {
ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.MacAddress); ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.MacAddress);
if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE){ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true){
if(ptarget_wlan) ptarget_wlan->fixed = _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 //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); ptarget_sta = rtw_joinbss_update_stainfo(adapter, pnetwork);
if(ptarget_sta==NULL) if(ptarget_sta==NULL)
@ -1873,7 +1873,7 @@ _func_enter_;
} }
//s4. indicate connect //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; pmlmepriv->cur_network_scanned = ptarget_wlan;
rtw_indicate_connect(adapter); rtw_indicate_connect(adapter);
@ -1908,7 +1908,7 @@ _func_enter_;
//rtw_free_assoc_resources(adapter, 1); //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))); 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); _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
@ -2048,7 +2048,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
_func_enter_; _func_enter_;
if(rtw_access_ctrl(adapter, pstassoc->macaddr) == _FALSE) if(rtw_access_ctrl(adapter, pstassoc->macaddr) == false)
return; return;
#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) #if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
@ -2123,7 +2123,7 @@ _func_enter_;
//psta->aid = (uint)pstassoc->cam_id; //psta->aid = (uint)pstassoc->cam_id;
DBG_871X("%s\n",__FUNCTION__); DBG_871X("%s\n",__FUNCTION__);
//for ad-hoc mode //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); rtw_sta_media_status_rpt(adapter, psta, 1);
@ -2131,19 +2131,19 @@ _func_enter_;
psta->dot118021XPrivacy = adapter->securitypriv.dot11PrivacyAlgrthm; psta->dot118021XPrivacy = adapter->securitypriv.dot11PrivacyAlgrthm;
psta->ieee8021x_blocked = _FALSE; psta->ieee8021x_blocked = false;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==_TRUE ) || if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==true ) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE ) ) (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==true ) )
{ {
if(adapter->stapriv.asoc_sta_count== 2) if(adapter->stapriv.asoc_sta_count== 2)
{ {
_enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress); ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress);
pmlmepriv->cur_network_scanned = ptarget_wlan; 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); _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
// a sta + bc/mc_stainfo (not Ibss_stainfo) // a sta + bc/mc_stainfo (not Ibss_stainfo)
rtw_indicate_connect(adapter); rtw_indicate_connect(adapter);
@ -2232,7 +2232,7 @@ _func_enter_;
// remove the network entry in scanned_queue // remove the network entry in scanned_queue
pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress); pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress);
if (pwlan) { if (pwlan) {
pwlan->fixed = _FALSE; pwlan->fixed = false;
rtw_free_network_nolock(pmlmepriv, pwlan); rtw_free_network_nolock(pmlmepriv, pwlan);
} }
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); _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); pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress);
if(pwlan) if(pwlan)
{ {
pwlan->fixed = _FALSE; pwlan->fixed = false;
rtw_free_network_nolock(pmlmepriv, pwlan); rtw_free_network_nolock(pmlmepriv, pwlan);
} }
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); _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); _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(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__); DBG_871X("exit %s when _FW_UNDER_SURVEY|_FW_UNDER_LINKING -> \n", __FUNCTION__);
return; 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); DBG_871X("%s exit cause traffic_busy(%x)\n",__FUNCTION__, pmlmepriv->sitesurveyctrl.traffic_busy);
return; return;
@ -2445,8 +2445,8 @@ static void rtw_auto_scan_handler(struct adapter *padapter)
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if (rtw_buddy_adapter_up(padapter)) if (rtw_buddy_adapter_up(padapter))
{ {
if ((check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) || if ((check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) ||
(padapter->pbuddy_adapter->mlmepriv.LinkDetectInfo.bBusyTraffic == _TRUE)) (padapter->pbuddy_adapter->mlmepriv.LinkDetectInfo.bBusyTraffic == true))
{ {
DBG_871X("%s, but buddy_intf is under scanning or linking or BusyTraffic\n", __FUNCTION__); DBG_871X("%s, but buddy_intf is under scanning or linking or BusyTraffic\n", __FUNCTION__);
return; return;
@ -2487,24 +2487,24 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
adapter->HalFunc.hal_checke_bt_hang(adapter); adapter->HalFunc.hal_checke_bt_hang(adapter);
} }
#endif #endif
if(adapter->hw_init_completed == _FALSE) if(adapter->hw_init_completed == false)
return; return;
if ((adapter->bDriverStopped == _TRUE)||(adapter->bSurpriseRemoved== _TRUE)) if ((adapter->bDriverStopped == true)||(adapter->bSurpriseRemoved== true))
return; return;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if(pbuddy_adapter) if(pbuddy_adapter)
{ {
if(adapter->net_closed == _TRUE && pbuddy_adapter->net_closed == _TRUE) if(adapter->net_closed == true && pbuddy_adapter->net_closed == true)
{ {
return; return;
} }
} }
else else
#endif //CONFIG_CONCURRENT_MODE #endif //CONFIG_CONCURRENT_MODE
if(adapter->net_closed == _TRUE) if(adapter->net_closed == true)
{ {
return; return;
} }
@ -2525,7 +2525,7 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
#ifndef CONFIG_ACTIVE_KEEP_ALIVE_CHECK #ifndef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
{ {
expire_timeout_chk(adapter); 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)) #else // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
if( rcu_dereference(adapter->pnetdev->rx_handler_data) if( rcu_dereference(adapter->pnetdev->rx_handler_data)
#endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) #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 // expire NAT2.5 entry
void nat25_db_expire(struct adapter *priv); 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) inline bool rtw_is_scan_deny(struct adapter *adapter)
{ {
struct mlme_priv *mlmepriv = &adapter->mlmepriv; 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) 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 * Select a new join candidate from the original @param candidate and @param competitor
* @return _TRUE: candidate is updated * @return true: candidate is updated
* @return _FALSE: candidate is not updated * @return false: candidate is not updated
*/ */
static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
, struct wlan_network **candidate, struct wlan_network *competitor) , struct wlan_network **candidate, struct wlan_network *competitor)
{ {
int updated = _FALSE; int updated = false;
struct adapter *adapter = container_of(pmlmepriv, struct adapter, mlmepriv); struct adapter *adapter = container_of(pmlmepriv, struct adapter, mlmepriv);
//check bssid, if needed //check bssid, if needed
if(pmlmepriv->assoc_by_bssid==_TRUE) { if(pmlmepriv->assoc_by_bssid==true) {
if(_rtw_memcmp(competitor->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN) ==_FALSE) if(_rtw_memcmp(competitor->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN) ==false)
goto exit; goto exit;
} }
//check ssid, if needed //check ssid, if needed
if(pmlmepriv->assoc_ssid.Ssid && pmlmepriv->assoc_ssid.SsidLength) { if(pmlmepriv->assoc_ssid.Ssid && pmlmepriv->assoc_ssid.SsidLength) {
if( competitor->network.Ssid.SsidLength != 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; goto exit;
} }
if(rtw_is_desired_network(adapter, competitor) == _FALSE) if(rtw_is_desired_network(adapter, competitor) == false)
goto exit; goto exit;
#ifdef CONFIG_LAYER2_ROAMING #ifdef CONFIG_LAYER2_ROAMING
if(rtw_to_roaming(adapter) > 0) { if(rtw_to_roaming(adapter) > 0) {
if( rtw_get_passing_time_ms((u32)competitor->last_scanned) >= RTW_SCAN_RESULT_EXPIRE 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; goto exit;
} }
@ -2668,7 +2668,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
if(*candidate == NULL ||(*candidate)->network.Rssi<competitor->network.Rssi ) if(*candidate == NULL ||(*candidate)->network.Rssi<competitor->network.Rssi )
{ {
*candidate = competitor; *candidate = competitor;
updated = _TRUE; updated = true;
} }
if(updated){ if(updated){
@ -2712,7 +2712,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
_queue *queue = &(pmlmepriv->scanned_queue); _queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
struct wlan_network *candidate = NULL; struct wlan_network *candidate = NULL;
u8 bSupportAntDiv = _FALSE; u8 bSupportAntDiv = false;
_func_enter_; _func_enter_;
@ -2752,17 +2752,17 @@ _func_enter_;
// check for situation of _FW_LINKED // 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__); 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_indicate_disconnect(adapter);
rtw_free_assoc_resources(adapter, 0); rtw_free_assoc_resources(adapter, 0);
} }
#ifdef CONFIG_ANTENNA_DIVERSITY #ifdef CONFIG_ANTENNA_DIVERSITY
rtw_hal_get_def_var(adapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &(bSupportAntDiv)); rtw_hal_get_def_var(adapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &(bSupportAntDiv));
if(_TRUE == bSupportAntDiv) if(true == bSupportAntDiv)
{ {
u8 CurrentAntenna; u8 CurrentAntenna;
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(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 do
{ {
if( ( psecuritypriv->PMKIDList[i].bUsed ) && 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; break;
} }
@ -3231,7 +3231,7 @@ void rtw_joinbss_reset(struct adapter *padapter)
pmlmepriv->num_sta_no_ht = 0; 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=1 => means that invalidate usb rx aggregation
// TH=0 => means that validate usb rx aggregation, use init value. // 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; 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); 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_, pframe = rtw_set_ie(out_ie+out_len, _HT_CAPABILITY_IE_,
sizeof(struct rtw_ieee80211_ht_cap), (unsigned char*)&ht_capie, pout_len); 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); p = rtw_get_ie(in_ie+12, _HT_ADD_INFO_IE_, &ielen, in_len-12);
if(p && (ielen==sizeof(struct ieee80211_ht_addt_info))) 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"); DBG_871X("+rtw_update_ht_cap()\n");
//maybe needs check if ap supports rx ampdu. //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) if(pregistrypriv->wifi_spec==1)
{ {
phtpriv->ampdu_enable = _FALSE; phtpriv->ampdu_enable = false;
} }
else else
{ {
phtpriv->ampdu_enable = _TRUE; phtpriv->ampdu_enable = true;
} }
} }
else if(pregistrypriv->ampdu_enable==2) 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; struct pkt_attrib *pattrib =&pxmitframe->attrib;
s32 bmcst = IS_MCAST(pattrib->ra); 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)) if(bmcst || (padapter->mlmepriv.LinkDetectInfo.NumTxOkInPeriod<100))
return; return;
@ -3505,7 +3505,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
phtpriv = &psta->htpriv; 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->agg_enable_bitmap>>priority)&0x1;
issued |= (phtpriv->candidate_tid_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) inline void rtw_set_roaming(struct adapter *adapter, u8 to_roaming)
{ {
if (to_roaming == 0) if (to_roaming == 0)
adapter->mlmepriv.to_join = _FALSE; adapter->mlmepriv.to_join = false;
adapter->mlmepriv.to_roaming = to_roaming; 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); pnetwork->network.Ssid.SsidLength);
_rtw_memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(NDIS_802_11_SSID)); _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 #ifdef CONFIG_WAPI_SUPPORT
rtw_wapi_return_all_sta_info(padapter); 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) sint rtw_linked_check(struct adapter *padapter)
{ {
if( (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == _TRUE) || if( (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == true) ||
(check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == _TRUE)) (check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == true))
{ {
if(padapter->stapriv.asoc_sta_count > 2) if(padapter->stapriv.asoc_sta_count > 2)
return _TRUE; return true;
} }
else else
{ //Station mode { //Station mode
if(check_fwstate(&padapter->mlmepriv, _FW_LINKED)== _TRUE) if(check_fwstate(&padapter->mlmepriv, _FW_LINKED)== true)
return _TRUE; return true;
} }
return _FALSE; return false;
} }
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
sint rtw_buddy_adapter_up(struct adapter *padapter) sint rtw_buddy_adapter_up(struct adapter *padapter)
{ {
sint res = _FALSE; sint res = false;
if(padapter == NULL) if(padapter == NULL)
return res; return res;
@ -3616,16 +3616,16 @@ sint rtw_buddy_adapter_up(struct adapter *padapter)
if(padapter->pbuddy_adapter == NULL) if(padapter->pbuddy_adapter == NULL)
{ {
res = _FALSE; res = false;
} }
else if( (padapter->pbuddy_adapter->bDriverStopped) || (padapter->pbuddy_adapter->bSurpriseRemoved) || 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 else
{ {
res = _TRUE; res = true;
} }
return res; return res;
@ -3635,28 +3635,28 @@ sint rtw_buddy_adapter_up(struct adapter *padapter)
sint check_buddy_fwstate(struct adapter *padapter, sint state) sint check_buddy_fwstate(struct adapter *padapter, sint state)
{ {
if(padapter == NULL) if(padapter == NULL)
return _FALSE; return false;
if(padapter->pbuddy_adapter == NULL) if(padapter->pbuddy_adapter == NULL)
return _FALSE; return false;
if ((state == WIFI_FW_NULL_STATE) && if ((state == WIFI_FW_NULL_STATE) &&
(padapter->pbuddy_adapter->mlmepriv.fw_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) if (padapter->pbuddy_adapter->mlmepriv.fw_state & state)
return _TRUE; return true;
return _FALSE; return false;
} }
u8 rtw_get_buddy_bBusyTraffic(struct adapter *padapter) u8 rtw_get_buddy_bBusyTraffic(struct adapter *padapter)
{ {
if(padapter == NULL) if(padapter == NULL)
return _FALSE; return false;
if(padapter->pbuddy_adapter == NULL) if(padapter->pbuddy_adapter == NULL)
return _FALSE; return false;
return padapter->pbuddy_adapter->mlmepriv.LinkDetectInfo.bBusyTraffic; return padapter->pbuddy_adapter->mlmepriv.LinkDetectInfo.bBusyTraffic;
} }

436
core/rtw_mlme_ext.c
View file

File diff suppressed because it is too large Load diff

22
core/rtw_mp_ioctl.c
View file

@ -1160,7 +1160,7 @@ _func_enter_;
("+oid_rt_pro_read_efuse_hd: buf_len=%d addr=%d cnts=%d\n", ("+oid_rt_pro_read_efuse_hd: buf_len=%d addr=%d cnts=%d\n",
poid_par_priv->information_buf_len, addr, cnts)); 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) { if ((addr + cnts) > max_available_size) {
RT_TRACE(_module_mp_, _drv_err_, ("!oid_rt_pro_read_efuse_hdl: parameter error!\n")); 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); _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")); RT_TRACE(_module_mp_, _drv_err_, ("!oid_rt_pro_read_efuse_hdl: rtw_efuse_access FAIL!\n"));
status = NDIS_STATUS_FAILURE; status = NDIS_STATUS_FAILURE;
} else } else
@ -1203,7 +1203,7 @@ _func_enter_;
("+oid_rt_pro_write_efuse_hdl: buf_len=%d addr=0x%04x cnts=%d\n", ("+oid_rt_pro_write_efuse_hdl: buf_len=%d addr=0x%04x cnts=%d\n",
poid_par_priv->information_buf_len, addr, cnts)); 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) { if ((addr + cnts) > max_available_size) {
RT_TRACE(_module_mp_, _drv_err_, ("!oid_rt_pro_write_efuse_hdl: parameter error")); RT_TRACE(_module_mp_, _drv_err_, ("!oid_rt_pro_write_efuse_hdl: parameter error"));
@ -1211,7 +1211,7 @@ _func_enter_;
} }
_irqlevel_changed_(&oldirql, LOWER); _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; status = NDIS_STATUS_FAILURE;
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
@ -1243,23 +1243,23 @@ _func_enter_;
("oid_rt_pro_rw_efuse_pgpkt_hdl: Read offset=0x%x\n",\ ("oid_rt_pro_rw_efuse_pgpkt_hdl: Read offset=0x%x\n",\
ppgpkt->offset)); ppgpkt->offset));
Efuse_PowerSwitch(Adapter, _FALSE, _TRUE); Efuse_PowerSwitch(Adapter, false, true);
if (Efuse_PgPacketRead(Adapter, ppgpkt->offset, ppgpkt->data, _FALSE) == _TRUE) if (Efuse_PgPacketRead(Adapter, ppgpkt->offset, ppgpkt->data, false) == true)
*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
else else
status = NDIS_STATUS_FAILURE; status = NDIS_STATUS_FAILURE;
Efuse_PowerSwitch(Adapter, _FALSE, _FALSE); Efuse_PowerSwitch(Adapter, false, false);
} else { } else {
RT_TRACE(_module_mp_, _drv_notice_, RT_TRACE(_module_mp_, _drv_notice_,
("oid_rt_pro_rw_efuse_pgpkt_hdl: Write offset=0x%x word_en=0x%x\n",\ ("oid_rt_pro_rw_efuse_pgpkt_hdl: Write offset=0x%x word_en=0x%x\n",\
ppgpkt->offset, ppgpkt->word_en)); ppgpkt->offset, ppgpkt->word_en));
Efuse_PowerSwitch(Adapter, _TRUE, _TRUE); Efuse_PowerSwitch(Adapter, true, true);
if (Efuse_PgPacketWrite(Adapter, ppgpkt->offset, ppgpkt->word_en, ppgpkt->data, _FALSE) == _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; *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
else else
status = NDIS_STATUS_FAILURE; status = NDIS_STATUS_FAILURE;
Efuse_PowerSwitch(Adapter, _TRUE, _FALSE); Efuse_PowerSwitch(Adapter, true, false);
} }
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
@ -1357,7 +1357,7 @@ _func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_efuse_map_hdl\n")); 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; *poid_par_priv->bytes_rw = 0;

192
core/rtw_p2p.c
View file

@ -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) 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) 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); plist = get_next(phead);
//look up sta asoc_queue //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); 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: // Value:
// Associated BSSID // 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 ); _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: // Value:
// Associated BSSID // 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 ); _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 device information
// WFD primary sink + available for WFD session + WiFi Direct mode // 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 ) 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: // Value:
// Associated BSSID // 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 ); _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: // Value:
// Associated BSSID // 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 ); _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: // Value:
// Associated BSSID // 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 ); _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: // Value:
// Associated BSSID // 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 ); _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: // Value:
// Associated BSSID // 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 ); _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: // Value:
// Associated BSSID // 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 ); _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: // Value:
// Associated BSSID // 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 ); _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: // Value:
// Associated BSSID // 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 ); _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: // Value:
// Associated BSSID // 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 ); _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: // Value:
// Associated BSSID // 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 ); _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 zero_array_check[L2SDTA_SERVICE_VE_LEN] = { 0x00 };
u8 widi_version = 0, i = 0; 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; 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) u32 process_probe_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint len)
{ {
u8 *p; u8 *p;
u32 ret=_FALSE; u32 ret=false;
u8 *p2pie; u8 *p2pie;
u32 p2pielen = 0; u32 p2pielen = 0;
int ssid_len=0, rate_cnt = 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 Requested Device Type attributes in WSC IE.
//Check Device ID attribute in P2P IE //Check Device ID attribute in P2P IE
ret = _TRUE; ret = true;
} }
else if ( (p != NULL) && ( ssid_len == 0 ) ) else if ( (p != NULL) && ( ssid_len == 0 ) )
{ {
ret = _TRUE; ret = true;
} }
} }
else else
@ -2521,7 +2521,7 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
plist = get_next(phead); plist = get_next(phead);
//look up sta asoc_queue //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); 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); 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) 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 ) 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 ); 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) 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) 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 defined(CONFIG_WFD) && defined(CONFIG_TDLS)
if(!(cap_attr & P2P_GRPCAP_INTRABSS) ) if(!(cap_attr & P2P_GRPCAP_INTRABSS) )
ptdlsinfo->ap_prohibited = _TRUE; ptdlsinfo->ap_prohibited = true;
#endif //defined(CONFIG_WFD) && defined(CONFIG_TDLS) #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); cap_attr = le16_to_cpu(cap_attr);
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
if(!(cap_attr & P2P_GRPCAP_INTRABSS) ) if(!(cap_attr & P2P_GRPCAP_INTRABSS) )
ptdlsinfo->ap_prohibited = _TRUE; ptdlsinfo->ap_prohibited = true;
#endif // CONFIG_TDLS #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); issue_p2p_presence_resp(pwdinfo, GetAddr2Ptr(pframe), status, dialogToken);
return _TRUE; return true;
} }
void find_phase_handler( struct adapter* padapter ) void find_phase_handler( struct adapter* padapter )
@ -3467,7 +3467,7 @@ _func_enter_;
} }
else if ( rtw_p2p_chk_state(pwdinfo, P2P_STATE_LISTEN) || 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_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) ) rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ) )
{ {
// Now, the driver is in the listen state of P2P mode. // Now, the driver is in the listen state of P2P mode.
@ -3505,7 +3505,7 @@ _func_enter_;
issue_probereq_p2p(padapter, NULL); issue_probereq_p2p(padapter, NULL);
_set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); _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; val8 = 1;
set_channel_bwmode(padapter, pwdinfo->nego_req_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); 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); issue_probereq_p2p(padapter, NULL);
_set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); _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; 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)); DBG_871X("%s, role=%d, p2p_state=%d\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo));
#endif #endif
pcfg80211_wdinfo->is_ro_ch = _FALSE; pcfg80211_wdinfo->is_ro_ch = false;
DBG_871X("cfg80211_remain_on_channel_expired\n"); 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) 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 #ifdef CONFIG_CONCURRENT_MODE
u8 *ies, *p2p_ie; u8 *ies, *p2p_ie;
u32 ies_len, p2p_ielen; 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<num_of_ch; i++) { for(i=0; i<num_of_ch; i++) {
if (*(pattr_temp+2+i) == buddy_ch) { if (*(pattr_temp+2+i) == buddy_ch) {
DBG_871X(FUNC_ADPT_FMT" ch_list fit buddy_ch:%u\n", FUNC_ADPT_ARG(padapter), buddy_ch); DBG_871X(FUNC_ADPT_FMT" ch_list fit buddy_ch:%u\n", FUNC_ADPT_ARG(padapter), buddy_ch);
fit = _TRUE; fit = true;
break; break;
} }
} }
@ -3719,7 +3719,7 @@ static bool rtw_chk_p2pie_ch_list_with_buddy(struct adapter *padapter, const u8
static bool rtw_chk_p2pie_op_ch_with_buddy(struct adapter *padapter, const u8 *frame_body, u32 len) static bool rtw_chk_p2pie_op_ch_with_buddy(struct adapter *padapter, const u8 *frame_body, u32 len)
{ {
bool fit = _FALSE; bool fit = false;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
u8 *ies, *p2p_ie; u8 *ies, *p2p_ie;
u32 ies_len, p2p_ielen; u32 ies_len, p2p_ielen;
@ -3742,7 +3742,7 @@ static bool rtw_chk_p2pie_op_ch_with_buddy(struct adapter *padapter, const u8 *f
if((pattr = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, NULL, (uint*)&attr_contentlen))!=NULL) { if((pattr = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, NULL, (uint*)&attr_contentlen))!=NULL) {
if (*(pattr+4) == buddy_ch) { if (*(pattr+4) == buddy_ch) {
DBG_871X(FUNC_ADPT_FMT" op_ch fit buddy_ch:%u\n", FUNC_ADPT_ARG(padapter), buddy_ch); DBG_871X(FUNC_ADPT_FMT" op_ch fit buddy_ch:%u\n", FUNC_ADPT_ARG(padapter), buddy_ch);
fit = _TRUE; fit = true;
break; break;
} }
} }
@ -3824,7 +3824,7 @@ void rtw_append_wfd_ie(struct adapter *padapter, u8 *buf, u32* len)
{ {
action = frame_body[1]; action = frame_body[1];
if (action == ACT_PUBLIC_VENDOR 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]; OUI_Subtype = frame_body[6];
@ -3933,7 +3933,7 @@ u8 *dump_p2p_attr_ch_list(u8 *p2p_ie, uint p2p_ielen, u8 *buf, u32 buf_len)
int w_sz = 0; int w_sz = 0;
u8 ch_cnt = 0; u8 ch_cnt = 0;
u8 ch_list[40]; u8 ch_list[40];
bool continuous = _FALSE; bool continuous = false;
if ((pattr=rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, NULL, &attr_contentlen))!=NULL) { if ((pattr=rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, NULL, &attr_contentlen))!=NULL) {
int i, j; int i, j;
@ -3977,16 +3977,16 @@ u8 *dump_p2p_attr_ch_list(u8 *p2p_ie, uint p2p_ielen, u8 *buf, u32 buf_len)
} }
/* /*
* return _TRUE if requester is GO, _FALSE if responder is GO * return true if requester is GO, false if responder is GO
*/ */
bool rtw_p2p_nego_intent_compare(u8 req, u8 resp) bool rtw_p2p_nego_intent_compare(u8 req, u8 resp)
{ {
if (req>>1 == resp >>1) if (req>>1 == resp >>1)
return req&0x01 ? _TRUE : _FALSE; return req&0x01 ? true : false;
else if (req>>1 > resp>>1) else if (req>>1 > resp>>1)
return _TRUE; return true;
else else
return _FALSE; return false;
} }
int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx) 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]; action = frame_body[1];
if (action == ACT_PUBLIC_VENDOR 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]; 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) { if (tx) {
#ifdef CONFIG_DRV_ISSUE_PROV_REQ // IOT FOR S2 #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); rtw_cfg80211_issue_p2p_provision_request(padapter, buf, len);
#endif //CONFIG_DRV_ISSUE_PROV_REQ #endif //CONFIG_DRV_ISSUE_PROV_REQ
//pwdev_priv->provdisc_req_issued = _FALSE; //pwdev_priv->provdisc_req_issued = false;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if(check_buddy_fwstate(padapter, _FW_LINKED) 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); 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", 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) { if (!tx) {
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if((check_buddy_fwstate(padapter, _FW_LINKED) if((check_buddy_fwstate(padapter, _FW_LINKED)
|| check_buddy_fwstate(padapter, WIFI_AP_STATE)) || 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)); 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); 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; status = *cont;
if (nego_info->token == dialogToken && nego_info->state == 0 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->status = (status==-1) ? 0xff : status;
nego_info->rsp_op_ch= op_ch; 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); 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", 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) { if (!tx) {
pwdev_priv->provdisc_req_issued = _FALSE; pwdev_priv->provdisc_req_issued = false;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if((check_buddy_fwstate(padapter, _FW_LINKED) if((check_buddy_fwstate(padapter, _FW_LINKED)
|| check_buddy_fwstate(padapter, WIFI_AP_STATE)) || 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)); 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); 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: case P2P_GO_NEGO_CONF:
{ {
struct rtw_wdev_nego_info* nego_info = &pwdev_priv->nego_info; struct rtw_wdev_nego_info* nego_info = &pwdev_priv->nego_info;
bool is_go = _FALSE; bool is_go = false;
if (tx) { if (tx) {
#ifdef CONFIG_CONCURRENT_MODE #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; status = *cont;
if (nego_info->token == dialogToken && nego_info->state == 1 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->status = (status==-1) ? 0xff : status;
nego_info->conf_op_ch = (op_ch==-1) ? 0 : op_ch; 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 (status == 0) {
if (rtw_p2p_nego_intent_compare(nego_info->req_intent, nego_info->rsp_intent) && tx) 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 */ 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); 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", 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) { 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); 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", 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) { if (!tx) {
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if(check_buddy_fwstate(padapter, _FW_LINKED) if(check_buddy_fwstate(padapter, _FW_LINKED)
|| check_buddy_fwstate(padapter, WIFI_AP_STATE)) { || 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); 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); 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)); 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); 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); op_ch = *(cont+4);
if (invit_info->token == dialogToken && invit_info->state == 0 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->status = (status==-1) ? 0xff : status;
invit_info->rsp_op_ch= op_ch; 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); 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", 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) { if (!tx) {
} }
@ -4270,11 +4270,11 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
break; break;
} }
case P2P_DEVDISC_REQ: 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; break;
case P2P_DEVDISC_RESP: case P2P_DEVDISC_RESP:
cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len); 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; break;
case P2P_PROVISION_DISC_REQ: 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 p2p_ielen = 0;
uint contentlen = 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) //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( (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)) 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 else
{ {
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_871X("provdisc_req_issued is _TRUE\n"); DBG_871X("provdisc_req_issued is true\n");
#endif //CONFIG_DEBUG_CFG80211 #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; break;
case P2P_PROVISION_DISC_RESP: 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; break;
default: 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; break;
} }
@ -4334,26 +4334,26 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
switch(OUI_Subtype) switch(OUI_Subtype)
{ {
case P2P_NOTICE_OF_ABSENCE: 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; break;
case P2P_PRESENCE_REQUEST: 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; break;
case P2P_PRESENCE_RESPONSE: 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; break;
case P2P_GO_DISC_REQUEST: 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; break;
default: 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; break;
} }
} }
else 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; return is_p2p_frame;
@ -4468,7 +4468,7 @@ void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength)
u32 attr_contentlen = 0; u32 attr_contentlen = 0;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); 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; u8 noa_offset, noa_num, noa_index;
_func_enter_; _func_enter_;
@ -4491,11 +4491,11 @@ _func_enter_;
while(p2p_ie) while(p2p_ie)
{ {
find_p2p = _TRUE; find_p2p = true;
// Get Notice of Absence IE. // Get Notice of Absence IE.
if(rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_NOA, noa_attr, &attr_contentlen)) 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]; noa_index = noa_attr[0];
if( (pwdinfo->p2p_ps_mode == P2P_PS_NONE) || if( (pwdinfo->p2p_ps_mode == P2P_PS_NONE) ||
@ -4534,7 +4534,7 @@ _func_enter_;
{ {
pwdinfo->p2p_ps_mode = P2P_PS_CTWINDOW; pwdinfo->p2p_ps_mode = P2P_PS_CTWINDOW;
// driver should wait LPS for entering 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); 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); p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1);
} }
@ -4589,7 +4589,7 @@ _func_enter_;
pwdinfo->opp_ps = 0; pwdinfo->opp_ps = 0;
pwdinfo->noa_num = 0; pwdinfo->noa_num = 0;
pwdinfo->p2p_ps_mode = P2P_PS_NONE; pwdinfo->p2p_ps_mode = P2P_PS_NONE;
if(pwrpriv->bFwCurrentInPSMode == _TRUE) if(pwrpriv->bFwCurrentInPSMode == true)
{ {
if(pwrpriv->smart_ps == 0) 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(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 ); p2p_protocol_wk_cmd( adapter, P2P_PRE_TX_PROVDISC_PROCESS_WK );
//issue_probereq_p2p(adapter, NULL); //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)) 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 ); p2p_protocol_wk_cmd( adapter, P2P_PRE_TX_NEGOREQ_PROCESS_WK );
} }
} }
else if ( rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_INVITE_REQ ) ) 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 ); 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 = &padapter->wdinfo;
pwdinfo->persistent_supported = 0; pwdinfo->persistent_supported = 0;
pwdinfo->session_available = _TRUE; pwdinfo->session_available = true;
pwdinfo->wfd_tdls_enable = 0; pwdinfo->wfd_tdls_enable = 0;
pwdinfo->wfd_tdls_weaksec = 0; pwdinfo->wfd_tdls_weaksec = 0;
} }
@ -4832,13 +4832,13 @@ int rtw_init_wifi_display_info(struct adapter* padapter)
// Used in P2P and TDLS // Used in P2P and TDLS
pwfd_info->rtsp_ctrlport = 554; pwfd_info->rtsp_ctrlport = 554;
pwfd_info->peer_rtsp_ctrlport = 0; // Reset to 0 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->wfd_device_type = WFD_DEVINFO_PSINK;
pwfd_info->scan_result_type = SCAN_RESULT_P2P_ONLY; pwfd_info->scan_result_type = SCAN_RESULT_P2P_ONLY;
// Used in P2P // Used in P2P
pwfd_info->peer_session_avail = _TRUE; pwfd_info->peer_session_avail = true;
pwfd_info->wfd_pc = _FALSE; pwfd_info->wfd_pc = false;
// Used in TDLS // Used in TDLS
_rtw_memset( pwfd_info->ip_address, 0x00, 4 ); _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; 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 ) ) ( ( 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); rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE);
#ifdef CONFIG_CONCURRENT_MODE #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); 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 //Enable P2P function
init_wifidirect_info(padapter, role); 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 #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 #endif
} }
else if (role == P2P_ROLE_DISABLE) else if (role == P2P_ROLE_DISABLE)
{ {
#ifdef CONFIG_INTEL_WIDI #ifdef CONFIG_INTEL_WIDI
if( padapter->mlmepriv.p2p_reject_disable == _TRUE ) if( padapter->mlmepriv.p2p_reject_disable == true )
return ret; return ret;
#endif //CONFIG_INTEL_WIDI #endif //CONFIG_INTEL_WIDI
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
if( padapter->wdinfo.driver_interface == DRIVER_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 #endif //CONFIG_IOCTL_CFG80211
if (_FAIL == rtw_pwr_wakeup(padapter)) { 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_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 #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 #endif
//Restore to initial setting. //Restore to initial setting.

214
core/rtw_pwrctrl.c
View file

@ -34,13 +34,13 @@ void _ips_enter(struct adapter * padapter)
{ {
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(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", DBG_871X("%s: hw_init_completed: %d\n",
__func__, padapter->hw_init_completed); __func__, padapter->hw_init_completed);
return; return;
} }
pwrpriv->bips_processing = _TRUE; pwrpriv->bips_processing = true;
// syn ips_mode with request // syn ips_mode with request
pwrpriv->ips_mode = pwrpriv->ips_mode_req; pwrpriv->ips_mode = pwrpriv->ips_mode_req;
@ -52,16 +52,16 @@ void _ips_enter(struct adapter * padapter)
#endif #endif
if(rf_off == pwrpriv->change_rfpwrstate ) if(rf_off == pwrpriv->change_rfpwrstate )
{ {
pwrpriv->bpower_saving = _TRUE; pwrpriv->bpower_saving = true;
DBG_871X_LEVEL(_drv_always_, "nolinked power save enter\n"); DBG_871X_LEVEL(_drv_always_, "nolinked power save enter\n");
if(pwrpriv->ips_mode == IPS_LEVEL_2) if(pwrpriv->ips_mode == IPS_LEVEL_2)
pwrpriv->bkeepfwalive = _TRUE; pwrpriv->bkeepfwalive = true;
rtw_ips_pwr_down(padapter); rtw_ips_pwr_down(padapter);
pwrpriv->rf_pwrstate = rf_off; 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)) if((pwrpriv->rf_pwrstate == rf_off) &&(!pwrpriv->bips_processing))
{ {
pwrpriv->bips_processing = _TRUE; pwrpriv->bips_processing = true;
pwrpriv->change_rfpwrstate = rf_on; pwrpriv->change_rfpwrstate = rf_on;
pwrpriv->ips_leave_cnts++; pwrpriv->ips_leave_cnts++;
DBG_871X("==>ips_leave cnts:%d\n",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_LEVEL(_drv_always_, "nolinked power save leave\n");
DBG_871X("==> ips_leave.....LED(0x%08x)...\n",rtw_read32(padapter,0x4c)); DBG_871X("==> ips_leave.....LED(0x%08x)...\n",rtw_read32(padapter,0x4c));
pwrpriv->bips_processing = _FALSE; pwrpriv->bips_processing = false;
pwrpriv->bkeepfwalive = _FALSE; pwrpriv->bkeepfwalive = false;
pwrpriv->bpower_saving = _FALSE; pwrpriv->bpower_saving = false;
} }
return result; return result;
@ -131,7 +131,7 @@ bool rtw_pwr_unassociated_idle(struct adapter *adapter)
#endif #endif
#endif #endif
bool ret = _FALSE; bool ret = false;
if (adapter_to_pwrctl(adapter)->ips_deny_time >= rtw_get_current_time()) { if (adapter_to_pwrctl(adapter)->ips_deny_time >= rtw_get_current_time()) {
//DBG_871X("%s ips_deny_time\n", __func__); //DBG_871X("%s ips_deny_time\n", __func__);
@ -181,7 +181,7 @@ bool rtw_pwr_unassociated_idle(struct adapter *adapter)
#endif #endif
#ifdef CONFIG_INTEL_PROXIM #ifdef CONFIG_INTEL_PROXIM
if(adapter->proximity.proxim_on==_TRUE){ if(adapter->proximity.proxim_on==true){
return; return;
} }
#endif #endif
@ -194,7 +194,7 @@ bool rtw_pwr_unassociated_idle(struct adapter *adapter)
goto exit; goto exit;
} }
ret = _TRUE; ret = true;
exit: exit:
return ret; return ret;
@ -211,10 +211,10 @@ void rtw_ps_processor(struct adapter*padapter)
rt_rf_power_state rfpwrstate; rt_rf_power_state rfpwrstate;
#endif //SUPPORT_HW_RFOFF_DETECTED #endif //SUPPORT_HW_RFOFF_DETECTED
pwrpriv->ps_processing = _TRUE; pwrpriv->ps_processing = true;
#ifdef SUPPORT_HW_RFOFF_DETECTED #ifdef SUPPORT_HW_RFOFF_DETECTED
if(pwrpriv->bips_processing == _TRUE) if(pwrpriv->bips_processing == true)
goto exit; goto exit;
//DBG_871X("==> fw report state(0x%x)\n",rtw_read8(padapter,0x1ca)); //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(pwrpriv->rf_pwrstate == rf_on)
{ {
if(padapter->net_closed == _TRUE) if(padapter->net_closed == true)
pwrpriv->ps_flag = _TRUE; pwrpriv->ps_flag = true;
rfpwrstate = RfOnOffDetect(padapter); rfpwrstate = RfOnOffDetect(padapter);
DBG_871X("@@@@- #1 %s==> rfstate:%s \n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); 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->change_rfpwrstate = rf_off;
pwrpriv->bkeepfwalive = _TRUE; pwrpriv->bkeepfwalive = true;
pwrpriv->brfoffbyhw = _TRUE; pwrpriv->brfoffbyhw = true;
autosuspend_enter(padapter); autosuspend_enter(padapter);
} }
@ -255,8 +255,8 @@ void rtw_ps_processor(struct adapter*padapter)
if(rfpwrstate == rf_off) if(rfpwrstate == rf_off)
{ {
pwrpriv->change_rfpwrstate = rf_off; pwrpriv->change_rfpwrstate = rf_off;
pwrpriv->brfoffbyhw = _TRUE; pwrpriv->brfoffbyhw = true;
padapter->bCardDisableWOHSM = _TRUE; padapter->bCardDisableWOHSM = true;
rtw_hw_suspend(padapter ); rtw_hw_suspend(padapter );
} }
else else
@ -274,7 +274,7 @@ void rtw_ps_processor(struct adapter*padapter)
if (pwrpriv->ips_mode_req == IPS_NONE) if (pwrpriv->ips_mode_req == IPS_NONE)
goto exit; goto exit;
if (rtw_pwr_unassociated_idle(padapter) == _FALSE) if (rtw_pwr_unassociated_idle(padapter) == false)
goto exit; goto exit;
if((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts%4)==0)) 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(padapter->registrypriv.usbss_enable)
{ {
if(pwrpriv->bHWPwrPindetect) if(pwrpriv->bHWPwrPindetect)
pwrpriv->bkeepfwalive = _TRUE; pwrpriv->bkeepfwalive = true;
if(padapter->net_closed == _TRUE) if(padapter->net_closed == true)
pwrpriv->ps_flag = _TRUE; pwrpriv->ps_flag = true;
#if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND) #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); DBG_871X("<==%s .pwrpriv->bInternalAutoSuspend)(%x)\n",__FUNCTION__,pwrpriv->bInternalAutoSuspend);
} else { } else {
pwrpriv->change_rfpwrstate = rf_off; pwrpriv->change_rfpwrstate = rf_off;
padapter->bCardDisableWOHSM = _TRUE; padapter->bCardDisableWOHSM = true;
DBG_871X("<==%s .pwrpriv->bInternalAutoSuspend)(%x) call autosuspend_enter\n",__FUNCTION__,pwrpriv->bInternalAutoSuspend); DBG_871X("<==%s .pwrpriv->bInternalAutoSuspend)(%x) call autosuspend_enter\n",__FUNCTION__,pwrpriv->bInternalAutoSuspend);
autosuspend_enter(padapter); autosuspend_enter(padapter);
} }
#else #else
padapter->bCardDisableWOHSM = _TRUE; padapter->bCardDisableWOHSM = true;
autosuspend_enter(padapter); autosuspend_enter(padapter);
#endif //if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND) #endif //if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND)
} }
@ -324,7 +324,7 @@ void rtw_ps_processor(struct adapter*padapter)
} }
exit: exit:
rtw_set_pwr_state_check_timer(pwrpriv); rtw_set_pwr_state_check_timer(pwrpriv);
pwrpriv->ps_processing = _FALSE; pwrpriv->ps_processing = false;
return; return;
} }
@ -358,14 +358,14 @@ _func_enter_;
pslv = PS_STATE(pslv); pslv = PS_STATE(pslv);
if (_TRUE == pwrpriv->btcoex_rfon) if (true == pwrpriv->btcoex_rfon)
{ {
if (pslv < PS_STATE_S4) if (pslv < PS_STATE_S4)
pslv = PS_STATE_S3; pslv = PS_STATE_S3;
} }
#ifdef CONFIG_LPS_RPWM_TIMER #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); 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) || if ((padapter->bSurpriseRemoved == true) ||
(padapter->hw_init_completed == _FALSE)) (padapter->hw_init_completed == false))
{ {
RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,
("%s: SurpriseRemoved(%d) hw_init_completed(%d)\n", ("%s: SurpriseRemoved(%d) hw_init_completed(%d)\n",
@ -391,7 +391,7 @@ _func_enter_;
return; return;
} }
if (padapter->bDriverStopped == _TRUE) if (padapter->bDriverStopped == true)
{ {
RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,
("%s: change power state(0x%02X) when DriverStopped\n", __FUNCTION__, pslv)); ("%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); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
if(_TRUE == pwrpriv->bInSuspend && pwrpriv->wowlan_mode) if(true == pwrpriv->bInSuspend && pwrpriv->wowlan_mode)
return _TRUE; return true;
else if (_TRUE == pwrpriv->bInSuspend) else if (true == pwrpriv->bInSuspend)
return _FALSE; return false;
#else #else
if(_TRUE == pwrpriv->bInSuspend ) if(true == pwrpriv->bInSuspend )
return _FALSE; return false;
#endif #endif
curr_time = rtw_get_current_time(); curr_time = rtw_get_current_time();
@ -495,29 +495,29 @@ u8 PS_RDY_CHECK(struct adapter * padapter)
if(delta_time < LPS_DELAY_TIME) if(delta_time < LPS_DELAY_TIME)
{ {
return _FALSE; return false;
} }
if ((check_fwstate(pmlmepriv, _FW_LINKED) == _FALSE) || if ((check_fwstate(pmlmepriv, _FW_LINKED) == false) ||
(check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) || (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) ||
(check_fwstate(pmlmepriv, WIFI_UNDER_WPS) == _TRUE) || (check_fwstate(pmlmepriv, WIFI_UNDER_WPS) == true) ||
(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) || (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) || (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) ) (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) )
return _FALSE; 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"); DBG_871X("Group handshake still in progress !!!\n");
return _FALSE; return false;
} }
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
if (!rtw_cfg80211_pwr_mgmt(padapter)) if (!rtw_cfg80211_pwr_mgmt(padapter))
return _FALSE; return false;
#endif #endif
return _TRUE; return true;
} }
void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode) 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]); phead = &(pstapriv->sta_hash[i]);
plist = get_next(phead); 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); ptdls_sta = LIST_CONTAINOR(plist, struct sta_info, hash_list);
@ -593,7 +593,7 @@ _func_enter_;
pwrpriv->pwr_mode = ps_mode; pwrpriv->pwr_mode = ps_mode;
rtw_set_rpwm(padapter, PS_STATE_S4); rtw_set_rpwm(padapter, PS_STATE_S4);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
if (pwrpriv->wowlan_mode == _TRUE) if (pwrpriv->wowlan_mode == true)
{ {
u32 start_time, delay_ms; u32 start_time, delay_ms;
u8 val8; u8 val8;
@ -615,14 +615,14 @@ _func_enter_;
} }
#endif #endif
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode)); rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode));
pwrpriv->bFwCurrentInPSMode = _FALSE; pwrpriv->bFwCurrentInPSMode = false;
} }
} }
else else
{ {
if (PS_RDY_CHECK(padapter) if (PS_RDY_CHECK(padapter)
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
|| (BT_1Ant(padapter) == _TRUE) || (BT_1Ant(padapter) == true)
#endif #endif
) )
{ {
@ -636,7 +636,7 @@ _func_enter_;
phead = &(pstapriv->sta_hash[i]); phead = &(pstapriv->sta_hash[i]);
plist = get_next(phead); 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); ptdls_sta = LIST_CONTAINOR(plist, struct sta_info, hash_list);
@ -649,7 +649,7 @@ _func_enter_;
_exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL);
#endif //CONFIG_TDLS #endif //CONFIG_TDLS
pwrpriv->bFwCurrentInPSMode = _TRUE; pwrpriv->bFwCurrentInPSMode = true;
pwrpriv->pwr_mode = ps_mode; pwrpriv->pwr_mode = ps_mode;
pwrpriv->smart_ps = smart_ps; pwrpriv->smart_ps = smart_ps;
pwrpriv->bcn_ant_mode = bcn_ant_mode; pwrpriv->bcn_ant_mode = bcn_ant_mode;
@ -687,7 +687,7 @@ _func_exit_;
s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms) s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms)
{ {
u32 start_time; u32 start_time;
u8 bAwake = _FALSE; u8 bAwake = false;
s32 err = 0; s32 err = 0;
@ -695,10 +695,10 @@ s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms)
while (1) while (1)
{ {
rtw_hal_get_hwreg(padapter, HW_VAR_FWLPS_RF_ON, &bAwake); rtw_hal_get_hwreg(padapter, HW_VAR_FWLPS_RF_ON, &bAwake);
if (_TRUE == bAwake) if (true == bAwake)
break; break;
if (_TRUE == padapter->bSurpriseRemoved) if (true == padapter->bSurpriseRemoved)
{ {
err = -2; err = -2;
DBG_871X("%s: device surprise removed!!\n", __FUNCTION__); DBG_871X("%s: device surprise removed!!\n", __FUNCTION__);
@ -761,17 +761,17 @@ _func_enter_;
} }
#endif #endif
if (PS_RDY_CHECK(padapter) == _FALSE) if (PS_RDY_CHECK(padapter) == false)
return; return;
if (_TRUE == pwrpriv->bLeisurePs) if (true == pwrpriv->bLeisurePs)
{ {
// Idle for a while if we connect to AP a while ago. // Idle for a while if we connect to AP a while ago.
if(pwrpriv->LpsIdleCount >= 2) // 4 Sec if(pwrpriv->LpsIdleCount >= 2) // 4 Sec
{ {
if(pwrpriv->pwr_mode == PS_MODE_ACTIVE) 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); DBG_871X("%s smart_ps:%d\n", __func__, pwrpriv->smart_ps);
//For Tenda W311R IOT issue //For Tenda W311R IOT issue
rtw_set_ps_mode(padapter, pwrpriv->power_mgnt, pwrpriv->smart_ps, 0x40); 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); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
u32 start_time; u32 start_time;
u8 bAwake = _FALSE; u8 bAwake = false;
_func_enter_; _func_enter_;
@ -818,7 +818,7 @@ _func_enter_;
} }
} }
pwrpriv->bpower_saving = _FALSE; pwrpriv->bpower_saving = false;
// DBG_871X("-LeisurePSLeave\n"); // DBG_871X("-LeisurePSLeave\n");
@ -838,7 +838,7 @@ void LeaveAllPowerSaveMode(IN struct adapter *Adapter)
_func_enter_; _func_enter_;
//DBG_871X("%s.....\n",__FUNCTION__); //DBG_871X("%s.....\n",__FUNCTION__);
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
{ //connect { //connect
#ifdef CONFIG_LPS_LCLK #ifdef CONFIG_LPS_LCLK
enqueue = 1; enqueue = 1;
@ -874,7 +874,7 @@ _func_enter_;
{ {
#if defined(CONFIG_PLATFORM_SPRD) #if defined(CONFIG_PLATFORM_SPRD)
#ifdef CONFIG_IPS #ifdef CONFIG_IPS
if(_FALSE == ips_leave(Adapter)) if(false == ips_leave(Adapter))
{ {
DBG_871X("======> ips_leave fail.............\n"); DBG_871X("======> ips_leave fail.............\n");
} }
@ -899,7 +899,7 @@ _func_enter_;
pwrpriv = adapter_to_pwrctl(padapter); pwrpriv = adapter_to_pwrctl(padapter);
bReady = _FALSE; bReady = false;
start_time = rtw_get_current_time(); start_time = rtw_get_current_time();
rtw_yield_os(); rtw_yield_os();
@ -908,18 +908,18 @@ _func_enter_;
{ {
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
if ((padapter->bSurpriseRemoved == _TRUE) if ((padapter->bSurpriseRemoved == true)
|| (padapter->hw_init_completed == _FALSE) || (padapter->hw_init_completed == false)
|| (padapter->bDriverStopped== _TRUE) || (padapter->bDriverStopped== true)
|| (pwrpriv->pwr_mode == PS_MODE_ACTIVE) || (pwrpriv->pwr_mode == PS_MODE_ACTIVE)
) )
{ {
bReady = _TRUE; bReady = true;
} }
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
if(_TRUE == bReady) if(true == bReady)
break; break;
if(rtw_get_passing_time_ms(start_time)>100) 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); DBG_871X("%s: cpwm=%d, nothing to do!\n", __func__, pwrpriv->cpwm);
goto exit; goto exit;
} }
pwrpriv->brpwmtimeout = _TRUE; pwrpriv->brpwmtimeout = true;
rtw_set_rpwm(padapter, pwrpriv->rpwm); rtw_set_rpwm(padapter, pwrpriv->rpwm);
pwrpriv->brpwmtimeout = _FALSE; pwrpriv->brpwmtimeout = false;
exit: exit:
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
@ -1102,7 +1102,7 @@ _func_enter_;
res = _SUCCESS; res = _SUCCESS;
pwrctrl = adapter_to_pwrctl(padapter); pwrctrl = adapter_to_pwrctl(padapter);
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
if (_TRUE == adapter_to_pwrctl(padapter)->btcoex_rfon) if (true == adapter_to_pwrctl(padapter)->btcoex_rfon)
pslv = PS_STATE_S3; pslv = PS_STATE_S3;
else else
#endif #endif
@ -1114,7 +1114,7 @@ _func_enter_;
register_task_alive(pwrctrl, XMIT_ALIVE); register_task_alive(pwrctrl, XMIT_ALIVE);
if (pwrctrl->bFwCurrentInPSMode == _TRUE) if (pwrctrl->bFwCurrentInPSMode == true)
{ {
RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
("rtw_register_tx_alive: cpwm=0x%02x alives=0x%08x\n", ("rtw_register_tx_alive: cpwm=0x%02x alives=0x%08x\n",
@ -1168,7 +1168,7 @@ _func_enter_;
res = _SUCCESS; res = _SUCCESS;
pwrctrl = adapter_to_pwrctl(padapter); pwrctrl = adapter_to_pwrctl(padapter);
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
if (_TRUE == adapter_to_pwrctl(padapter)->btcoex_rfon) if (true == adapter_to_pwrctl(padapter)->btcoex_rfon)
pslv = PS_STATE_S3; pslv = PS_STATE_S3;
else else
#endif #endif
@ -1180,7 +1180,7 @@ _func_enter_;
register_task_alive(pwrctrl, CMD_ALIVE); register_task_alive(pwrctrl, CMD_ALIVE);
if (pwrctrl->bFwCurrentInPSMode == _TRUE) if (pwrctrl->bFwCurrentInPSMode == true)
{ {
RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_info_, RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_info_,
("rtw_register_cmd_alive: cpwm=0x%02x alives=0x%08x\n", ("rtw_register_cmd_alive: cpwm=0x%02x alives=0x%08x\n",
@ -1292,7 +1292,7 @@ _func_enter_;
unregister_task_alive(pwrctrl, XMIT_ALIVE); unregister_task_alive(pwrctrl, XMIT_ALIVE);
if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) &&
(pwrctrl->bFwCurrentInPSMode == _TRUE)) (pwrctrl->bFwCurrentInPSMode == true))
{ {
RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
("%s: cpwm=0x%02x alives=0x%08x\n", ("%s: cpwm=0x%02x alives=0x%08x\n",
@ -1330,7 +1330,7 @@ _func_enter_;
unregister_task_alive(pwrctrl, CMD_ALIVE); unregister_task_alive(pwrctrl, CMD_ALIVE);
if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) &&
(pwrctrl->bFwCurrentInPSMode == _TRUE)) (pwrctrl->bFwCurrentInPSMode == true))
{ {
RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_info_, RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_info_,
("%s: cpwm=0x%02x alives=0x%08x\n", ("%s: cpwm=0x%02x alives=0x%08x\n",
@ -1411,16 +1411,16 @@ _func_enter_;
pwrctrlpriv->rf_pwrstate = rf_on; pwrctrlpriv->rf_pwrstate = rf_on;
pwrctrlpriv->ips_enter_cnts=0; pwrctrlpriv->ips_enter_cnts=0;
pwrctrlpriv->ips_leave_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 = padapter->registrypriv.ips_mode;
pwrctrlpriv->ips_mode_req = 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_interval = RTW_PWR_STATE_CHK_INTERVAL;
pwrctrlpriv->pwr_state_check_cnts = 0; pwrctrlpriv->pwr_state_check_cnts = 0;
pwrctrlpriv->bInternalAutoSuspend = _FALSE; pwrctrlpriv->bInternalAutoSuspend = false;
pwrctrlpriv->bInSuspend = _FALSE; pwrctrlpriv->bInSuspend = false;
pwrctrlpriv->bkeepfwalive = _FALSE; pwrctrlpriv->bkeepfwalive = false;
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
#ifdef SUPPORT_HW_RFOFF_DETECTED #ifdef SUPPORT_HW_RFOFF_DETECTED
@ -1434,9 +1434,9 @@ _func_enter_;
pwrctrlpriv->power_mgnt =PS_MODE_ACTIVE ; pwrctrlpriv->power_mgnt =PS_MODE_ACTIVE ;
else else
pwrctrlpriv->power_mgnt =padapter->registrypriv.power_mgnt;// PS_MODE_MIN; 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->rpwm = 0;
pwrctrlpriv->cpwm = PS_STATE_S4; pwrctrlpriv->cpwm = PS_STATE_S4;
@ -1447,7 +1447,7 @@ _func_enter_;
pwrctrlpriv->tog = 0x80; pwrctrlpriv->tog = 0x80;
pwrctrlpriv->btcoex_rfon = _FALSE; pwrctrlpriv->btcoex_rfon = false;
#ifdef CONFIG_LPS_LCLK #ifdef CONFIG_LPS_LCLK
rtw_hal_set_hwreg(padapter, HW_VAR_SET_RPWM, (u8 *)(&pwrctrlpriv->rpwm)); 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); _init_workitem(&pwrctrlpriv->cpwm_event, cpwm_event_callback, NULL);
#ifdef CONFIG_LPS_RPWM_TIMER #ifdef CONFIG_LPS_RPWM_TIMER
pwrctrlpriv->brpwmtimeout = _FALSE; pwrctrlpriv->brpwmtimeout = false;
_init_workitem(&pwrctrlpriv->rpwmtimeoutwi, rpwmtimeout_workitem_callback, NULL); _init_workitem(&pwrctrlpriv->rpwmtimeoutwi, rpwmtimeout_workitem_callback, NULL);
_init_timer(&pwrctrlpriv->pwr_rpwm_timer, padapter->pnetdev, pwr_rpwm_timeout_handler, padapter); _init_timer(&pwrctrlpriv->pwr_rpwm_timer, padapter->pnetdev, pwr_rpwm_timeout_handler, padapter);
#endif // CONFIG_LPS_RPWM_TIMER #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) #if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER)
inline bool rtw_is_earlysuspend_registered(struct pwrctrl_priv *pwrpriv) 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) 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) 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); struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
DBG_871X("%s\n",__FUNCTION__); 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) 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__); DBG_871X("%s\n",__FUNCTION__);
if(pwrpriv->do_late_resume) { if(pwrpriv->do_late_resume) {
rtw_set_do_late_resume(pwrpriv, _FALSE); rtw_set_do_late_resume(pwrpriv, false);
rtw_resume_process(adapter); rtw_resume_process(adapter);
} }
} }
@ -1591,7 +1591,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
{ {
DBG_871X("%s\n", __FUNCTION__); DBG_871X("%s\n", __FUNCTION__);
rtw_set_do_late_resume(pwrpriv, _FALSE); rtw_set_do_late_resume(pwrpriv, false);
if (pwrpriv->early_suspend.suspend) if (pwrpriv->early_suspend.suspend)
unregister_early_suspend(&pwrpriv->early_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); struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
DBG_871X("%s\n",__FUNCTION__); 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) 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__); DBG_871X("%s\n",__FUNCTION__);
if(pwrpriv->do_late_resume) { if(pwrpriv->do_late_resume) {
rtw_set_do_late_resume(pwrpriv, _FALSE); rtw_set_do_late_resume(pwrpriv, false);
rtw_resume_process(adapter); rtw_resume_process(adapter);
} }
} }
@ -1639,7 +1639,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
{ {
DBG_871X("%s\n", __FUNCTION__); DBG_871X("%s\n", __FUNCTION__);
rtw_set_do_late_resume(pwrpriv, _FALSE); rtw_set_do_late_resume(pwrpriv, false);
if (pwrpriv->early_suspend.suspend) if (pwrpriv->early_suspend.suspend)
android_unregister_early_suspend(&pwrpriv->early_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 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); rtw_hal_intf_ps_func(padapter,efunc_id,val);
return bResult; return bResult;
@ -1682,7 +1682,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
if (padapter->pbuddy_adapter) if (padapter->pbuddy_adapter)
LeaveAllPowerSaveMode(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; padapter = padapter->pbuddy_adapter;
pmlmepriv = &padapter->mlmepriv; pmlmepriv = &padapter->mlmepriv;
} }
@ -1714,7 +1714,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
} }
#endif #endif
if (pwrpriv->bInternalAutoSuspend == _FALSE && pwrpriv->bInSuspend) { if (pwrpriv->bInternalAutoSuspend == false && pwrpriv->bInSuspend) {
DBG_871X("%s wait bInSuspend...\n", __func__); DBG_871X("%s wait bInSuspend...\n", __func__);
while (pwrpriv->bInSuspend while (pwrpriv->bInSuspend
&& ((rtw_get_passing_time_ms(start) <= 3000 && !rtw_is_do_late_resume(pwrpriv)) && ((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 //System suspend is not allowed to wakeup
if((pwrpriv->bInternalAutoSuspend == _FALSE) && (_TRUE == pwrpriv->bInSuspend )){ if((pwrpriv->bInternalAutoSuspend == false) && (true == pwrpriv->bInSuspend )){
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} }
//block??? //block???
if((pwrpriv->bInternalAutoSuspend == _TRUE) && (padapter->net_closed == _TRUE)) { if((pwrpriv->bInternalAutoSuspend == true) && (padapter->net_closed == true)) {
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} }
//I think this should be check in IPS, LPS, autosuspend functions... //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 defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND)
if(_TRUE==pwrpriv->bInternalAutoSuspend){ if(true==pwrpriv->bInternalAutoSuspend){
if(0==pwrpriv->autopm_cnt){ if(0==pwrpriv->autopm_cnt){
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf) < 0) 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 ) if(rf_off == pwrpriv->rf_pwrstate )
{ {
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
if(pwrpriv->brfoffbyhw==_TRUE) if(pwrpriv->brfoffbyhw==true)
{ {
DBG_8192C("hw still in rf_off state ...........\n"); DBG_8192C("hw still in rf_off state ...........\n");
ret = _FAIL; ret = _FAIL;
@ -1810,7 +1810,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
, padapter->bDriverStopped , padapter->bDriverStopped
, padapter->bup , padapter->bup
, padapter->hw_init_completed); , padapter->hw_init_completed);
ret= _FALSE; ret= false;
goto exit; goto exit;
} }
@ -1839,7 +1839,7 @@ int rtw_pm_set_lps(struct adapter *padapter, u8 mode)
pwrctrlpriv->LpsIdleCount = 2; pwrctrlpriv->LpsIdleCount = 2;
} }
pwrctrlpriv->power_mgnt = mode; 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 else

166
core/rtw_recv.c
View file

@ -185,7 +185,7 @@ union recv_frame *_rtw_alloc_recvframe (_queue *pfree_recv_queue)
struct recv_priv *precvpriv; struct recv_priv *precvpriv;
_func_enter_; _func_enter_;
if(_rtw_queue_empty(pfree_recv_queue) == _TRUE) if(_rtw_queue_empty(pfree_recv_queue) == true)
{ {
precvframe = NULL; precvframe = NULL;
} }
@ -354,7 +354,7 @@ _func_enter_;
phead = get_list_head(pframequeue); phead = get_list_head(pframequeue);
plist = get_next(phead); 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); 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); _enter_critical_ex(&queue->lock, &irqL);
if(_rtw_queue_empty(queue) == _TRUE) if(_rtw_queue_empty(queue) == true)
{ {
precvbuf = NULL; precvbuf = NULL;
} }
@ -450,7 +450,7 @@ sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe){
sint i,res=_SUCCESS; sint i,res=_SUCCESS;
u32 datalen; u32 datalen;
u8 miccode[8]; u8 miccode[8];
u8 bmic_err=_FALSE,brpt_micerror = _TRUE; u8 bmic_err=false,brpt_micerror = true;
u8 *pframe, *payload,*pframemic; u8 *pframe, *payload,*pframemic;
u8 *mickey; u8 *mickey;
//u8 *iv,rxdata_key_idx=0; //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", //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); // psecuritypriv->dot118021XGrpKeyid,pmlmeinfo->key_index,rxdata_key_idx);
if(psecuritypriv->binstallGrpkey==_FALSE) if(psecuritypriv->binstallGrpkey==false)
{ {
res=_FAIL; res=_FAIL;
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n")); 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; pframemic=payload+datalen;
bmic_err=_FALSE; bmic_err=false;
for(i=0;i<8;i++){ for(i=0;i<8;i++){
if(miccode[i] != *(pframemic+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))); 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", 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))); *(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 , // double check key_index for some timing issue ,
// cannot compare with psecuritypriv->dot118021XGrpKeyid also cause timing issue // cannot compare with psecuritypriv->dot118021XGrpKeyid also cause timing issue
if((IS_MCAST(prxattrib->ra)==_TRUE) && (prxattrib->key_index != pmlmeinfo->key_index )) if((IS_MCAST(prxattrib->ra)==true) && (prxattrib->key_index != pmlmeinfo->key_index ))
brpt_micerror = _FALSE; 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)); 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)); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" mic error :prxattrib->bdecrypted=%d ",prxattrib->bdecrypted));
@ -566,9 +566,9 @@ _func_enter_;
} }
else{ else{
//mic checked ok //mic checked ok
if((psecuritypriv->bcheck_grpkey ==_FALSE)&&(IS_MCAST(prxattrib->ra)==_TRUE)){ if((psecuritypriv->bcheck_grpkey ==false)&&(IS_MCAST(prxattrib->ra)==true)){
psecuritypriv->bcheck_grpkey =_TRUE; psecuritypriv->bcheck_grpkey =true;
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("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 #ifdef CONFIG_CONCURRENT_MODE
if(!IS_MCAST(prxattrib->ra))//bc/mc packets use sw decryption for concurrent mode if(!IS_MCAST(prxattrib->ra))//bc/mc packets use sw decryption for concurrent mode
#endif #endif
psecuritypriv->hw_decrypted=_FALSE; psecuritypriv->hw_decrypted=false;
#ifdef DBG_RX_DECRYPTOR #ifdef DBG_RX_DECRYPTOR
DBG_871X("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n" 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->busetkipkey==1 || prxattrib->encrypt !=_TKIP_ )
) )
{ {
psecuritypriv->hw_decrypted=_TRUE; psecuritypriv->hw_decrypted=true;
#ifdef DBG_RX_DECRYPTOR #ifdef DBG_RX_DECRYPTOR
DBG_871X("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n" DBG_871X("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n"
, prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted); , prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted);
@ -683,7 +683,7 @@ _func_enter_;
} }
else{ else{
prxattrib->bdecrypted = _TRUE; prxattrib->bdecrypted = true;
} }
//recvframe_chkmic(adapter, precv_frame); //move to recvframme_defrag function //recvframe_chkmic(adapter, precv_frame); //move to recvframme_defrag function
@ -1095,8 +1095,8 @@ sint sta2sta_data_frame(
_func_enter_; _func_enter_;
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) || if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true))
{ {
// filter packets that SA is myself or multicast or broadcast // filter packets that SA is myself or multicast or broadcast
@ -1121,7 +1121,7 @@ _func_enter_;
sta_addr = pattrib->src; 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 #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) 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->dst, GetAddr1Ptr(ptr), ETH_ALEN);
_rtw_memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN); _rtw_memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN);
@ -1300,9 +1300,9 @@ sint ap2sta_data_frame(
_func_enter_; _func_enter_;
if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true)
&& (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE && (check_fwstate(pmlmepriv, _FW_LINKED) == true
|| check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE ) || check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true )
) )
{ {
@ -1379,8 +1379,8 @@ _func_enter_;
} }
} }
else if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) && else if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true) &&
(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) ) (check_fwstate(pmlmepriv, _FW_LINKED) == true) )
{ {
_rtw_memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN); _rtw_memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN);
_rtw_memcpy(pattrib->src, GetAddr2Ptr(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 */ /* Special case */
ret = RTW_RX_HANDLED; ret = RTW_RX_HANDLED;
@ -1455,7 +1455,7 @@ sint sta2ap_data_frame(
_func_enter_; _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 //For AP mode, RA=BSSID, TX=STA(SRC_ADDR), A3=DST_ADDR
if(!_rtw_memcmp(pattrib->bssid, mybssid, ETH_ALEN)) 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_phead = get_list_head(&psta->sleep_q);
xmitframe_plist = get_next(xmitframe_phead); 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); 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 //upate BCN for TIM IE
//update_BCNTIM(padapter); //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); //_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 //upate BCN for TIM IE
//update_BCNTIM(padapter); //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) else if (GetFrameSubType(precv_frame->u.hdr.rx_data) == WIFI_PROBEREQ)
psta->sta_stats.rx_probereq_pkts++; psta->sta_stats.rx_probereq_pkts++;
else if (GetFrameSubType(precv_frame->u.hdr.rx_data) == WIFI_PROBERSP) { 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++; psta->sta_stats.rx_probersp_pkts++;
else if (is_broadcast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)) else if (is_broadcast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data))
|| is_multicast_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 #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 rx_pkt_attrib * pattrib=&precv_frame->u.hdr.attrib;
struct recv_stat* prxstat=( struct recv_stat * ) precv_frame->u.hdr.rx_head ; 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) if(pattrib->priority!=0 && pattrib->priority!=3)
{ {
adapter->recvpriv.bIsAnyNonBEPkts = _TRUE; adapter->recvpriv.bIsAnyNonBEPkts = true;
} }
} }
else else
@ -1935,7 +1935,7 @@ static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *prec
//only support station mode //only support station mode
if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED)
&& adapter->securitypriv.binstallBIPkey == _TRUE) && adapter->securitypriv.binstallBIPkey == true)
{ {
//unicast management frame decrypt //unicast management frame decrypt
if(pattrib->privacy && !(IS_MCAST(GetAddr1Ptr(ptr))) && if(pattrib->privacy && !(IS_MCAST(GetAddr1Ptr(ptr))) &&
@ -2280,16 +2280,16 @@ _func_enter_;
/* convert hdr + possible LLC headers into Ethernet header */ /* convert hdr + possible LLC headers into Ethernet header */
//eth_type = (psnap_type[0] << 8) | psnap_type[1]; //eth_type = (psnap_type[0] << 8) | psnap_type[1];
if((_rtw_memcmp(psnap, rtw_rfc1042_header, SNAP_SIZE) && 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_IPX, 2) == false) &&
(_rtw_memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2)==_FALSE) )|| (_rtw_memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2)==false) )||
//eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || //eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) ||
_rtw_memcmp(psnap, rtw_bridge_tunnel_header, SNAP_SIZE)){ _rtw_memcmp(psnap, rtw_bridge_tunnel_header, SNAP_SIZE)){
/* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ /* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */
bsnaphdr = _TRUE; bsnaphdr = true;
} }
else { else {
/* Leave Ethernet header part of hdr and full payload */ /* Leave Ethernet header part of hdr and full payload */
bsnaphdr = _FALSE; bsnaphdr = false;
} }
rmv_len = pattrib->hdrlen + pattrib->iv_len +(bsnaphdr?SNAP_SIZE:0); 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 eth_type= ntohs((unsigned short )eth_type); //pattrib->ether_type
pattrib->eth_type = eth_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 += rmv_len ;
*ptr = 0x87; *ptr = 0x87;
@ -2355,12 +2355,12 @@ _func_enter_;
if (psnap->dsap==0xaa && psnap->ssap==0xaa && psnap->ctrl==0x03) if (psnap->dsap==0xaa && psnap->ssap==0xaa && psnap->ctrl==0x03)
{ {
if (_rtw_memcmp(psnap->oui, oui_rfc1042, WLAN_IEEE_OUI_LEN)) 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) && else if (_rtw_memcmp(psnap->oui, SNAP_HDR_APPLETALK_DDP, WLAN_IEEE_OUI_LEN) &&
_rtw_memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_DDP, 2) ) _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)) 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 { else {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("drop pkt due to invalid frame format!\n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("drop pkt due to invalid frame format!\n"));
ret= _FAIL; ret= _FAIL;
@ -2368,12 +2368,12 @@ _func_enter_;
} }
} else } 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); 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)); 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 += rmv_len ;
*ptr = 0x87; *ptr = 0x87;
@ -2502,7 +2502,7 @@ _func_enter_;
data=get_recvframe_data(prframe); 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); pnextrframe = LIST_CONTAINOR(plist, union recv_frame , u);
pnfhdr=&pnextrframe->u.hdr; pnfhdr=&pnextrframe->u.hdr;
@ -2604,7 +2604,7 @@ _func_enter_;
if(fragnum==0) if(fragnum==0)
{ {
//the first fragment //the first fragment
if(_rtw_queue_empty(pdefrag_q) == _FALSE) if(_rtw_queue_empty(pdefrag_q) == false)
{ {
//free current defrag_q //free current defrag_q
rtw_free_recvframe_queue(pdefrag_q, pfree_recv_queue); 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)) #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); int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb);
if (nat25_handle_frame(padapter, sub_skb) == -1) { 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 #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); //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); 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); phead = get_list_head(ppending_recvframe_queue);
plist = get_next(phead); 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); pnextrframe = LIST_CONTAINOR(plist, union recv_frame, u);
pnextattrib = &pnextrframe->u.hdr.attrib; 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); //_exit_critical_ex(&ppending_recvframe_queue->lock, &irql);
return _FALSE; return false;
} }
else 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)); //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; union recv_frame *prframe;
struct rx_pkt_attrib *pattrib; struct rx_pkt_attrib *pattrib;
//u8 index = 0; //u8 index = 0;
int bPktInBuf = _FALSE; int bPktInBuf = false;
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
_queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue; _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); plist = get_next(phead);
// Handling some condition for forced indicate case. // Handling some condition for forced indicate case.
if(bforced==_TRUE) if(bforced==true)
{ {
if(rtw_is_list_empty(phead)) if(rtw_is_list_empty(phead))
{ {
// _exit_critical_ex(&ppending_recvframe_queue->lock, &irql); // _exit_critical_ex(&ppending_recvframe_queue->lock, &irql);
//_rtw_spinunlock_ex(&ppending_recvframe_queue->lock); //_rtw_spinunlock_ex(&ppending_recvframe_queue->lock);
return _TRUE; return true;
} }
prframe = LIST_CONTAINOR(plist, union recv_frame, u); 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); //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) && if ((padapter->bDriverStopped == false) &&
(padapter->bSurpriseRemoved == _FALSE)) (padapter->bSurpriseRemoved == false))
{ {
rtw_recv_indicatepkt(padapter, prframe);//indicate this recv_frame 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. //Update local variables.
bPktInBuf = _FALSE; bPktInBuf = false;
} }
else else
{ {
bPktInBuf = _TRUE; bPktInBuf = true;
break; 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); //_exit_critical_ex(&ppending_recvframe_queue->lock, &irql);
//return _TRUE; //return true;
return bPktInBuf; 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)) // || (pattrib->eth_type==0x0806) || (pattrib->ack_policy!=0))
if (pattrib->qos!=1) if (pattrib->qos!=1)
{ {
if ((padapter->bDriverStopped == _FALSE) && if ((padapter->bDriverStopped == false) &&
(padapter->bSurpriseRemoved == _FALSE)) (padapter->bSurpriseRemoved == false))
{ {
RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("@@@@ recv_indicatepkt_reorder -recv_func recv_indicatepkt\n" )); 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 //indicate this recv_frame
preorder_ctrl->indicate_seq = pattrib->seq_num; 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 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; preorder_ctrl->indicate_seq = pattrib->seq_num;
#ifdef DBG_RX_SEQ #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. // 2. All packets with SeqNum larger than or equal to WinStart => Buffer it.
// //
//recv_indicatepkts_in_order(padapter, preorder_ctrl, _TRUE); //recv_indicatepkts_in_order(padapter, preorder_ctrl, true);
if(recv_indicatepkts_in_order(padapter, preorder_ctrl, _FALSE)==_TRUE) if(recv_indicatepkts_in_order(padapter, preorder_ctrl, false)==true)
{ {
_set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME); _set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME);
_exit_critical_bh(&ppending_recvframe_queue->lock, &irql); _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); _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); _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; struct ht_priv *phtpriv = &pmlmepriv->htpriv;
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
if( (phtpriv->ht_option==_TRUE) || if( (phtpriv->ht_option==true) ||
((psta->tdls_sta_state & TDLS_LINKED_STATE) && ((psta->tdls_sta_state & TDLS_LINKED_STATE) &&
(psta->htpriv.ht_option==_TRUE) && (psta->htpriv.ht_option==true) &&
(psta->htpriv.ampdu_enable==_TRUE))) //B/G/N Mode (psta->htpriv.ampdu_enable==true))) //B/G/N Mode
#else #else
if(phtpriv->ht_option==_TRUE) //B/G/N Mode if(phtpriv->ht_option==true) //B/G/N Mode
#endif //CONFIG_TDLS #endif //CONFIG_TDLS
{ {
//prframe->u.hdr.preorder_ctrl = &precvpriv->recvreorder_ctrl[pattrib->priority]; //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__); DBG_871X("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __FUNCTION__);
#endif #endif
if ((padapter->bDriverStopped == _FALSE) && if ((padapter->bDriverStopped == false) &&
(padapter->bSurpriseRemoved == _FALSE)) (padapter->bSurpriseRemoved == false))
{ {
retval = _FAIL; retval = _FAIL;
return retval; return retval;
@ -3381,7 +3381,7 @@ int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prfram
return retval; return retval;
} }
if ((padapter->bDriverStopped ==_FALSE)&&( padapter->bSurpriseRemoved==_FALSE)) if ((padapter->bDriverStopped ==false)&&( padapter->bSurpriseRemoved==false))
{ {
//indicate this recv_frame //indicate this recv_frame
RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("@@@@ process_recv_indicatepkts- recv_func recv_indicatepkt\n" )); 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; 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" )); RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("@@@@ recv_func: recv_func rtw_recv_indicatepkt\n" ));
//indicate this recv_frame //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*/ /* check if need to enqueue into uc_swdec_pending_queue*/
if (check_fwstate(mlmepriv, WIFI_STATION_STATE) && if (check_fwstate(mlmepriv, WIFI_STATION_STATE) &&
!IS_MCAST(prxattrib->ra) && prxattrib->encrypt>0 && !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->ndisauthtype == Ndis802_11AuthModeWPAPSK &&
!psecuritypriv->busetkipkey) !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 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 || rtw_get_passing_time_ms(rtw_get_on_cur_ch_time(adapter)) < 2 * adapter->mlmeextpriv.mlmext_info.bcn_interval
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
|| ((BTDM_IsBtDisabled(adapter) == _FALSE) && (BT_IsBtInquiryPage(adapter) == _TRUE)) || ((BTDM_IsBtDisabled(adapter) == false) && (BT_IsBtInquiryPage(adapter) == true))
#endif #endif
) { ) {
goto set_timer; goto set_timer;
} }
} }
if(check_fwstate(&adapter->mlmepriv, _FW_UNDER_SURVEY) == _TRUE if(check_fwstate(&adapter->mlmepriv, _FW_UNDER_SURVEY) == true
|| check_fwstate(&adapter->mlmepriv, _FW_LINKED) == _FALSE || check_fwstate(&adapter->mlmepriv, _FW_LINKED) == false
) { ) {
goto set_timer; goto set_timer;
} }
#ifdef CONFIG_CONCURRENT_MODE #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; goto set_timer;
#endif #endif

14
core/rtw_security.c
View file

@ -805,7 +805,7 @@ _func_enter_;
static u32 no_gkey_bc_cnt = 0; static u32 no_gkey_bc_cnt = 0;
static u32 no_gkey_mc_cnt = 0; static u32 no_gkey_mc_cnt = 0;
if(psecuritypriv->binstallGrpkey==_FALSE) if(psecuritypriv->binstallGrpkey==false)
{ {
res=_FAIL; res=_FAIL;
@ -2005,7 +2005,7 @@ _func_enter_;
//in concurrent we should use sw descrypt in group key, so we remove this message //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"); //DBG_871X("rx bc/mc packets, to perform sw rtw_aes_decrypt\n");
//prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; //prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
if(psecuritypriv->binstallGrpkey==_FALSE) if(psecuritypriv->binstallGrpkey==false)
{ {
res=_FAIL; res=_FAIL;
@ -3080,7 +3080,7 @@ _func_enter_;
RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("^^^rtw_use_tkipkey_handler ^^^\n")); 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)); 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++){ for(keyid=0;keyid<4;keyid++){
if(securitypriv->key_mask & BIT(keyid)){ if(securitypriv->key_mask & BIT(keyid)){
if(keyid == securitypriv->dot11PrivacyKeyIndex) if(keyid == securitypriv->dot11PrivacyKeyIndex)
rtw_set_key(adapter,securitypriv, keyid, 1, _TRUE); rtw_set_key(adapter,securitypriv, keyid, 1, true);
else 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); struct security_priv* securitypriv=&(adapter->securitypriv);
u8 status = _SUCCESS; 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); u32 passing_ms = rtw_get_passing_time_ms(securitypriv->btkip_countermeasure_time);
if (passing_ms > 60*1000) { if (passing_ms > 60*1000) {
DBG_871X_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%ds > 60s \n", DBG_871X_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%ds > 60s \n",
caller, ADPT_ARG(adapter), passing_ms/1000); caller, ADPT_ARG(adapter), passing_ms/1000);
securitypriv->btkip_countermeasure = _FALSE; securitypriv->btkip_countermeasure = false;
securitypriv->btkip_countermeasure_time = 0; securitypriv->btkip_countermeasure_time = 0;
} else { } else {
DBG_871X_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%ds < 60s \n", DBG_871X_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%ds < 60s \n",

20
core/rtw_sreset.c
View file

@ -27,7 +27,7 @@ void sreset_init_value(struct adapter *padapter)
struct sreset_priv *psrtpriv = &pHalData->srestpriv; struct sreset_priv *psrtpriv = &pHalData->srestpriv;
_rtw_mutex_init(&psrtpriv->silentreset_mutex); _rtw_mutex_init(&psrtpriv->silentreset_mutex);
psrtpriv->silent_reset_inprogress = _FALSE; psrtpriv->silent_reset_inprogress = false;
psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
psrtpriv->last_tx_time =0; psrtpriv->last_tx_time =0;
psrtpriv->last_tx_complete_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); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = &pHalData->srestpriv; struct sreset_priv *psrtpriv = &pHalData->srestpriv;
//psrtpriv->silent_reset_inprogress = _FALSE; //psrtpriv->silent_reset_inprogress = false;
psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
psrtpriv->last_tx_time =0; psrtpriv->last_tx_time =0;
psrtpriv->last_tx_complete_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; u8 status = WIFI_STATUS_SUCCESS;
u32 val32 = 0; u32 val32 = 0;
_irqL irqL; _irqL irqL;
if(psrtpriv->silent_reset_inprogress == _TRUE) if(psrtpriv->silent_reset_inprogress == true)
{ {
return status; return status;
} }
@ -106,7 +106,7 @@ bool sreset_inprogress(struct adapter *padapter)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
return pHalData->srestpriv.silent_reset_inprogress; return pHalData->srestpriv.silent_reset_inprogress;
#else #else
return _FALSE; return false;
#endif #endif
} }
@ -145,9 +145,9 @@ void sreset_restore_security_station(struct adapter *padapter)
else else
{ {
//pairwise key //pairwise key
rtw_setstakey_cmd(padapter, (unsigned char *)psta, _TRUE,_FALSE); rtw_setstakey_cmd(padapter, (unsigned char *)psta, true,false);
//group key //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_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
rtw_setopmode_cmd(padapter, Ndis802_11Infrastructure,_FALSE); rtw_setopmode_cmd(padapter, Ndis802_11Infrastructure,false);
{ {
u8 threshold; 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); set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode);
//disable dynamic functions, such as high power, DIG //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); 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); _enter_pwrlock(&pwrpriv->lock);
psrtpriv->silent_reset_inprogress = _TRUE; psrtpriv->silent_reset_inprogress = true;
pwrpriv->change_rfpwrstate = rf_off; pwrpriv->change_rfpwrstate = rf_off;
sreset_stop_adapter(padapter); sreset_stop_adapter(padapter);
@ -305,7 +305,7 @@ void sreset_reset(struct adapter *padapter)
sreset_start_adapter(padapter->pbuddy_adapter); sreset_start_adapter(padapter->pbuddy_adapter);
#endif #endif
psrtpriv->silent_reset_inprogress = _FALSE; psrtpriv->silent_reset_inprogress = false;
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);

34
core/rtw_sta_mgt.c
View file

@ -62,7 +62,7 @@ _func_enter_;
psta->capability = 0; psta->capability = 0;
psta->bpairwise_key_installed = _FALSE; psta->bpairwise_key_installed = false;
#ifdef CONFIG_NATIVEAP_MLME #ifdef CONFIG_NATIVEAP_MLME
@ -245,7 +245,7 @@ _func_enter_;
phead = get_list_head(&pstapriv->free_sta_queue); phead = get_list_head(&pstapriv->free_sta_queue);
plist = get_next(phead); 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); psta = LIST_CONTAINOR(plist, struct sta_info ,list);
plist = get_next(plist); plist = get_next(plist);
@ -300,7 +300,7 @@ _func_enter_;
phead = &(pstapriv->sta_hash[index]); phead = &(pstapriv->sta_hash[index]);
plist = get_next(phead); plist = get_next(phead);
while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) while ((rtw_end_of_queue_search(phead, plist)) == false)
{ {
int i; int i;
psta = LIST_CONTAINOR(plist, struct sta_info ,hash_list); 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(&(pfree_sta_queue->lock), &irqL);
_enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL2); _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(&(pfree_sta_queue->lock), &irqL);
_exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL2); _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL2);
@ -421,7 +421,7 @@ _func_enter_;
preorder_ctrl->padapter = pstapriv->padapter; preorder_ctrl->padapter = pstapriv->padapter;
preorder_ctrl->enable = _FALSE; preorder_ctrl->enable = false;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
@ -592,7 +592,7 @@ _func_enter_;
} }
if (!(psta->state & WIFI_AP_STATE)) 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 #ifdef CONFIG_AP_MODE
@ -680,7 +680,7 @@ _func_enter_;
phead = &(pstapriv->sta_hash[index]); phead = &(pstapriv->sta_hash[index]);
plist = get_next(phead); 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); psta = LIST_CONTAINOR(plist, struct sta_info ,hash_list);
@ -738,12 +738,12 @@ _func_enter_;
plist = get_next(phead); 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); 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 { // if found the matched address
break; break;
} }
@ -813,12 +813,12 @@ _func_exit_;
u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr) u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)
{ {
u8 res = _TRUE; u8 res = true;
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
_irqL irqL; _irqL irqL;
_list *plist, *phead; _list *plist, *phead;
struct rtw_wlan_acl_node *paclnode; struct rtw_wlan_acl_node *paclnode;
u8 match = _FALSE; u8 match = false;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
_queue *pacl_node_q =&pacl_list->acl_node_q; _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); _enter_critical_bh(&(pacl_node_q->lock), &irqL);
phead = get_list_head(pacl_node_q); phead = get_list_head(pacl_node_q);
plist = get_next(phead); 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); paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list);
plist = get_next(plist); plist = get_next(plist);
if(_rtw_memcmp(paclnode->addr, mac_addr, ETH_ALEN)) if(_rtw_memcmp(paclnode->addr, mac_addr, ETH_ALEN))
{ {
if(paclnode->valid == _TRUE) if(paclnode->valid == true)
{ {
match = _TRUE; match = true;
break; 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 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 else if(pacl_list->mode == 2)//deny unless in accept list
{ {
res = (match == _TRUE) ? _TRUE:_FALSE; res = (match == true) ? true:false;
} }
else else
{ {
res = _TRUE; res = true;
} }
#endif #endif

64
core/rtw_tdls.c
View file

@ -34,10 +34,10 @@ void rtw_reset_tdls_info(_adapter* padapter)
{ {
struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;
ptdlsinfo->ap_prohibited = _FALSE; ptdlsinfo->ap_prohibited = false;
ptdlsinfo->setup_state = TDLS_STATE_NONE; ptdlsinfo->setup_state = TDLS_STATE_NONE;
ptdlsinfo->sta_cnt = 0; ptdlsinfo->sta_cnt = 0;
ptdlsinfo->sta_maximum = _FALSE; ptdlsinfo->sta_maximum = false;
ptdlsinfo->macid_index= 6; ptdlsinfo->macid_index= 6;
ptdlsinfo->clear_cam= 0; ptdlsinfo->clear_cam= 0;
ptdlsinfo->ch_sensing = 0; ptdlsinfo->ch_sensing = 0;
@ -166,7 +166,7 @@ s32 update_tdls_attrib(_adapter *padapter, struct pkt_attrib *pattrib)
pattrib->priority = 0; pattrib->priority = 0;
} }
if (psta->ieee8021x_blocked == _TRUE) if (psta->ieee8021x_blocked == true)
{ {
pattrib->encrypt = 0; pattrib->encrypt = 0;
} }
@ -217,11 +217,11 @@ s32 update_tdls_attrib(_adapter *padapter, struct pkt_attrib *pattrib)
} }
if (pattrib->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;
} else { } else {
pattrib->bswenc = _FALSE; pattrib->bswenc = false;
} }
//qos_en, ht_en, init rate, ,bw, ch_offset, sgi //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->bwmode = psta->htpriv.bwmode;
pattrib->ch_offset = psta->htpriv.ch_offset; pattrib->ch_offset = psta->htpriv.ch_offset;
pattrib->sgi= psta->htpriv.sgi; pattrib->sgi= psta->htpriv.sgi;
pattrib->ampdu_en = _FALSE; pattrib->ampdu_en = false;
//if(pattrib->ht_en && psta->htpriv.ampdu_enable) //if(pattrib->ht_en && psta->htpriv.ampdu_enable)
//{ //{
// if(psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority)) // if(psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority))
// pattrib->ampdu_en = _TRUE; // pattrib->ampdu_en = true;
//} //}
exit: exit:
@ -257,13 +257,13 @@ void free_tdls_sta(_adapter *padapter, struct sta_info *ptdls_sta)
_exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
if( ptdlsinfo->sta_cnt < (NUM_STA - 2) ) // -2: AP + BC/MC sta 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) ); _rtw_memset( &ptdlsinfo->ss_record, 0x00, sizeof(struct tdls_ss_record) );
} }
//ready to clear cam //ready to clear cam
if(ptdls_sta->mac_id!=0){ if(ptdls_sta->mac_id!=0){
ptdlsinfo->clear_cam=ptdls_sta->mac_id; 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){ 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) if(prx_pkt_attrib->encrypt)
{ {
ptdls_sta->dot118021XPrivacy=_AES_; 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(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 else
{ {
ptdls_sta->htpriv.ht_option = _FALSE; ptdls_sta->htpriv.ht_option = false;
ptdls_sta->stat_code = _STATS_FAILURE_; 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 //check if sta supports rx ampdu
if(adapter->registrypriv.ampdu_enable==1) 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 //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)) 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 // 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; 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. 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; goto exit;
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) 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); _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
if( ptdlsinfo->sta_cnt == (NUM_STA - 2) ) // -2: AP + BC/MC sta if( ptdlsinfo->sta_cnt == (NUM_STA - 2) ) // -2: AP + BC/MC sta
{ {
ptdlsinfo->sta_maximum = _TRUE; ptdlsinfo->sta_maximum = true;
} }
} }
else else
@ -992,9 +992,9 @@ void issue_tdls_ch_switch_rsp(_adapter *padapter, u8 *mac_addr)
pattrib->qsel=pattrib->priority; pattrib->qsel=pattrib->priority;
/* /*
_enter_critical_bh(&pxmitpriv->lock, &irqL); _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); _exit_critical_bh(&pxmitpriv->lock, &irqL);
return _FALSE; return false;
} }
*/ */
if(rtw_xmit_tdls_coalesce(padapter, pmgntframe, TDLS_CHANNEL_SWITCH_RESPONSE) !=_SUCCESS ){ 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; ptdls_sta->tdls_sta_state |= TDLS_ALIVE_STATE;
//Record the tdls sta with lowest signal strength //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) ) 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 else
{ {
if( ptdlsinfo->sta_maximum == _TRUE) if( ptdlsinfo->sta_maximum == true)
{ {
if( _rtw_memcmp( ptdlsinfo->ss_record.macaddr, empty_addr, ETH_ALEN ) ) 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 -PAYLOAD_TYPE_LEN
-FIXED_IE; -FIXED_IE;
if(ptdlsinfo->ap_prohibited == _TRUE) if(ptdlsinfo->ap_prohibited == true)
{ {
goto exit; goto exit;
} }
@ -1192,7 +1192,7 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame)
ppairwise_cipher=prsnie+10; ppairwise_cipher=prsnie+10;
_rtw_memcpy(&pairwise_count, (u16*)(ppairwise_cipher-2), 1); _rtw_memcpy(&pairwise_count, (u16*)(ppairwise_cipher-2), 1);
for(k=0;k<pairwise_count;k++){ for(k=0;k<pairwise_count;k++){
if(_rtw_memcmp( ppairwise_cipher+4*k, RSN_CIPHER_SUITE_CCMP, 4)==_TRUE) if(_rtw_memcmp( ppairwise_cipher+4*k, RSN_CIPHER_SUITE_CCMP, 4)==true)
ccmp_have=1; ccmp_have=1;
} }
if(ccmp_have==0){ if(ccmp_have==0){
@ -1221,7 +1221,7 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame)
case EID_BSSCoexistence: case EID_BSSCoexistence:
break; break;
case _LINK_ID_IE_: case _LINK_ID_IE_:
if(_rtw_memcmp(get_bssid(pmlmepriv), pIE->data, 6) == _FALSE) if(_rtw_memcmp(get_bssid(pmlmepriv), pIE->data, 6) == false)
{ {
//not in the same BSS //not in the same BSS
ptdls_sta->stat_code=7; 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); _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
if( ptdlsinfo->sta_cnt == (NUM_STA - 2) ) // -2: AP + BC/MC sta if( ptdlsinfo->sta_cnt == (NUM_STA - 2) ) // -2: AP + BC/MC sta
{ {
ptdlsinfo->sta_maximum = _TRUE; ptdlsinfo->sta_maximum = true;
} }
#ifdef CONFIG_WFD #ifdef CONFIG_WFD
@ -1380,7 +1380,7 @@ sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame)
ppairwise_cipher=prsnie+10; ppairwise_cipher=prsnie+10;
_rtw_memcpy(&pairwise_count, (u16*)(ppairwise_cipher-2), 2); _rtw_memcpy(&pairwise_count, (u16*)(ppairwise_cipher-2), 2);
for(k=0;k<pairwise_count;k++){ for(k=0;k<pairwise_count;k++){
if(_rtw_memcmp( ppairwise_cipher+4*k, RSN_CIPHER_SUITE_CCMP, 4)==_TRUE) if(_rtw_memcmp( ppairwise_cipher+4*k, RSN_CIPHER_SUITE_CCMP, 4)==true)
verify_ccmp=1; verify_ccmp=1;
} }
case _EXT_CAP_IE_: case _EXT_CAP_IE_:
@ -1611,7 +1611,7 @@ sint On_TDLS_Dis_Req(_adapter *adapter, union recv_frame *precv_frame)
goto exit; goto exit;
} }
dst = pIE->data + 12; dst = pIE->data + 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; 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); xmitframe_plist = get_next(xmitframe_phead);
//transmit buffered frames //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); pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list);
xmitframe_plist = get_next(xmitframe_plist); 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.eosp = 1;
} }
//pxmitframe->attrib.triggered = 1; //maybe doesn't need in TDLS //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); rtw_os_xmit_complete(adapter, pxmitframe);
} }
@ -1987,7 +1987,7 @@ void wfd_ie_tdls(_adapter * padapter, u8 *pframe, u32 *pktlen )
// Value: // Value:
// Associated BSSID // 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 ); _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; return psta_ht->sgi;
} }
else else
return _FALSE; return false;
} }
u32 update_mask_tdls(_adapter *padapter, struct sta_info *psta) u32 update_mask_tdls(_adapter *padapter, struct sta_info *psta)

130
core/rtw_wlan_util.c
View file

@ -77,10 +77,10 @@ int cckrates_included(unsigned char *rate, int ratelen)
{ {
if ( (((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) || if ( (((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) ||
(((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22) ) (((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) && if ( (((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) &&
(((rate[i]) & 0x7f) != 11) && (((rate[i]) & 0x7f) != 22) ) (((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) 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; network_type = WIRELESS_11_24N;
} }
if ((cckratesonly_included(rate, ratelen)) == _TRUE) if ((cckratesonly_included(rate, ratelen)) == true)
{ {
network_type |= WIRELESS_11B; network_type |= WIRELESS_11B;
} }
else if((cckrates_included(rate, ratelen)) == _TRUE) else if((cckrates_included(rate, ratelen)) == true)
{ {
network_type |= WIRELESS_11BG; network_type |= WIRELESS_11BG;
} }
@ -251,12 +251,12 @@ int is_basicrate(struct adapter *padapter, unsigned char rate)
{ {
if (rate == ratetbl_val_2wifirate(val)) if (rate == ratetbl_val_2wifirate(val))
{ {
return _TRUE; return true;
} }
} }
} }
return _FALSE; return false;
} }
unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *rateset); unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *rateset);
@ -282,7 +282,7 @@ unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *rateset)
default: default:
rate = ratetbl_val_2wifirate(rate); rate = ratetbl_val_2wifirate(rate);
if (is_basicrate(padapter, rate) == _TRUE) if (is_basicrate(padapter, rate) == true)
{ {
rate |= IEEE80211_BASIC_RATE_MASK; rate |= IEEE80211_BASIC_RATE_MASK;
} }
@ -355,19 +355,19 @@ void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen)
void Save_DM_Func_Flag(struct adapter *padapter) 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)); rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag));
} }
void Restore_DM_Func_Flag(struct adapter *padapter) 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)); rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag));
} }
void Switch_DM_Func(struct adapter *padapter, u32 mode, u8 enable) 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)); rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_SET, (u8 *)(&mode));
else else
rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode)); 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)) if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE))
{ {
return _TRUE; return true;
} }
else 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)) if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE))
{ {
return _TRUE; return true;
} }
else 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); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
//if(check_buddy_mlmeinfo_state(padapter, _HW_STATE_NOLINK_)) //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); 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; cam_id = 4;
} }
//clear_cam_entry(padapter, cam_id); //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 //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 ); 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 ); DBG_8192C( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
return( _TRUE ); return( true );
} }
} }
else else
@ -851,7 +851,7 @@ int WMM_param_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
pmlmeinfo->WMM_enable = 1; pmlmeinfo->WMM_enable = 1;
_rtw_memcpy(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_element)); _rtw_memcpy(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_element));
return _TRUE; return true;
/*if (pregpriv->wifi_spec == 1) /*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; pmlmeinfo->WMM_enable = 1;
_rtw_rtw_memcpy(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_element)); _rtw_rtw_memcpy(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_element));
return _TRUE; return true;
} }
} }
else else
@ -963,13 +963,13 @@ void WMMOnAssocRsp(struct adapter *padapter)
//compare CW and AIFS //compare CW and AIFS
if((edca[j] & 0xFFFF) < (edca[i] & 0xFFFF)) if((edca[j] & 0xFFFF) < (edca[i] & 0xFFFF))
{ {
change_inx = _TRUE; change_inx = true;
} }
else if((edca[j] & 0xFFFF) == (edca[i] & 0xFFFF)) else if((edca[j] & 0xFFFF) == (edca[i] & 0xFFFF))
{ {
//compare TXOP //compare TXOP
if((edca[j] >> 16) > (edca[i] >> 16)) if((edca[j] >> 16) > (edca[i] >> 16))
change_inx = _TRUE; change_inx = true;
} }
if(change_inx) if(change_inx)
@ -982,7 +982,7 @@ void WMMOnAssocRsp(struct adapter *padapter)
inx[i] = inx[j]; inx[i] = inx[j];
inx[j] = tmp; 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) if(!pIE)
return; return;
if(phtpriv->ht_option == _FALSE) return; if(phtpriv->ht_option == false) return;
if(pIE->Length > sizeof(struct HT_info_element)) if(pIE->Length > sizeof(struct HT_info_element))
return; 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)) 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_bwmode = new_bwmode;
pmlmeext->cur_ch_offset = new_ch_offset; pmlmeext->cur_ch_offset = new_ch_offset;
@ -1057,11 +1057,11 @@ static void bwmode_update_check(struct adapter *padapter, PNDIS_802_11_VARIABLE_
} }
else else
{ {
pmlmeinfo->bwmode_updated = _FALSE; pmlmeinfo->bwmode_updated = false;
} }
if(_TRUE == pmlmeinfo->bwmode_updated) if(true == pmlmeinfo->bwmode_updated)
{ {
struct sta_info *psta; struct sta_info *psta;
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); 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 #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(pIE==NULL) return;
if(phtpriv->ht_option == _FALSE) return; if(phtpriv->ht_option == false) return;
pmlmeinfo->HT_caps_enable = 1; 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(pIE==NULL) return;
if(phtpriv->ht_option == _FALSE) return; if(phtpriv->ht_option == false) return;
if(pIE->Length > sizeof(struct HT_info_element)) 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) if(pkt_len < 5)
{ {
return _FALSE; return false;
} }
pframe += 4; pframe += 4;
if( (*pframe) & tdls_prohibited_bit ) if( (*pframe) & tdls_prohibited_bit )
return _TRUE; return true;
return _FALSE; return false;
} }
#endif //CONFIG_TDLS #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 short ht_cap_info;
unsigned char ht_info_infos_0; unsigned char ht_info_infos_0;
if (is_client_associated_to_ap(Adapter) == _FALSE) if (is_client_associated_to_ap(Adapter) == false)
return _TRUE; return true;
len = packet_len - sizeof(struct rtw_ieee80211_hdr_3addr); 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; 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, 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)); MAC_ARG(pbssid), MAC_ARG(cur_network->network.MacAddress));
return _TRUE; return true;
} }
bssid = (WLAN_BSSID_EX *)rtw_zmalloc(sizeof(WLAN_BSSID_EX)); 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 */ /* checking SSID */
if ((p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _SSID_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_)) == NULL) { 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__); DBG_871X("%s marc: cannot find SSID for survey event\n", __func__);
hidden_ssid = _TRUE; hidden_ssid = true;
} else { } 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)); _rtw_memcpy(bssid->Ssid.Ssid, (p + 2), *(p + 1));
bssid->Ssid.SsidLength = *(p + 1); bssid->Ssid.SsidLength = *(p + 1);
} else { } 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, bssid->Ssid.SsidLength, cur_network->network.Ssid.Ssid,
cur_network->network.Ssid.SsidLength)); 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) { bssid->Ssid.SsidLength != cur_network->network.Ssid.SsidLength) {
if (bssid->Ssid.Ssid[0] != '\0' && bssid->Ssid.SsidLength != 0) { /* not hidden ssid */ if (bssid->Ssid.Ssid[0] != '\0' && bssid->Ssid.SsidLength != 0) { /* not hidden ssid */
DBG_871X("%s(), SSID is not match return FAIL\n", __func__); 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; break;
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
case _EXT_CAP_IE_: case _EXT_CAP_IE_:
if( check_ap_tdls_prohibited(pIE->data, pIE->Length) == _TRUE ) if( check_ap_tdls_prohibited(pIE->data, pIE->Length) == true )
ptdlsinfo->ap_prohibited = _TRUE; ptdlsinfo->ap_prohibited = true;
break; break;
#endif //CONFIG_TDLS #endif //CONFIG_TDLS
default: default:
@ -1619,14 +1619,14 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)
case _VENDOR_SPECIFIC_IE_: case _VENDOR_SPECIFIC_IE_:
if ((_rtw_memcmp(pIE->data, RTW_WPA_OUI, 4)) && (_rtw_memcmp((pIE->data + 12), WPA_TKIP_CIPHER, 4))) if ((_rtw_memcmp(pIE->data, RTW_WPA_OUI, 4)) && (_rtw_memcmp((pIE->data + 12), WPA_TKIP_CIPHER, 4)))
{ {
return _TRUE; return true;
} }
break; break;
case _RSN_IE_2_: case _RSN_IE_2_:
if (_rtw_memcmp((pIE->data + 8), RSN_TKIP_CIPHER, 4)) if (_rtw_memcmp((pIE->data + 8), RSN_TKIP_CIPHER, 4))
{ {
return _TRUE; return true;
} }
default: default:
@ -1636,11 +1636,11 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)
i += (pIE->Length + 2); i += (pIE->Length + 2);
} }
return _FALSE; return false;
} }
else 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) && if (_rtw_memcmp(pIE->data, RTW_WPA_OUI, 4) &&
((_rtw_memcmp((pIE->data + 12), WPA_CIPHER_SUITE_CCMP, 4)) || ((_rtw_memcmp((pIE->data + 12), WPA_CIPHER_SUITE_CCMP, 4)) ||
(_rtw_memcmp((pIE->data + 16), WPA_CIPHER_SUITE_CCMP, 4)))) (_rtw_memcmp((pIE->data + 16), WPA_CIPHER_SUITE_CCMP, 4))))
return _FALSE; return false;
break; break;
case _RSN_IE_2_: case _RSN_IE_2_:
if ((_rtw_memcmp((pIE->data + 8), RSN_CIPHER_SUITE_CCMP, 4)) || if ((_rtw_memcmp((pIE->data + 8), RSN_CIPHER_SUITE_CCMP, 4)) ||
(_rtw_memcmp((pIE->data + 12), RSN_CIPHER_SUITE_CCMP, 4))) (_rtw_memcmp((pIE->data + 12), RSN_CIPHER_SUITE_CCMP, 4)))
return _FALSE; return false;
default: default:
break; break;
@ -1679,11 +1679,11 @@ unsigned int should_forbid_n_rate(struct adapter * padapter)
i += (pIE->Length + 2); i += (pIE->Length + 2);
} }
return _TRUE; return true;
} }
else else
{ {
return _FALSE; return false;
} }
} }
@ -1707,11 +1707,11 @@ unsigned int is_ap_in_wep(struct adapter *padapter)
{ {
case _VENDOR_SPECIFIC_IE_: case _VENDOR_SPECIFIC_IE_:
if (_rtw_memcmp(pIE->data, RTW_WPA_OUI, 4)) if (_rtw_memcmp(pIE->data, RTW_WPA_OUI, 4))
return _FALSE; return false;
break; break;
case _RSN_IE_2_: case _RSN_IE_2_:
return _FALSE; return false;
default: default:
break; break;
@ -1720,11 +1720,11 @@ unsigned int is_ap_in_wep(struct adapter *padapter)
i += (pIE->Length + 2); i += (pIE->Length + 2);
} }
return _TRUE; return true;
} }
else else
{ {
return _FALSE; return false;
} }
} }
@ -2048,13 +2048,13 @@ void update_IOT_info(struct adapter *padapter)
pmlmeinfo->turboMode_cts2self = 0; pmlmeinfo->turboMode_cts2self = 0;
pmlmeinfo->turboMode_rtsen = 1; pmlmeinfo->turboMode_rtsen = 1;
//disable high power //disable high power
Switch_DM_Func(padapter, (~DYNAMIC_BB_DYNAMIC_TXPWR), _FALSE); Switch_DM_Func(padapter, (~DYNAMIC_BB_DYNAMIC_TXPWR), false);
break; break;
case HT_IOT_PEER_REALTEK: case HT_IOT_PEER_REALTEK:
//rtw_write16(padapter, 0x4cc, 0xffff); //rtw_write16(padapter, 0x4cc, 0xffff);
//rtw_write16(padapter, 0x546, 0x01c0); //rtw_write16(padapter, 0x546, 0x01c0);
//disable high power //disable high power
Switch_DM_Func(padapter, (~DYNAMIC_BB_DYNAMIC_TXPWR), _FALSE); Switch_DM_Func(padapter, (~DYNAMIC_BB_DYNAMIC_TXPWR), false);
break; break;
default: default:
pmlmeinfo->turboMode_cts2self = 0; pmlmeinfo->turboMode_cts2self = 0;
@ -2079,7 +2079,7 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap)
{ // Short Preamble { // Short Preamble
if(pmlmeinfo->preamble_mode != PREAMBLE_SHORT) // PREAMBLE_LONG or PREAMBLE_AUTO if(pmlmeinfo->preamble_mode != PREAMBLE_SHORT) // PREAMBLE_LONG or PREAMBLE_AUTO
{ {
ShortPreamble = _TRUE; ShortPreamble = true;
pmlmeinfo->preamble_mode = PREAMBLE_SHORT; pmlmeinfo->preamble_mode = PREAMBLE_SHORT;
rtw_hal_set_hwreg( Adapter, HW_VAR_ACK_PREAMBLE, (u8 *)&ShortPreamble ); 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 { // Long Preamble
if(pmlmeinfo->preamble_mode != PREAMBLE_LONG) // PREAMBLE_SHORT or PREAMBLE_AUTO if(pmlmeinfo->preamble_mode != PREAMBLE_LONG) // PREAMBLE_SHORT or PREAMBLE_AUTO
{ {
ShortPreamble = _FALSE; ShortPreamble = false;
pmlmeinfo->preamble_mode = PREAMBLE_LONG; pmlmeinfo->preamble_mode = PREAMBLE_LONG;
rtw_hal_set_hwreg( Adapter, HW_VAR_ACK_PREAMBLE, (u8 *)&ShortPreamble ); 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; network_type = WIRELESS_11_24N;
} }
if ((cckratesonly_included(rate, ratelen)) == _TRUE) if ((cckratesonly_included(rate, ratelen)) == true)
{ {
network_type |= WIRELESS_11B; network_type |= WIRELESS_11B;
} }
else if((cckrates_included(rate, ratelen)) == _TRUE) else if((cckrates_included(rate, ratelen)) == true)
{ {
network_type |= WIRELESS_11BG; 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; preorder_ctrl->indicate_seq = 0xffff;
#endif #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 #ifdef CONFIG_DUALMAC_CONCURRENT
if (dvobj->InterfaceNumber == 0) { if (dvobj->InterfaceNumber == 0) {
//set adapter_type/iface type //set adapter_type/iface type
adapter->isprimary = _TRUE; adapter->isprimary = true;
adapter->adapter_type = PRIMARY_struct adapter; adapter->adapter_type = PRIMARY_struct adapter;
adapter->iface_type = IFACE_PORT0; adapter->iface_type = IFACE_PORT0;
DBG_871X("%s(): PRIMARY_struct adapter\n",__FUNCTION__); DBG_871X("%s(): PRIMARY_struct adapter\n",__FUNCTION__);
} else { } else {
//set adapter_type/iface type //set adapter_type/iface type
adapter->isprimary = _FALSE; adapter->isprimary = false;
adapter->adapter_type = SECONDARY_struct adapter; adapter->adapter_type = SECONDARY_struct adapter;
adapter->iface_type = IFACE_PORT1; adapter->iface_type = IFACE_PORT1;
DBG_871X("%s(): SECONDARY_struct adapter\n",__FUNCTION__); DBG_871X("%s(): SECONDARY_struct adapter\n",__FUNCTION__);

180
core/rtw_xmit.c
View file

@ -170,7 +170,7 @@ _func_enter_;
pxmitbuf->priv_data = NULL; pxmitbuf->priv_data = NULL;
pxmitbuf->padapter = padapter; pxmitbuf->padapter = padapter;
pxmitbuf->ext_tag = _FALSE; pxmitbuf->ext_tag = false;
/* /*
pxmitbuf->pallocated_buf = rtw_zmalloc(MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ); pxmitbuf->pallocated_buf = rtw_zmalloc(MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ);
@ -259,7 +259,7 @@ _func_enter_;
pxmitbuf->priv_data = NULL; pxmitbuf->priv_data = NULL;
pxmitbuf->padapter = padapter; pxmitbuf->padapter = padapter;
pxmitbuf->ext_tag = _TRUE; pxmitbuf->ext_tag = true;
/* /*
pxmitbuf->pallocated_buf = rtw_zmalloc(max_xmit_extbuf_size); pxmitbuf->pallocated_buf = rtw_zmalloc(max_xmit_extbuf_size);
@ -306,7 +306,7 @@ _func_enter_;
pxmitpriv->voq_cnt = 0; pxmitpriv->voq_cnt = 0;
#ifdef CONFIG_XMIT_ACK #ifdef CONFIG_XMIT_ACK
pxmitpriv->ack_tx = _FALSE; pxmitpriv->ack_tx = false;
_rtw_mutex_init(&pxmitpriv->ack_tx_mutex); _rtw_mutex_init(&pxmitpriv->ack_tx_mutex);
rtw_sctx_init(&pxmitpriv->ack_tx_ops, 0); rtw_sctx_init(&pxmitpriv->ack_tx_ops, 0);
#endif #endif
@ -488,10 +488,10 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *
} }
else else
{ {
while (_TRUE) while (true)
{ {
//IOT action //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_ )) (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_ ))
{ {
pattrib->vcs_mode = CTS_TO_SELF; 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. //to do list: check MIMO power save condition.
//check AMPDU aggregation for TXOP //check AMPDU aggregation for TXOP
if(pattrib->ampdu_en==_TRUE) if(pattrib->ampdu_en==true)
{ {
pattrib->vcs_mode = RTS_CTS; pattrib->vcs_mode = RTS_CTS;
break; break;
@ -566,16 +566,16 @@ static void update_attrib_phy_info(struct pkt_attrib *pattrib, struct sta_info *
pattrib->bwmode = psta->htpriv.bwmode; pattrib->bwmode = psta->htpriv.bwmode;
pattrib->ch_offset = psta->htpriv.ch_offset; pattrib->ch_offset = psta->htpriv.ch_offset;
pattrib->sgi= psta->htpriv.sgi; pattrib->sgi= psta->htpriv.sgi;
pattrib->ampdu_en = _FALSE; pattrib->ampdu_en = false;
#endif //CONFIG_80211N_HT #endif //CONFIG_80211N_HT
//if(pattrib->ht_en && psta->htpriv.ampdu_enable) //if(pattrib->ht_en && psta->htpriv.ampdu_enable)
//{ //{
// if(psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority)) // 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; pattrib->pctrl = 0;
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) || if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) { (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) {
_rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); _rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, 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; res =_FAIL;
goto exit; 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; res =_FAIL;
goto exit; 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 //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; 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 #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 #endif
res = _FAIL; res = _FAIL;
goto exit; goto exit;
@ -888,27 +888,27 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
pattrib->encrypt, padapter->securitypriv.sw_encrypt)); pattrib->encrypt, padapter->securitypriv.sw_encrypt));
if (pattrib->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_, 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)); pattrib->encrypt, padapter->securitypriv.sw_encrypt));
} else { } else {
pattrib->bswenc = _FALSE; pattrib->bswenc = false;
RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("update_attrib: bswenc=_FALSE\n")); RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("update_attrib: bswenc=false\n"));
} }
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if((pattrib->encrypt && bmcast) || (pattrib->encrypt ==_WEP40_) || (pattrib->encrypt ==_WEP104_)) 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 #endif
#ifdef CONFIG_WAPI_SUPPORT #ifdef CONFIG_WAPI_SUPPORT
if(pattrib->encrypt == _SMS4_) if(pattrib->encrypt == _SMS4_)
pattrib->bswenc = _FALSE; pattrib->bswenc = false;
#endif #endif
rtw_set_tx_chksum_offload(pkt, pattrib); rtw_set_tx_chksum_offload(pkt, pattrib);
@ -979,7 +979,7 @@ _func_enter_;
if(bmcst) 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"); //DbgPrint("\nxmitframe_addmic:stainfo->dot11tkiptxmickey==0\n");
//rtw_msleep_os(10); //rtw_msleep_os(10);
return _FAIL; return _FAIL;
@ -989,7 +989,7 @@ _func_enter_;
} }
else 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"); //DbgPrint("\nxmitframe_addmic:stainfo->dot11tkiptxmickey==0\n");
//rtw_msleep_os(10); //rtw_msleep_os(10);
return _FAIL; 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 rtw_ieee80211_hdr *pwlanhdr = (struct rtw_ieee80211_hdr *)hdr;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct qos_priv *pqospriv = &pmlmepriv->qospriv; struct qos_priv *pqospriv = &pmlmepriv->qospriv;
u8 qos_option = _FALSE; u8 qos_option = false;
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
@ -1163,7 +1163,7 @@ _func_enter_;
if (pattrib->subtype & WIFI_DATA_TYPE) 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; //to_ds = 1, fr_ds = 0;
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
if((ptdlsinfo->setup_state == TDLS_LINKED_STATE)){ if((ptdlsinfo->setup_state == TDLS_LINKED_STATE)){
@ -1193,10 +1193,10 @@ _func_enter_;
} }
if (pqospriv->qos_option) 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; //to_ds = 0, fr_ds = 1;
SetFrDs(fctrl); SetFrDs(fctrl);
_rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); _rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
@ -1204,16 +1204,16 @@ _func_enter_;
_rtw_memcpy(pwlanhdr->addr3, pattrib->src, ETH_ALEN); _rtw_memcpy(pwlanhdr->addr3, pattrib->src, ETH_ALEN);
if(psta->qos_option) if(psta->qos_option)
qos_option = _TRUE; qos_option = true;
} }
else if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) || else if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) { (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) {
_rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); _rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); _rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN); _rtw_memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);
if(psta->qos_option) if(psta->qos_option)
qos_option = _TRUE; qos_option = true;
} }
else { else {
RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("fw_state:%x is not allowed to xmit frame\n", get_fwstate(pmlmepriv))); 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(pattrib->ht_en && psta->htpriv.ampdu_enable)
{ {
if(psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority)) 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 //re-check if enable ampdu by BA_starting_seqctrl
if(pattrib->ampdu_en == _TRUE) if(pattrib->ampdu_en == true)
{ {
u16 tx_seq; u16 tx_seq;
@ -1278,19 +1278,19 @@ _func_enter_;
if(SN_LESS(pattrib->seqnum, tx_seq)) if(SN_LESS(pattrib->seqnum, tx_seq))
{ {
//DBG_871X("tx ampdu seqnum(%d) < tx_seq(%d)\n", 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)) else if(SN_EQUAL(pattrib->seqnum, tx_seq))
{ {
psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (tx_seq+1)&0xfff; psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (tx_seq+1)&0xfff;
pattrib->ampdu_en = _TRUE;//AGG EN pattrib->ampdu_en = true;//AGG EN
} }
else else
{ {
//DBG_871X("tx ampdu over run\n"); //DBG_871X("tx ampdu over run\n");
psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (pattrib->seqnum+1)&0xfff; 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; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
return ((_rtw_queue_empty(&pxmitpriv->be_pending) == _FALSE) || return ((_rtw_queue_empty(&pxmitpriv->be_pending) == false) ||
(_rtw_queue_empty(&pxmitpriv->bk_pending) == _FALSE) || (_rtw_queue_empty(&pxmitpriv->bk_pending) == false) ||
(_rtw_queue_empty(&pxmitpriv->vi_pending) == _FALSE) || (_rtw_queue_empty(&pxmitpriv->vi_pending) == false) ||
(_rtw_queue_empty(&pxmitpriv->vo_pending) == _FALSE)); (_rtw_queue_empty(&pxmitpriv->vo_pending) == false));
} }
s32 rtw_txframes_sta_ac_pending(struct adapter *padapter, struct pkt_attrib *pattrib) s32 rtw_txframes_sta_ac_pending(struct adapter *padapter, struct pkt_attrib *pattrib)
@ -1858,7 +1858,7 @@ _func_enter_;
frg_inx++; frg_inx++;
if (bmcst || (rtw_endofpktfile(&pktfile) == _TRUE)) if (bmcst || (rtw_endofpktfile(&pktfile) == true))
{ {
pattrib->nr_frags = frg_inx; pattrib->nr_frags = frg_inx;
@ -1889,7 +1889,7 @@ _func_enter_;
xmitframe_swencrypt(padapter, pxmitframe); xmitframe_swencrypt(padapter, pxmitframe);
if(bmcst == _FALSE) if(bmcst == false)
update_attrib_vcs_info(padapter, pxmitframe); update_attrib_vcs_info(padapter, pxmitframe);
else else
pattrib->vcs_mode = NONE_VCS; pattrib->vcs_mode = NONE_VCS;
@ -1945,7 +1945,7 @@ _func_enter_;
goto xmitframe_coalesce_success; goto xmitframe_coalesce_success;
//IGTK key is not install, it may not support 802.11w //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"); DBG_871X("no instll BIP key\n");
goto xmitframe_coalesce_success; goto xmitframe_coalesce_success;
@ -2264,7 +2264,7 @@ _func_enter_;
_enter_critical(&pfree_queue->lock, &irqL); _enter_critical(&pfree_queue->lock, &irqL);
if(_rtw_queue_empty(pfree_queue) == _TRUE) { if(_rtw_queue_empty(pfree_queue) == true) {
pxmitbuf = NULL; pxmitbuf = NULL;
} else { } else {
@ -2286,7 +2286,7 @@ _func_enter_;
pxmitbuf->priv_data = NULL; pxmitbuf->priv_data = NULL;
//pxmitbuf->ext_tag = _TRUE; //pxmitbuf->ext_tag = true;
if (pxmitbuf->sctx) { if (pxmitbuf->sctx) {
DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__); DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__);
@ -2344,7 +2344,7 @@ _func_enter_;
_enter_critical(&pfree_xmitbuf_queue->lock, &irqL); _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; pxmitbuf = NULL;
} else { } else {
@ -2366,7 +2366,7 @@ _func_enter_;
//DBG_871X("alloc, free_xmitbuf_cnt=%d\n", pxmitpriv->free_xmitbuf_cnt); //DBG_871X("alloc, free_xmitbuf_cnt=%d\n", pxmitpriv->free_xmitbuf_cnt);
pxmitbuf->priv_data = NULL; pxmitbuf->priv_data = NULL;
//pxmitbuf->ext_tag = _FALSE; //pxmitbuf->ext_tag = false;
if (pxmitbuf->sctx) { if (pxmitbuf->sctx) {
DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__); DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__);
rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC); 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); _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)); RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_alloc_xmitframe:%d\n", pxmitpriv->free_xmitframe_cnt));
pxframe = NULL; pxframe = NULL;
} else { } else {
@ -2520,7 +2520,7 @@ _func_enter_;
_enter_critical_bh(&queue->lock, &irqL); _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)); RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_alloc_xmitframe_ext:%d\n", pxmitpriv->free_xframe_ext_cnt));
pxframe = NULL; pxframe = NULL;
} else { } else {
@ -2643,7 +2643,7 @@ _func_enter_;
phead = get_list_head(pframequeue); phead = get_list_head(pframequeue);
plist = get_next(phead); 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); 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_phead = get_list_head(pframe_queue);
xmitframe_plist = get_next(xmitframe_phead); 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); pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list);
@ -2748,7 +2748,7 @@ _func_enter_;
sta_phead = get_list_head(phwxmit->sta_queue); sta_phead = get_list_head(phwxmit->sta_queue);
sta_plist = get_next(sta_phead); 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); 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 sk_buff *skb = *pskb;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
_irqL irqL; _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); void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb);
int res, is_vlan_tag=0, i, do_nat25=1; 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)); RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("### do_queue_select priority=%d ,qsel = %d\n",pattrib->priority ,qsel));
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
// if (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == _TRUE) // if (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == true)
// qsel = 7;// // qsel = 7;//
#endif #endif
@ -3250,7 +3250,7 @@ s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt)
rcu_read_unlock(); rcu_read_unlock();
#endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) #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); res = rtw_br_client_tx(padapter, ppkt);
if (res == -1) if (res == -1)
@ -3290,7 +3290,7 @@ s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt)
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
_enter_critical_bh(&pxmitpriv->lock, &irqL0); _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); _exit_critical_bh(&pxmitpriv->lock, &irqL0);
return 1; return 1;
@ -3298,7 +3298,7 @@ s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt)
_exit_critical_bh(&pxmitpriv->lock, &irqL0); _exit_critical_bh(&pxmitpriv->lock, &irqL0);
#endif #endif
if (rtw_hal_xmit(padapter, pxmitframe) == _FALSE) if (rtw_hal_xmit(padapter, pxmitframe) == false)
return 1; return 1;
return 0; return 0;
@ -3307,7 +3307,7 @@ s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt)
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
sint xmitframe_enqueue_for_tdls_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe) sint xmitframe_enqueue_for_tdls_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
sint ret=_FALSE; sint ret=false;
_irqL irqL; _irqL irqL;
struct sta_info *ptdls_sta=NULL; 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) if(pattrib->triggered==1)
{ {
ret = _TRUE; ret = true;
return ret; return ret;
} }
@ -3367,7 +3367,7 @@ sint xmitframe_enqueue_for_tdls_sleeping_sta(struct adapter *padapter, struct xm
//transmit TDLS PTI via AP //transmit TDLS PTI via AP
rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_SD_PTI); 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) sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
_irqL irqL; _irqL irqL;
sint ret=_FALSE; sint ret=false;
struct sta_info *psta=NULL; struct sta_info *psta=NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct pkt_attrib *pattrib = &pxmitframe->attrib; 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 #endif //CONFIG_TDLS
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _FALSE) if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == false)
return ret; return ret;
if(pattrib->psta) if(pattrib->psta)
@ -3416,13 +3416,13 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr
if(psta==NULL) if(psta==NULL)
{ {
DBG_871X("%s, psta==NUL\n", __func__); DBG_871X("%s, psta==NUL\n", __func__);
return _FALSE; return false;
} }
if(!(psta->state &_FW_LINKED)) if(!(psta->state &_FW_LINKED))
{ {
DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state); DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
return _FALSE; return false;
} }
if(pattrib->triggered==1) 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); //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); //_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"); //DBG_871X("sleepq_len==1, update BCNTIM\n");
//upate BCN for TIM IE //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); // 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); phead = get_list_head(pframequeue);
plist = get_next(phead); 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); 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); ret = xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe);
if(_TRUE == ret) if(true == ret)
{ {
pattrib = &pxmitframe->attrib; pattrib = &pxmitframe->attrib;
@ -3580,7 +3580,7 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc
} }
else 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_phead = get_list_head(&psta->sleep_q);
xmitframe_plist = get_next(xmitframe_phead); 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); 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); _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); 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_phead = get_list_head(&psta_bmc->sleep_q);
xmitframe_plist = get_next(xmitframe_phead); 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); 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; pxmitframe->attrib.triggered = 1;
/* /*
_exit_critical_bh(&psta_bmc->sleep_q.lock, &irqL); _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); rtw_os_xmit_complete(padapter, pxmitframe);
} }
@ -3824,7 +3824,7 @@ _exit:
{ {
//update_BCNTIM(padapter); //update_BCNTIM(padapter);
//printk("%s => call update_beacon\n",__FUNCTION__); //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_phead = get_list_head(&psta->sleep_q);
xmitframe_plist = get_next(xmitframe_phead); 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); 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; pxmitframe->attrib.triggered = 1;
/* /*
if(rtw_hal_xmit(padapter, pxmitframe) == _TRUE) if(rtw_hal_xmit(padapter, pxmitframe) == true)
{ {
rtw_os_xmit_complete(padapter, pxmitframe); 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); //DBG_871X("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap);
//upate BCN for TIM IE //upate BCN for TIM IE
//update_BCNTIM(padapter); //update_BCNTIM(padapter);
update_beacon(padapter, _TIM_IE_, NULL, _FALSE); update_beacon(padapter, _TIM_IE_, NULL, false);
//update_mask = BIT(0); //update_mask = BIT(0);
} }
@ -3961,7 +3961,7 @@ struct xmit_buf* dequeue_pending_xmitbuf(
_enter_critical_bh(&pqueue->lock, &irql); _enter_critical_bh(&pqueue->lock, &irql);
if (_rtw_queue_empty(pqueue) == _FALSE) if (_rtw_queue_empty(pqueue) == false)
{ {
_list *plist, *phead; _list *plist, *phead;
@ -3990,7 +3990,7 @@ struct xmit_buf* dequeue_pending_xmitbuf_under_survey(
_enter_critical_bh(&pqueue->lock, &irql); _enter_critical_bh(&pqueue->lock, &irql);
if (_rtw_queue_empty(pqueue) == _FALSE) if (_rtw_queue_empty(pqueue) == false)
{ {
_list *plist, *phead; _list *plist, *phead;
u8 type; u8 type;
@ -4032,10 +4032,10 @@ sint check_pending_xmitbuf(
pqueue = &pxmitpriv->pending_xmitbuf_queue; pqueue = &pxmitpriv->pending_xmitbuf_queue;
if(_rtw_queue_empty(pqueue) == _FALSE) if(_rtw_queue_empty(pqueue) == false)
return _TRUE; return true;
else else
return _FALSE; return false;
} }
thread_return rtw_xmit_thread(thread_context context) 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_DRV_STOP:
case RTW_SCTX_DONE_DEV_REMOVE: case RTW_SCTX_DONE_DEV_REMOVE:
return _TRUE; return true;
default: 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); 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); c2h_evt_hdl(adapter, NULL, ccx_id_filter);
if (pack_tx_ops->status != RTW_SCTX_SUBMITTED) if (pack_tx_ops->status != RTW_SCTX_SUBMITTED)

2
hal/HalPhyRf_8188e.c
View file

@ -2771,7 +2771,7 @@ void phy_SetRFPathSwitch_8188E(
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
if(!pAdapter->bHWInitReady) if(!pAdapter->bHWInitReady)
#elif (DM_ODM_SUPPORT_TYPE == ODM_CE) #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
if(pAdapter->hw_init_completed == _FALSE) if(pAdapter->hw_init_completed == false)
#endif #endif
{ {
u1Byte u1bTmp; u1Byte u1bTmp;

12
hal/HalPwrSeqCmd.c
View file

@ -52,7 +52,7 @@ u8 HalPwrSeqCmdParsing(
WLAN_PWR_CFG PwrSeqCmd[]) WLAN_PWR_CFG PwrSeqCmd[])
{ {
WLAN_PWR_CFG PwrCfgCmd = {0}; WLAN_PWR_CFG PwrCfgCmd = {0};
u8 bPollingBit = _FALSE; u8 bPollingBit = false;
u32 AryIdx = 0; u32 AryIdx = 0;
u8 value = 0; u8 value = 0;
u32 offset = 0; u32 offset = 0;
@ -100,20 +100,20 @@ u8 HalPwrSeqCmdParsing(
case PWR_CMD_POLLING: case PWR_CMD_POLLING:
RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_POLLING\n")); RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_POLLING\n"));
bPollingBit = _FALSE; bPollingBit = false;
offset = GET_PWR_CFG_OFFSET(PwrCfgCmd); offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);
do { do {
value = rtw_read8(padapter, offset); value = rtw_read8(padapter, offset);
value &= GET_PWR_CFG_MASK(PwrCfgCmd); value &= GET_PWR_CFG_MASK(PwrCfgCmd);
if (value == (GET_PWR_CFG_VALUE(PwrCfgCmd) & GET_PWR_CFG_MASK(PwrCfgCmd))) if (value == (GET_PWR_CFG_VALUE(PwrCfgCmd) & GET_PWR_CFG_MASK(PwrCfgCmd)))
bPollingBit = _TRUE; bPollingBit = true;
else else
rtw_udelay_os(10); rtw_udelay_os(10);
if (pollingCount++ > maxPollingCnt) { if (pollingCount++ > maxPollingCnt) {
DBG_871X("Fail to polling Offset[%#x]\n", offset); DBG_871X("Fail to polling Offset[%#x]\n", offset);
return _FALSE; return false;
} }
} while (!bPollingBit); } while (!bPollingBit);
@ -130,7 +130,7 @@ u8 HalPwrSeqCmdParsing(
case PWR_CMD_END: case PWR_CMD_END:
// When this command is parsed, end the process // When this command is parsed, end the process
RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_END\n")); RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_END\n"));
return _TRUE; return true;
break; break;
default: default:
@ -142,5 +142,5 @@ u8 HalPwrSeqCmdParsing(
AryIdx++;//Add Array Index AryIdx++;//Add Array Index
}while(1); }while(1);
return _TRUE; return true;
} }

14
hal/hal_com.c
View file

@ -84,16 +84,16 @@ hal_com_get_channel_plan(
u8 swConfig; u8 swConfig;
u8 chnlPlan; u8 chnlPlan;
swConfig = _TRUE; swConfig = true;
if (!AutoLoadFail) if (!AutoLoadFail)
{ {
if (!rtw_is_channel_plan_valid(sw_channel_plan)) if (!rtw_is_channel_plan_valid(sw_channel_plan))
swConfig = _FALSE; swConfig = false;
if (hw_channel_plan & EEPROM_CHANNEL_PLAN_BY_HW_MASK) if (hw_channel_plan & EEPROM_CHANNEL_PLAN_BY_HW_MASK)
swConfig = _FALSE; swConfig = false;
} }
if (swConfig == _TRUE) if (swConfig == true)
chnlPlan = sw_channel_plan; chnlPlan = sw_channel_plan;
else else
chnlPlan = hw_channel_plan & (~EEPROM_CHANNEL_PLAN_BY_HW_MASK); chnlPlan = hw_channel_plan & (~EEPROM_CHANNEL_PLAN_BY_HW_MASK);
@ -289,9 +289,9 @@ Hal_MappingOutPipe(
{ {
struct registry_priv *pregistrypriv = &pAdapter->registrypriv; 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) switch(NumOutPipe)
{ {
@ -305,7 +305,7 @@ Hal_MappingOutPipe(
_OneOutPipeMapping(pAdapter); _OneOutPipeMapping(pAdapter);
break; break;
default: default:
result = _FALSE; result = false;
break; break;
} }

36
hal/hal_intf.c
View file

@ -101,28 +101,28 @@ uint rtw_hal_init(struct adapter *padapter)
int i; int i;
#ifdef CONFIG_DUALMAC_CONCURRENT #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; return status;
} }
// before init mac0, driver must init mac1 first to avoid usb rx error. // 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)) && (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 else
{ {
status = padapter->HalFunc.hal_init(padapter->pbuddy_adapter); status = padapter->HalFunc.hal_init(padapter->pbuddy_adapter);
if(status == _SUCCESS){ if(status == _SUCCESS){
padapter->pbuddy_adapter->hw_init_completed = _TRUE; padapter->pbuddy_adapter->hw_init_completed = true;
} }
else{ 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")); 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"); DBG_871X("rtw_hal_init: hal__init fail(pbuddy_adapter)\n");
return status; return status;
@ -136,7 +136,7 @@ uint rtw_hal_init(struct adapter *padapter)
if(status == _SUCCESS){ if(status == _SUCCESS){
for (i = 0; i<dvobj->iface_nums; i++) { for (i = 0; i<dvobj->iface_nums; i++) {
padapter = dvobj->padapters[i]; padapter = dvobj->padapters[i];
padapter->hw_init_completed = _TRUE; padapter->hw_init_completed = true;
} }
if (padapter->registrypriv.notch_filter == 1) if (padapter->registrypriv.notch_filter == 1)
@ -150,7 +150,7 @@ uint rtw_hal_init(struct adapter *padapter)
else{ else{
for (i = 0; i<dvobj->iface_nums; i++) { for (i = 0; i<dvobj->iface_nums; i++) {
padapter = dvobj->padapters[i]; padapter = dvobj->padapters[i];
padapter->hw_init_completed = _FALSE; padapter->hw_init_completed = false;
} }
DBG_871X("rtw_hal_init: hal__init fail\n"); DBG_871X("rtw_hal_init: hal__init fail\n");
} }
@ -178,7 +178,7 @@ _func_enter_;
if(status == _SUCCESS){ if(status == _SUCCESS){
for (i = 0; i<dvobj->iface_nums; i++) { for (i = 0; i<dvobj->iface_nums; i++) {
padapter = dvobj->padapters[i]; padapter = dvobj->padapters[i];
padapter->hw_init_completed = _FALSE; padapter->hw_init_completed = false;
} }
} }
else else
@ -287,7 +287,7 @@ s32 rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmit
if(padapter->HalFunc.hal_xmitframe_enqueue) if(padapter->HalFunc.hal_xmitframe_enqueue)
return padapter->HalFunc.hal_xmitframe_enqueue(padapter, pxmitframe); return padapter->HalFunc.hal_xmitframe_enqueue(padapter, pxmitframe);
return _FALSE; return false;
} }
s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe) 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) if(padapter->HalFunc.hal_xmit)
return padapter->HalFunc.hal_xmit(padapter, pxmitframe); return padapter->HalFunc.hal_xmit(padapter, pxmitframe);
return _FALSE; return false;
} }
s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe) 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); _rtw_memcpy(pmgntframe->attrib.ra, pwlanhdr->addr1, ETH_ALEN);
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
if(padapter->securitypriv.binstallBIPkey == _TRUE) if(padapter->securitypriv.binstallBIPkey == true)
{ {
if(IS_MCAST(pmgntframe->attrib.ra)) if(IS_MCAST(pmgntframe->attrib.ra))
{ {
pmgntframe->attrib.encrypt = _BIP_; pmgntframe->attrib.encrypt = _BIP_;
//pmgntframe->attrib.bswenc = _TRUE; //pmgntframe->attrib.bswenc = true;
} }
else else
{ {
pmgntframe->attrib.encrypt = _AES_; pmgntframe->attrib.encrypt = _AES_;
pmgntframe->attrib.bswenc = _TRUE; pmgntframe->attrib.bswenc = true;
} }
rtw_mgmt_xmitframe_coalesce(padapter, pmgntframe->pkt, pmgntframe); 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); 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); add_RATid(padapter, psta, rssi_level);
} }
@ -464,7 +464,7 @@ u8 rtw_hal_antdiv_before_linked(struct adapter *padapter)
{ {
if(padapter->HalFunc.AntDivBeforeLinkHandler) if(padapter->HalFunc.AntDivBeforeLinkHandler)
return padapter->HalFunc.AntDivBeforeLinkHandler(padapter); 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) 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 rtw_hal_sreset_inprogress(struct adapter *padapter)
{ {
bool inprogress = _FALSE; bool inprogress = false;
padapter = GET_PRIMARY_ADAPTER(padapter); padapter = GET_PRIMARY_ADAPTER(padapter);

66
hal/odm.c
View file

@ -1907,8 +1907,8 @@ odm_DIGInit(
//pDM_DigTable->CurMultiSTAConnectState = DIG_MultiSTA_DISCONNECT; //pDM_DigTable->CurMultiSTAConnectState = DIG_MultiSTA_DISCONNECT;
pDM_DigTable->RssiLowThresh = DM_DIG_THRESH_LOW; pDM_DigTable->RssiLowThresh = DM_DIG_THRESH_LOW;
pDM_DigTable->RssiHighThresh = DM_DIG_THRESH_HIGH; pDM_DigTable->RssiHighThresh = DM_DIG_THRESH_HIGH;
pDM_DigTable->FALowThresh = DM_FALSEALARM_THRESH_LOW; pDM_DigTable->FALowThresh = DMfalseALARM_THRESH_LOW;
pDM_DigTable->FAHighThresh = DM_FALSEALARM_THRESH_HIGH; pDM_DigTable->FAHighThresh = DMfalseALARM_THRESH_HIGH;
if(pDM_Odm->BoardType & (ODM_BOARD_EXT_PA|ODM_BOARD_EXT_LNA)) if(pDM_Odm->BoardType & (ODM_BOARD_EXT_PA|ODM_BOARD_EXT_LNA))
{ {
pDM_DigTable->rx_gain_range_max = DM_DIG_MAX_NIC; pDM_DigTable->rx_gain_range_max = DM_DIG_MAX_NIC;
@ -2627,8 +2627,8 @@ odm_DIGInit(
//pDM_DigTable->CurMultiSTAConnectState = DIG_MultiSTA_DISCONNECT; //pDM_DigTable->CurMultiSTAConnectState = DIG_MultiSTA_DISCONNECT;
pDM_DigTable->RssiLowThresh = DM_DIG_THRESH_LOW; pDM_DigTable->RssiLowThresh = DM_DIG_THRESH_LOW;
pDM_DigTable->RssiHighThresh = DM_DIG_THRESH_HIGH; pDM_DigTable->RssiHighThresh = DM_DIG_THRESH_HIGH;
pDM_DigTable->FALowThresh = DM_FALSEALARM_THRESH_LOW; pDM_DigTable->FALowThresh = DMfalseALARM_THRESH_LOW;
pDM_DigTable->FAHighThresh = DM_FALSEALARM_THRESH_HIGH; pDM_DigTable->FAHighThresh = DMfalseALARM_THRESH_HIGH;
if(pDM_Odm->BoardType & (ODM_BOARD_EXT_LNA | ODM_BOARD_EXT_PA)) if(pDM_Odm->BoardType & (ODM_BOARD_EXT_LNA | ODM_BOARD_EXT_PA))
{ {
pDM_DigTable->rx_gain_range_max = DM_DIG_MAX_NIC; pDM_DigTable->rx_gain_range_max = DM_DIG_MAX_NIC;
@ -3601,9 +3601,9 @@ odm_RateAdaptiveMaskInit(
#elif (DM_ODM_SUPPORT_TYPE == ODM_CE) #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
pOdmRA->Type = DM_Type_ByDriver; pOdmRA->Type = DM_Type_ByDriver;
if (pOdmRA->Type == DM_Type_ByDriver) if (pOdmRA->Type == DM_Type_ByDriver)
pDM_Odm->bUseRAMask = _TRUE; pDM_Odm->bUseRAMask = true;
else else
pDM_Odm->bUseRAMask = _FALSE; pDM_Odm->bUseRAMask = false;
#endif #endif
@ -4038,12 +4038,12 @@ odm_DynamicTxPowerInit(
struct adapter *Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
pdmpriv->bDynamicTxPowerEnable = _FALSE; pdmpriv->bDynamicTxPowerEnable = false;
#if (RTL8192C_SUPPORT==1) #if (RTL8192C_SUPPORT==1)
#ifdef CONFIG_INTEL_PROXIM #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 #else
if(pHalData->BoardType == BOARD_USB_High_PA) if(pHalData->BoardType == BOARD_USB_High_PA)
#endif #endif
@ -4051,7 +4051,7 @@ odm_DynamicTxPowerInit(
{ {
//odm_SavePowerIndex(Adapter); //odm_SavePowerIndex(Adapter);
odm_DynamicTxPowerSavePowerIndex(pDM_Odm); odm_DynamicTxPowerSavePowerIndex(pDM_Odm);
pdmpriv->bDynamicTxPowerEnable = _TRUE; pdmpriv->bDynamicTxPowerEnable = true;
} }
else else
#endif #endif
@ -4369,7 +4369,7 @@ odm_DynamicTxPower_92C(
return; return;
#ifdef CONFIG_INTEL_PROXIM #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; struct proximity_priv *prox_priv=Adapter->proximity.proximity_priv;
// Intel set fixed tx power // 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); 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 #endif
{ {
// STA not connected and AP not connected // STA not connected and AP not connected
if((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) && if((check_fwstate(pmlmepriv, _FW_LINKED) != true) &&
(pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) (pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0))
{ {
//ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any \n")); //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any \n"));
@ -4423,7 +4423,7 @@ odm_DynamicTxPower_92C(
return; return;
} }
if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) // Default port if(check_fwstate(pmlmepriv, _FW_LINKED) == true) // Default port
{ {
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
} }
@ -4645,7 +4645,7 @@ odm_DynamicTxPower_92D(
#endif #endif
// If dynamic high power is disabled. // If dynamic high power is disabled.
if( (pdmpriv->bDynamicTxPowerEnable != _TRUE) || if( (pdmpriv->bDynamicTxPowerEnable != true) ||
(!(podmpriv->SupportAbility& ODM_BB_DYNAMIC_TXPWR)) ) (!(podmpriv->SupportAbility& ODM_BB_DYNAMIC_TXPWR)) )
{ {
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal; pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
@ -4653,7 +4653,7 @@ odm_DynamicTxPower_92D(
} }
// STA not connected and AP not connected // STA not connected and AP not connected
if((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) && if((check_fwstate(pmlmepriv, _FW_LINKED) != true) &&
(pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) (pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0))
{ {
//ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any \n")); //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any \n"));
@ -4665,7 +4665,7 @@ odm_DynamicTxPower_92D(
return; return;
} }
if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) // Default port if(check_fwstate(pmlmepriv, _FW_LINKED) == true) // Default port
{ {
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
} }
@ -4723,7 +4723,7 @@ odm_DynamicTxPower_92D(
pHalData->DynamicTxHighPowerLvl = Adapter->DualMacDMSPControl.CurTxHighLvlForAnotherMacOfDMSP; pHalData->DynamicTxHighPowerLvl = Adapter->DualMacDMSPControl.CurTxHighLvlForAnotherMacOfDMSP;
PHY_SetTxPowerLevel8192D(Adapter, pHalData->CurrentChannel); PHY_SetTxPowerLevel8192D(Adapter, pHalData->CurrentChannel);
pHalData->DynamicTxHighPowerLvl = HighPowerLvlBackForMac0; pHalData->DynamicTxHighPowerLvl = HighPowerLvlBackForMac0;
Adapter->DualMacDMSPControl.bChangeTxHighPowerLvlForAnotherMacOfDMSP = _FALSE; Adapter->DualMacDMSPControl.bChangeTxHighPowerLvlForAnotherMacOfDMSP = false;
} }
} }
#endif #endif
@ -4748,7 +4748,7 @@ odm_DynamicTxPower_92D(
if(Adapter->bSlaveOfDMSP) if(Adapter->bSlaveOfDMSP)
{ {
//ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() bslave case \n")); //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; BuddyAdapter->DualMacDMSPControl.CurTxHighLvlForAnotherMacOfDMSP = pHalData->DynamicTxHighPowerLvl;
} }
else else
@ -4939,7 +4939,7 @@ IN struct adapter *pAdapter
//1 1.Determine the minimum RSSI //1 1.Determine the minimum RSSI
if((pDM_Odm->bLinked != _TRUE) && if((pDM_Odm->bLinked != true) &&
(pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) (pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0))
pdmpriv->MinUndecoratedPWDBForDM = 0; pdmpriv->MinUndecoratedPWDBForDM = 0;
else else
@ -4961,10 +4961,10 @@ odm_RSSIMonitorCheckCE(
u8 sta_cnt=0; u8 sta_cnt=0;
u32 PWDB_rssi[NUM_STA]={0};//[0~15]:MACID, [16~31]:PWDB_rssi u32 PWDB_rssi[NUM_STA]={0};//[0~15]:MACID, [16~31]:PWDB_rssi
if(pDM_Odm->bLinked != _TRUE) if(pDM_Odm->bLinked != true)
return; 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 #if 1
struct sta_info *psta; struct sta_info *psta;
@ -5005,7 +5005,7 @@ odm_RSSIMonitorCheckCE(
phead = &(pstapriv->sta_hash[i]); phead = &(pstapriv->sta_hash[i]);
plist = get_next(phead); 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); psta = LIST_CONTAINOR(plist, struct sta_info, hash_list);
@ -5046,7 +5046,7 @@ odm_RSSIMonitorCheckCE(
for(i=0; i< sta_cnt; i++) for(i=0; i< sta_cnt; i++)
{ {
if(PWDB_rssi[i] != (0)){ 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) #if(RTL8192D_SUPPORT==1)
FillH2CCmd92D(Adapter, H2C_RSSI_REPORT, 3, (u8 *)(&PWDB_rssi[i])); 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)); ODM_RT_TRACE(pDM_Odm,COMP_POWER_TRACKING, DBG_LOUD, ("pMgntInfo->bTXPowerTracking = %d\n", pMgntInfo->bTXPowerTracking));
#elif (DM_ODM_SUPPORT_TYPE == ODM_CE) #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.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 (MP_DRIVER != 1) //for mp driver, turn off txpwrtracking as default
if ( *(pDM_Odm->mp_mode) != 1) if ( *(pDM_Odm->mp_mode) != 1)
pDM_Odm->RFCalibrateInfo.TxPowerTrackControl = _TRUE; pDM_Odm->RFCalibrateInfo.TxPowerTrackControl = true;
//#endif//#if (MP_DRIVER != 1) //#endif//#if (MP_DRIVER != 1)
MSG_8192C("pDM_Odm TxPowerTrackControl = %d\n", pDM_Odm->RFCalibrateInfo.TxPowerTrackControl); MSG_8192C("pDM_Odm TxPowerTrackControl = %d\n", pDM_Odm->RFCalibrateInfo.TxPowerTrackControl);
} }
#elif (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) #elif (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
#ifdef RTL8188E_SUPPORT #ifdef RTL8188E_SUPPORT
{ {
pDM_Odm->RFCalibrateInfo.bTXPowerTracking = _TRUE; pDM_Odm->RFCalibrateInfo.bTXPowerTracking = true;
pDM_Odm->RFCalibrateInfo.TXPowercount = 0; pDM_Odm->RFCalibrateInfo.TXPowercount = 0;
pDM_Odm->RFCalibrateInfo.bTXPowerTrackingInit = _FALSE; pDM_Odm->RFCalibrateInfo.bTXPowerTrackingInit = false;
pDM_Odm->RFCalibrateInfo.TxPowerTrackControl = _TRUE; pDM_Odm->RFCalibrateInfo.TxPowerTrackControl = true;
} }
#endif #endif
#endif #endif
@ -6229,7 +6229,7 @@ void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext)
{ {
PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext; PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext;
struct adapter *padapter = pDM_Odm->Adapter; struct adapter *padapter = pDM_Odm->Adapter;
if(padapter->net_closed == _TRUE) if(padapter->net_closed == true)
return; return;
odm_SwAntDivChkAntSwitch(pDM_Odm, SWAW_STEP_DETERMINE); odm_SwAntDivChkAntSwitch(pDM_Odm, SWAW_STEP_DETERMINE);
} }
@ -7145,7 +7145,7 @@ odm_EdcaTurboCheckCE(
u32 edca_param; u32 edca_param;
u64 cur_tx_bytes = 0; u64 cur_tx_bytes = 0;
u64 cur_rx_bytes = 0; u64 cur_rx_bytes = 0;
u8 bbtchange = _FALSE; u8 bbtchange = false;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct xmit_priv *pxmitpriv = &(Adapter->xmitpriv); struct xmit_priv *pxmitpriv = &(Adapter->xmitpriv);
struct recv_priv *precvpriv = &(Adapter->recvpriv); 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.prv_traffic_idx = trafficIndex;
} }
pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = _TRUE; pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = true;
} else { } else {
// //
// Turn Off EDCA turbo here. // Turn Off EDCA turbo here.
@ -7229,13 +7229,13 @@ odm_EdcaTurboCheckCE(
if(pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA) if(pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA)
{ {
rtw_write32(Adapter, REG_EDCA_BE_PARAM, pHalData->AcParam_BE); 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: dm_CheckEdcaTurbo_EXIT:
// Set variables for next time. // Set variables for next time.
precvpriv->bIsAnyNonBEPkts = _FALSE; precvpriv->bIsAnyNonBEPkts = false;
pxmitpriv->last_tx_bytes = pxmitpriv->tx_bytes; pxmitpriv->last_tx_bytes = pxmitpriv->tx_bytes;
precvpriv->last_rx_bytes = precvpriv->rx_bytes; precvpriv->last_rx_bytes = precvpriv->rx_bytes;
#endif #endif

6
hal/odm.h
View file

@ -211,7 +211,7 @@ typedef struct _Dynamic_Power_Saving_
}PS_T,*pPS_T; }PS_T,*pPS_T;
typedef struct _FALSE_ALARM_STATISTICS{ typedef struct false_ALARM_STATISTICS{
u4Byte Cnt_Parity_Fail; u4Byte Cnt_Parity_Fail;
u4Byte Cnt_Rate_Illegal; u4Byte Cnt_Rate_Illegal;
u4Byte Cnt_Crc8_fail; u4Byte Cnt_Crc8_fail;
@ -1477,8 +1477,8 @@ typedef enum tag_DIG_Connect_Definition
#define DM_DIG_THRESH_HIGH 40 #define DM_DIG_THRESH_HIGH 40
#define DM_DIG_THRESH_LOW 35 #define DM_DIG_THRESH_LOW 35
#define DM_FALSEALARM_THRESH_LOW 400 #define DMfalseALARM_THRESH_LOW 400
#define DM_FALSEALARM_THRESH_HIGH 1000 #define DMfalseALARM_THRESH_HIGH 1000
#define DM_DIG_MAX_NIC 0x4A #define DM_DIG_MAX_NIC 0x4A
#define DM_DIG_MIN_NIC 0x1e //0x22//0x1c #define DM_DIG_MIN_NIC 0x1e //0x22//0x1c

4
hal/odm_RTL8188E.c
View file

@ -631,7 +631,7 @@ odm_FastAntTrainingCallback(
#if (DM_ODM_SUPPORT_TYPE == ODM_CE) #if (DM_ODM_SUPPORT_TYPE == ODM_CE)
struct adapter *padapter = pDM_Odm->Adapter; struct adapter *padapter = pDM_Odm->Adapter;
if(padapter->net_closed == _TRUE) if(padapter->net_closed == true)
return; return;
//if(*pDM_Odm->pbNet_closed == TRUE) //if(*pDM_Odm->pbNet_closed == TRUE)
// return; // return;
@ -768,7 +768,7 @@ void odm_FastAntTrainingCallback(void *FunctionContext)
{ {
PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext; PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext;
struct adapter *padapter = pDM_Odm->Adapter; struct adapter *padapter = pDM_Odm->Adapter;
if(padapter->net_closed == _TRUE) if(padapter->net_closed == true)
return; return;
odm_FastAntTraining(pDM_Odm); odm_FastAntTraining(pDM_Odm);
} }

12
hal/odm_types.h
View file

@ -140,8 +140,8 @@ typedef enum _RT_SPINLOCK_TYPE{
#define DEV_BUS_TYPE RT_PCI_INTERFACE #define DEV_BUS_TYPE RT_PCI_INTERFACE
#define _TRUE 1 #define true 1
#define _FALSE 0 #define false 0
#elif (DM_ODM_SUPPORT_TYPE == ODM_ADSL) #elif (DM_ODM_SUPPORT_TYPE == ODM_ADSL)
@ -167,8 +167,8 @@ typedef enum _RT_SPINLOCK_TYPE{
#define DEV_BUS_TYPE RT_PCI_INTERFACE #define DEV_BUS_TYPE RT_PCI_INTERFACE
#define _TRUE 1 #define true 1
#define _FALSE 0 #define false 0
#elif (DM_ODM_SUPPORT_TYPE == ODM_CE) #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
#include <basic_types.h> #include <basic_types.h>
@ -212,8 +212,8 @@ typedef enum _RT_SPINLOCK_TYPE{
#define TRUE _TRUE #define TRUE true
#define FALSE _FALSE #define FALSE false
#define SET_TX_DESC_ANTSEL_A_88E(__pTxDesc, __Value) SET_BITS_TO_LE_4BYTE(__pTxDesc+8, 24, 1, __Value) #define SET_TX_DESC_ANTSEL_A_88E(__pTxDesc, __Value) SET_BITS_TO_LE_4BYTE(__pTxDesc+8, 24, 1, __Value)

64
hal/rtl8188e_cmd.c
View file

@ -41,7 +41,7 @@
static u8 _is_fw_read_cmd_down(struct adapter* padapter, u8 msgbox_num) 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; int retry_cnts = 100;
u8 valid; u8 valid;
@ -51,7 +51,7 @@ static u8 _is_fw_read_cmd_down(struct adapter* padapter, u8 msgbox_num)
do{ do{
valid = rtw_read8(padapter,REG_HMETFR) & BIT(msgbox_num); valid = rtw_read8(padapter,REG_HMETFR) & BIT(msgbox_num);
if(0 == valid ){ if(0 == valid ){
read_down = _TRUE; read_down = true;
} }
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
rtw_msleep_os(2); 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) 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; s32 retry_cnts = 100;
u8 h2c_box_num; u8 h2c_box_num;
u32 msgbox_addr; u32 msgbox_addr;
@ -91,7 +91,7 @@ _func_enter_;
padapter = GET_PRIMARY_ADAPTER(padapter); padapter = GET_PRIMARY_ADAPTER(padapter);
pHalData = GET_HAL_DATA(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"); DBG_8192C("FillH2CCmd_88E(): return H2C cmd because fw is not ready\n");
return ret; return ret;
@ -105,7 +105,7 @@ _func_enter_;
if (CmdLen > RTL88E_MAX_CMD_LEN) { if (CmdLen > RTL88E_MAX_CMD_LEN) {
goto exit; goto exit;
} }
if (padapter->bSurpriseRemoved == _TRUE) if (padapter->bSurpriseRemoved == true)
goto exit; goto exit;
//pay attention to if race condition happened in H2C cmd setting. //pay attention to if race condition happened in H2C cmd setting.
@ -150,7 +150,7 @@ _func_enter_;
rtw_write32(padapter,msgbox_addr, h2c_cmd); rtw_write32(padapter,msgbox_addr, h2c_cmd);
#endif #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" // 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); // ,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; struct H2C_SS_RFOFF_PARAM param;
DBG_8192C("==>%s bfwpoll(%x)\n",__FUNCTION__,bfwpoll); DBG_8192C("==>%s bfwpoll(%x)\n",__FUNCTION__,bfwpoll);
param.gpio_period = period;//Polling GPIO_11 period time 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*)(&param)); FillH2CCmd_88E(padapter, SELECTIVE_SUSPEND_ROF_CMD, sizeof(param), (u8*)(&param));
return res; return res;
} }
@ -208,7 +208,7 @@ u8 rtl8188e_set_rssi_cmd(struct adapter*padapter, u8 *param)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
_func_enter_; _func_enter_;
if(pHalData->fw_ractrl == _TRUE){ if(pHalData->fw_ractrl == true){
}else{ }else{
DBG_8192C("==>%s fw dont support RA \n",__FUNCTION__); DBG_8192C("==>%s fw dont support RA \n",__FUNCTION__);
res=_FAIL; res=_FAIL;
@ -225,7 +225,7 @@ u8 rtl8188e_set_raid_cmd(struct adapter*padapter, u32 mask)
u8 res=_SUCCESS; u8 res=_SUCCESS;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
_func_enter_; _func_enter_;
if(pHalData->fw_ractrl == _TRUE){ if(pHalData->fw_ractrl == true){
_rtw_memset(buf, 0, 3); _rtw_memset(buf, 0, 3);
mask = cpu_to_le32( mask ); mask = cpu_to_le32( mask );
_rtw_memcpy(buf, &mask, 3); _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); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
//struct dm_priv *pdmpriv = &pHalData->dmpriv; //struct dm_priv *pdmpriv = &pHalData->dmpriv;
u8 macid, init_rate, raid, shortGIrate=_FALSE; u8 macid, init_rate, raid, shortGIrate=false;
macid = arg&0x1f; 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; 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); init_rate |= BIT(6);
@ -569,7 +569,7 @@ void ConstructNullFunctionData(
SetSeqNum(pwlanhdr, 0); SetSeqNum(pwlanhdr, 0);
if (bQoS == _TRUE) { if (bQoS == true) {
struct rtw_ieee80211_hdr_3addr_qos *pwlanqoshdr; struct rtw_ieee80211_hdr_3addr_qos *pwlanqoshdr;
SetFrameSubType(pframe, WIFI_QOS_DATA_NULL); SetFrameSubType(pframe, WIFI_QOS_DATA_NULL);
@ -760,7 +760,7 @@ static void ConstructARPResponse(
psta = rtw_get_stainfo(&padapter->stapriv, get_my_bssid(&(pmlmeinfo->network))); psta = rtw_get_stainfo(&padapter->stapriv, get_my_bssid(&(pmlmeinfo->network)));
if (psta != NULL) { 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__); DBG_871X("%s(): STA dot11tkiptxmickey==0\n",__FUNCTION__);
} }
//start to calculate the mic code //start to calculate the mic code
@ -895,7 +895,7 @@ static void SetFwRsvdPagePkt(struct adapter *padapter, BOOLEAN bDLFinished)
//3 (2) ps-poll *1 page //3 (2) ps-poll *1 page
RsvdPageLoc.LocPsPoll = PageNum; RsvdPageLoc.LocPsPoll = PageNum;
ConstructPSPoll(padapter, &ReservedPagePacket[BufIndex], &PSPollLength); 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); PageNeed = (u8)PageNum_128(TxDescLen + PSPollLength);
PageNum += PageNeed; PageNum += PageNeed;
@ -909,8 +909,8 @@ static void SetFwRsvdPagePkt(struct adapter *padapter, BOOLEAN bDLFinished)
&ReservedPagePacket[BufIndex], &ReservedPagePacket[BufIndex],
&NullDataLength, &NullDataLength,
get_my_bssid(&pmlmeinfo->network), get_my_bssid(&pmlmeinfo->network),
_FALSE, 0, 0, _FALSE); false, 0, 0, false);
rtl8188e_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], NullDataLength, _FALSE, _FALSE); rtl8188e_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], NullDataLength, false, false);
PageNeed = (u8)PageNum_128(TxDescLen + NullDataLength); PageNeed = (u8)PageNum_128(TxDescLen + NullDataLength);
PageNum += PageNeed; PageNum += PageNeed;
@ -924,8 +924,8 @@ static void SetFwRsvdPagePkt(struct adapter *padapter, BOOLEAN bDLFinished)
&ReservedPagePacket[BufIndex], &ReservedPagePacket[BufIndex],
&QosNullLength, &QosNullLength,
get_my_bssid(&pmlmeinfo->network), get_my_bssid(&pmlmeinfo->network),
_TRUE, 0, 0, _FALSE); true, 0, 0, false);
rtl8188e_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], QosNullLength, _FALSE, _FALSE); rtl8188e_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], QosNullLength, false, false);
PageNeed = (u8)PageNum_128(TxDescLen + QosNullLength); PageNeed = (u8)PageNum_128(TxDescLen + QosNullLength);
PageNum += PageNeed; PageNum += PageNeed;
@ -942,7 +942,7 @@ static void SetFwRsvdPagePkt(struct adapter *padapter, BOOLEAN bDLFinished)
&ARPLegnth, &ARPLegnth,
currentip 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) switch (psecuritypriv->dot11PrivacyAlgrthm)
{ {
@ -1013,8 +1013,8 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
#endif #endif
BOOLEAN bSendBeacon=_FALSE; BOOLEAN bSendBeacon=false;
BOOLEAN bcn_valid = _FALSE; BOOLEAN bcn_valid = false;
u8 DLBcnCount=0; u8 DLBcnCount=0;
u32 poll = 0; u32 poll = 0;
@ -1048,7 +1048,7 @@ _func_enter_;
if(pHalData->RegFwHwTxQCtrl&BIT6) if(pHalData->RegFwHwTxQCtrl&BIT6)
{ {
DBG_871X("HalDownloadRSVDPage(): There is an Adapter is sending beacon.\n"); 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. // 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 do
{ {
// download rsvd page. // download rsvd page.
SetFwRsvdPagePkt(padapter, _FALSE); SetFwRsvdPagePkt(padapter, false);
DLBcnCount++; DLBcnCount++;
do do
{ {
@ -1099,7 +1099,7 @@ _func_enter_;
poll = 0; poll = 0;
do do
{ {
SetFwRsvdPagePkt(padapter, _TRUE); SetFwRsvdPagePkt(padapter, true);
DLBcnCount++; DLBcnCount++;
do do
@ -1310,7 +1310,7 @@ int reset_tsf(struct adapter *Adapter, u8 reset_port )
reset_cnt_after = rtw_read8(Adapter, reg_reset_tsf_cnt); 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){ if(enable){
pwowlan_parm.mode |=FW_WOWLAN_FUN_EN; pwowlan_parm.mode |=FW_WOWLAN_FUN_EN;
pwrpriv->wowlan_magic =_TRUE; pwrpriv->wowlan_magic =true;
if (psecpriv->dot11PrivacyAlgrthm == _WEP40_ || psecpriv->dot11PrivacyAlgrthm == _WEP104_) 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; pwowlan_parm.mode |= FW_WOWLAN_PATTERN_MATCH;
DBG_871X_LEVEL(_drv_info_, "%s 2.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode ); 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; pwowlan_parm.mode |=FW_WOWLAN_MAGIC_PKT;
DBG_871X_LEVEL(_drv_info_, "%s 3.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode ); 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; pwowlan_parm.mode |=FW_WOWLAN_UNICAST;
DBG_871X_LEVEL(_drv_info_, "%s 4.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode ); 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); res = FillH2CCmd_88E(padapter, H2C_COM_REMOTE_WAKE_CTRL, 3, (u8 *)&pwowlan_parm);
} else { } else {
pwrpriv->wowlan_magic =_FALSE; pwrpriv->wowlan_magic =false;
#ifdef CONFIG_GPIO_WAKEUP #ifdef CONFIG_GPIO_WAKEUP
rtl8188es_set_output_gpio(padapter, gpio_wake_pin, !gpio_high_active); rtl8188es_set_output_gpio(padapter, gpio_wake_pin, !gpio_high_active);
#endif //CONFIG_GPIO_WAKEUP #endif //CONFIG_GPIO_WAKEUP

44
hal/rtl8188e_dm.c
View file

@ -58,7 +58,7 @@ dm_CheckStatistics(
static void dm_CheckPbcGPIO(struct adapter *padapter) static void dm_CheckPbcGPIO(struct adapter *padapter)
{ {
u8 tmp1byte; u8 tmp1byte;
u8 bPbcPressed = _FALSE; u8 bPbcPressed = false;
if(!padapter->registrypriv.hw_wps_pbc) if(!padapter->registrypriv.hw_wps_pbc)
return; return;
@ -81,9 +81,9 @@ static void dm_CheckPbcGPIO(struct adapter *padapter)
if (tmp1byte&HAL_8188E_HW_GPIO_WPS_BIT) 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 // Here we only set bPbcPressed to true
// After trigger PBC, the variable will be set to false // After trigger PBC, the variable will be set to false
@ -310,9 +310,9 @@ rtl8188e_HalDmWatchDog(
IN struct adapter *Adapter IN struct adapter *Adapter
) )
{ {
BOOLEAN bFwCurrentInPSMode = _FALSE; BOOLEAN bFwCurrentInPSMode = false;
BOOLEAN bFwPSAwake = _TRUE; BOOLEAN bFwPSAwake = true;
u8 hw_init_completed = _FALSE; u8 hw_init_completed = false;
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
@ -324,7 +324,7 @@ rtl8188e_HalDmWatchDog(
hw_init_completed = Adapter->hw_init_completed; hw_init_completed = Adapter->hw_init_completed;
if (hw_init_completed == _FALSE) if (hw_init_completed == false)
goto skip_dm; goto skip_dm;
#ifdef CONFIG_LPS #ifdef CONFIG_LPS
@ -336,10 +336,10 @@ rtl8188e_HalDmWatchDog(
// Fw is under p2p powersaving mode, driver should stop dynamic mechanism. // Fw is under p2p powersaving mode, driver should stop dynamic mechanism.
// modifed by thomas. 2011.06.11. // modifed by thomas. 2011.06.11.
if(Adapter->wdinfo.p2p_ps_mode) if(Adapter->wdinfo.p2p_ps_mode)
bFwPSAwake = _FALSE; bFwPSAwake = false;
#endif //CONFIG_P2P_PS #endif //CONFIG_P2P_PS
if( (hw_init_completed == _TRUE) if( (hw_init_completed == true)
&& ((!bFwCurrentInPSMode) && bFwPSAwake)) && ((!bFwCurrentInPSMode) && bFwPSAwake))
{ {
// //
@ -350,30 +350,30 @@ rtl8188e_HalDmWatchDog(
//ODM //ODM
if (hw_init_completed == _TRUE) if (hw_init_completed == true)
{ {
u8 bLinked=_FALSE; u8 bLinked=false;
u8 bsta_state = _FALSE; u8 bsta_state = false;
#ifdef CONFIG_DISABLE_ODM #ifdef CONFIG_DISABLE_ODM
pHalData->odmpriv.SupportAbility = 0; pHalData->odmpriv.SupportAbility = 0;
#endif #endif
if(rtw_linked_check(Adapter)) if(rtw_linked_check(Adapter))
bLinked = _TRUE; bLinked = true;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if(pbuddy_adapter && rtw_linked_check(pbuddy_adapter)) if(pbuddy_adapter && rtw_linked_check(pbuddy_adapter))
bLinked = _TRUE; bLinked = true;
#endif //CONFIG_CONCURRENT_MODE #endif //CONFIG_CONCURRENT_MODE
ODM_CmnInfoUpdate(&pHalData->odmpriv ,ODM_CMNINFO_LINK, bLinked); ODM_CmnInfoUpdate(&pHalData->odmpriv ,ODM_CMNINFO_LINK, bLinked);
if (check_fwstate(&Adapter->mlmepriv, WIFI_STATION_STATE)) if (check_fwstate(&Adapter->mlmepriv, WIFI_STATION_STATE))
bsta_state = _TRUE; bsta_state = true;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if(pbuddy_adapter && check_fwstate(&pbuddy_adapter->mlmepriv, WIFI_STATION_STATE)) if(pbuddy_adapter && check_fwstate(&pbuddy_adapter->mlmepriv, WIFI_STATION_STATE))
bsta_state = _TRUE; bsta_state = true;
#endif //CONFIG_CONCURRENT_MODE #endif //CONFIG_CONCURRENT_MODE
ODM_CmnInfoUpdate(&pHalData->odmpriv ,ODM_CMNINFO_STATION_STATE, bsta_state); ODM_CmnInfoUpdate(&pHalData->odmpriv ,ODM_CMNINFO_STATION_STATE, bsta_state);
@ -451,12 +451,12 @@ u8 AntDivBeforeLink8188E(struct adapter *Adapter )
if(pHalData->AntDivCfg==0) if(pHalData->AntDivCfg==0)
{ {
//DBG_8192C("odm_AntDivBeforeLink8192C(): No AntDiv Mechanism.\n"); //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; 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); //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"); //DBG_8192C("%s change antenna to ANT_( %s ).....\n",__FUNCTION__, (pDM_SWAT_Table->CurAntenna==Antenna_A)?"A":"B");
return _TRUE; return true;
} }
else else
{ {
pDM_SWAT_Table->SWAS_NoLink_State = 0; pDM_SWAT_Table->SWAS_NoLink_State = 0;
return _FALSE; return false;
} }
} }

184
hal/rtl8188e_hal_init.c
View file

@ -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); //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); 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); _8051Reset88E(padapter);
} }
@ -723,7 +723,7 @@ void _MCUIO_Reset88E(struct adapter *padapter,u8 bReset)
{ {
u8 u1bTmp; u8 u1bTmp;
if(bReset==_TRUE){ if(bReset==true){
// Reset MCU IO Wrapper- sugggest by SD1-Gimmy // Reset MCU IO Wrapper- sugggest by SD1-Gimmy
u1bTmp = rtw_read8(padapter, REG_RSV_CTRL+1); u1bTmp = rtw_read8(padapter, REG_RSV_CTRL+1);
rtw_write8(padapter,REG_RSV_CTRL+1, (u1bTmp&(~BIT3))); rtw_write8(padapter,REG_RSV_CTRL+1, (u1bTmp&(~BIT3)));
@ -738,10 +738,10 @@ void _8051Reset88E(struct adapter *padapter)
{ {
u8 u1bTmp; u8 u1bTmp;
_MCUIO_Reset88E(padapter,_TRUE); _MCUIO_Reset88E(padapter,true);
u1bTmp = rtw_read8(padapter, REG_SYS_FUNC_EN+1); u1bTmp = rtw_read8(padapter, REG_SYS_FUNC_EN+1);
rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp&(~BIT2)); 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)); rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp|(BIT2));
DBG_871X("=====> _8051Reset88E(): 8051 reset success .\n"); 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)); // RT_TRACE(_module_hal_init_c_, _drv_err_, ("rtl8723a_FirmwareDownload: %s\n", pFwImageFileName));
#ifdef CONFIG_FILE_FWIMG #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); DBG_871X("%s accquire FW from file:%s\n", __FUNCTION__, rtw_fw_file_path);
pFirmware->eFWSource = FW_SOURCE_IMG_FILE; pFirmware->eFWSource = FW_SOURCE_IMG_FILE;
@ -920,7 +920,7 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter)
_8051Reset88E(padapter); _8051Reset88E(padapter);
} }
_FWDownloadEnable(padapter, _TRUE); _FWDownloadEnable(padapter, true);
fwdl_start_time = rtw_get_current_time(); fwdl_start_time = rtw_get_current_time();
while(1) { while(1) {
//reset the FWDL chksum //reset the FWDL chksum
@ -933,7 +933,7 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter)
) )
break; break;
} }
_FWDownloadEnable(padapter, _FALSE); _FWDownloadEnable(padapter, false);
DBG_871X("%s writeFW_retry:%u, time after fwdl_start_time:%ums\n", __FUNCTION__ DBG_871X("%s writeFW_retry:%u, time after fwdl_start_time:%ums\n", __FUNCTION__
, writeFW_retry , writeFW_retry
@ -977,7 +977,7 @@ void rtl8188e_InitializeFirmwareVars(struct adapter *padapter)
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
// Init Fw LPS related. // Init Fw LPS related.
pwrpriv->bFwCurrentInPSMode = _FALSE; pwrpriv->bFwCurrentInPSMode = false;
// Init H2C counter. by tynli. 2009.12.09. // Init H2C counter. by tynli. 2009.12.09.
pHalData->LastHMEBoxNum = 0; pHalData->LastHMEBoxNum = 0;
} }
@ -1000,7 +1000,7 @@ SetFwRelatedForWoWLAN8188ES(
{ {
int status=_FAIL; int status=_FAIL;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
u8 bRecover = _FALSE; u8 bRecover = false;
// //
// 1. Before WoWLAN we need to re-download WoWLAN Fw. // 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); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter);
// Init Fw LPS related. // Init Fw LPS related.
adapter_to_pwrctl(padapter)->bFwCurrentInPSMode = _FALSE; adapter_to_pwrctl(padapter)->bFwCurrentInPSMode = false;
// Init H2C counter. by tynli. 2009.12.09. // Init H2C counter. by tynli. 2009.12.09.
pHalData->LastHMEBoxNum = 0; pHalData->LastHMEBoxNum = 0;
@ -1084,7 +1084,7 @@ hal_EfusePowerSwitch_RTL8188E(
u8 tempval; u8 tempval;
u16 tmpV16; u16 tmpV16;
if (PwrState == _TRUE) if (PwrState == true)
{ {
rtw_write8(pAdapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_ON); rtw_write8(pAdapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_ON);
@ -1108,7 +1108,7 @@ hal_EfusePowerSwitch_RTL8188E(
rtw_write16(pAdapter,REG_SYS_CLKR,tmpV16); rtw_write16(pAdapter,REG_SYS_CLKR,tmpV16);
} }
if(bWrite == _TRUE) if(bWrite == true)
{ {
// Enable LDO 2.5V before read/write action // Enable LDO 2.5V before read/write action
tempval = rtw_read8(pAdapter, EFUSE_TEST+3); tempval = rtw_read8(pAdapter, EFUSE_TEST+3);
@ -1121,7 +1121,7 @@ hal_EfusePowerSwitch_RTL8188E(
{ {
rtw_write8(pAdapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_OFF); rtw_write8(pAdapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_OFF);
if(bWrite == _TRUE){ if(bWrite == true){
// Disable LDO 2.5V after read/write action // Disable LDO 2.5V after read/write action
tempval = rtw_read8(pAdapter, EFUSE_TEST+3); tempval = rtw_read8(pAdapter, EFUSE_TEST+3);
rtw_write8(pAdapter, EFUSE_TEST+3, (tempval & 0x7F)); rtw_write8(pAdapter, EFUSE_TEST+3, (tempval & 0x7F));
@ -1149,7 +1149,7 @@ static bool efuse_read_phymap(
u8 *pos = pbuf; u8 *pos = pbuf;
u16 limit = *size; u16 limit = *size;
u16 addr = 0; u16 addr = 0;
bool reach_end = _FALSE; bool reach_end = false;
// //
// Refresh efuse init map as all 0xFF. // Refresh efuse init map as all 0xFF.
@ -1162,7 +1162,7 @@ static bool efuse_read_phymap(
// //
while(addr < limit) while(addr < limit)
{ {
ReadEFuseByte(Adapter, addr, pos, _FALSE); ReadEFuseByte(Adapter, addr, pos, false);
if(*pos != 0xFF) if(*pos != 0xFF)
{ {
pos++; pos++;
@ -1170,7 +1170,7 @@ static bool efuse_read_phymap(
} }
else else
{ {
reach_end = _TRUE; reach_end = true;
break; break;
} }
} }
@ -1383,14 +1383,14 @@ Hal_EfuseSwitchToBank(
IN BOOLEAN bPseudoTest IN BOOLEAN bPseudoTest
) )
{ {
BOOLEAN bRet = _FALSE; BOOLEAN bRet = false;
u32 value32=0; u32 value32=0;
//RTPRINT(FEEPROM, EFUSE_PG, ("Efuse switch bank to %d\n", bank)); //RTPRINT(FEEPROM, EFUSE_PG, ("Efuse switch bank to %d\n", bank));
if(bPseudoTest) if(bPseudoTest)
{ {
fakeEfuseBank = bank; fakeEfuseBank = bank;
bRet = _TRUE; bRet = true;
} }
else else
{ {
@ -1398,7 +1398,7 @@ Hal_EfuseSwitchToBank(
INCLUDE_MULTI_FUNC_BT(pAdapter)) INCLUDE_MULTI_FUNC_BT(pAdapter))
{ {
value32 = rtw_read32(pAdapter, EFUSE_TEST); value32 = rtw_read32(pAdapter, EFUSE_TEST);
bRet = _TRUE; bRet = true;
switch(bank) switch(bank)
{ {
case 0: case 0:
@ -1415,13 +1415,13 @@ Hal_EfuseSwitchToBank(
break; break;
default: default:
value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_WIFI_SEL_0); value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_WIFI_SEL_0);
bRet = _FALSE; bRet = false;
break; break;
} }
rtw_write32(pAdapter, EFUSE_TEST, value32); rtw_write32(pAdapter, EFUSE_TEST, value32);
} }
else else
bRet = _TRUE; bRet = true;
} }
return bRet; return bRet;
} }
@ -1468,7 +1468,7 @@ ReadEFuseByIC(
exit: exit:
#ifdef DBG_IOL_READ_EFUSE_MAP #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; int i;
DBG_871X("%s compare first 0x130 byte fail\n", __FUNCTION__); DBG_871X("%s compare first 0x130 byte fail\n", __FUNCTION__);
@ -1784,7 +1784,7 @@ static u16
hal_EfuseGetCurrentSize_8188e(IN struct adapter *pAdapter, hal_EfuseGetCurrentSize_8188e(IN struct adapter *pAdapter,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
{ {
int bContinual = _TRUE; int bContinual = true;
u16 efuse_addr = 0; u16 efuse_addr = 0;
u8 hoffset=0,hworden=0; u8 hoffset=0,hworden=0;
@ -1833,7 +1833,7 @@ hal_EfuseGetCurrentSize_8188e(IN struct adapter *pAdapter,
} }
else else
{ {
bContinual = _FALSE ; bContinual = false ;
} }
} }
@ -1894,8 +1894,8 @@ hal_EfusePgPacketRead_8188e(
{ {
u8 ReadState = PG_STATE_HEADER; u8 ReadState = PG_STATE_HEADER;
int bContinual = _TRUE; int bContinual = true;
int bDataEmpty = _TRUE ; int bDataEmpty = true ;
u8 efuse_data,word_cnts = 0; u8 efuse_data,word_cnts = 0;
u16 efuse_addr = 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); EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAX_SECTION, (void *)&max_section, bPseudoTest);
if(data==NULL) if(data==NULL)
return _FALSE; return false;
if(offset>max_section) if(offset>max_section)
return _FALSE; return false;
_rtw_memset((void *)data, 0xff, sizeof(u8)*PGPKT_DATA_SIZE); _rtw_memset((void *)data, 0xff, sizeof(u8)*PGPKT_DATA_SIZE);
_rtw_memset((void *)tmpdata, 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; hworden = efuse_data & 0x0F;
} }
word_cnts = Efuse_CalculateWordCnts(hworden); word_cnts = Efuse_CalculateWordCnts(hworden);
bDataEmpty = _TRUE ; bDataEmpty = true ;
if(hoffset==offset) if(hoffset==offset)
{ {
@ -1962,11 +1962,11 @@ hal_EfusePgPacketRead_8188e(
tmpdata[tmpidx] = efuse_data; tmpdata[tmpidx] = efuse_data;
if(efuse_data!=0xff) if(efuse_data!=0xff)
{ {
bDataEmpty = _FALSE; bDataEmpty = false;
} }
} }
} }
if(bDataEmpty==_FALSE){ if(bDataEmpty==false){
ReadState = PG_STATE_DATA; ReadState = PG_STATE_DATA;
}else{//read next header }else{//read next header
efuse_addr = efuse_addr + (word_cnts*2)+1; efuse_addr = efuse_addr + (word_cnts*2)+1;
@ -1980,7 +1980,7 @@ hal_EfusePgPacketRead_8188e(
} }
else{ else{
bContinual = _FALSE ; bContinual = false ;
} }
} }
//------- Data section Read ------------- //------- Data section Read -------------
@ -1995,9 +1995,9 @@ hal_EfusePgPacketRead_8188e(
if( (data[0]==0xff) &&(data[1]==0xff) && (data[2]==0xff) && (data[3]==0xff) && 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)) (data[4]==0xff) &&(data[5]==0xff) && (data[6]==0xff) && (data[7]==0xff))
return _FALSE; return false;
else else
return _TRUE; return true;
} }
@ -2072,7 +2072,7 @@ hal_EfuseFixHeaderProcess(
PgWriteSuccess = Efuse_PgPacketWrite(pAdapter, pFixPkt->offset, badworden, originaldata, bPseudoTest); PgWriteSuccess = Efuse_PgPacketWrite(pAdapter, pFixPkt->offset, badworden, originaldata, bPseudoTest);
if(!PgWriteSuccess) if(!PgWriteSuccess)
return _FALSE; return false;
else else
efuse_addr = Efuse_GetCurrentSize(pAdapter, efuseType, bPseudoTest); efuse_addr = Efuse_GetCurrentSize(pAdapter, efuseType, bPseudoTest);
} }
@ -2086,7 +2086,7 @@ hal_EfuseFixHeaderProcess(
efuse_addr = efuse_addr + (pFixPkt->word_cnts*2) +1; efuse_addr = efuse_addr + (pFixPkt->word_cnts*2) +1;
} }
*pAddr = efuse_addr; *pAddr = efuse_addr;
return _TRUE; return true;
} }
static BOOLEAN static BOOLEAN
@ -2097,7 +2097,7 @@ hal_EfusePgPacketWrite2ByteHeader(
IN PPGPKT_STRUCT pTargetPkt, IN PPGPKT_STRUCT pTargetPkt,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
{ {
BOOLEAN bRet=_FALSE, bContinual=_TRUE; BOOLEAN bRet=false, bContinual=true;
u16 efuse_addr=*pAddr, efuse_max_available_len=0; u16 efuse_addr=*pAddr, efuse_max_available_len=0;
u8 pg_header=0, tmp_header=0, pg_header_temp=0; u8 pg_header=0, tmp_header=0, pg_header_temp=0;
u8 repeatcnt=0; u8 repeatcnt=0;
@ -2117,7 +2117,7 @@ hal_EfusePgPacketWrite2ByteHeader(
if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_)
{ {
//RTPRINT(FEEPROM, EFUSE_PG, ("Repeat over limit for pg_header!!\n")); //RTPRINT(FEEPROM, EFUSE_PG, ("Repeat over limit for pg_header!!\n"));
return _FALSE; return false;
} }
efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest); efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest);
@ -2139,7 +2139,7 @@ hal_EfusePgPacketWrite2ByteHeader(
if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_)
{ {
//RTPRINT(FEEPROM, EFUSE_PG, ("Repeat over limit for ext_header!!\n")); //RTPRINT(FEEPROM, EFUSE_PG, ("Repeat over limit for ext_header!!\n"));
return _FALSE; return false;
} }
efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest); efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest);
@ -2151,7 +2151,7 @@ hal_EfusePgPacketWrite2ByteHeader(
if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_)
{ {
//RTPRINT(FEEPROM, EFUSE_PG, ("Repeat over limit for word_en!!\n")); //RTPRINT(FEEPROM, EFUSE_PG, ("Repeat over limit for word_en!!\n"));
return _FALSE; return false;
} }
else else
{ {
@ -2167,11 +2167,11 @@ hal_EfusePgPacketWrite2ByteHeader(
fixPkt.word_en = tmp_header & 0x0F; fixPkt.word_en = tmp_header & 0x0F;
fixPkt.word_cnts = Efuse_CalculateWordCnts(fixPkt.word_en); fixPkt.word_cnts = Efuse_CalculateWordCnts(fixPkt.word_en);
if(!hal_EfuseFixHeaderProcess(pAdapter, efuseType, &fixPkt, &efuse_addr, bPseudoTest)) if(!hal_EfuseFixHeaderProcess(pAdapter, efuseType, &fixPkt, &efuse_addr, bPseudoTest))
return _FALSE; return false;
} }
else else
{ {
bRet = _TRUE; bRet = true;
break; break;
} }
} }
@ -2194,7 +2194,7 @@ hal_EfusePgPacketWrite1ByteHeader(
IN PPGPKT_STRUCT pTargetPkt, IN PPGPKT_STRUCT pTargetPkt,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
{ {
BOOLEAN bRet=_FALSE; BOOLEAN bRet=false;
u8 pg_header=0, tmp_header=0; u8 pg_header=0, tmp_header=0;
u16 efuse_addr=*pAddr; u16 efuse_addr=*pAddr;
u8 repeatcnt=0; u8 repeatcnt=0;
@ -2209,7 +2209,7 @@ hal_EfusePgPacketWrite1ByteHeader(
{ {
if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_)
{ {
return _FALSE; return false;
} }
efuse_OneByteWrite(pAdapter,efuse_addr, pg_header, bPseudoTest); efuse_OneByteWrite(pAdapter,efuse_addr, pg_header, bPseudoTest);
efuse_OneByteRead(pAdapter,efuse_addr, &tmp_header, bPseudoTest); efuse_OneByteRead(pAdapter,efuse_addr, &tmp_header, bPseudoTest);
@ -2217,7 +2217,7 @@ hal_EfusePgPacketWrite1ByteHeader(
if(pg_header == tmp_header) if(pg_header == tmp_header)
{ {
bRet = _TRUE; bRet = true;
} }
else else
{ {
@ -2227,7 +2227,7 @@ hal_EfusePgPacketWrite1ByteHeader(
fixPkt.word_en = tmp_header & 0x0F; fixPkt.word_en = tmp_header & 0x0F;
fixPkt.word_cnts = Efuse_CalculateWordCnts(fixPkt.word_en); fixPkt.word_cnts = Efuse_CalculateWordCnts(fixPkt.word_en);
if(!hal_EfuseFixHeaderProcess(pAdapter, efuseType, &fixPkt, &efuse_addr, bPseudoTest)) if(!hal_EfuseFixHeaderProcess(pAdapter, efuseType, &fixPkt, &efuse_addr, bPseudoTest))
return _FALSE; return false;
} }
*pAddr = efuse_addr; *pAddr = efuse_addr;
@ -2242,7 +2242,7 @@ hal_EfusePgPacketWriteData(
IN PPGPKT_STRUCT pTargetPkt, IN PPGPKT_STRUCT pTargetPkt,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
{ {
BOOLEAN bRet=_FALSE; BOOLEAN bRet=false;
u16 efuse_addr=*pAddr; u16 efuse_addr=*pAddr;
u8 badworden=0; u8 badworden=0;
u32 PgWriteSuccess=0; u32 PgWriteSuccess=0;
@ -2253,7 +2253,7 @@ hal_EfusePgPacketWriteData(
{ {
// write ok // write ok
//RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfusePgPacketWriteData ok!!\n")); //RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfusePgPacketWriteData ok!!\n"));
return _TRUE; return true;
} }
else else
{ {
@ -2263,9 +2263,9 @@ hal_EfusePgPacketWriteData(
PgWriteSuccess = Efuse_PgPacketWrite(pAdapter, pTargetPkt->offset, badworden, pTargetPkt->data, bPseudoTest); PgWriteSuccess = Efuse_PgPacketWrite(pAdapter, pTargetPkt->offset, badworden, pTargetPkt->data, bPseudoTest);
if(!PgWriteSuccess) if(!PgWriteSuccess)
return _FALSE; return false;
else else
return _TRUE; return true;
} }
return bRet; return bRet;
@ -2279,7 +2279,7 @@ hal_EfusePgPacketWriteHeader(
IN PPGPKT_STRUCT pTargetPkt, IN PPGPKT_STRUCT pTargetPkt,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
{ {
BOOLEAN bRet=_FALSE; BOOLEAN bRet=false;
if(pTargetPkt->offset >= EFUSE_MAX_SECTION_BASE) if(pTargetPkt->offset >= EFUSE_MAX_SECTION_BASE)
{ {
@ -2328,9 +2328,9 @@ wordEnMatched(
*pWden = match_word_en; *pWden = match_word_en;
if(match_word_en != 0xf) if(match_word_en != 0xf)
return _TRUE; return true;
else else
return _FALSE; return false;
} }
static BOOLEAN static BOOLEAN
@ -2341,13 +2341,13 @@ hal_EfuseCheckIfDatafollowed(
IN BOOLEAN bPseudoTest IN BOOLEAN bPseudoTest
) )
{ {
BOOLEAN bRet=_FALSE; BOOLEAN bRet=false;
u8 i, efuse_data; u8 i, efuse_data;
for(i=0; i<(word_cnts*2) ; i++) for(i=0; i<(word_cnts*2) ; i++)
{ {
if(efuse_OneByteRead(pAdapter, (startAddr+i) ,&efuse_data, bPseudoTest)&&(efuse_data != 0xFF)) if(efuse_OneByteRead(pAdapter, (startAddr+i) ,&efuse_data, bPseudoTest)&&(efuse_data != 0xFF))
bRet = _TRUE; bRet = true;
} }
return bRet; return bRet;
@ -2362,7 +2362,7 @@ hal_EfusePartialWriteCheck(
IN BOOLEAN bPseudoTest IN BOOLEAN bPseudoTest
) )
{ {
BOOLEAN bRet=_FALSE; BOOLEAN bRet=false;
u8 i, efuse_data=0, cur_header=0; u8 i, efuse_data=0, cur_header=0;
u8 new_wden=0, matched_wden=0, badworden=0; u8 new_wden=0, matched_wden=0, badworden=0;
u16 startAddr=0, efuse_max_available_len=0, efuse_max=0; u16 startAddr=0, efuse_max_available_len=0, efuse_max=0;
@ -2400,7 +2400,7 @@ hal_EfusePartialWriteCheck(
{ {
if(startAddr >= efuse_max_available_len) if(startAddr >= efuse_max_available_len)
{ {
bRet = _FALSE; bRet = false;
break; break;
} }
@ -2414,7 +2414,7 @@ hal_EfusePartialWriteCheck(
if(ALL_WORDS_DISABLED(efuse_data)) if(ALL_WORDS_DISABLED(efuse_data))
{ {
//RTPRINT(FEEPROM, EFUSE_PG, ("Error condition, all words disabled")); //RTPRINT(FEEPROM, EFUSE_PG, ("Error condition, all words disabled"));
bRet = _FALSE; bRet = false;
break; break;
} }
else else
@ -2449,7 +2449,7 @@ hal_EfusePartialWriteCheck(
if(!PgWriteSuccess) if(!PgWriteSuccess)
{ {
bRet = _FALSE; // write fail, return bRet = false; // write fail, return
break; break;
} }
} }
@ -2471,7 +2471,7 @@ hal_EfusePartialWriteCheck(
// not used header, 0xff // not used header, 0xff
*pAddr = startAddr; *pAddr = startAddr;
//RTPRINT(FEEPROM, EFUSE_PG, ("Started from unused header offset=%d\n", startAddr)); //RTPRINT(FEEPROM, EFUSE_PG, ("Started from unused header offset=%d\n", startAddr));
bRet = _TRUE; bRet = true;
break; break;
} }
} }
@ -2488,7 +2488,7 @@ hal_EfusePgCheckAvailableAddr(
u16 efuse_max_available_len=0; u16 efuse_max_available_len=0;
//Change to check TYPE_EFUSE_MAP_LEN ,beacuse 8188E raw 256,logic map over 256. //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); //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)); //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) if(Efuse_GetCurrentSize(pAdapter, efuseType, bPseudoTest) >= efuse_max_available_len)
{ {
//RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfusePgCheckAvailableAddr error!!\n")); //RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfusePgCheckAvailableAddr error!!\n"));
return _FALSE; return false;
} }
return _TRUE; return true;
} }
static void static void
@ -2533,20 +2533,20 @@ hal_EfusePgPacketWrite_BT(
u8 efuseType=EFUSE_BT; u8 efuseType=EFUSE_BT;
if(!hal_EfusePgCheckAvailableAddr(pAdapter, efuseType, bPseudoTest)) if(!hal_EfusePgCheckAvailableAddr(pAdapter, efuseType, bPseudoTest))
return _FALSE; return false;
hal_EfuseConstructPGPkt(offset, word_en, pData, &targetPkt); hal_EfuseConstructPGPkt(offset, word_en, pData, &targetPkt);
if(!hal_EfusePartialWriteCheck(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) if(!hal_EfusePartialWriteCheck(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest))
return _FALSE; return false;
if(!hal_EfusePgPacketWriteHeader(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) if(!hal_EfusePgPacketWriteHeader(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest))
return _FALSE; return false;
if(!hal_EfusePgPacketWriteData(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) if(!hal_EfusePgPacketWriteData(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest))
return _FALSE; return false;
return _TRUE; return true;
} }
static BOOLEAN static BOOLEAN
@ -2563,20 +2563,20 @@ hal_EfusePgPacketWrite_8188e(
u8 efuseType=EFUSE_WIFI; u8 efuseType=EFUSE_WIFI;
if(!hal_EfusePgCheckAvailableAddr(pAdapter, efuseType, bPseudoTest)) if(!hal_EfusePgCheckAvailableAddr(pAdapter, efuseType, bPseudoTest))
return _FALSE; return false;
hal_EfuseConstructPGPkt(offset, word_en, pData, &targetPkt); hal_EfuseConstructPGPkt(offset, word_en, pData, &targetPkt);
if(!hal_EfusePartialWriteCheck(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) if(!hal_EfusePartialWriteCheck(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest))
return _FALSE; return false;
if(!hal_EfusePgPacketWriteHeader(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) if(!hal_EfusePgPacketWriteHeader(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest))
return _FALSE; return false;
if(!hal_EfusePgPacketWriteData(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) 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; u32 i;
u16 value16; u16 value16;
if(_FALSE == pEEPROM->bautoload_fail_flag) if(false == pEEPROM->bautoload_fail_flag)
{ // autoload OK. { // autoload OK.
if (is_boot_from_eeprom(padapter)) if (is_boot_from_eeprom(padapter))
{ {
@ -2976,16 +2976,16 @@ Hal_InitPGData88E(struct adapter *padapter)
else else
{ {
// Read EFUSE real map to shadow. // Read EFUSE real map to shadow.
EFUSE_ShadowMapUpdate(padapter, EFUSE_WIFI, _FALSE); EFUSE_ShadowMapUpdate(padapter, EFUSE_WIFI, false);
} }
} }
else else
{//autoload fail {//autoload fail
RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("AutoLoad Fail reported from CR9346!!\n")); 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 //update to default value 0xFF
if (!is_boot_from_eeprom(padapter)) 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) if (EEPROMId != RTL_EEPROM_ID)
{ {
DBG_8192C("EEPROM ID(%#x) is invalid!!\n", EEPROMId); DBG_8192C("EEPROM ID(%#x) is invalid!!\n", EEPROMId);
pEEPROM->bautoload_fail_flag = _TRUE; pEEPROM->bautoload_fail_flag = true;
} }
else else
{ {
pEEPROM->bautoload_fail_flag = _FALSE; pEEPROM->bautoload_fail_flag = false;
} }
DBG_871X("EEPROM ID=0x%04x\n", EEPROMId); DBG_871X("EEPROM ID=0x%04x\n", EEPROMId);
@ -3208,11 +3208,11 @@ Hal_GetChnlGroup88E(
OUT u8* pGroup OUT u8* pGroup
) )
{ {
u8 bIn24G=_TRUE; u8 bIn24G=true;
if(chnl<=14) if(chnl<=14)
{ {
bIn24G=_TRUE; bIn24G=true;
if (chnl < 3) // Chanel 1-2 if (chnl < 3) // Chanel 1-2
*pGroup = 0; *pGroup = 0;
@ -3233,7 +3233,7 @@ Hal_GetChnlGroup88E(
} }
else else
{ {
bIn24G=_FALSE; bIn24G=false;
if (chnl <=40) if (chnl <=40)
*pGroup = 0; *pGroup = 0;
@ -3282,15 +3282,15 @@ void Hal_ReadPowerSavingMode88E(
u8 tmpvalue; u8 tmpvalue;
if(AutoLoadFail){ if(AutoLoadFail){
pwrctl->bHWPowerdown = _FALSE; pwrctl->bHWPowerdown = false;
pwrctl->bSupportRemoteWakeup = _FALSE; pwrctl->bSupportRemoteWakeup = false;
} }
else { else {
//hw power down mode selection , 0:rf-off / 1:power down //hw power down mode selection , 0:rf-off / 1:power down
if(padapter->registrypriv.hwpdn_mode==2) 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 else
pwrctl->bHWPowerdown = padapter->registrypriv.hwpdn_mode; pwrctl->bHWPowerdown = padapter->registrypriv.hwpdn_mode;
@ -3298,7 +3298,7 @@ void Hal_ReadPowerSavingMode88E(
// decide hw if support remote wakeup function // decide hw if support remote wakeup function
// if hw supported, 8051 (SIE) will generate WeakUP signal( D+/D- toggle) when autoresume // 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__, DBG_8192C("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,bSupportRemoteWakeup(%x)\n",__FUNCTION__,
pwrctl->bHWPwrPindetect, pwrctl->bHWPowerdown, pwrctl->bSupportRemoteWakeup); pwrctl->bHWPwrPindetect, pwrctl->bHWPowerdown, pwrctl->bSupportRemoteWakeup);
@ -3560,7 +3560,7 @@ Hal_ReadThermalMeter_88E(
if(pHalData->EEPROMThermalMeter == 0xff || AutoloadFail) if(pHalData->EEPROMThermalMeter == 0xff || AutoloadFail)
{ {
pHalData->bAPKThermalMeterIgnore = _TRUE; pHalData->bAPKThermalMeterIgnore = true;
pHalData->EEPROMThermalMeter = EEPROM_Default_ThermalMeter_88E; pHalData->EEPROMThermalMeter = EEPROM_Default_ThermalMeter_88E;
} }
@ -3588,11 +3588,11 @@ BOOLEAN HalDetectPwrDownMode88E(struct adapter *Adapter)
// 2010/08/25 MH INF priority > PDN Efuse value. // 2010/08/25 MH INF priority > PDN Efuse value.
if(tmpvalue & BIT(4) && pwrctrlpriv->reg_pdnmode) if(tmpvalue & BIT(4) && pwrctrlpriv->reg_pdnmode)
{ {
pHalData->pwrdown = _TRUE; pHalData->pwrdown = true;
} }
else else
{ {
pHalData->pwrdown = _FALSE; pHalData->pwrdown = false;
} }
DBG_8192C("HalDetectPwrDownMode(): PDN=%d\n", pHalData->pwrdown); DBG_8192C("HalDetectPwrDownMode(): PDN=%d\n", pHalData->pwrdown);
@ -3603,7 +3603,7 @@ BOOLEAN HalDetectPwrDownMode88E(struct adapter *Adapter)
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
void Hal_DetectWoWMode(struct adapter *pAdapter) void Hal_DetectWoWMode(struct adapter *pAdapter)
{ {
adapter_to_pwrctl(pAdapter)->bSupportRemoteWakeup = _TRUE; adapter_to_pwrctl(pAdapter)->bSupportRemoteWakeup = true;
DBG_871X("%s\n", __func__); DBG_871X("%s\n", __func__);
} }
#endif #endif
@ -3619,7 +3619,7 @@ void Hal_ReadRFGainOffset(
// //
// BB_RF Gain Offset from EEPROM // 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 ){ if(!AutoloadFail ){
Adapter->eeprompriv.EEPROMRFGainOffset = PROMContent[EEPROM_RF_GAIN_OFFSET_88E]; Adapter->eeprompriv.EEPROMRFGainOffset = PROMContent[EEPROM_RF_GAIN_OFFSET_88E];
Adapter->eeprompriv.EEPROMRFGainVal=EFUSE_Read1Byte(Adapter, EEPROM_RF_GAIN_VAL_88E); Adapter->eeprompriv.EEPROMRFGainVal=EFUSE_Read1Byte(Adapter, EEPROM_RF_GAIN_VAL_88E);

48
hal/rtl8188e_phycfg.c
View file

@ -89,7 +89,7 @@ sic_IsSICReady(
IN struct adapter *Adapter IN struct adapter *Adapter
) )
{ {
BOOLEAN bRet=_FALSE; BOOLEAN bRet=false;
u32 retryCnt=0; u32 retryCnt=0;
u8 sic_cmd=0xff; u8 sic_cmd=0xff;
@ -98,11 +98,11 @@ sic_IsSICReady(
if(retryCnt++ >= SIC_MAX_POLL_CNT) if(retryCnt++ >= SIC_MAX_POLL_CNT)
{ {
//RTPRINT(FPHY, (PHY_SICR|PHY_SICW), ("[SIC], sic_IsSICReady() return FALSE\n")); //RTPRINT(FPHY, (PHY_SICR|PHY_SICW), ("[SIC], sic_IsSICReady() return FALSE\n"));
return _FALSE; return false;
} }
//if(RT_SDIO_CANNOT_IO(Adapter)) //if(RT_SDIO_CANNOT_IO(Adapter))
// return _FALSE; // return false;
sic_cmd = rtw_read8(Adapter, SIC_CMD_REG); sic_cmd = rtw_read8(Adapter, SIC_CMD_REG);
//sic_cmd = PlatformEFIORead1Byte(Adapter, SIC_CMD_REG); //sic_cmd = PlatformEFIORead1Byte(Adapter, SIC_CMD_REG);
@ -111,7 +111,7 @@ sic_IsSICReady(
#endif #endif
//RTPRINT(FPHY, (PHY_SICR|PHY_SICW), ("[SIC], sic_IsSICReady(), readback 0x%x=0x%x\n", SIC_CMD_REG, sic_cmd)); //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) if(sic_cmd == SIC_CMD_READY)
return _TRUE; return true;
else else
{ {
rtw_msleep_os(1); rtw_msleep_os(1);
@ -253,7 +253,7 @@ SIC_SetBBReg(
//RTPRINT(FPHY, PHY_SICW, ("[SIC], SIC_SetBBReg() start\n")); //RTPRINT(FPHY, PHY_SICW, ("[SIC], SIC_SetBBReg() start\n"));
/* /*
while(PlatformAtomicExchange(&pHalData->bChangeBBInProgress, _TRUE) == _TRUE) while(PlatformAtomicExchange(&pHalData->bChangeBBInProgress, true) == true)
{ {
BBWaitCounter ++; BBWaitCounter ++;
delay_ms(10); // 1 ms delay_ms(10); // 1 ms
@ -280,7 +280,7 @@ SIC_SetBBReg(
sic_Write4Byte(Adapter, RegAddr, Data); sic_Write4Byte(Adapter, RegAddr, Data);
//PlatformAtomicExchange(&pHalData->bChangeBBInProgress, _FALSE); //PlatformAtomicExchange(&pHalData->bChangeBBInProgress, false);
//RTPRINT(FPHY, PHY_SICW, ("[SIC], SIC_SetBBReg() end\n")); //RTPRINT(FPHY, PHY_SICW, ("[SIC], SIC_SetBBReg() end\n"));
} }
@ -298,7 +298,7 @@ SIC_QueryBBReg(
//RTPRINT(FPHY, PHY_SICR, ("[SIC], SIC_QueryBBReg() start\n")); //RTPRINT(FPHY, PHY_SICR, ("[SIC], SIC_QueryBBReg() start\n"));
/* /*
while(PlatformAtomicExchange(&pHalData->bChangeBBInProgress, _TRUE) == _TRUE) while(PlatformAtomicExchange(&pHalData->bChangeBBInProgress, true) == true)
{ {
BBWaitCounter ++; BBWaitCounter ++;
delay_ms(10); // 10 ms 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(), 0x%x=0x%x\n", RegAddr, OriginalValue));
//RTPRINT(FPHY, PHY_SICR, ("[SIC], SIC_QueryBBReg() end\n")); //RTPRINT(FPHY, PHY_SICR, ("[SIC], SIC_QueryBBReg() end\n"));
//PlatformAtomicExchange(&pHalData->bChangeBBInProgress, _FALSE); //PlatformAtomicExchange(&pHalData->bChangeBBInProgress, false);
return (ReturnValue); return (ReturnValue);
} }
@ -355,7 +355,7 @@ SIC_LedOff(
{ {
// When SIC is enabled, led pin will be used as debug pin, // When SIC is enabled, led pin will be used as debug pin,
// so don't execute led function when SIC is enabled. // so don't execute led function when SIC is enabled.
return _TRUE; return true;
} }
#endif #endif
@ -1453,7 +1453,7 @@ phy_BB8188E_Config_ParaFile(
// //
// 2. If EEPROM or EFUSE autoload OK, We must config by PHY_REG_PG.txt // 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; pHalData->pwrGroupCnt = 0;
@ -2279,7 +2279,7 @@ PHY_UpdateTxPowerDbm8188E(
//Adapter->HalFunc.SetTxPowerLevelHandler(Adapter, pHalData->CurrentChannel);//gtest:todo //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) if(pHalData->rf_chip == RF_PSEUDO_11N)
{ {
//pHalData->SetBWModeInProgress= _FALSE; //pHalData->SetBWModeInProgress= false;
return; return;
} }
@ -2588,10 +2588,10 @@ PHY_SwChnl8188E( // Call after initialization
IN u8 channel 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); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
u8 tmpchannel = pHalData->CurrentChannel; u8 tmpchannel = pHalData->CurrentChannel;
BOOLEAN bResult = _TRUE; BOOLEAN bResult = true;
if(pHalData->rf_chip == RF_PSEUDO_11N) if(pHalData->rf_chip == RF_PSEUDO_11N)
{ {
@ -2678,7 +2678,7 @@ phy_SwChnlStepByStep(
OUT u32 *delay OUT u32 *delay
) )
{ {
return _TRUE; return true;
} }
@ -2698,14 +2698,14 @@ phy_SetSwChnlCmdArray(
if(CmdTable == NULL) if(CmdTable == NULL)
{ {
//RT_ASSERT(FALSE, ("phy_SetSwChnlCmdArray(): CmdTable cannot be NULL.\n")); //RT_ASSERT(FALSE, ("phy_SetSwChnlCmdArray(): CmdTable cannot be NULL.\n"));
return _FALSE; return false;
} }
if(CmdTableIdx >= CmdTableSz) if(CmdTableIdx >= CmdTableSz)
{ {
//RT_ASSERT(FALSE, //RT_ASSERT(FALSE,
// ("phy_SetSwChnlCmdArray(): Access invalid index, please check size of the table, CmdTableIdx:%ld, CmdTableSz:%ld\n", // ("phy_SetSwChnlCmdArray(): Access invalid index, please check size of the table, CmdTableIdx:%ld, CmdTableSz:%ld\n",
// CmdTableIdx, CmdTableSz)); // CmdTableIdx, CmdTableSz));
return _FALSE; return false;
} }
pCmd = CmdTable + CmdTableIdx; pCmd = CmdTable + CmdTableIdx;
@ -2714,7 +2714,7 @@ phy_SetSwChnlCmdArray(
pCmd->Para2 = Para2; pCmd->Para2 = Para2;
pCmd->msDelay = msDelay; pCmd->msDelay = msDelay;
return _TRUE; return true;
} }
@ -2812,7 +2812,7 @@ PHY_CheckIsLegalRfPath8192C(
IN struct adapter *pAdapter, IN struct adapter *pAdapter,
IN u32 eRFPath) IN u32 eRFPath)
{ {
BOOLEAN rtValue = _TRUE; BOOLEAN rtValue = true;
// NOt check RF Path now.! // NOt check RF Path now.!
return rtValue; return rtValue;
@ -2861,7 +2861,7 @@ static BOOLEAN _PHY_QueryRFPathSwitch(
) )
{ {
// if(is2T) // if(is2T)
// return _TRUE; // return true;
if(!pAdapter->hw_init_completed) if(!pAdapter->hw_init_completed)
{ {
@ -2872,16 +2872,16 @@ static BOOLEAN _PHY_QueryRFPathSwitch(
if(is2T) if(is2T)
{ {
if(PHY_QueryBBReg(pAdapter, rFPGA0_XB_RFInterfaceOE, BIT5|BIT6) == 0x01) if(PHY_QueryBBReg(pAdapter, rFPGA0_XB_RFInterfaceOE, BIT5|BIT6) == 0x01)
return _TRUE; return true;
else else
return _FALSE; return false;
} }
else else
{ {
if(PHY_QueryBBReg(pAdapter, rFPGA0_XA_RFInterfaceOE, 0x300) == 0x02) if(PHY_QueryBBReg(pAdapter, rFPGA0_XA_RFInterfaceOE, 0x300) == 0x02)
return _TRUE; return true;
else else
return _FALSE; return false;
} }
} }

34
hal/rtl8188e_rf6052.c
View file

@ -169,12 +169,12 @@ rtl8188e_PHY_RF6052SetCckTxPower(
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
//PMGNT_INFO pMgntInfo=&Adapter->MgntInfo; //PMGNT_INFO pMgntInfo=&Adapter->MgntInfo;
u32 TxAGC[2]={0, 0}, tmpval=0,pwrtrac_value; u32 TxAGC[2]={0, 0}, tmpval=0,pwrtrac_value;
BOOLEAN TurboScanOff = _FALSE; BOOLEAN TurboScanOff = false;
u8 idx1, idx2; u8 idx1, idx2;
u8* ptr; u8* ptr;
u8 direction; u8 direction;
//FOR CE ,must disable turbo scan //FOR CE ,must disable turbo scan
TurboScanOff = _TRUE; TurboScanOff = true;
if(pmlmeext->sitesurvey_res.state == SCAN_PROCESS) if(pmlmeext->sitesurvey_res.state == SCAN_PROCESS)
@ -182,7 +182,7 @@ rtl8188e_PHY_RF6052SetCckTxPower(
TxAGC[RF_PATH_A] = 0x3f3f3f3f; TxAGC[RF_PATH_A] = 0x3f3f3f3f;
TxAGC[RF_PATH_B] = 0x3f3f3f3f; TxAGC[RF_PATH_B] = 0x3f3f3f3f;
TurboScanOff = _TRUE;//disable turbo scan TurboScanOff = true;//disable turbo scan
if(TurboScanOff) if(TurboScanOff)
{ {
@ -834,7 +834,7 @@ PHY_RFShadowWrite(
IN u32 Data) IN u32 Data)
{ {
RF_Shadow[eRFPath][Offset].Value = (Data & bRFRegOffsetMask); RF_Shadow[eRFPath][Offset].Value = (Data & bRFRegOffsetMask);
RF_Shadow[eRFPath][Offset].Driver_Write = _TRUE; RF_Shadow[eRFPath][Offset].Driver_Write = true;
} /* PHY_RFShadowWrite */ } /* PHY_RFShadowWrite */
@ -847,21 +847,21 @@ PHY_RFShadowCompare(
{ {
u32 reg; u32 reg;
// Check if we need to check the register // 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); reg = PHY_QueryRFReg(Adapter, eRFPath, Offset, bRFRegOffsetMask);
// Compare shadow and real rf register for 20bits!! // Compare shadow and real rf register for 20bits!!
if (RF_Shadow[eRFPath][Offset].Value != reg) if (RF_Shadow[eRFPath][Offset].Value != reg)
{ {
// Locate error position. // Locate error position.
RF_Shadow[eRFPath][Offset].ErrorOrNot = _TRUE; RF_Shadow[eRFPath][Offset].ErrorOrNot = true;
//RT_TRACE(COMP_INIT, DBG_LOUD, //RT_TRACE(COMP_INIT, DBG_LOUD,
//("PHY_RFShadowCompare RF-%d Addr%02lx Err = %05lx\n", //("PHY_RFShadowCompare RF-%d Addr%02lx Err = %05lx\n",
//eRFPath, Offset, reg)); //eRFPath, Offset, reg));
} }
return RF_Shadow[eRFPath][Offset].ErrorOrNot ; return RF_Shadow[eRFPath][Offset].ErrorOrNot ;
} }
return _FALSE; return false;
} /* PHY_RFShadowCompare */ } /* PHY_RFShadowCompare */
@ -872,10 +872,10 @@ PHY_RFShadowRecorver(
IN u32 Offset) IN u32 Offset)
{ {
// Check if the address is error // 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. // 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, PHY_SetRFReg(Adapter, eRFPath, Offset, bRFRegOffsetMask,
RF_Shadow[eRFPath][Offset].Value); 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!!!! // 2008/11/20 MH For S3S4 test, we only check reg 26/27 now!!!!
if (Offset != 0x26 && Offset != 0x27) 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 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!!!! // 2008/11/20 MH For S3S4 test, we only check reg 26/27 now!!!!
if (Offset != 0x26 && Offset != 0x27) 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 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++) for (Offset = 0; Offset <= RF6052_MAX_REG; Offset++)
{ {
RF_Shadow[eRFPath][Offset].Value = 0; RF_Shadow[eRFPath][Offset].Value = 0;
RF_Shadow[eRFPath][Offset].Compare = _FALSE; RF_Shadow[eRFPath][Offset].Compare = false;
RF_Shadow[eRFPath][Offset].Recorver = _FALSE; RF_Shadow[eRFPath][Offset].Recorver = false;
RF_Shadow[eRFPath][Offset].ErrorOrNot = _FALSE; RF_Shadow[eRFPath][Offset].ErrorOrNot = false;
RF_Shadow[eRFPath][Offset].Driver_Write = _FALSE; RF_Shadow[eRFPath][Offset].Driver_Write = false;
} }
} }

12
hal/rtl8188e_rxdesc.c
View file

@ -278,9 +278,9 @@ void update_recvframe_phyinfo_88e(
struct sta_info *psta; struct sta_info *psta;
//_irqL irqL; //_irqL irqL;
pkt_info.bPacketMatchBSSID =_FALSE; pkt_info.bPacketMatchBSSID =false;
pkt_info.bPacketToSelf = _FALSE; pkt_info.bPacketToSelf = false;
pkt_info.bPacketBeacon = _FALSE; pkt_info.bPacketBeacon = false;
wlanhdr = get_recvframe_data(precvframe); wlanhdr = get_recvframe_data(precvframe);
@ -293,7 +293,7 @@ void update_recvframe_phyinfo_88e(
pkt_info.bPacketBeacon = pkt_info.bPacketMatchBSSID && (GetFrameSubType(wlanhdr) == WIFI_BEACON); pkt_info.bPacketBeacon = pkt_info.bPacketMatchBSSID && (GetFrameSubType(wlanhdr) == WIFI_BEACON);
if(pkt_info.bPacketBeacon){ 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; sa = padapter->mlmepriv.cur_network.network.MacAddress;
} }
else else
@ -319,7 +319,7 @@ void update_recvframe_phyinfo_88e(
precvframe->u.hdr.psta = NULL; precvframe->u.hdr.psta = NULL;
if (pkt_info.bPacketMatchBSSID && if (pkt_info.bPacketMatchBSSID &&
(check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == _TRUE)) (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == true))
{ {
if (psta) if (psta)
{ {
@ -330,7 +330,7 @@ void update_recvframe_phyinfo_88e(
} }
else if (pkt_info.bPacketToSelf || pkt_info.bPacketBeacon) 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) if (psta)
{ {

6
hal/rtl8188e_xmit.c
View file

@ -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) void _dbg_dump_tx_info(struct adapter *padapter,int frame_tag,struct tx_desc *ptxdesc)
{ {
u8 bDumpTxPkt; u8 bDumpTxPkt;
u8 bDumpTxDesc = _FALSE; u8 bDumpTxDesc = false;
rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DUMP_TXPKT, &(bDumpTxPkt)); rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DUMP_TXPKT, &(bDumpTxPkt));
if(bDumpTxPkt ==1){//dump txdesc for data frame if(bDumpTxPkt ==1){//dump txdesc for data frame
DBG_871X("dump tx_desc for data frame\n"); DBG_871X("dump tx_desc for data frame\n");
if((frame_tag&0x0f) == DATA_FRAMETAG){ if((frame_tag&0x0f) == DATA_FRAMETAG){
bDumpTxDesc = _TRUE; bDumpTxDesc = true;
} }
} }
else if(bDumpTxPkt ==2){//dump txdesc for mgnt frame else if(bDumpTxPkt ==2){//dump txdesc for mgnt frame
DBG_871X("dump tx_desc for mgnt frame\n"); DBG_871X("dump tx_desc for mgnt frame\n");
if((frame_tag&0x0f) == MGNT_FRAMETAG){ if((frame_tag&0x0f) == MGNT_FRAMETAG){
bDumpTxDesc = _TRUE; bDumpTxDesc = true;
} }
} }
else if(bDumpTxPkt ==3){//dump early info else if(bDumpTxPkt ==3){//dump early info

10
hal/rtl8188eu_led.c
View file

@ -50,7 +50,7 @@ SwLedOn(
u8 LedCfg; u8 LedCfg;
//HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
if( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)) if( (padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true))
{ {
return; return;
} }
@ -70,7 +70,7 @@ SwLedOn(
break; break;
} }
pLed->bLedOn = _TRUE; pLed->bLedOn = true;
} }
@ -87,7 +87,7 @@ SwLedOff(
u8 LedCfg; u8 LedCfg;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
if((padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)) if((padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true))
{ {
goto exit; goto exit;
} }
@ -98,7 +98,7 @@ SwLedOff(
switch(pLed->LedPin) switch(pLed->LedPin)
{ {
case LED_PIN_LED0: 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. LedCfg &= 0x90; // Set to software control.
rtw_write8(padapter, REG_LEDCFG2, (LedCfg|BIT3)); rtw_write8(padapter, REG_LEDCFG2, (LedCfg|BIT3));
@ -121,7 +121,7 @@ SwLedOff(
break; break;
} }
exit: exit:
pLed->bLedOn = _FALSE; pLed->bLedOn = false;
} }

58
hal/rtl8188eu_xmit.c
View file

@ -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. 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 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 (padapter->registrypriv.mp_mode == 0)
{ {
if((!bagg_pkt) &&(urb_zero_packet_chk(padapter, sz)==0))//(sz %512) != 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); ptxdesc = (struct tx_desc *)(pmem+PACKET_OFFSET_SZ);
//DBG_8192C("==> non-agg-pkt,shift pointer...\n"); //DBG_8192C("==> non-agg-pkt,shift pointer...\n");
@ -305,7 +305,7 @@ if (padapter->registrypriv.mp_mode == 0)
fill_txdesc_sectype(pattrib, ptxdesc); fill_txdesc_sectype(pattrib, ptxdesc);
if(pattrib->ampdu_en==_TRUE){ if(pattrib->ampdu_en==true){
ptxdesc->txdw2 |= cpu_to_le32(AGG_EN);//AGG EN ptxdesc->txdw2 |= cpu_to_le32(AGG_EN);//AGG EN
//SET_TX_DESC_MAX_AGG_NUM_88E(pDesc, 0x1F); //SET_TX_DESC_MAX_AGG_NUM_88E(pDesc, 0x1F);
@ -446,13 +446,13 @@ if (padapter->registrypriv.mp_mode == 0)
//offset 20 //offset 20
ptxdesc->txdw5 |= cpu_to_le32(RTY_LMT_EN);//retry limit enable 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 ptxdesc->txdw5 |= cpu_to_le32(0x00180000);//retry limit = 6
else else
ptxdesc->txdw5 |= cpu_to_le32(0x00300000);//retry limit = 12 ptxdesc->txdw5 |= cpu_to_le32(0x00300000);//retry limit = 12
#ifdef CONFIG_INTEL_PROXIM #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); DBG_871X("\n %s pattrib->rate=%d\n",__FUNCTION__,pattrib->rate);
ptxdesc->txdw5 |= cpu_to_le32( pattrib->rate); ptxdesc->txdw5 |= cpu_to_le32( pattrib->rate);
} }
@ -540,7 +540,7 @@ s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter)
return _FAIL; return _FAIL;
} }
ret = (padapter->bDriverStopped == _TRUE) || (padapter->bSurpriseRemoved == _TRUE); ret = (padapter->bDriverStopped == true) || (padapter->bSurpriseRemoved == true);
if (ret) { if (ret) {
RT_TRACE(_module_hal_xmit_c_, _drv_notice_, RT_TRACE(_module_hal_xmit_c_, _drv_notice_,
("%s: bDriverStopped(%d) bSurpriseRemoved(%d)!\n", ("%s: bDriverStopped(%d) bSurpriseRemoved(%d)!\n",
@ -548,7 +548,7 @@ s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter)
return _FAIL; return _FAIL;
} }
if(check_pending_xmitbuf(pxmitpriv) == _FALSE) if(check_pending_xmitbuf(pxmitpriv) == false)
return _SUCCESS; return _SUCCESS;
#ifdef CONFIG_LPS_LCLK #ifdef CONFIG_LPS_LCLK
@ -622,7 +622,7 @@ static s32 rtw_dump_xframe(struct adapter *padapter, struct xmit_frame *pxmitfra
sz = pattrib->last_txcmdsz; sz = pattrib->last_txcmdsz;
} }
pull = update_txdesc(pxmitframe, mem_addr, sz, _FALSE); pull = update_txdesc(pxmitframe, mem_addr, sz, false);
if(pull) if(pull)
{ {
@ -726,7 +726,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm
pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv); pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
if (pxmitbuf == NULL){ if (pxmitbuf == NULL){
//DBG_871X("%s #1, connot alloc xmitbuf!!!! \n",__FUNCTION__); //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 // no more xmit frame, release xmit buffer
//DBG_8192C("no more xmit frame ,return\n"); //DBG_8192C("no more xmit frame ,return\n");
rtw_free_xmitbuf(pxmitpriv, pxmitbuf); rtw_free_xmitbuf(pxmitpriv, pxmitbuf);
return _FALSE; return false;
} }
#ifndef IDEA_CONDITION #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 pxmitframe->pkt_offset = 1; // first frame of aggregation, reserve offset
#endif #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__); DBG_871X("%s coalesce 1st xmitframe failed \n",__FUNCTION__);
continue; 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_phead = get_list_head(&ptxservq->sta_pending);
xmitframe_plist = get_next(xmitframe_phead); 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); pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list);
xmitframe_plist = get_next(xmitframe_plist); 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->pxmitbuf = pxmitbuf;
pxmitframe->buf_addr = pxmitbuf->pbuf + pbuf; 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__); DBG_871X("%s coalesce failed \n",__FUNCTION__);
rtw_free_xmitframe(pxmitpriv, pxmitframe); rtw_free_xmitframe(pxmitpriv, pxmitframe);
continue; continue;
@ -909,7 +909,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm
rtw_os_xmit_complete(padapter, pxmitframe); rtw_os_xmit_complete(padapter, pxmitframe);
// (len - TXDESC_SIZE) == pxmitframe->attrib.last_txcmdsz // (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 // don't need xmitframe any more
rtw_free_xmitframe(pxmitpriv, pxmitframe); 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) }//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); rtw_list_delete(&ptxservq->tx_pending);
_exit_critical_bh(&pxmitpriv->lock, &irqL); _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 #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 #ifdef CONFIG_TX_EARLY_MODE
//prepare EM info for first frame, agg_num value start from 1 //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); rtw_free_xmitframe(pxmitpriv, pfirstframe);
return _TRUE; return true;
} }
#else #else
@ -1011,7 +1011,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm
pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv); pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
if(!pxmitbuf) if(!pxmitbuf)
{ {
return _FALSE; return false;
} }
} }
@ -1058,14 +1058,14 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm
else else
{ {
rtw_free_xmitbuf(pxmitpriv, pxmitbuf); rtw_free_xmitbuf(pxmitpriv, pxmitbuf);
return _FALSE; return false;
} }
break; break;
}while(0/*xcnt < (NR_XMITFRAME >> 3)*/); }while(0/*xcnt < (NR_XMITFRAME >> 3)*/);
return _TRUE; return true;
} }
#endif #endif
@ -1090,8 +1090,8 @@ static s32 xmitframe_direct(struct adapter *padapter, struct xmit_frame *pxmitfr
/* /*
* Return * Return
* _TRUE dump packet directly * true dump packet directly
* _FALSE enqueue packet * false enqueue packet
*/ */
static s32 pre_xmitframe(struct adapter *padapter, struct xmit_frame *pxmitframe) 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; goto enqueue;
#ifdef CONFIG_CONCURRENT_MODE #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; goto enqueue;
#endif #endif
@ -1140,7 +1140,7 @@ static s32 pre_xmitframe(struct adapter *padapter, struct xmit_frame *pxmitframe
rtw_free_xmitframe(pxmitpriv, pxmitframe); rtw_free_xmitframe(pxmitpriv, pxmitframe);
} }
return _TRUE; return true;
enqueue: enqueue:
res = rtw_xmitframe_enqueue(padapter, pxmitframe); res = rtw_xmitframe_enqueue(padapter, pxmitframe);
@ -1153,10 +1153,10 @@ enqueue:
// Trick, make the statistics correct // Trick, make the statistics correct
pxmitpriv->tx_pkts--; pxmitpriv->tx_pkts--;
pxmitpriv->tx_drop++; pxmitpriv->tx_drop++;
return _TRUE; return true;
} }
return _FALSE; return false;
} }
s32 rtl8188eu_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe) 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 * Return
* _TRUE dump packet directly ok * true dump packet directly ok
* _FALSE temporary can't transmit packets to hardware * false temporary can't transmit packets to hardware
*/ */
s32 rtl8188eu_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe) s32 rtl8188eu_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {

160
hal/usb_halinit.c
View file

@ -87,7 +87,7 @@ static BOOLEAN HalUsbSetQueuePipeMapping8188EUsb(
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
BOOLEAN result = _FALSE; BOOLEAN result = false;
_ConfigNormalChipOutEP_8188E(pAdapter, NumOutPipe); _ConfigNormalChipOutEP_8188E(pAdapter, NumOutPipe);
@ -114,7 +114,7 @@ void rtl8188eu_interface_configure(struct adapter *padapter)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(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 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) static u32 InitPowerOn_rtl8188eu(struct adapter *padapter)
{ {
u16 value16; u16 value16;
u8 bMacPwrCtrlOn=_FALSE; u8 bMacPwrCtrlOn=false;
// HW Power on sequence // HW Power on sequence
rtw_hal_get_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); rtw_hal_get_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
if(bMacPwrCtrlOn == _TRUE) if(bMacPwrCtrlOn == true)
return _SUCCESS; return _SUCCESS;
if(!HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK, Rtl8188E_NIC_PWR_ON_FLOW)) 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); rtw_write16(padapter, REG_CR, value16);
bMacPwrCtrlOn = _TRUE; bMacPwrCtrlOn = true;
rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
return _SUCCESS; return _SUCCESS;
@ -854,7 +854,7 @@ usb_AggSettingTxUpdate(
u32 value32; u32 value32;
if(Adapter->registrypriv.wifi_spec) if(Adapter->registrypriv.wifi_spec)
pHalData->UsbTxAggMode = _FALSE; pHalData->UsbTxAggMode = false;
if(pHalData->UsbTxAggMode){ if(pHalData->UsbTxAggMode){
value32 = rtw_read32(Adapter, REG_TDECTRL); value32 = rtw_read32(Adapter, REG_TDECTRL);
@ -983,7 +983,7 @@ InitUsbAggregationSetting(
usb_AggSettingRxUpdate(Adapter); usb_AggSettingRxUpdate(Adapter);
// 201/12/10 MH Add for USB agg mode dynamic switch. // 201/12/10 MH Add for USB agg mode dynamic switch.
pHalData->UsbRxHighSpeedMode = _FALSE; pHalData->UsbRxHighSpeedMode = false;
} }
void void
HalRxAggr8188EUsb( HalRxAggr8188EUsb(
@ -1068,7 +1068,7 @@ _InitRFType(
pHalData->rf_chip = RF_6052; pHalData->rf_chip = RF_6052;
if(_FALSE == is92CU){ if(false == is92CU){
pHalData->rf_type = RF_1T1R; pHalData->rf_type = RF_1T1R;
DBG_8192C("Set RF Chip ID to RF_6052 and RF type to 1T1R.\n"); DBG_8192C("Set RF Chip ID to RF_6052 and RF type to 1T1R.\n");
return; return;
@ -1193,7 +1193,7 @@ HwSuspendModeEnable_88eu(
// to disable HW suspend mode for IPS/radio_off. // to disable HW suspend mode for IPS/radio_off.
// //
//RT_TRACE(COMP_RF, DBG_LOUD, ("HwSuspendModeEnable92Cu = %d\n", Type)); //RT_TRACE(COMP_RF, DBG_LOUD, ("HwSuspendModeEnable92Cu = %d\n", Type));
if (Type == _FALSE) if (Type == false)
{ {
reg |= BIT14; reg |= BIT14;
//RT_TRACE(COMP_RF, DBG_LOUD, ("REG_GPIO_MUXCFG = %x\n", reg)); //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); _ps_open_RF(Adapter);
if(pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized){ if(pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized){
// PHY_IQCalibrate(padapter, _TRUE); // PHY_IQCalibrate(padapter, true);
PHY_IQCalibrate_8188E(Adapter,_TRUE); PHY_IQCalibrate_8188E(Adapter,true);
} }
else else
{ {
// PHY_IQCalibrate(padapter, _FALSE); // PHY_IQCalibrate(padapter, false);
PHY_IQCalibrate_8188E(Adapter,_FALSE); PHY_IQCalibrate_8188E(Adapter,false);
pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = _TRUE; pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = true;
} }
// dm_CheckTXPowerTracking(padapter); // dm_CheckTXPowerTracking(padapter);
@ -1397,7 +1397,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_PW_ON);
pHalData->CurrentChannel = 6;//default set to 6 pHalData->CurrentChannel = 6;//default set to 6
if(pwrctrlpriv->reg_rfoff == _TRUE){ if(pwrctrlpriv->reg_rfoff == true){
pwrctrlpriv->rf_pwrstate = rf_off; pwrctrlpriv->rf_pwrstate = rf_off;
} }
@ -1436,20 +1436,20 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_DOWNLOAD_FW);
{ {
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
status = rtl8188e_FirmwareDownload(Adapter, _FALSE); status = rtl8188e_FirmwareDownload(Adapter, false);
#else #else
status = rtl8188e_FirmwareDownload(Adapter); status = rtl8188e_FirmwareDownload(Adapter);
#endif //CONFIG_WOWLAN #endif //CONFIG_WOWLAN
if (status != _SUCCESS) { if (status != _SUCCESS) {
DBG_871X("%s: Download Firmware failed!!\n", __FUNCTION__); DBG_871X("%s: Download Firmware failed!!\n", __FUNCTION__);
Adapter->bFWReady = _FALSE; Adapter->bFWReady = false;
pHalData->fw_ractrl = _FALSE; pHalData->fw_ractrl = false;
return status; return status;
} else { } else {
RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("Initializepadapter8192CSdio(): Download Firmware Success!!\n")); RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("Initializepadapter8192CSdio(): Download Firmware Success!!\n"));
Adapter->bFWReady = _TRUE; Adapter->bFWReady = true;
pHalData->fw_ractrl = _FALSE; pHalData->fw_ractrl = false;
} }
} }
@ -1524,7 +1524,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC02);
InitUsbAggregationSetting(Adapter); InitUsbAggregationSetting(Adapter);
_InitOperationMode(Adapter);//todo _InitOperationMode(Adapter);//todo
_InitBeaconParameters(Adapter); _InitBeaconParameters(Adapter);
_InitBeaconMaxError(Adapter, _TRUE); _InitBeaconMaxError(Adapter, true);
// //
// Init CR MACTXEN, MACRXEN after setting RxFF boundary REG_TRXFF_BNDY to patch // 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(pwrctrlpriv->rf_pwrstate == rf_on)
{ {
if(pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized){ if(pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized){
PHY_IQCalibrate_8188E(Adapter,_TRUE); PHY_IQCalibrate_8188E(Adapter,true);
} }
else else
{ {
PHY_IQCalibrate_8188E(Adapter,_FALSE); PHY_IQCalibrate_8188E(Adapter,false);
pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = _TRUE; pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = true;
} }
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_PW_TRACK); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_PW_TRACK);
@ -1754,10 +1754,10 @@ void hal_poweroff_rtl8188eu(
u8 val8; u8 val8;
u16 val16; u16 val16;
u32 val32; u32 val32;
u8 bMacPwrCtrlOn=_FALSE; u8 bMacPwrCtrlOn=false;
rtw_hal_get_hwreg(Adapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); rtw_hal_get_hwreg(Adapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
if(bMacPwrCtrlOn == _FALSE) if(bMacPwrCtrlOn == false)
return ; return ;
RT_TRACE(COMP_INIT, DBG_LOUD, ("%s\n",__FUNCTION__)); 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); val8 = rtw_read8(Adapter, REG_GPIO_IO_SEL+1);
rtw_write8(Adapter, REG_GPIO_IO_SEL+1, val8|0x0F);//Reg0x43 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 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); 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) static void rtl8188eu_hw_power_down(struct adapter *padapter)
@ -1858,7 +1858,7 @@ u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
else else
#endif #endif
{ {
if(Adapter->hw_init_completed == _TRUE){ if(Adapter->hw_init_completed == true){
hal_poweroff_rtl8188eu(Adapter); hal_poweroff_rtl8188eu(Adapter);
if((pwrctl->bHWPwrPindetect ) && (pwrctl->bHWPowerdown)) if((pwrctl->bHWPwrPindetect ) && (pwrctl->bHWPowerdown))
@ -1898,7 +1898,7 @@ _func_enter_;
precvbuf = (struct recv_buf *)precvpriv->precv_buf; precvbuf = (struct recv_buf *)precvpriv->precv_buf;
for(i=0; i<NR_RECVBUFF; i++) for(i=0; i<NR_RECVBUFF; i++)
{ {
if(_read_port(pintfhdl, precvpriv->ff_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")); RT_TRACE(_module_hci_hal_init_c_,_drv_err_,("usb_rx_init: usb_read_port error \n"));
status = _FAIL; status = _FAIL;
@ -1917,7 +1917,7 @@ _func_enter_;
goto exit; goto exit;
} }
_read_interrupt = pintfhdl->io_ops._read_interrupt; _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")); RT_TRACE(_module_hci_hal_init_c_,_drv_err_,("usb_rx_init: usb_read_interrupt error \n"));
status = _FAIL; status = _FAIL;
@ -1990,7 +1990,7 @@ _ReadLEDSetting(
struct led_priv *pledpriv = &(Adapter->ledpriv); struct led_priv *pledpriv = &(Adapter->ledpriv);
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
#ifdef CONFIG_SW_LED #ifdef CONFIG_SW_LED
pledpriv->bRegUseLed = _TRUE; pledpriv->bRegUseLed = true;
switch(pHalData->CustomerID) switch(pHalData->CustomerID)
{ {
@ -1998,7 +1998,7 @@ _ReadLEDSetting(
pledpriv->LedStrategy = SW_LED_MODE1; pledpriv->LedStrategy = SW_LED_MODE1;
break; 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 #else // HW LED
pledpriv->LedStrategy = HW_LED; pledpriv->LedStrategy = HW_LED;
#endif //CONFIG_SW_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); fp = filp_open("/system/etc/wifi/wifi_efuse.map", O_RDWR, 0644);
if (IS_ERR(fp)) { if (IS_ERR(fp)) {
pEEPROM->bloadfile_fail_flag = _TRUE; pEEPROM->bloadfile_fail_flag = true;
DBG_871X("Error, Efuse configure file doesn't exist.\n"); DBG_871X("Error, Efuse configure file doesn't exist.\n");
return _FAIL; return _FAIL;
} }
@ -2169,7 +2169,7 @@ static u32 Hal_readPGDataFromConfigFile(
filp_close(fp, NULL); filp_close(fp, NULL);
pEEPROM->bloadfile_fail_flag = _FALSE; pEEPROM->bloadfile_fail_flag = false;
return _SUCCESS; return _SUCCESS;
} }
@ -2196,7 +2196,7 @@ Hal_ReadMACAddrFromFile_8188EU(
fp = filp_open("/data/wifimac.txt", O_RDWR, 0644); fp = filp_open("/data/wifimac.txt", O_RDWR, 0644);
if (IS_ERR(fp)) { 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"); DBG_871X("Error, wifi mac address file doesn't exist.\n");
} else { } else {
fs = get_fs(); fs = get_fs();
@ -2224,7 +2224,7 @@ Hal_ReadMACAddrFromFile_8188EU(
} }
DBG_871X("\n"); DBG_871X("\n");
set_fs(fs); set_fs(fs);
pEEPROM->bloadmac_fail_flag = _FALSE; pEEPROM->bloadmac_fail_flag = false;
filp_close(fp, NULL); filp_close(fp, NULL);
} }
@ -2289,8 +2289,8 @@ static void _ReadPROMContent(
/* check system boot selection */ /* check system boot selection */
eeValue = rtw_read8(Adapter, REG_9346CR); eeValue = rtw_read8(Adapter, REG_9346CR);
pEEPROM->EepromOrEfuse = (eeValue & BOOT_FROM_EEPROM) ? _TRUE : _FALSE; pEEPROM->EepromOrEfuse = (eeValue & BOOT_FROM_EEPROM) ? true : false;
pEEPROM->bautoload_fail_flag = (eeValue & EEPROM_EN) ? _FALSE : _TRUE; pEEPROM->bautoload_fail_flag = (eeValue & EEPROM_EN) ? false : true;
DBG_8192C("Boot from %s, Autoload %s !\n", (pEEPROM->EepromOrEfuse ? "EEPROM" : "EFUSE"), 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 #ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT
rtw_write8(Adapter, REG_DRVERLYINT, 0x05);//restore early int time to 5ms 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 #endif // CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT
#ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR #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_BCN_OK_ERR
#endif //CONFIG_INTERRUPT_BASED_TXBCN #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
#ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT #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 #endif//CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT
#ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR #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_BCN_OK_ERR
#endif //CONFIG_INTERRUPT_BASED_TXBCN #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 #ifdef CONFIG_TSF_RESET_OFFLOAD
// Reset TSF for STA+AP concurrent mode // Reset TSF for STA+AP concurrent mode
if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) { 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", DBG_871X("ERROR! %s()-%d: Reset port1 TSF fail\n",
__FUNCTION__, __LINE__); __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
#ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT #ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT
rtw_write8(Adapter, REG_DRVERLYINT, 0x05);//restore early int time to 5ms 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 #endif//CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT
#ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR #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_BCN_OK_ERR
#endif //CONFIG_INTERRUPT_BASED_TXBCN #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
#ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT #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 #endif//CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT
#ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR #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_BCN_OK_ERR
#endif //CONFIG_INTERRUPT_BASED_TXBCN #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 #ifdef CONFIG_TSF_RESET_OFFLOAD
// Reset TSF for STA+AP concurrent mode // Reset TSF for STA+AP concurrent mode
if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) { 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", DBG_871X("ERROR! %s()-%d: Reset port0 TSF fail\n",
__FUNCTION__, __LINE__); __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)); rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)|BIT(3));
#ifdef CONFIG_TSF_RESET_OFFLOAD #ifdef CONFIG_TSF_RESET_OFFLOAD
// Update buddy port's TSF(TBTT) if it is SoftAP for beacon TX issue! // 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", DBG_871X("ERROR! %s()-%d: Reset port0 TSF fail\n",
__FUNCTION__, __LINE__); __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)); rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)|BIT(3));
#ifdef CONFIG_TSF_RESET_OFFLOAD #ifdef CONFIG_TSF_RESET_OFFLOAD
// Update buddy port's TSF if it is SoftAP for beacon TX issue! // 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", DBG_871X("ERROR! %s()-%d: Reset port1 TSF fail\n",
__FUNCTION__, __LINE__); __FUNCTION__, __LINE__);
#endif // CONFIG_TSF_RESET_OFFLOAD #endif // CONFIG_TSF_RESET_OFFLOAD
@ -2941,7 +2941,7 @@ static void hw_var_set_mlme_join(struct adapter *Adapter, u8 variable, u8* val)
else else
rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)|RCR_CBSSID_DATA|RCR_CBSSID_BCN); 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; RetryLimit = (pHalData->CustomerID == RT_CID_CCX) ? 7 : 48;
} }
@ -3169,7 +3169,7 @@ _func_enter_;
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); 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) ) ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) )
{ {
//enable to rx data frame //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); 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; 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. // saving sequence. 2010.06.07. Added by tynli. Suggested by SD3 yschang.
if( (psmode != PS_MODE_ACTIVE) && (!IS_92C_SERIAL(pHalData->VersionID))) 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); rtl8188e_set_FwPwrMode_cmd(Adapter, psmode);
} }
@ -3682,7 +3682,7 @@ _func_enter_;
//keep sn //keep sn
Adapter->xmitpriv.nqos_ssn = rtw_read16(Adapter,REG_NQOS_SEQ); Adapter->xmitpriv.nqos_ssn = rtw_read16(Adapter,REG_NQOS_SEQ);
if(pwrpriv->bkeepfwalive != _TRUE) if(pwrpriv->bkeepfwalive != true)
{ {
//RX DMA stop //RX DMA stop
rtw_write32(Adapter,REG_RXPKT_NUM,(rtw_read32(Adapter,REG_RXPKT_NUM)|RW_RELEASE_EN)); rtw_write32(Adapter,REG_RXPKT_NUM,(rtw_read32(Adapter,REG_RXPKT_NUM)|RW_RELEASE_EN));
@ -3739,10 +3739,10 @@ _func_enter_;
case WOWLAN_ENABLE: case WOWLAN_ENABLE:
DBG_871X_LEVEL(_drv_always_, "WOWLAN_ENABLE\n"); DBG_871X_LEVEL(_drv_always_, "WOWLAN_ENABLE\n");
SetFwRelatedForWoWLAN8188ES(Adapter, _TRUE); SetFwRelatedForWoWLAN8188ES(Adapter, true);
//Set Pattern //Set Pattern
//if(adapter_to_pwrctl(Adapter)->wowlan_pattern==_TRUE) //if(adapter_to_pwrctl(Adapter)->wowlan_pattern==true)
// rtw_wowlan_reload_pattern(Adapter); // rtw_wowlan_reload_pattern(Adapter);
//RX DMA stop //RX DMA stop
@ -3801,7 +3801,7 @@ _func_enter_;
if (mstatus & BIT1) if (mstatus & BIT1)
printk("System did not release RX_DMA\n"); printk("System did not release RX_DMA\n");
else else
SetFwRelatedForWoWLAN8188ES(Adapter, _FALSE); SetFwRelatedForWoWLAN8188ES(Adapter, false);
rtw_msleep_os(2); rtw_msleep_os(2);
if(!(adapter_to_pwrctl(Adapter)->wowlan_wake_reason & FWDecisionDisconnect)) if(!(adapter_to_pwrctl(Adapter)->wowlan_wake_reason & FWDecisionDisconnect))
@ -3857,7 +3857,7 @@ _func_enter_;
break; break;
case HW_VAR_BCN_VALID: case HW_VAR_BCN_VALID:
//BCN_VALID, BIT16 of REG_TDECTRL = BIT0 of REG_TDECTRL+2 //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; break;
case HW_VAR_DM_FLAG: case HW_VAR_DM_FLAG:
val[0] = podmpriv->SupportAbility; 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, // If it is in HW/SW Radio OFF or IPS state, we do not check Fw LPS Leave,
// because Fw is unload. // because Fw is unload.
val[0] = _TRUE; val[0] = true;
} }
else else
{ {
@ -3880,9 +3880,9 @@ _func_enter_;
valRCR = rtw_read32(Adapter, REG_RCR); valRCR = rtw_read32(Adapter, REG_RCR);
valRCR &= 0x00070000; valRCR &= 0x00070000;
if(valRCR) if(valRCR)
val[0] = _FALSE; val[0] = false;
else else
val[0] = _TRUE; val[0] = true;
} }
} }
break; break;
@ -3898,7 +3898,7 @@ _func_enter_;
*val = pHalData->bMacPwrCtrlOn; *val = pHalData->bMacPwrCtrlOn;
break; break;
case HW_VAR_CHK_HI_QUEUE_EMPTY: 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; break;
case HW_VAR_READ_LLT_TAB: case HW_VAR_READ_LLT_TAB:
@ -3958,7 +3958,7 @@ GetHalDefVar8188EUsb(
} }
} }
#else //V4 branch #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; *((int *)pValue) = pHalData->dmpriv.UndecoratedSmoothedPWDB;
} }
else{ else{
@ -3968,7 +3968,7 @@ GetHalDefVar8188EUsb(
break; break;
case HAL_DEF_IS_SUPPORT_ANT_DIV: case HAL_DEF_IS_SUPPORT_ANT_DIV:
#ifdef CONFIG_ANTENNA_DIVERSITY #ifdef CONFIG_ANTENNA_DIVERSITY
*((u8 *)pValue) = (pHalData->AntDivCfg==0)?_FALSE:_TRUE; *((u8 *)pValue) = (pHalData->AntDivCfg==0)?false:true;
#endif #endif
break; break;
case HAL_DEF_CURRENT_ANTENNA: case HAL_DEF_CURRENT_ANTENNA:
@ -4020,19 +4020,19 @@ GetHalDefVar8188EUsb(
{ {
u8 entry_id = *((u8*)pValue); u8 entry_id = *((u8*)pValue);
u8 i; u8 i;
u8 bLinked = _FALSE; u8 bLinked = false;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
struct adapter *pbuddy_adapter = Adapter->pbuddy_adapter; struct adapter *pbuddy_adapter = Adapter->pbuddy_adapter;
#endif //CONFIG_CONCURRENT_MODE #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)) if(rtw_linked_check(Adapter))
bLinked = _TRUE; bLinked = true;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if(pbuddy_adapter && rtw_linked_check(pbuddy_adapter)) if(pbuddy_adapter && rtw_linked_check(pbuddy_adapter))
bLinked = _TRUE; bLinked = true;
#endif #endif
if(bLinked){ if(bLinked){
@ -4193,7 +4193,7 @@ void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rssi_level
u8 init_rate=0; u8 init_rate=0;
u8 networkType, raid; u8 networkType, raid;
u32 mask,rate_bitmap; u32 mask,rate_bitmap;
u8 shortGIrate = _FALSE; u8 shortGIrate = false;
int supportRateNum = 0; int supportRateNum = 0;
struct sta_info *psta; struct sta_info *psta;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); 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))) if (support_short_GI(padapter, &(pmlmeinfo->HT_caps)))
{ {
shortGIrate = _TRUE; shortGIrate = true;
} }
break; break;
@ -4273,7 +4273,7 @@ void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rssi_level
init_rate = get_highest_rate_idx(mask)&0x3f; init_rate = get_highest_rate_idx(mask)&0x3f;
if(pHalData->fw_ractrl == _TRUE) if(pHalData->fw_ractrl == true)
{ {
u8 arg = 0; u8 arg = 0;
@ -4282,13 +4282,13 @@ void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rssi_level
arg |= BIT(7); arg |= BIT(7);
if (shortGIrate==_TRUE) if (shortGIrate==true)
arg |= BIT(5); arg |= BIT(5);
mask |= ((raid<<28)&0xf0000000); mask |= ((raid<<28)&0xf0000000);
DBG_871X("update raid entry, mask=0x%x, arg=0x%x\n", mask, arg); DBG_871X("update raid entry, mask=0x%x, arg=0x%x\n", mask, arg);
psta->ra_mask=mask; psta->ra_mask=mask;
#ifdef CONFIG_INTEL_PROXIM #ifdef CONFIG_INTEL_PROXIM
if(padapter->proximity.proxim_on ==_TRUE){ if(padapter->proximity.proxim_on ==true){
arg &= ~BIT(6); arg &= ~BIT(6);
} }
else { else {
@ -4373,7 +4373,7 @@ void SetBeaconRelatedRegisters8188EUsb(struct adapter *padapter)
rtw_write8(padapter, REG_RXTSF_OFFSET_CCK, 0x50); rtw_write8(padapter, REG_RXTSF_OFFSET_CCK, 0x50);
rtw_write8(padapter, REG_RXTSF_OFFSET_OFDM, 0x50); rtw_write8(padapter, REG_RXTSF_OFFSET_OFDM, 0x50);
_BeaconFunctionEnable(padapter, _TRUE, _TRUE); _BeaconFunctionEnable(padapter, true, true);
ResumeTxBeacon(padapter); ResumeTxBeacon(padapter);
@ -4400,14 +4400,14 @@ static void rtl8188eu_init_default_value(struct adapter * padapter)
//init default value //init default value
pHalData->fw_ractrl = _FALSE; pHalData->fw_ractrl = false;
if(!pwrctrlpriv->bkeepfwalive) if(!pwrctrlpriv->bkeepfwalive)
pHalData->LastHMEBoxNum = 0; pHalData->LastHMEBoxNum = 0;
//init dm default value //init dm default value
pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = _FALSE; pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = false;
pHalData->odmpriv.RFCalibrateInfo.TM_Trigger = 0;//for IQK pHalData->odmpriv.RFCalibrateInfo.TM_Trigger = 0;//for IQK
//pdmpriv->binitialized = _FALSE; //pdmpriv->binitialized = false;
// pdmpriv->prv_traffic_idx = 3; // pdmpriv->prv_traffic_idx = 3;
// pdmpriv->initialize = 0; // pdmpriv->initialize = 0;
pHalData->pwrGroupCnt = 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) 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){ switch(efunc_id){
#if defined(CONFIG_AUTOSUSPEND) && defined(SUPPORT_HW_RFOFF_DETECTED) #if defined(CONFIG_AUTOSUSPEND) && defined(SUPPORT_HW_RFOFF_DETECTED)

68
hal/usb_ops_linux.c
View file

@ -131,7 +131,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
if (status < 0) { if (status < 0) {
if(status == (-ESHUTDOWN) || status == -ENODEV ) if(status == (-ESHUTDOWN) || status == -ENODEV )
{ {
padapter->bSurpriseRemoved = _TRUE; padapter->bSurpriseRemoved = true;
} else { } else {
#ifdef DBG_CONFIG_ERROR_DETECT #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 ){ if(rtw_inc_and_chk_continual_io_error(pdvobjpriv) == true ){
padapter->bSurpriseRemoved = _TRUE; padapter->bSurpriseRemoved = true;
break; break;
} }
@ -412,7 +412,7 @@ void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pbuf)
if(check_fwstate(pmlmepriv, WIFI_AP_STATE)) if(check_fwstate(pmlmepriv, WIFI_AP_STATE))
{ {
//send_beacon(padapter); //send_beacon(padapter);
if(pmlmepriv->update_bcn == _TRUE) if(pmlmepriv->update_bcn == true)
{ {
//tx_beacon_hdl(padapter, NULL); //tx_beacon_hdl(padapter, NULL);
set_tx_beacon_cmd(padapter); 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)) if(check_buddy_fwstate(padapter, WIFI_AP_STATE))
{ {
//send_beacon(padapter); //send_beacon(padapter);
if(padapter->pbuddy_adapter->mlmepriv.update_bcn == _TRUE) if(padapter->pbuddy_adapter->mlmepriv.update_bcn == true)
{ {
//tx_beacon_hdl(padapter, NULL); //tx_beacon_hdl(padapter, NULL);
set_tx_beacon_cmd(padapter->pbuddy_adapter); 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 -EPIPE:
case -ENODEV: case -ENODEV:
case -ESHUTDOWN: case -ESHUTDOWN:
//padapter->bSurpriseRemoved=_TRUE; //padapter->bSurpriseRemoved=true;
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=TRUE\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=TRUE\n"));
case -ENOENT: case -ENOENT:
padapter->bDriverStopped=_TRUE; padapter->bDriverStopped=true;
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=TRUE\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=TRUE\n"));
break; break;
case -EPROTO: 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); 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); //primary_myid = myid(&primary_padapter->eeprompriv);
secondary_myid = myid(&secondary_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 else // Handle BC/MC Packets
{ {
u8 clone = _TRUE; u8 clone = true;
if(_TRUE == clone) { if(true == clone) {
//clone/copy to if2 //clone/copy to if2
u8 shift_sz = 0; u8 shift_sz = 0;
u32 alloc_sz, skb_len; 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))) 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"); 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); 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 ){ if(rtw_inc_and_chk_continual_io_error(adapter_to_dvobj(padapter)) == true ){
padapter->bSurpriseRemoved = _TRUE; padapter->bSurpriseRemoved = true;
} }
switch(purb->status) { switch(purb->status) {
@ -965,10 +965,10 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
case -EPIPE: case -EPIPE:
case -ENODEV: case -ENODEV:
case -ESHUTDOWN: case -ESHUTDOWN:
//padapter->bSurpriseRemoved=_TRUE; //padapter->bSurpriseRemoved=true;
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=TRUE\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=TRUE\n"));
case -ENOENT: case -ENOENT:
padapter->bDriverStopped=_TRUE; padapter->bDriverStopped=true;
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=TRUE\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=TRUE\n"));
break; break;
case -EPROTO: case -EPROTO:
@ -1296,7 +1296,7 @@ void rtl8188eu_recv_tasklet(void *priv)
while (NULL != (pskb = skb_dequeue(&precvpriv->rx_skb_queue))) 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"); DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved \n");
rtw_skb_free(pskb); 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")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete!!!\n"));
//_enter_critical(&precvpriv->lock, &irqL); //_enter_critical(&precvpriv->lock, &irqL);
//precvbuf->irp_pending=_FALSE; //precvbuf->irp_pending=false;
//precvpriv->rx_pending_cnt --; //precvpriv->rx_pending_cnt --;
//_exit_critical(&precvpriv->lock, &irqL); //_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)); 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 #ifdef CONFIG_PREALLOC_RECV_SKB
precvbuf->reuse = _TRUE; precvbuf->reuse = true;
#else #else
if(precvbuf->pskb){ if(precvbuf->pskb){
DBG_8192C("==> free skb(%p)\n",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)) 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")); 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); rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
DBG_8192C("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__); 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); tasklet_schedule(&precvpriv->recv_tasklet);
precvbuf->pskb = NULL; precvbuf->pskb = NULL;
precvbuf->reuse = _FALSE; precvbuf->reuse = false;
rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); 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); 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 ){ if(rtw_inc_and_chk_continual_io_error(adapter_to_dvobj(padapter)) == true ){
padapter->bSurpriseRemoved = _TRUE; padapter->bSurpriseRemoved = true;
} }
switch(purb->status) { switch(purb->status) {
@ -1402,10 +1402,10 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
case -EPIPE: case -EPIPE:
case -ENODEV: case -ENODEV:
case -ESHUTDOWN: case -ESHUTDOWN:
//padapter->bSurpriseRemoved=_TRUE; //padapter->bSurpriseRemoved=true;
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=TRUE\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=TRUE\n"));
case -ENOENT: case -ENOENT:
padapter->bDriverStopped=_TRUE; padapter->bDriverStopped=true;
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=TRUE\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=TRUE\n"));
break; break;
case -EPROTO: 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; pHalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL;
} }
#endif #endif
precvbuf->reuse = _TRUE; precvbuf->reuse = true;
rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
break; break;
case -EINPROGRESS: case -EINPROGRESS:
@ -1462,11 +1462,11 @@ _func_enter_;
} }
#ifdef CONFIG_PREALLOC_RECV_SKB #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))) if (NULL != (precvbuf->pskb = skb_dequeue(&precvpriv->free_recv_skb_queue)))
{ {
precvbuf->reuse = _TRUE; precvbuf->reuse = true;
} }
} }
#endif #endif
@ -1477,7 +1477,7 @@ _func_enter_;
rtl8188eu_init_recvbuf(adapter, precvbuf); rtl8188eu_init_recvbuf(adapter, precvbuf);
//re-assign for linux based on skb //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); 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->pend = skb_end_pointer(precvbuf->pskb);
precvbuf->pbuf = precvbuf->pskb->data; precvbuf->pbuf = precvbuf->pskb->data;
precvbuf->reuse = _FALSE; precvbuf->reuse = false;
} }
//_enter_critical(&precvpriv->lock, &irqL); //_enter_critical(&precvpriv->lock, &irqL);
//precvpriv->rx_pending_cnt++; //precvpriv->rx_pending_cnt++;
//precvbuf->irp_pending = _TRUE; //precvbuf->irp_pending = true;
//_exit_critical(&precvpriv->lock, &irqL); //_exit_critical(&precvpriv->lock, &irqL);
precvpriv->rx_pending_cnt++; precvpriv->rx_pending_cnt++;
@ -1549,16 +1549,16 @@ _func_exit_;
void rtl8188eu_xmit_tasklet(void *priv) void rtl8188eu_xmit_tasklet(void *priv)
{ {
int ret = _FALSE; int ret = false;
struct adapter *padapter = (struct adapter*)priv; struct adapter *padapter = (struct adapter*)priv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; 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; return;
while(1) 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"); DBG_8192C("xmit_tasklet => bDriverStopped or bSurpriseRemoved or bWritePortCancel\n");
break; break;
@ -1566,7 +1566,7 @@ void rtl8188eu_xmit_tasklet(void *priv)
ret = rtl8188eu_xmitframe_complete(padapter, pxmitpriv, NULL); ret = rtl8188eu_xmitframe_complete(padapter, pxmitpriv, NULL);
if(ret==_FALSE) if(ret==false)
break; break;
} }

2
include/Hal8188EPhyCfg.h
View file

@ -362,7 +362,7 @@ storePwrIndexDiffRateOffset(
// 2) "#define RTL8723_FPGA_VERIFICATION 1" in Precomp.h.WlanE.Windows // 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. // 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_ENABLE 1
#define SIC_HW_SUPPORT 1 #define SIC_HW_SUPPORT 1
#else #else

4
include/HalVerDef.h
View file

@ -20,8 +20,8 @@
#ifndef __HAL_VERSION_DEF_H__ #ifndef __HAL_VERSION_DEF_H__
#define __HAL_VERSION_DEF_H__ #define __HAL_VERSION_DEF_H__
#define TRUE _TRUE #define TRUE true
#define FALSE _FALSE #define FALSE false
// HAL_IC_TYPE_E // HAL_IC_TYPE_E
typedef enum tag_HAL_IC_Type_Definition typedef enum tag_HAL_IC_Type_Definition

2
include/autoconf.h
View file

@ -25,7 +25,7 @@
#define CONFIG_ODM_REFRESH_RAMASK #define CONFIG_ODM_REFRESH_RAMASK
#define CONFIG_PHY_SETTING_WITH_ODM #define CONFIG_PHY_SETTING_WITH_ODM
//for FPGA VERIFICATION config //for FPGA VERIFICATION config
#define RTL8188E_FPGA_TRUE_PHY_VERIFICATION 0 #define RTL8188E_FPGAtrue_PHY_VERIFICATION 0
//***** temporarily flag ******* //***** temporarily flag *******
/* /*

12
include/basic_types.h
View file

@ -26,18 +26,6 @@
#define SUCCESS 0 #define SUCCESS 0
#define FAIL (-1) #define FAIL (-1)
#ifndef TRUE
#define _TRUE 1
#else
#define _TRUE TRUE
#endif
#ifndef FALSE
#define _FALSE 0
#else
#define _FALSE FALSE
#endif
#include <linux/types.h> #include <linux/types.h>
#define IN #define IN
#define OUT #define OUT

12
include/ieee80211.h
View file

@ -186,19 +186,19 @@ enum NETWORK_TYPE
#define SUPPORTED_24G_NETTYPE_MSK (WIRELESS_11B | WIRELESS_11G | WIRELESS_11_24N) #define SUPPORTED_24G_NETTYPE_MSK (WIRELESS_11B | WIRELESS_11G | WIRELESS_11_24N)
#define SUPPORTED_5G_NETTYPE_MSK (WIRELESS_11A | WIRELESS_11_5N) #define SUPPORTED_5G_NETTYPE_MSK (WIRELESS_11A | WIRELESS_11_5N)
#define IsSupported24G(NetType) ((NetType) & SUPPORTED_24G_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 IsSupported5G(NetType) ((NetType) & SUPPORTED_5G_NETTYPE_MSK ? true : false)
#define IsEnableHWCCK(NetType) IsSupported24G(NetType) #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 IsSupportedRxCCK(NetType) IsEnableHWCCK(NetType)
#define IsSupportedRxOFDM(NetType) IsEnableHWOFDM(NetType) #define IsSupportedRxOFDM(NetType) IsEnableHWOFDM(NetType)
#define IsSupportedRxMCS(NetType) IsEnableHWOFDM(NetType) #define IsSupportedRxMCS(NetType) IsEnableHWOFDM(NetType)
#define IsSupportedTxCCK(NetType) ((NetType) & (WIRELESS_11B) ? _TRUE : _FALSE) #define IsSupportedTxCCK(NetType) ((NetType) & (WIRELESS_11B) ? true : false)
#define IsSupportedTxOFDM(NetType) ((NetType) & (WIRELESS_11G|WIRELESS_11A) ? _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 IsSupportedTxMCS(NetType) ((NetType) & (WIRELESS_11_24N|WIRELESS_11_5N) ? true : false)
typedef struct ieee_param { typedef struct ieee_param {

2
include/mp_custom_oid.h
View file

@ -98,7 +98,7 @@
// by Owen for RTL8185 Phy Status Report Utility // 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_DEBUG_MODE 0xFF818581
#define OID_RT_UTILITY_SELECT_SUBCARRIER_NUMBER 0xFF818582 #define OID_RT_UTILITY_SELECT_SUBCARRIER_NUMBER 0xFF818582
#define OID_RT_UTILITY_GET_RSSI_STATUS 0xFF818583 #define OID_RT_UTILITY_GET_RSSI_STATUS 0xFF818583

9
include/osdep_service.h
View file

@ -29,13 +29,6 @@
#define RTW_RX_HANDLED 2 #define RTW_RX_HANDLED 2
//#define RTW_STATUS_TIMEDOUT -110 //#define RTW_STATUS_TIMEDOUT -110
#undef _TRUE
#define _TRUE 1
#undef _FALSE
#define _FALSE 0
#include <linux/version.h> #include <linux/version.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/compiler.h> #include <linux/compiler.h>
@ -280,7 +273,7 @@ __inline static void _set_timer(_timer *ptimer,u32 delay_time)
__inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled) __inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled)
{ {
del_timer_sync(ptimer); del_timer_sync(ptimer);
*bcancelled= _TRUE;//TRUE ==1; FALSE==0 *bcancelled= true;//TRUE ==1; FALSE==0
} }
#define RTW_TIMER_HDL_ARGS void *FunctionContext #define RTW_TIMER_HDL_ARGS void *FunctionContext

10
include/rtl8188e_spec.h
View file

@ -409,15 +409,15 @@
//RXERR_RPT //RXERR_RPT
#define RXERR_TYPE_OFDM_PPDU 0 #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_OK 2
#define RXERR_TYPE_OFDM_MPDU_FAIL 3 #define RXERR_TYPE_OFDM_MPDU_FAIL 3
#define RXERR_TYPE_CCK_PPDU 4 #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_OK 6
#define RXERR_TYPE_CCK_MPDU_FAIL 7 #define RXERR_TYPE_CCK_MPDU_FAIL 7
#define RXERR_TYPE_HT_PPDU 8 #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_TOTAL 10
#define RXERR_TYPE_HT_MPDU_OK 11 #define RXERR_TYPE_HT_MPDU_OK 11
#define RXERR_TYPE_HT_MPDU_FAIL 12 #define RXERR_TYPE_HT_MPDU_FAIL 12
@ -678,8 +678,8 @@ Default: 00b.
#define TOTAL_CAM_ENTRY 32 #define TOTAL_CAM_ENTRY 32
#define HALF_CAM_ENTRY 16 #define HALF_CAM_ENTRY 16
#define CAM_CONFIG_USEDK _TRUE #define CAM_CONFIG_USEDK true
#define CAM_CONFIG_NO_USEDK _FALSE #define CAM_CONFIG_NO_USEDK false
#define CAM_WRITE BIT16 #define CAM_WRITE BIT16
#define CAM_READ 0x00000000 #define CAM_READ 0x00000000

10
include/rtl8192c_spec.h
View file

@ -556,8 +556,8 @@ Default: 00b.
#define TOTAL_CAM_ENTRY 32 #define TOTAL_CAM_ENTRY 32
#define HALF_CAM_ENTRY 16 #define HALF_CAM_ENTRY 16
#define CAM_CONFIG_USEDK _TRUE #define CAM_CONFIG_USEDK true
#define CAM_CONFIG_NO_USEDK _FALSE #define CAM_CONFIG_NO_USEDK false
#define CAM_WRITE BIT16 #define CAM_WRITE BIT16
#define CAM_READ 0x00000000 #define CAM_READ 0x00000000
@ -1600,15 +1600,15 @@ Current IOREG MAP
//2 RXERR_RPT //2 RXERR_RPT
#define RXERR_TYPE_OFDM_PPDU 0 #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_OK 2
#define RXERR_TYPE_OFDM_MPDU_FAIL 3 #define RXERR_TYPE_OFDM_MPDU_FAIL 3
#define RXERR_TYPE_CCK_PPDU 4 #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_OK 6
#define RXERR_TYPE_CCK_MPDU_FAIL 7 #define RXERR_TYPE_CCK_MPDU_FAIL 7
#define RXERR_TYPE_HT_PPDU 8 #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_TOTAL 10
#define RXERR_TYPE_HT_MPDU_OK 11 #define RXERR_TYPE_HT_MPDU_OK 11
#define RXERR_TYPE_HT_MPDU_FAIL 12 #define RXERR_TYPE_HT_MPDU_FAIL 12

10
include/rtl8192d_spec.h
View file

@ -574,8 +574,8 @@ Default: 00b.
#define TOTAL_CAM_ENTRY 32 #define TOTAL_CAM_ENTRY 32
#define HALF_CAM_ENTRY 16 #define HALF_CAM_ENTRY 16
#define CAM_CONFIG_USEDK _TRUE #define CAM_CONFIG_USEDK true
#define CAM_CONFIG_NO_USEDK _FALSE #define CAM_CONFIG_NO_USEDK false
#define CAM_WRITE BIT16 #define CAM_WRITE BIT16
#define CAM_READ 0x00000000 #define CAM_READ 0x00000000
@ -1559,15 +1559,15 @@ Current IOREG MAP
//2 RXERR_RPT //2 RXERR_RPT
#define RXERR_TYPE_OFDM_PPDU 0 #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_OK 2
#define RXERR_TYPE_OFDM_MPDU_FAIL 3 #define RXERR_TYPE_OFDM_MPDU_FAIL 3
#define RXERR_TYPE_CCK_PPDU 4 #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_OK 6
#define RXERR_TYPE_CCK_MPDU_FAIL 7 #define RXERR_TYPE_CCK_MPDU_FAIL 7
#define RXERR_TYPE_HT_PPDU 8 #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_TOTAL 10
#define RXERR_TYPE_HT_MPDU_OK 11 #define RXERR_TYPE_HT_MPDU_OK 11
#define RXERR_TYPE_HT_MPDU_FAIL 12 #define RXERR_TYPE_HT_MPDU_FAIL 12

14
include/rtw_mlme.h
View file

@ -366,7 +366,7 @@ struct wifidirect_info{
struct tdls_ss_record{ //signal strength record struct tdls_ss_record{ //signal strength record
u8 macaddr[ETH_ALEN]; u8 macaddr[ETH_ALEN];
u8 RxPWDBAll; 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{ 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) __inline static sint check_fwstate(struct mlme_priv *pmlmepriv, sint state)
{ {
if (pmlmepriv->fw_state & state) if (pmlmepriv->fw_state & state)
return _TRUE; return true;
return _FALSE; return false;
} }
__inline static sint get_fwstate(struct mlme_priv *pmlmepriv) __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; pmlmepriv->fw_state |= state;
//FOR HW integration //FOR HW integration
if(_FW_UNDER_SURVEY==state){ 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; pmlmepriv->fw_state &= ~state;
//FOR HW integration //FOR HW integration
if(_FW_UNDER_SURVEY==state){ 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; _irqL irqL;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
if (check_fwstate(pmlmepriv, state) == _TRUE) if (check_fwstate(pmlmepriv, state) == true)
pmlmepriv->fw_state ^= state; pmlmepriv->fw_state ^= state;
_exit_critical_bh(&pmlmepriv->lock, &irqL); _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_timer_hdl(struct adapter *adapter);
void rtw_set_scan_deny(struct adapter *adapter, u32 ms); void rtw_set_scan_deny(struct adapter *adapter, u32 ms);
#else #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_clear_scan_deny(adapter) do {} while (0)
#define rtw_set_scan_deny_timer_hdl(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) #define rtw_set_scan_deny(adapter, ms) do {} while (0)

4
include/rtw_mp.h
View file

@ -409,8 +409,8 @@ struct bb_reg_param {
}; };
//======================================================================= //=======================================================================
#define LOWER _TRUE #define LOWER true
#define RAISE _FALSE #define RAISE false
/* Hardware Registers */ /* Hardware Registers */
#define BB_REG_BASE_ADDR 0x800 #define BB_REG_BASE_ADDR 0x800

6
include/rtw_pwrctrl.h
View file

@ -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_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_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_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) #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_register_early_suspend(struct pwrctrl_priv *pwrpriv);
void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv); void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv);
#else #else
#define rtw_is_earlysuspend_registered(pwrpriv) _FALSE #define rtw_is_earlysuspend_registered(pwrpriv) false
#define rtw_is_do_late_resume(pwrpriv) _FALSE #define rtw_is_do_late_resume(pwrpriv) false
#define rtw_set_do_late_resume(pwrpriv, enable) do {} while (0) #define rtw_set_do_late_resume(pwrpriv, enable) do {} while (0)
#define rtw_register_early_suspend(pwrpriv) do {} while (0) #define rtw_register_early_suspend(pwrpriv) do {} while (0)
#define rtw_unregister_early_suspend(pwrpriv) do {} while (0) #define rtw_unregister_early_suspend(pwrpriv) do {} while (0)

2
include/rtw_security.h
View file

@ -167,7 +167,7 @@ struct security_priv
s32 sw_encrypt;//from registry_priv s32 sw_encrypt;//from registry_priv
s32 sw_decrypt;//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) //keeps the auth_type & enc_status from upper layer ioctl(wpa_supplicant or wzc)

8
include/usb_ops.h
View file

@ -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) 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); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
if (pdvobjpriv->ishighspeed == _TRUE) if (pdvobjpriv->ishighspeed == true)
rst = (0 == (buf_len) % USB_HIGH_SPEED_BULK_SIZE)?_TRUE:_FALSE; rst = (0 == (buf_len) % USB_HIGH_SPEED_BULK_SIZE)?true:false;
else 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; return rst;
} }

8
include/wifi.h
View file

@ -366,9 +366,9 @@ enum WIFI_REG_DOMAIN {
__inline static int IS_MCAST(unsigned char *da) __inline static int IS_MCAST(unsigned char *da)
{ {
if ((*da) & 0x01) if ((*da) & 0x01)
return _TRUE; return true;
else 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) __inline static int IsFrameTypeCtrl(unsigned char *pframe)
{ {
if(WIFI_CTRL_TYPE == GetFrameType(pframe)) if(WIFI_CTRL_TYPE == GetFrameType(pframe))
return _TRUE; return true;
else else
return _FALSE; return false;
} }
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
Below is for the security related definition Below is for the security related definition

286
os_dep/ioctl_cfg80211.c
View file

File diff suppressed because it is too large Load diff

444
os_dep/ioctl_linux.c
View file

File diff suppressed because it is too large Load diff

4
os_dep/mlme_linux.c
View file

@ -157,8 +157,8 @@ void rtw_os_indicate_connect(struct adapter *adapter)
_func_enter_; _func_enter_;
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==_TRUE ) || if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==true ) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE ) ) (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==true ) )
{ {
rtw_cfg80211_ibss_indicate_connect(adapter); rtw_cfg80211_ibss_indicate_connect(adapter);
} }

124
os_dep/os_intfs.c
View file

@ -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. static int rtw_bt_ampdu =1 ;// 0:Disable BT control A-MPDU, 1:Enable BT control A-MPDU.
#endif #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_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) 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 adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct sockaddr *addr = p; 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], //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]); //addr->sa_data[4], addr->sa_data[5]);
_rtw_memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN); _rtw_memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN);
//_rtw_memcpy(pnetdev->dev_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; return 0;
@ -716,7 +716,7 @@ u32 rtw_start_drv_threads(struct adapter *padapter)
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if(padapter->isprimary == _TRUE) if(padapter->isprimary == true)
#endif //CONFIG_CONCURRENT_MODE #endif //CONFIG_CONCURRENT_MODE
{ {
padapter->cmdThread = kthread_run(rtw_cmd_thread, padapter, "RTW_CMD_THREAD"); 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")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_stop_drv_threads\n"));
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if(padapter->isprimary == _TRUE) if(padapter->isprimary == true)
#endif //CONFIG_CONCURRENT_MODE #endif //CONFIG_CONCURRENT_MODE
{ {
rtw_stop_cmd_thread(padapter); rtw_stop_cmd_thread(padapter);
@ -836,7 +836,7 @@ u8 rtw_init_default_value(struct adapter *padapter)
//ht_priv //ht_priv
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
pmlmepriv->htpriv.ampdu_enable = _FALSE;//set to disabled pmlmepriv->htpriv.ampdu_enable = false;//set to disabled
#endif #endif
//security_priv //security_priv
@ -869,8 +869,8 @@ u8 rtw_init_default_value(struct adapter *padapter)
rtw_hal_def_value_init(padapter); rtw_hal_def_value_init(padapter);
//misc. //misc.
padapter->bReadPortCancel = _FALSE; padapter->bReadPortCancel = false;
padapter->bWritePortCancel = _FALSE; padapter->bWritePortCancel = false;
padapter->bRxRSSIDisplay = 0; padapter->bRxRSSIDisplay = 0;
padapter->bNotifyChannelChange = 0; padapter->bNotifyChannelChange = 0;
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
@ -888,15 +888,15 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)
//hal_priv //hal_priv
rtw_hal_def_value_init(padapter); rtw_hal_def_value_init(padapter);
padapter->bReadPortCancel = _FALSE; padapter->bReadPortCancel = false;
padapter->bWritePortCancel = _FALSE; padapter->bWritePortCancel = false;
padapter->bRxRSSIDisplay = 0; padapter->bRxRSSIDisplay = 0;
pmlmepriv->scan_interval = SCAN_INTERVAL;// 30*2 sec = 60sec pmlmepriv->scan_interval = SCAN_INTERVAL;// 30*2 sec = 60sec
padapter->xmitpriv.tx_pkts = 0; padapter->xmitpriv.tx_pkts = 0;
padapter->recvpriv.rx_pkts = 0; padapter->recvpriv.rx_pkts = 0;
pmlmepriv->LinkDetectInfo.bBusyTraffic = _FALSE; pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY |_FW_UNDER_LINKING); _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); 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); _netdev_open(primary_padapter->pnetdev);
} }
if(padapter->bup == _FALSE && primary_padapter->bup == _TRUE && if(padapter->bup == false && primary_padapter->bup == true &&
primary_padapter->hw_init_completed == _TRUE) primary_padapter->hw_init_completed == true)
{ {
int i; int i;
padapter->bDriverStopped = _FALSE; padapter->bDriverStopped = false;
padapter->bSurpriseRemoved = _FALSE; padapter->bSurpriseRemoved = false;
padapter->bCardDisableWOHSM = _FALSE; padapter->bCardDisableWOHSM = false;
padapter->bFWReady = primary_padapter->bFWReady; padapter->bFWReady = primary_padapter->bFWReady;
@ -1252,11 +1252,11 @@ int _netdev_if2_open(struct net_device *pnetdev)
rtw_cfg80211_init_wiphy(padapter); rtw_cfg80211_init_wiphy(padapter);
#endif #endif
padapter->bup = _TRUE; padapter->bup = true;
} }
padapter->net_closed = _FALSE; padapter->net_closed = false;
_set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000); _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000);
@ -1270,7 +1270,7 @@ int _netdev_if2_open(struct net_device *pnetdev)
netdev_if2_open_error: netdev_if2_open_error:
padapter->bup = _FALSE; padapter->bup = false;
netif_carrier_off(pnetdev); netif_carrier_off(pnetdev);
rtw_netif_stop_queue(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); struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
padapter->net_closed = _TRUE; padapter->net_closed = true;
if(pnetdev) if(pnetdev)
{ {
@ -1304,7 +1304,7 @@ static int netdev_if2_close(struct net_device *pnetdev)
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
rtw_scan_abort(padapter); rtw_scan_abort(padapter);
wdev_to_priv(padapter->rtw_wdev)->bandroid_scan = _FALSE; wdev_to_priv(padapter->rtw_wdev)->bandroid_scan = false;
#endif #endif
return 0; 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)); _rtw_memcpy(padapter, primary_padapter, sizeof(struct adapter));
// //
padapter->bup = _FALSE; padapter->bup = false;
padapter->net_closed = _TRUE; padapter->net_closed = true;
padapter->hw_init_completed = _FALSE; padapter->hw_init_completed = false;
padapter->dir_dev = NULL; padapter->dir_dev = NULL;
padapter->dir_odm = NULL; padapter->dir_odm = NULL;
//set adapter_type/iface type //set adapter_type/iface type
padapter->isprimary = _FALSE; padapter->isprimary = false;
padapter->adapter_type = SECONDARY_ADAPTER; padapter->adapter_type = SECONDARY_ADAPTER;
padapter->pbuddy_adapter = primary_padapter; padapter->pbuddy_adapter = primary_padapter;
padapter->iface_id = IFACE_ID1; padapter->iface_id = IFACE_ID1;
@ -1497,8 +1497,8 @@ void rtw_drv_if2_stop(struct adapter *if2)
*/ */
rtw_cancel_all_timer(padapter); rtw_cancel_all_timer(padapter);
if (padapter->bup == _TRUE) { if (padapter->bup == true) {
padapter->bDriverStopped = _TRUE; padapter->bDriverStopped = true;
#ifdef CONFIG_XMIT_ACK #ifdef CONFIG_XMIT_ACK
if (padapter->xmitpriv.ack_tx) if (padapter->xmitpriv.ack_tx)
rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP); 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); rtw_stop_drv_threads(padapter);
padapter->bup = _FALSE; padapter->bup = false;
} }
/* /*
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
@ -1530,7 +1530,7 @@ void netdev_br_init(struct net_device *netdev)
rcu_read_lock(); rcu_read_lock();
#endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) #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; //struct net_bridge *br = netdev->br_port->br;//->dev->dev_addr;
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) #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")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - dev_open\n"));
DBG_871X("+871x_drv - drv_open, bup=%d\n", padapter->bup); DBG_871X("+871x_drv - drv_open, bup=%d\n", padapter->bup);
if(pwrctrlpriv->ps_flag == _TRUE){ if(pwrctrlpriv->ps_flag == true){
padapter->net_closed = _FALSE; padapter->net_closed = false;
goto netdev_open_normal_process; goto netdev_open_normal_process;
} }
if(padapter->bup == _FALSE) if(padapter->bup == false)
{ {
padapter->bDriverStopped = _FALSE; padapter->bDriverStopped = false;
padapter->bSurpriseRemoved = _FALSE; padapter->bSurpriseRemoved = false;
padapter->bCardDisableWOHSM = _FALSE; padapter->bCardDisableWOHSM = false;
status = rtw_hal_init(padapter); status = rtw_hal_init(padapter);
if (status ==_FAIL) if (status ==_FAIL)
@ -1694,11 +1694,11 @@ int _netdev_open(struct net_device *pnetdev)
rtw_led_control(padapter, LED_CTL_NO_LINK); 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); _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000);
@ -1723,7 +1723,7 @@ netdev_open_normal_process:
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
{ {
struct adapter *sec_adapter = padapter->pbuddy_adapter; 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); _netdev_if2_open(sec_adapter->pnetdev);
} }
#endif #endif
@ -1735,7 +1735,7 @@ netdev_open_normal_process:
netdev_open_error: netdev_open_error:
padapter->bup = _FALSE; padapter->bup = false;
netif_carrier_off(pnetdev); netif_carrier_off(pnetdev);
rtw_netif_stop_queue(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) static int ips_netdrv_open(struct adapter *padapter)
{ {
int status = _SUCCESS; int status = _SUCCESS;
padapter->net_closed = _FALSE; padapter->net_closed = false;
DBG_871X("===> %s.........\n",__FUNCTION__); DBG_871X("===> %s.........\n",__FUNCTION__);
padapter->bDriverStopped = _FALSE; padapter->bDriverStopped = false;
padapter->bCardDisableWOHSM = _FALSE; padapter->bCardDisableWOHSM = false;
//padapter->bup = _TRUE; //padapter->bup = true;
status = rtw_hal_init(padapter); status = rtw_hal_init(padapter);
if (status ==_FAIL) if (status ==_FAIL)
@ -1793,7 +1793,7 @@ static int ips_netdrv_open(struct adapter *padapter)
return _SUCCESS; return _SUCCESS;
netdev_open_error: netdev_open_error:
//padapter->bup = _FALSE; //padapter->bup = false;
DBG_871X("-ips_netdrv_open - drv_open failure, bup=%d\n", padapter->bup); DBG_871X("-ips_netdrv_open - drv_open failure, bup=%d\n", padapter->bup);
return _FAIL; return _FAIL;
@ -1821,13 +1821,13 @@ void rtw_ips_pwr_down(struct adapter *padapter)
u32 start_time = rtw_get_current_time(); u32 start_time = rtw_get_current_time();
DBG_871X("===> rtw_ips_pwr_down...................\n"); DBG_871X("===> rtw_ips_pwr_down...................\n");
padapter->bCardDisableWOHSM = _TRUE; padapter->bCardDisableWOHSM = true;
padapter->net_closed = _TRUE; padapter->net_closed = true;
rtw_led_control(padapter, LED_CTL_POWER_OFF); rtw_led_control(padapter, LED_CTL_POWER_OFF);
rtw_ips_dev_unload(padapter); 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)); DBG_871X("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time));
} }
#endif #endif
@ -1845,7 +1845,7 @@ void rtw_ips_dev_unload(struct adapter *padapter)
} }
//s5. //s5.
if(padapter->bSurpriseRemoved == _FALSE) if(padapter->bSurpriseRemoved == false)
{ {
rtw_hal_deinit(padapter); rtw_hal_deinit(padapter);
} }
@ -1888,7 +1888,7 @@ int pm_netdev_open(struct net_device *pnetdev,u8 bnormal)
int status; int status;
if (_TRUE == bnormal) if (true == bnormal)
status = netdev_open(pnetdev); status = netdev_open(pnetdev);
#ifdef CONFIG_IPS #ifdef CONFIG_IPS
else 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")); 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); //rtw_pwr_wakeup(padapter);
if(adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off) 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) /* 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); 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); rtw_dev_unload(padapter);
} }
@ -1934,13 +1934,13 @@ static int netdev_close(struct net_device *pnetdev)
#ifndef CONFIG_ANDROID #ifndef CONFIG_ANDROID
//s2. //s2.
LeaveAllPowerSaveMode(padapter); LeaveAllPowerSaveMode(padapter);
rtw_disassoc_cmd(padapter, 500, _FALSE); rtw_disassoc_cmd(padapter, 500, false);
//s2-2. indicate disconnect to os //s2-2. indicate disconnect to os
rtw_indicate_disconnect(padapter); rtw_indicate_disconnect(padapter);
//s2-3. //s2-3.
rtw_free_assoc_resources(padapter, 1); rtw_free_assoc_resources(padapter, 1);
//s2-4. //s2-4.
rtw_free_network_queue(padapter,_TRUE); rtw_free_network_queue(padapter,true);
#endif #endif
// Close LED // Close LED
rtw_led_control(padapter, LED_CTL_POWER_OFF); rtw_led_control(padapter, LED_CTL_POWER_OFF);
@ -1960,7 +1960,7 @@ static int netdev_close(struct net_device *pnetdev)
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
rtw_scan_abort(padapter); 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 padapter->rtw_wdev->iftype = NL80211_IFTYPE_MONITOR; //set this at the end
#endif //CONFIG_IOCTL_CFG80211 #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)) 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 #ifdef CONFIG_AP_MODE
else if(check_fwstate(pmlmepriv, WIFI_AP_STATE)) 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 #ifdef CONFIG_AUTOSUSPEND
if(is_primary_adapter(padapter) && (!adapter_to_pwrctl(padapter)->bInternalAutoSuspend )) if(is_primary_adapter(padapter) && (!adapter_to_pwrctl(padapter)->bInternalAutoSuspend ))
#endif #endif
rtw_free_network_queue(padapter, _TRUE); rtw_free_network_queue(padapter, true);
if(check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) if(check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
rtw_indicate_scan_done(padapter, 1); rtw_indicate_scan_done(padapter, 1);
@ -2365,10 +2365,10 @@ int rtw_resume_common(struct adapter *padapter)
#endif #endif
rtw_reset_drv_sw(padapter); rtw_reset_drv_sw(padapter);
pwrpriv->bkeepfwalive = _FALSE; pwrpriv->bkeepfwalive = false;
DBG_871X("bkeepfwalive(%x)\n",pwrpriv->bkeepfwalive); 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__); DBG_871X("%s ==> pm_netdev_open failed \n",__FUNCTION__);
ret = -1; ret = -1;
return ret; return ret;

28
os_dep/osdep_service.c
View file

@ -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 //under Linux/GNU/GLibc, the return value of memcmp for two same mem. chunk is 0
if (!(memcmp(dst, src, sz))) if (!(memcmp(dst, src, sz)))
return _TRUE; return true;
else else
return _FALSE; return false;
} }
void _rtw_memset(void *pbuf, int c, u32 sz) 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) u32 rtw_is_list_empty(_list *phead)
{ {
if (list_empty(phead)) if (list_empty(phead))
return _TRUE; return true;
else else
return _FALSE; return false;
} }
void rtw_list_insert_head(_list *plist, _list *phead) 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) u32 rtw_end_of_queue_search(_list *head, _list *plist)
{ {
if (head == plist) if (head == plist)
return _TRUE; return true;
else 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 * Test if the specifi @param path is a file and readable
* @param path the path of the file to test * @param path the path of the file to test
* @return _TRUE or _FALSE * @return true or false
*/ */
int rtw_is_file_readable(char *path) int rtw_is_file_readable(char *path)
{ {
if(isFileReadable(path) == 0) if(isFileReadable(path) == 0)
return _TRUE; return true;
else else
return _FALSE; return false;
} }
/* /*
@ -1385,22 +1385,22 @@ keep_ori:
* rtw_cbuf_full - test if cbuf is full * rtw_cbuf_full - test if cbuf is full
* @cbuf: pointer of struct rtw_cbuf * @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) 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 * rtw_cbuf_empty - test if cbuf is empty
* @cbuf: pointer of struct rtw_cbuf * @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) 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 * @buf: pointer to push in
* *
* Lock free operation, be careful of the use scheme * 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) bool rtw_cbuf_push(struct rtw_cbuf *cbuf, void *buf)
{ {

16
os_dep/recv_linux.c
View file

@ -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 dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
struct usb_device *pusbd = pdvobjpriv->pusbdev; struct usb_device *pusbd = pdvobjpriv->pusbdev;
precvbuf->irp_pending = _FALSE; precvbuf->irp_pending = false;
precvbuf->purb = usb_alloc_urb(0, GFP_KERNEL); precvbuf->purb = usb_alloc_urb(0, GFP_KERNEL);
if(precvbuf->purb == NULL){ if(precvbuf->purb == NULL){
res = _FAIL; res = _FAIL;
@ -85,7 +85,7 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, struct recv_buf *pre
precvbuf->pskb = NULL; precvbuf->pskb = NULL;
precvbuf->reuse = _FALSE; precvbuf->reuse = false;
precvbuf->pallocated_buf = precvbuf->pbuf = NULL; 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 ) 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->last_mic_err_time = 0;
psecuritypriv->btkip_countermeasure_time = cur_time; 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)); 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; _pkt *pskb2=NULL;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
@ -303,7 +303,7 @@ _func_enter_;
//DBG_871X("bmcast=%d\n", bmcast); //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); //DBG_871X("not ap psta=%p, addr=%pM\n", psta, pattrib->dst);
@ -359,7 +359,7 @@ _func_enter_;
rcu_read_unlock(); rcu_read_unlock();
#endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) #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); int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb);
if (nat25_handle_frame(padapter, skb) == -1) { 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); rtw_skb_free(precvbuf->pskb);
precvbuf->pskb = NULL; 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); rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
} }

12
os_dep/rtw_android.c
View file

@ -120,7 +120,7 @@ typedef struct android_wifi_priv_cmd {
* time (only) in dhd_open, subsequential wifi on will be handled by * time (only) in dhd_open, subsequential wifi on will be handled by
* wl_android_wifi_on * wl_android_wifi_on
*/ */
static int g_wifi_on = _TRUE; static int g_wifi_on = true;
static unsigned int oob_irq; 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; struct wlan_network *pcur_network = &pmlmepriv->cur_network;
int bytes_written = 0; 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", bytes_written += snprintf(&command[bytes_written], total_len, "%s rssi %d",
pcur_network->network.Ssid.Ssid, padapter->recvpriv.rssi); 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; char *block_value = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_BLOCK]) + 1;
#ifdef CONFIG_IOCTL_CFG80211 #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 #endif
return 0; 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); //rtw_set_scan_mode((struct adapter *)rtw_netdev_priv(net), SCAN_ACTIVE);
#ifdef CONFIG_PLATFORM_MSTAR #ifdef CONFIG_PLATFORM_MSTAR
#ifdef CONFIG_IOCTL_CFG80211 #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_IOCTL_CFG80211
#endif //CONFIG_PLATFORM_MSTAR #endif //CONFIG_PLATFORM_MSTAR
break; break;
@ -514,7 +514,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
pwfd_info = &padapter->wfd_info; pwfd_info = &padapter->wfd_info;
if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 ) if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 )
pwfd_info->wfd_enable = _TRUE; pwfd_info->wfd_enable = true;
break; break;
case ANDROID_WIFI_CMD_WFD_DISABLE: case ANDROID_WIFI_CMD_WFD_DISABLE:
// Commented by Albert 2012/07/24 // 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; pwfd_info = &padapter->wfd_info;
if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 ) if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 )
pwfd_info->wfd_enable = _FALSE; pwfd_info->wfd_enable = false;
break; break;
case ANDROID_WIFI_CMD_WFD_SET_TCPPORT: case ANDROID_WIFI_CMD_WFD_SET_TCPPORT:
// Commented by Albert 2012/07/24 // Commented by Albert 2012/07/24

146
os_dep/usb_intf.c
View file

@ -59,7 +59,7 @@ static void rtw_dev_shutdown(struct device *dev)
for (i = 0; i<dvobj->iface_nums; i++) { for (i = 0; i<dvobj->iface_nums; i++) {
adapter = dvobj->padapters[i]; adapter = dvobj->padapters[i];
adapter->bSurpriseRemoved = _TRUE; adapter->bSurpriseRemoved = true;
} }
ATOMIC_SET(&dvobj->continual_io_error, MAX_CONTINUAL_IO_ERR+1); 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->h2c_fwcmd_mutex);
_rtw_mutex_init(&pdvobjpriv->setch_mutex); _rtw_mutex_init(&pdvobjpriv->setch_mutex);
_rtw_mutex_init(&pdvobjpriv->setbw_mutex); _rtw_mutex_init(&pdvobjpriv->setbw_mutex);
pdvobjpriv->processing_dev_remove = _FALSE; pdvobjpriv->processing_dev_remove = false;
pdvobjpriv->pusbintf = usb_intf ; pdvobjpriv->pusbintf = usb_intf ;
pusbd = pdvobjpriv->pusbdev = interface_to_usbdev(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); 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) { if (pusbd->speed == USB_SPEED_HIGH) {
pdvobjpriv->ishighspeed = _TRUE; pdvobjpriv->ishighspeed = true;
DBG_871X("USB_SPEED_HIGH\n"); DBG_871X("USB_SPEED_HIGH\n");
} else { } else {
pdvobjpriv->ishighspeed = _FALSE; pdvobjpriv->ishighspeed = false;
DBG_871X("NON USB_SPEED_HIGH\n"); 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")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+usb_intf_stop\n"));
//disabel_hw_interrupt //disabel_hw_interrupt
if(padapter->bSurpriseRemoved == _FALSE) if(padapter->bSurpriseRemoved == false)
{ {
//device still exists, so driver can do i/o operation //device still exists, so driver can do i/o operation
//TODO: //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 //cancel in irp
@ -461,11 +461,11 @@ void rtw_dev_unload(struct adapter *padapter)
u8 val8; u8 val8;
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_dev_unload\n")); 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"); DBG_871X("===> rtw_dev_unload\n");
padapter->bDriverStopped = _TRUE; padapter->bDriverStopped = true;
#ifdef CONFIG_XMIT_ACK #ifdef CONFIG_XMIT_ACK
if (padapter->xmitpriv.ack_tx) if (padapter->xmitpriv.ack_tx)
rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP); rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP);
@ -483,29 +483,29 @@ void rtw_dev_unload(struct adapter *padapter)
//s5. //s5.
if(padapter->bSurpriseRemoved == _FALSE) if(padapter->bSurpriseRemoved == false)
{ {
//DBG_871X("r871x_dev_unload()->rtl871x_hal_deinit()\n"); //DBG_871X("r871x_dev_unload()->rtl871x_hal_deinit()\n");
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
if((adapter_to_pwrctl(padapter)->bSupportRemoteWakeup==_TRUE)&&(adapter_to_pwrctl(padapter)->wowlan_mode==_TRUE)){ 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__); DBG_871X("%s bSupportWakeOnWlan==true do not run rtw_hal_deinit()\n",__FUNCTION__);
} }
else else
#endif //CONFIG_WOWLAN #endif //CONFIG_WOWLAN
{ {
rtw_hal_deinit(padapter); rtw_hal_deinit(padapter);
} }
padapter->bSurpriseRemoved = _TRUE; padapter->bSurpriseRemoved = true;
} }
padapter->bup = _FALSE; padapter->bup = false;
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
padapter->hw_init_completed=_FALSE; padapter->hw_init_completed=false;
#endif //CONFIG_WOWLAN #endif //CONFIG_WOWLAN
} }
else 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"); DBG_871X("<=== rtw_dev_unload\n");
@ -572,8 +572,8 @@ int rtw_hw_suspend(struct adapter *padapter )
DBG_871X("==> rtw_hw_suspend\n"); DBG_871X("==> rtw_hw_suspend\n");
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
pwrpriv->bips_processing = _TRUE; pwrpriv->bips_processing = true;
//padapter->net_closed = _TRUE; //padapter->net_closed = true;
//s1. //s1.
if(pnetdev) if(pnetdev)
{ {
@ -582,7 +582,7 @@ int rtw_hw_suspend(struct adapter *padapter )
} }
//s2. //s2.
rtw_disassoc_cmd(padapter, 500, _FALSE); rtw_disassoc_cmd(padapter, 500, false);
//s2-2. indicate disconnect to os //s2-2. indicate disconnect to os
//rtw_indicate_disconnect(padapter); //rtw_indicate_disconnect(padapter);
@ -608,12 +608,12 @@ int rtw_hw_suspend(struct adapter *padapter )
rtw_free_assoc_resources(padapter, 1); rtw_free_assoc_resources(padapter, 1);
//s2-4. //s2-4.
rtw_free_network_queue(padapter,_TRUE); rtw_free_network_queue(padapter,true);
#ifdef CONFIG_IPS #ifdef CONFIG_IPS
rtw_ips_dev_unload(padapter); rtw_ips_dev_unload(padapter);
#endif #endif
pwrpriv->rf_pwrstate = rf_off; pwrpriv->rf_pwrstate = rf_off;
pwrpriv->bips_processing = _FALSE; pwrpriv->bips_processing = false;
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
} }
@ -641,10 +641,10 @@ int rtw_hw_resume(struct adapter *padapter)
{ {
DBG_871X("==> rtw_hw_resume\n"); DBG_871X("==> rtw_hw_resume\n");
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
pwrpriv->bips_processing = _TRUE; pwrpriv->bips_processing = true;
rtw_reset_drv_sw(padapter); rtw_reset_drv_sw(padapter);
if(pm_netdev_open(pnetdev,_FALSE) != 0) if(pm_netdev_open(pnetdev,false) != 0)
{ {
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
goto error_exit; goto error_exit;
@ -658,11 +658,11 @@ int rtw_hw_resume(struct adapter *padapter)
else else
rtw_netif_wake_queue(pnetdev); rtw_netif_wake_queue(pnetdev);
pwrpriv->bkeepfwalive = _FALSE; pwrpriv->bkeepfwalive = false;
pwrpriv->brfoffbyhw = _FALSE; pwrpriv->brfoffbyhw = false;
pwrpriv->rf_pwrstate = rf_on; pwrpriv->rf_pwrstate = rf_on;
pwrpriv->bips_processing = _FALSE; pwrpriv->bips_processing = false;
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
} }
@ -691,9 +691,9 @@ static void rtw_suspend_wow(struct adapter *padapter)
struct wowlan_ioctl_param poidparam; struct wowlan_ioctl_param poidparam;
if (check_fwstate(pmlmepriv, _FW_LINKED)) if (check_fwstate(pmlmepriv, _FW_LINKED))
pwrpriv->wowlan_mode = _TRUE; pwrpriv->wowlan_mode = true;
else else
pwrpriv->wowlan_mode = _FALSE; pwrpriv->wowlan_mode = false;
rtw_cancel_all_timer(padapter); rtw_cancel_all_timer(padapter);
LeaveAllPowerSaveMode(padapter); LeaveAllPowerSaveMode(padapter);
@ -701,7 +701,7 @@ static void rtw_suspend_wow(struct adapter *padapter)
rtw_stop_cmd_thread(padapter); rtw_stop_cmd_thread(padapter);
//padapter->net_closed = _TRUE; //padapter->net_closed = true;
//s1. //s1.
if(pnetdev) if(pnetdev)
{ {
@ -709,7 +709,7 @@ static void rtw_suspend_wow(struct adapter *padapter)
rtw_netif_stop_queue(pnetdev); rtw_netif_stop_queue(pnetdev);
} }
if(pwrpriv->bSupportRemoteWakeup==_TRUE && pwrpriv->wowlan_mode==_TRUE){ if(pwrpriv->bSupportRemoteWakeup==true && pwrpriv->wowlan_mode==true){
//set H2C command //set H2C command
poidparam.subcode=WOWLAN_ENABLE; poidparam.subcode=WOWLAN_ENABLE;
padapter->HalFunc.SetHwRegHandler(padapter,HW_VAR_WOWLAN,(u8 *)&poidparam); padapter->HalFunc.SetHwRegHandler(padapter,HW_VAR_WOWLAN,(u8 *)&poidparam);
@ -717,7 +717,7 @@ static void rtw_suspend_wow(struct adapter *padapter)
else else
{ {
//s2. //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 ) if(!pwrpriv->bInternalAutoSuspend )
#endif #endif
//s2-4. //s2-4.
rtw_free_network_queue(padapter, _TRUE); rtw_free_network_queue(padapter, true);
rtw_dev_unload(padapter); 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 #ifdef CONFIG_IOL_READ_EFUSE_MAP
if(!padapter->bup){ if(!padapter->bup){
u8 bMacPwrCtrlOn = _FALSE; u8 bMacPwrCtrlOn = false;
rtw_hal_get_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); rtw_hal_get_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
if(bMacPwrCtrlOn) if(bMacPwrCtrlOn)
rtw_hal_power_off(padapter); 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. // The FW command register update must after MAC and FW init ready.
if((padapter->bFWReady) && (pwrpriv->bHWPwrPindetect ) && (padapter->registrypriv.usbss_enable )) 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); 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
#endif #endif
} }
pwrpriv->bInSuspend = _TRUE; pwrpriv->bInSuspend = true;
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
@ -814,7 +814,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
pwrpriv->rf_pwrstate = rf_off; pwrpriv->rf_pwrstate = rf_off;
pwrpriv->bips_processing = _FALSE; pwrpriv->bips_processing = false;
#endif #endif
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
@ -848,9 +848,9 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
if (check_fwstate(pmlmepriv, _FW_LINKED)) if (check_fwstate(pmlmepriv, _FW_LINKED))
pwrpriv->wowlan_mode = _TRUE; pwrpriv->wowlan_mode = true;
else else
pwrpriv->wowlan_mode = _FALSE; pwrpriv->wowlan_mode = false;
#endif #endif
if((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved)) 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. // The FW command register update must after MAC and FW init ready.
if((padapter->bFWReady) && (pwrpriv->bHWPwrPindetect ) && (padapter->registrypriv.usbss_enable )) 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); 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
#endif #endif
} }
pwrpriv->bInSuspend = _TRUE; pwrpriv->bInSuspend = true;
rtw_cancel_all_timer(padapter); rtw_cancel_all_timer(padapter);
LeaveAllPowerSaveMode(padapter); LeaveAllPowerSaveMode(padapter);
rtw_stop_cmd_thread(padapter); rtw_stop_cmd_thread(padapter);
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
//padapter->net_closed = _TRUE; //padapter->net_closed = true;
//s1. //s1.
if(pnetdev) if(pnetdev)
{ {
@ -890,7 +890,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
} }
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
if(pwrpriv->bSupportRemoteWakeup==_TRUE && pwrpriv->wowlan_mode==_TRUE){ if(pwrpriv->bSupportRemoteWakeup==true && pwrpriv->wowlan_mode==true){
//set H2C command //set H2C command
poidparam.subcode=WOWLAN_ENABLE; poidparam.subcode=WOWLAN_ENABLE;
padapter->HalFunc.SetHwRegHandler(padapter,HW_VAR_WOWLAN,(u8 *)&poidparam); 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 #else
{ {
//s2. //s2.
rtw_disassoc_cmd(padapter, 0, _FALSE); rtw_disassoc_cmd(padapter, 0, false);
} }
#endif //CONFIG_WOWLAN #endif //CONFIG_WOWLAN
@ -924,12 +924,12 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
if(!pwrpriv->bInternalAutoSuspend ) if(!pwrpriv->bInternalAutoSuspend )
#endif #endif
//s2-4. //s2-4.
rtw_free_network_queue(padapter, _TRUE); rtw_free_network_queue(padapter, true);
rtw_dev_unload(padapter); rtw_dev_unload(padapter);
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
pwrpriv->rf_pwrstate = rf_off; pwrpriv->rf_pwrstate = rf_off;
pwrpriv->bips_processing = _FALSE; pwrpriv->bips_processing = false;
#endif #endif
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
@ -968,7 +968,7 @@ static int rtw_resume(struct usb_interface *pusb_intf)
#endif /* CONFIG_WOWLAN */ #endif /* CONFIG_WOWLAN */
) { ) {
/* jeff: bypass resume here, do in late_resume */ /* jeff: bypass resume here, do in late_resume */
rtw_set_do_late_resume(pwrpriv, _TRUE); rtw_set_do_late_resume(pwrpriv, true);
} else { } else {
ret = rtw_resume_process(padapter); ret = rtw_resume_process(padapter);
} }
@ -1011,9 +1011,9 @@ int rtw_resume_process(struct adapter *padapter)
#endif #endif
DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume ); DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
if( _TRUE == pwrpriv->bAutoResume ){ if( true == pwrpriv->bAutoResume ){
pwrpriv->bInternalAutoSuspend = _FALSE; pwrpriv->bInternalAutoSuspend = false;
pwrpriv->bAutoResume=_FALSE; pwrpriv->bAutoResume=false;
DBG_871X("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend ); 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. // The FW command register update must after MAC and FW init ready.
if((padapter->bFWReady) && (pwrpriv->bHWPwrPindetect) && (padapter->registrypriv.usbss_enable )) 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 //rtl8192c_set_FwSelectSuspend_cmd(padapter,false ,500);//note fw to support hw power down ping detect
u8 bOpen = _FALSE; u8 bOpen = false;
rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen); rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen);
} }
#endif #endif
#endif #endif
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume ); DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
if( _TRUE == pwrpriv->bAutoResume ){ if( true == pwrpriv->bAutoResume ){
pwrpriv->bInternalAutoSuspend = _FALSE; pwrpriv->bInternalAutoSuspend = false;
pwrpriv->bAutoResume=_FALSE; pwrpriv->bAutoResume=false;
DBG_871X("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend ); DBG_871X("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend );
} }
#else //#ifdef CONFIG_BT_COEXIST #else //#ifdef CONFIG_BT_COEXIST
pwrpriv->bInternalAutoSuspend = _FALSE; pwrpriv->bInternalAutoSuspend = false;
#endif //#ifdef CONFIG_BT_COEXIST #endif //#ifdef CONFIG_BT_COEXIST
pwrpriv->brfoffbyhw = _FALSE; pwrpriv->brfoffbyhw = false;
} }
#endif #endif
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
@ -1068,7 +1068,7 @@ exit:
rtw_unlock_suspend(); rtw_unlock_suspend();
#endif //CONFIG_RESUME_IN_WORKQUEUE #endif //CONFIG_RESUME_IN_WORKQUEUE
pwrpriv->bInSuspend = _FALSE; pwrpriv->bInSuspend = false;
DBG_871X("<=== %s return %d.............. in %dms\n", __FUNCTION__ DBG_871X("<=== %s return %d.............. in %dms\n", __FUNCTION__
, ret, rtw_get_passing_time_ms(start_time)); , ret, rtw_get_passing_time_ms(start_time));
@ -1085,8 +1085,8 @@ void autosuspend_enter(struct adapter* padapter)
DBG_871X("==>autosuspend_enter...........\n"); DBG_871X("==>autosuspend_enter...........\n");
pwrpriv->bInternalAutoSuspend = _TRUE; pwrpriv->bInternalAutoSuspend = true;
pwrpriv->bips_processing = _TRUE; pwrpriv->bips_processing = true;
if(rf_off == pwrpriv->change_rfpwrstate ) if(rf_off == pwrpriv->change_rfpwrstate )
{ {
@ -1146,7 +1146,7 @@ int autoresume_enter(struct adapter* padapter)
if(rf_off == pwrpriv->rf_pwrstate ) if(rf_off == pwrpriv->rf_pwrstate )
{ {
pwrpriv->ps_flag = _FALSE; pwrpriv->ps_flag = false;
#ifndef CONFIG_BT_COEXIST #ifndef CONFIG_BT_COEXIST
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(dvobj->pusbintf) < 0) 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); DBG_871X("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt);
#endif #endif
#else //#ifndef CONFIG_BT_COEXIST #else //#ifndef CONFIG_BT_COEXIST
pwrpriv->bAutoResume=_TRUE; pwrpriv->bAutoResume=true;
if(0==pwrpriv->autopm_cnt){ if(0==pwrpriv->autopm_cnt){
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(dvobj->pusbintf) < 0) 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; padapter->dvobj = dvobj;
dvobj->if1 = padapter; dvobj->if1 = padapter;
padapter->bDriverStopped=_TRUE; padapter->bDriverStopped=true;
dvobj->padapters[dvobj->iface_nums++] = padapter; dvobj->padapters[dvobj->iface_nums++] = padapter;
padapter->iface_id = IFACE_ID0; padapter->iface_id = IFACE_ID0;
#if defined(CONFIG_CONCURRENT_MODE) || defined(CONFIG_DUALMAC_CONCURRENT) #if defined(CONFIG_CONCURRENT_MODE) || defined(CONFIG_DUALMAC_CONCURRENT)
//set adapter_type/iface type for primary padapter //set adapter_type/iface type for primary padapter
padapter->isprimary = _TRUE; padapter->isprimary = true;
padapter->adapter_type = PRIMARY_ADAPTER; padapter->adapter_type = PRIMARY_ADAPTER;
#ifndef CONFIG_HWPORT_SWAP #ifndef CONFIG_HWPORT_SWAP
padapter->iface_type = IFACE_PORT0; 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); struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(if1);
if(check_fwstate(pmlmepriv, _FW_LINKED)) if(check_fwstate(pmlmepriv, _FW_LINKED))
rtw_disassoc_cmd(if1, 0, _FALSE); rtw_disassoc_cmd(if1, 0, false);
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
@ -1418,7 +1418,7 @@ static void rtw_usb_if1_deinit(struct adapter *if1)
rtw_cancel_all_timer(if1); rtw_cancel_all_timer(if1);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
pwrctl->wowlan_mode=_FALSE; pwrctl->wowlan_mode=false;
#endif //CONFIG_WOWLAN #endif //CONFIG_WOWLAN
rtw_dev_unload(if1); rtw_dev_unload(if1);
@ -1677,18 +1677,18 @@ _func_enter_;
DBG_871X("+rtw_dev_remove\n"); DBG_871X("+rtw_dev_remove\n");
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+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); 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"); //DBG_871X("r871xu_dev_remove():padapter->bSurpriseRemoved == true\n");
padapter->bSurpriseRemoved = _TRUE; padapter->bSurpriseRemoved = true;
} }
/*else /*else
{ {
//DBG_871X("r871xu_dev_remove():module removed\n"); //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) #if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER)
rtw_unregister_early_suspend(dvobj_to_pwrctl(dvobj)); rtw_unregister_early_suspend(dvobj_to_pwrctl(dvobj));
@ -1777,7 +1777,7 @@ static int __init rtw_drv_entry(void)
rtw_suspend_lock_init(); rtw_suspend_lock_init();
usb_drv->drv_registered = _TRUE; usb_drv->drv_registered = true;
return usb_register(&usb_drv->usbdrv); 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")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_halt\n"));
DBG_871X("+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); usb_deregister(&usb_drv->usbdrv);
#ifdef CONFIG_PLATFORM_ARM_SUNxI #ifdef CONFIG_PLATFORM_ARM_SUNxI

18
os_dep/usb_ops_linux.c
View file

@ -286,11 +286,11 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl)
DBG_871X("%s\n", __func__); DBG_871X("%s\n", __func__);
padapter->bReadPortCancel = _TRUE; padapter->bReadPortCancel = true;
for (i=0; i < NR_RECVBUFF ; i++) { for (i=0; i < NR_RECVBUFF ; i++) {
precvbuf->reuse = _TRUE; precvbuf->reuse = true;
if (precvbuf->purb) { if (precvbuf->purb) {
//DBG_8192C("usb_read_port_cancel : usb_kill_urb \n"); //DBG_8192C("usb_read_port_cancel : usb_kill_urb \n");
usb_kill_urb(precvbuf->purb); usb_kill_urb(precvbuf->purb);
@ -416,14 +416,14 @@ _func_enter_;
} else if (purb->status == -ESHUTDOWN) { } else if (purb->status == -ESHUTDOWN) {
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete: ESHUTDOWN\n")); 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")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bDriverStopped=TRUE\n"));
goto check_completion; goto check_completion;
} }
else else
{ {
padapter->bSurpriseRemoved=_TRUE; padapter->bSurpriseRemoved=true;
DBG_8192C("bSurpriseRemoved=TRUE\n"); DBG_8192C("bSurpriseRemoved=TRUE\n");
//rtl8192cu_trigger_gpio_0(padapter); //rtl8192cu_trigger_gpio_0(padapter);
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bSurpriseRemoved=TRUE\n")); 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; _irqL irqL;
unsigned int pipe; unsigned int pipe;
int status; int status;
u32 ret = _FAIL, bwritezero = _FALSE; u32 ret = _FAIL, bwritezero = false;
PURB purb = NULL; PURB purb = NULL;
struct adapter *padapter = (struct adapter *)pintfhdl->padapter; struct adapter *padapter = (struct adapter *)pintfhdl->padapter;
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
@ -563,7 +563,7 @@ _func_enter_;
#ifdef CONFIG_REDUCE_USB_TX_INT #ifdef CONFIG_REDUCE_USB_TX_INT
if ( (pxmitpriv->free_xmitbuf_cnt%NR_XMITBUFF == 0) if ( (pxmitpriv->free_xmitbuf_cnt%NR_XMITBUFF == 0)
|| (pxmitbuf->ext_tag == _TRUE) ) || (pxmitbuf->ext_tag == true) )
{ {
purb->transfer_flags &= (~URB_NO_INTERRUPT); purb->transfer_flags &= (~URB_NO_INTERRUPT);
} else { } else {
@ -600,7 +600,7 @@ _func_enter_;
switch (status) { switch (status) {
case -ENODEV: case -ENODEV:
padapter->bDriverStopped=_TRUE; padapter->bDriverStopped=true;
break; break;
default: default:
break; break;
@ -613,7 +613,7 @@ _func_enter_;
// Commented by Albert 2009/10/13 // 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. // 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); usb_bulkout_zero(pintfhdl, addr);
} }
@ -637,7 +637,7 @@ void usb_write_port_cancel(struct intf_hdl *pintfhdl)
DBG_871X("%s \n", __func__); DBG_871X("%s \n", __func__);
padapter->bWritePortCancel = _TRUE; padapter->bWritePortCancel = true;
for (i=0; i<NR_XMITBUFF; i++) { for (i=0; i<NR_XMITBUFF; i++) {
for (j=0; j<8; j++) { for (j=0; j<8; j++) {

22
os_dep/xmit_linux.c
View file

@ -76,12 +76,12 @@ _func_enter_;
if (pfile->pkt_len == 0) { if (pfile->pkt_len == 0) {
_func_exit_; _func_exit_;
return _TRUE; return true;
} }
_func_exit_; _func_exit_;
return _FALSE; return false;
} }
void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib) 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); plist = get_next(phead);
//free sta asoc_queue //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; int stainfo_offset;
psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list);
plist = get_next(plist); plist = get_next(plist);
@ -311,9 +311,9 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
continue; continue;
/* avoid come from STA1 and send back STA1 */ /* avoid come from STA1 and send back STA1 */
if (_rtw_memcmp(psta->hwaddr, &skb->data[6], 6) == _TRUE if (_rtw_memcmp(psta->hwaddr, &skb->data[6], 6) == true
|| _rtw_memcmp(psta->hwaddr, null_addr, 6) == _TRUE || _rtw_memcmp(psta->hwaddr, null_addr, 6) == true
|| _rtw_memcmp(psta->hwaddr, bc_addr, 6) == _TRUE || _rtw_memcmp(psta->hwaddr, bc_addr, 6) == true
) )
continue; 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__); DBG_871X("%s-%d: rtw_skb_copy() failed!\n", __FUNCTION__, __LINE__);
pxmitpriv->tx_drop++; pxmitpriv->tx_drop++;
//rtw_skb_free(skb); //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); rtw_skb_free(skb);
return _TRUE; return true;
} }
#endif // CONFIG_TX_MCAST2UNI #endif // CONFIG_TX_MCAST2UNI
@ -358,7 +358,7 @@ _func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("+xmit_enry\n")); 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")); RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit_entry: rtw_if_up fail\n"));
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s if_up fail\n", __FUNCTION__); DBG_871X("DBG_TX_DROP_FRAME %s if_up fail\n", __FUNCTION__);
@ -370,7 +370,7 @@ _func_enter_;
#ifdef CONFIG_TX_MCAST2UNI #ifdef CONFIG_TX_MCAST2UNI
if ( !rtw_mc2u_disable if ( !rtw_mc2u_disable
&& check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE && check_fwstate(pmlmepriv, WIFI_AP_STATE) == true
&& ( IP_MCAST_MAC(pkt->data) && ( IP_MCAST_MAC(pkt->data)
|| ICMPV6_MCAST_MAC(pkt->data) ) || ICMPV6_MCAST_MAC(pkt->data) )
&& (padapter->registrypriv.wifi_spec == 0) && (padapter->registrypriv.wifi_spec == 0)
@ -378,7 +378,7 @@ _func_enter_;
{ {
if ( pxmitpriv->free_xmitframe_cnt > (NR_XMITFRAME/4) ) { if ( pxmitpriv->free_xmitframe_cnt > (NR_XMITFRAME/4) ) {
res = rtw_mlcst2unicst(padapter, pkt); res = rtw_mlcst2unicst(padapter, pkt);
if (res == _TRUE) { if (res == true) {
goto exit; goto exit;
} }
} else { } else {