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

rtl8188eu: Remove antenna diversity configuration variables

Browse source 
Always selected are CONFIG_ANTENNA_DIVERSITY and CONFIG_hW_ANTENNA_DIVERSITY.
Not selected is CONFIG_SW_ANTENNA_DIVERSITY.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-02-25 15:41:18 -06:00
parent dae15933ce
commit f6fb81d6a0
17 changed files with 44 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/rtw_cmd.c
View file

@ -2377,7 +2377,6 @@ exit:
#endif
#ifdef CONFIG_ANTENNA_DIVERSITY
static void antenna_select_wk_hdl(struct adapter *padapter, u8 antenna)
{
rtw_hal_set_hwreg(padapter, HW_VAR_ANTENNA_DIVERSITY_SELECT, (u8 *)(&antenna));
@ -2427,9 +2426,7 @@ exit:
return res;
}
#endif
void power_saving_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz);
void power_saving_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
{
rtw_ps_processor(padapter);
@ -2783,11 +2780,9 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf)
rpt_timer_setting_wk_hdl(padapter, pdrvextra_cmd->type_size);
break;
#endif
#ifdef CONFIG_ANTENNA_DIVERSITY
case ANT_SELECT_WK_CID:
antenna_select_wk_hdl(padapter, pdrvextra_cmd->type_size);
break;
#endif
#ifdef CONFIG_P2P_PS
case P2P_PS_WK_CID:
p2p_ps_wk_hdl(padapter, pdrvextra_cmd->type_size);

18
core/rtw_mlme.c
View file

@ -673,11 +673,7 @@ void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src,
u8 sq_final;
long rssi_final;
;
#ifdef CONFIG_ANTENNA_DIVERSITY
rtw_hal_antdiv_rssi_compared(padapter, dst, src); /* this will update src.Rssi, need consider again */
#endif
#if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) && 1
if(strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) {
@ -732,8 +728,6 @@ void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src,
, dst->Ssid.Ssid, MAC_ARG(dst->MacAddress), dst->PhyInfo.SignalStrength, dst->PhyInfo.SignalQuality, dst->Rssi);
}
#endif
;
}
static void update_current_network(struct adapter *adapter, WLAN_BSSID_EX *pnetwork)
@ -823,9 +817,7 @@ void rtw_update_scanned_network(struct adapter *adapter, WLAN_BSSID_EX *target)
/* list_del_init(&oldest->list); */
pnetwork = oldest;
#ifdef CONFIG_ANTENNA_DIVERSITY
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(target->PhyInfo.Optimum_antenna));
#endif
memcpy(&(pnetwork->network), target, get_WLAN_BSSID_EX_sz(target));
/* pnetwork->last_scanned = rtw_get_current_time(); */
/* variable initialize */
@ -852,10 +844,7 @@ void rtw_update_scanned_network(struct adapter *adapter, WLAN_BSSID_EX *target)
bssid_ex_sz = get_WLAN_BSSID_EX_sz(target);
target->Length = bssid_ex_sz;
#ifdef CONFIG_ANTENNA_DIVERSITY
/* target->PhyInfo.Optimum_antenna = pHalData->CurAntenna; */
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(target->PhyInfo.Optimum_antenna));
#endif
memcpy(&(pnetwork->network), target, bssid_ex_sz );
pnetwork->last_scanned = rtw_get_current_time();
@ -1389,11 +1378,6 @@ void rtw_indicate_connect(struct adapter *padapter)
if(!check_fwstate(&padapter->mlmepriv, _FW_LINKED))
{
#ifdef CONFIG_SW_ANTENNA_DIVERSITY
rtw_hal_set_hwreg(padapter, HW_VAR_ANTENNA_DIVERSITY_LINK, 0);
#endif
set_fwstate(pmlmepriv, _FW_LINKED);
rtw_led_control(padapter, LED_CTL_LINK);
@ -2542,7 +2526,6 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
rtw_free_assoc_resources(adapter, 0);
}
#ifdef CONFIG_ANTENNA_DIVERSITY
rtw_hal_get_def_var(adapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &(bSupportAntDiv));
if(true == bSupportAntDiv)
{
@ -2553,7 +2536,6 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
(2==CurrentAntenna)?"A":"B"
);
}
#endif
set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
ret = rtw_joinbss_cmd(adapter, candidate);

14
core/rtw_mlme_ext.c
View file

@ -8374,7 +8374,6 @@ void site_survey(struct adapter *padapter)
pmlmeinfo->scan_cnt = 0;
#endif /* CONFIG_DMP_STA_NODE_SCAN_UNDER_AP_MODE */
#ifdef CONFIG_ANTENNA_DIVERSITY
/* 20100721:Interrupt scan operation here. */
/* For SW antenna diversity before link, it needs to switch to another antenna and scan again. */
/* It compares the scan result and select beter one to do connection. */
@ -8386,7 +8385,6 @@ void site_survey(struct adapter *padapter)
set_survey_timer(pmlmeext, pmlmeext->chan_scan_time);
return;
}
#endif
#ifdef CONFIG_P2P
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_SCAN) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH))
@ -8502,10 +8500,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLA
bssid->Rssi = precv_frame->u.hdr.attrib.phy_info.RecvSignalPower; /* in dBM.raw data */
bssid->PhyInfo.SignalQuality = precv_frame->u.hdr.attrib.phy_info.SignalQuality;/* in percentage */
bssid->PhyInfo.SignalStrength = precv_frame->u.hdr.attrib.phy_info.SignalStrength;/* in percentage */
#ifdef CONFIG_ANTENNA_DIVERSITY
/* rtw_hal_get_hwreg(padapter, HW_VAR_CURRENT_ANTENNA, (u8 *)(&bssid->PhyInfo.Optimum_antenna)); */
rtw_hal_get_def_var(padapter, HAL_DEF_CURRENT_ANTENNA, &bssid->PhyInfo.Optimum_antenna);
#endif
/* checking SSID */
if ((p = rtw_get_ie(bssid->IEs + ie_offset, _SSID_IE_, &len, bssid->IELength - ie_offset)) == NULL)
@ -10188,21 +10183,16 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network));
#ifdef CONFIG_ANTENNA_DIVERSITY
struct joinbss_parm *pparm = (struct joinbss_parm *)pbuf;
#endif /* CONFIG_ANTENNA_DIVERSITY */
u32 i;
/* u32 initialgain; */
/* u32 acparm; */
u8 ch, bw, offset;
/* check already connecting to AP or not */
if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)
{
if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) {
if (pmlmeinfo->state & WIFI_FW_STATION_STATE)
{
issue_deauth_ex(padapter, pnetwork->MacAddress, WLAN_REASON_DEAUTH_LEAVING, 5, 100);
}
pmlmeinfo->state = WIFI_FW_NULL_STATE;
@ -10219,9 +10209,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)
rtw_hal_set_hwreg(padapter, HW_VAR_MLME_DISCONNECT, NULL);
}
#ifdef CONFIG_ANTENNA_DIVERSITY
rtw_antenna_select_cmd(padapter, pparm->network.PhyInfo.Optimum_antenna, false);
#endif
#ifdef CONFIG_WAPI_SUPPORT
rtw_wapi_clear_all_cam_entry(padapter);