mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-08 14:33:05 +00:00
rtl8188eu: Remove ANTENNA DIVERSITY configuration variables and dead code
These changes include the following: 1. CONFIG_SW_ANTENNA_DIVERSITY - not selected 2. CONFIG_HW_ANTENNA_DIVERSITY - selected 3. CONFIG_ANTENNA_DIVERSITY - selected Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
9ba4954378
commit
951757e916
17 changed files with 42 additions and 944 deletions
|
|
@ -2197,7 +2197,6 @@ _func_exit_;
|
|||
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ANTENNA_DIVERSITY
|
||||
static void antenna_select_wk_hdl(_adapter *padapter, u8 antenna)
|
||||
{
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_ANTENNA_DIVERSITY_SELECT, (u8 *)(&antenna));
|
||||
|
|
@ -2247,9 +2246,7 @@ _func_exit_;
|
|||
return res;
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
void power_saving_wk_hdl(_adapter *padapter, u8 *pbuf, int sz);
|
||||
void power_saving_wk_hdl(_adapter *padapter, u8 *pbuf, int sz)
|
||||
{
|
||||
rtw_ps_processor(padapter);
|
||||
|
|
@ -2550,11 +2547,9 @@ u8 rtw_drvextra_cmd_hdl(_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);
|
||||
|
|
|
|||
|
|
@ -661,9 +661,7 @@ void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src,
|
|||
|
||||
_func_enter_;
|
||||
|
||||
#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_PROCESSING) && 1
|
||||
if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) {
|
||||
|
|
@ -786,9 +784,7 @@ _func_enter_;
|
|||
/* 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
|
||||
_rtw_memcpy(&(pnetwork->network), target, get_WLAN_BSSID_EX_sz(target));
|
||||
/* variable initialize */
|
||||
pnetwork->fixed = false;
|
||||
|
|
@ -801,23 +797,19 @@ _func_enter_;
|
|||
/* bss info not receving from the right channel */
|
||||
if (pnetwork->network.PhyInfo.SignalQuality == 101)
|
||||
pnetwork->network.PhyInfo.SignalQuality = 0;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
/* Otherwise just pull from the free list */
|
||||
|
||||
pnetwork = rtw_alloc_network(pmlmepriv); /* will update scan_time */
|
||||
|
||||
if (pnetwork==NULL){
|
||||
if (pnetwork == NULL) {
|
||||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n\n\nsomething wrong here\n\n\n"));
|
||||
goto exit;
|
||||
}
|
||||
|
||||
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
|
||||
_rtw_memcpy(&(pnetwork->network), target, bssid_ex_sz );
|
||||
|
||||
pnetwork->last_scanned = rtw_get_current_time();
|
||||
|
|
@ -1263,16 +1255,10 @@ _func_enter_;
|
|||
pmlmepriv->to_join = false;
|
||||
|
||||
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);
|
||||
|
||||
|
||||
#ifdef CONFIG_DRVEXT_MODULE
|
||||
if (padapter->drvextpriv.enable_wpa) {
|
||||
indicate_l2_connect(padapter);
|
||||
|
|
@ -2389,7 +2375,6 @@ _func_enter_;
|
|||
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)
|
||||
{
|
||||
|
|
@ -2400,7 +2385,6 @@ _func_enter_;
|
|||
(2==CurrentAntenna)?"A":"B"
|
||||
);
|
||||
}
|
||||
#endif
|
||||
|
||||
ret = rtw_joinbss_cmd(adapter, candidate);
|
||||
|
||||
|
|
|
|||
|
|
@ -7973,7 +7973,6 @@ void site_survey(_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. */
|
||||
|
|
@ -7985,8 +7984,6 @@ void site_survey(_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))
|
||||
rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo));
|
||||
|
|
@ -8093,30 +8090,22 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI
|
|||
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)
|
||||
{
|
||||
if ((p = rtw_get_ie(bssid->IEs + ie_offset, _SSID_IE_, &len, bssid->IELength - ie_offset)) == NULL) {
|
||||
DBG_88E("marc: cannot find SSID for survey event\n");
|
||||
return _FAIL;
|
||||
}
|
||||
|
||||
if (*(p + 1))
|
||||
{
|
||||
if (len > NDIS_802_11_LENGTH_SSID)
|
||||
{
|
||||
if (*(p + 1)) {
|
||||
if (len > NDIS_802_11_LENGTH_SSID) {
|
||||
DBG_88E("%s()-%d: IE too long (%d) for survey event\n", __func__, __LINE__, len);
|
||||
return _FAIL;
|
||||
}
|
||||
_rtw_memcpy(bssid->Ssid.Ssid, (p + 2), *(p + 1));
|
||||
bssid->Ssid.SsidLength = *(p + 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
bssid->Ssid.SsidLength = 0;
|
||||
}
|
||||
|
||||
|
|
@ -9708,20 +9697,13 @@ u8 join_cmd_hdl(_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; */
|
||||
|
||||
/* 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;
|
||||
|
||||
|
|
@ -9731,16 +9713,13 @@ u8 join_cmd_hdl(_adapter *padapter, u8 *pbuf)
|
|||
_cancel_timer_ex(&pmlmeext->link_timer);
|
||||
|
||||
/* set MSR to nolink -> infra. mode */
|
||||
/* Set_MSR(padapter, _HW_STATE_NOLINK_); */
|
||||
Set_MSR(padapter, _HW_STATE_STATION_);
|
||||
|
||||
|
||||
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
|
||||
|
||||
rtw_joinbss_reset(padapter);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue