From f6fb81d6a0440ade1bf87a1a065ddeff9a2e0f8d Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 25 Feb 2015 15:41:18 -0600 Subject: [PATCH] rtl8188eu: Remove antenna diversity configuration variables Always selected are CONFIG_ANTENNA_DIVERSITY and CONFIG_hW_ANTENNA_DIVERSITY. Not selected is CONFIG_SW_ANTENNA_DIVERSITY. Signed-off-by: Larry Finger --- core/rtw_cmd.c | 5 - core/rtw_mlme.c | 18 ---- core/rtw_mlme_ext.c | 14 +-- hal/hal_intf.c | 2 - hal/odm.c | 201 ---------------------------------------- hal/odm.h | 4 - hal/odm_HWConfig.c | 4 - hal/odm_RTL8188E.c | 12 --- hal/rtl8188e_dm.c | 12 --- hal/rtl8188e_hal_init.c | 2 - hal/rtl8188eu_xmit.c | 2 - hal/usb_halinit.c | 20 +--- include/autoconf.h | 46 --------- include/hal_intf.h | 4 - include/rtl8188e_dm.h | 2 - include/rtl8192c_dm.h | 30 ------ include/rtw_cmd.h | 87 +++++++++-------- 17 files changed, 44 insertions(+), 421 deletions(-) diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index b312598..40fca1c 100755 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -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); diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index ebc403c..71e2f9a 100755 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -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); diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 7651e85..9acab4b 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -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); diff --git a/hal/hal_intf.c b/hal/hal_intf.c index 8f3d130..1d19f57 100755 --- a/hal/hal_intf.c +++ b/hal/hal_intf.c @@ -423,7 +423,6 @@ void rtw_hal_bcn_related_reg_setting(struct adapter *padapter) } -#ifdef CONFIG_ANTENNA_DIVERSITY u8 rtw_hal_antdiv_before_linked(struct adapter *padapter) { if(padapter->HalFunc.AntDivBeforeLinkHandler) @@ -435,7 +434,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, WLAN_BSSID_EX *dst, if(padapter->HalFunc.AntDivCompareHandler) padapter->HalFunc.AntDivCompareHandler(padapter, dst, src); } -#endif #ifdef CONFIG_HOSTAPD_MLME s32 rtw_hal_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt) diff --git a/hal/odm.c b/hal/odm.c index aba753c..0bed022 100755 --- a/hal/odm.c +++ b/hal/odm.c @@ -984,13 +984,7 @@ odm_CommonInfoSelfInit( pDM_Odm->bCckHighPower = (BOOLEAN) ODM_GetBBReg(pDM_Odm, 0x824, BIT9); pDM_Odm->RFPathRxEnable = (u8) ODM_GetBBReg(pDM_Odm, 0xc04, 0x0F); if(pDM_Odm->SupportICType & (ODM_RTL8192C|ODM_RTL8192D)) - { -#if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) pDM_Odm->AntDivType = CG_TRX_HW_ANTDIV; -#elif (defined(CONFIG_SW_ANTENNA_DIVERSITY)) - pDM_Odm->AntDivType = CGCS_RX_SW_ANTDIV; -#endif - } if(pDM_Odm->SupportICType & (ODM_RTL8723A)) pDM_Odm->AntDivType = CGCS_RX_SW_ANTDIV; @@ -3416,188 +3410,6 @@ odm_TXPowerTrackingCheckAP( /* 3============================================================ */ /* 3 SW Antenna Diversity */ /* 3============================================================ */ -#if(defined(CONFIG_SW_ANTENNA_DIVERSITY)) -void -odm_SwAntDivInit( - IN PDM_ODM_T pDM_Odm - ) -{ - odm_SwAntDivInit_NIC(pDM_Odm); -} - -void -odm_SwAntDivInit_NIC( - IN PDM_ODM_T pDM_Odm - ) -{ - pSWAT_T pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; -/* Init SW ANT DIV mechanism for 8723AE/AU/AS*/ -/* CE/AP/ADSL no using SW ANT DIV for 8723A Series IC */ - ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("SWAS:Init SW Antenna Switch\n")); - pDM_SWAT_Table->RSSI_sum_A = 0; - pDM_SWAT_Table->RSSI_cnt_A = 0; - pDM_SWAT_Table->RSSI_sum_B = 0; - pDM_SWAT_Table->RSSI_cnt_B = 0; - pDM_SWAT_Table->CurAntenna = Antenna_A; - pDM_SWAT_Table->PreAntenna = Antenna_A; - pDM_SWAT_Table->try_flag = 0xff; - pDM_SWAT_Table->PreRSSI = 0; - pDM_SWAT_Table->SWAS_NoLink_State = 0; - pDM_SWAT_Table->bTriggerAntennaSwitch = 0; - pDM_SWAT_Table->SelectAntennaMap=0xAA; - pDM_SWAT_Table->lastTxOkCnt = 0; - pDM_SWAT_Table->lastRxOkCnt = 0; - pDM_SWAT_Table->TXByteCnt_A = 0; - pDM_SWAT_Table->TXByteCnt_B = 0; - pDM_SWAT_Table->RXByteCnt_A = 0; - pDM_SWAT_Table->RXByteCnt_B = 0; - pDM_SWAT_Table->TrafficLoad = TRAFFIC_LOW; - pDM_SWAT_Table->SWAS_NoLink_BK_Reg860 = ODM_Read4Byte(pDM_Odm, 0x860); -} - -/* */ -/* 20100514 Joseph: */ -/* Add new function to reset the state of antenna diversity before link. */ -/* */ -void -ODM_SwAntDivResetBeforeLink( - IN PDM_ODM_T pDM_Odm - ) -{ - - pSWAT_T pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; - - pDM_SWAT_Table->SWAS_NoLink_State = 0; - -} - -/* */ -/* 20100514 Luke/Joseph: */ -/* Add new function to reset antenna diversity state after link. */ -/* */ -void -ODM_SwAntDivRestAfterLink( - IN PDM_ODM_T pDM_Odm - ) -{ - pSWAT_T pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; - - pDM_SWAT_Table->RSSI_cnt_A = 0; - pDM_SWAT_Table->RSSI_cnt_B = 0; - pDM_Odm->RSSI_test = FALSE; - pDM_SWAT_Table->try_flag = 0xff; - pDM_SWAT_Table->RSSI_Trying = 0; - pDM_SWAT_Table->SelectAntennaMap=0xAA; -} - -void -ODM_SwAntDivChkPerPktRssi( - IN PDM_ODM_T pDM_Odm, - IN u8 StationID, - IN PODM_PHY_INFO_T pPhyInfo - ) -{ - SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; - - if(!(pDM_Odm->SupportAbility & (ODM_BB_ANT_DIV))) - return; - - if(StationID == pDM_SWAT_Table->RSSI_target) - { - /* 1 RSSI for SW Antenna Switch */ - if(pDM_SWAT_Table->CurAntenna == Antenna_A) - { - pDM_SWAT_Table->RSSI_sum_A += pPhyInfo->RxPWDBAll; - pDM_SWAT_Table->RSSI_cnt_A++; - } - else - { - pDM_SWAT_Table->RSSI_sum_B += pPhyInfo->RxPWDBAll; - pDM_SWAT_Table->RSSI_cnt_B++; - - } - } - -} - -/* */ -void -odm_SwAntDivChkAntSwitch( - IN PDM_ODM_T pDM_Odm, - IN u8 Step - ) -{ - /* */ - /* For AP/ADSL use prtl8192cd_priv */ - /* For CE/NIC use PADAPTER */ - /* */ - struct adapter * pAdapter = pDM_Odm->Adapter; - prtl8192cd_priv priv = pDM_Odm->priv; - - /* */ - /* 2011/09/29 MH In HW integration first stage, we provide 4 different handle to operate */ - /* at the same time. In the stage2/3, we need to prive universal interface and merge all */ - /* HW dynamic mechanism. */ - /* */ - switch (pDM_Odm->SupportPlatform) { - case ODM_MP: - case ODM_CE: - odm_SwAntDivChkAntSwitchNIC(pDM_Odm, Step); - break; - case ODM_AP: - case ODM_ADSL: - break; - } -} - -/* */ -/* 20100514 Luke/Joseph: */ -/* Add new function for antenna diversity after link. */ -/* This is the main function of antenna diversity after link. */ -/* This function is called in HalDmWatchDog() and ODM_SwAntDivChkAntSwitchCallback(). */ -/* HalDmWatchDog() calls this function with SWAW_STEP_PEAK to initialize the antenna test. */ -/* In SWAW_STEP_PEAK, another antenna and a 500ms timer will be set for testing. */ -/* After 500ms, ODM_SwAntDivChkAntSwitchCallback() calls this function to compare the signal just */ -/* listened on the air with the RSSI of original antenna. */ -/* It chooses the antenna with better RSSI. */ -/* There is also a aged policy for error trying. Each error trying will cost more 5 seconds waiting */ -/* penalty to get next try. */ - - -void -ODM_SetAntenna( - IN PDM_ODM_T pDM_Odm, - IN u8 Antenna) -{ - ODM_SetBBReg(pDM_Odm, 0x860, BIT8|BIT9, Antenna); -} -/* 2012--09--06-- */ -/* Note: Antenna_Main--> Antenna_A */ -/* Antenna_Aux---> Antenna_B */ -/* */ -void -odm_SwAntDivChkAntSwitchNIC( - IN PDM_ODM_T pDM_Odm, - IN u8 Step - ) -{ -} - -/* */ -/* 20100514 Luke/Joseph: */ -/* Callback function for 500ms antenna test trying. */ -/* */ -void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext) -{ - PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext; - struct adapter *padapter = pDM_Odm->Adapter; - if(padapter->net_closed == true) - return; - odm_SwAntDivChkAntSwitch(pDM_Odm, SWAW_STEP_DETERMINE); -} - -#else /* if(defined(CONFIG_SW_ANTENNA_DIVERSITY)) */ - void odm_SwAntDivInit( IN PDM_ODM_T pDM_Odm ) {} void ODM_SwAntDivChkPerPktRssi( IN PDM_ODM_T pDM_Odm, @@ -3612,13 +3424,10 @@ static void ODM_SwAntDivResetBeforeLink( IN PDM_ODM_T pDM_Odm ){} void ODM_SwAntDivRestAfterLink( IN PDM_ODM_T pDM_Odm ){} void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext){} -#endif /* if(defined(CONFIG_SW_ANTENNA_DIVERSITY)) */ - /* 3============================================================ */ /* 3 SW Antenna Diversity */ /* 3============================================================ */ -#if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) static void odm_InitHybridAntDiv_88C_92D( IN PDM_ODM_T pDM_Odm @@ -3939,16 +3748,6 @@ odm_HwAntDiv( } -#else /* if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) */ - -void odm_InitHybridAntDiv( IN PDM_ODM_T pDM_Odm ){} -void odm_HwAntDiv( IN PDM_ODM_T pDM_Odm){} -void ODM_SetTxAntByTxInfo_88C_92D( IN PDM_ODM_T pDM_Odm){ } - -#endif /* if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) */ - - - /* */ /* EDCA Turbo */ /* */ diff --git a/hal/odm.h b/hal/odm.h index 3e1efe6..7f58331 100755 --- a/hal/odm.h +++ b/hal/odm.h @@ -233,7 +233,6 @@ typedef struct _RX_High_Power_ #define ASSOCIATE_ENTRY_NUM 32 /* Max size of AsocEntry[]. */ #define ODM_ASSOCIATE_ENTRY_NUM ASSOCIATE_ENTRY_NUM -/* ifdef CONFIG_ANTENNA_DIVERSITY */ /* This indicates two different the steps. */ /* In SWAW_STEP_PEAK, driver needs to switch antenna and listen to the signal on the air. */ /* In SWAW_STEP_DETERMINE, driver just compares the signal captured in SWAW_STEP_PEAK */ @@ -277,7 +276,6 @@ typedef struct _SW_Antenna_Switch_ u64 RXByteCnt_B; u8 TrafficLoad; RT_TIMER SwAntennaSwitchTimer; -#ifdef CONFIG_HW_ANTENNA_DIVERSITY /* Hybrid Antenna Diversity */ u32 CCK_Ant1_Cnt[ASSOCIATE_ENTRY_NUM]; u32 CCK_Ant2_Cnt[ASSOCIATE_ENTRY_NUM]; @@ -289,8 +287,6 @@ typedef struct _SW_Antenna_Switch_ u8 TargetSTA; u8 antsel; u8 RxIdleAnt; - -#endif }SWAT_T, *pSWAT_T; typedef struct _EDCA_TURBO_ { diff --git a/hal/odm_HWConfig.c b/hal/odm_HWConfig.c index 7b116f6..4fa11ea 100755 --- a/hal/odm_HWConfig.c +++ b/hal/odm_HWConfig.c @@ -571,13 +571,11 @@ odm_RxPhyStatus92CSeries_Parsing( } /* For 92C/92D HW (Hybrid) Antenna Diversity */ -#if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) pDM_SWAT_Table->antsel = pPhyStaRpt->ant_sel; /* For 88E HW Antenna Diversity */ pDM_Odm->DM_FatTable.antsel_rx_keep_0 = pPhyStaRpt->ant_sel; pDM_Odm->DM_FatTable.antsel_rx_keep_1 = pPhyStaRpt->ant_sel_b; pDM_Odm->DM_FatTable.antsel_rx_keep_2 = pPhyStaRpt->antsel_rx_keep_2; -#endif } void @@ -627,7 +625,6 @@ odm_Process_RSSIForDM( pDM_Odm->PhyDbgInfo.NumQryBeaconPkt++; pDM_Odm->RxRate = pPktinfo->Rate; -#if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) /* Smart Antenna Debug Message------------------ */ if(pDM_Odm->SupportICType == ODM_RTL8188E) { @@ -653,7 +650,6 @@ odm_Process_RSSIForDM( } } -#endif /* if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) */ /* Smart Antenna Debug Message------------------ */ UndecoratedSmoothedCCK = pEntry->rssi_stat.UndecoratedSmoothedCCK; diff --git a/hal/odm_RTL8188E.c b/hal/odm_RTL8188E.c index f93297d..faed849 100755 --- a/hal/odm_RTL8188E.c +++ b/hal/odm_RTL8188E.c @@ -42,7 +42,6 @@ ODM_DIG_LowerBound_88E( } -#if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) static void odm_RX_HWAntDivInit( IN PDM_ODM_T pDM_Odm @@ -528,17 +527,6 @@ ODM_AntennaDiversity_88E( odm_HWAntDiv(pDM_Odm); } - -#else /* if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) */ -void -ODM_SetTxAntByTxInfo_88E( - IN PDM_ODM_T pDM_Odm, - IN u8 * pDesc, - IN u8 macId - ) -{ -} -#endif /* if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) */ /* 3============================================================ */ /* 3 Dynamic Primary CCA */ /* 3============================================================ */ diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index 38f48f7..bc24e67 100755 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -367,10 +367,6 @@ void rtl8188e_init_dm_priv(IN struct adapter *Adapter) memset(pdmpriv, 0, sizeof(struct dm_priv)); /* _rtw_spinlock_init(&(pHalData->odm_stainfo_lock)); */ Init_ODM_ComInfo_88E(Adapter); -#ifdef CONFIG_SW_ANTENNA_DIVERSITY - /* _init_timer(&(pdmpriv->SwAntennaSwitchTimer), Adapter->pnetdev , odm_SW_AntennaSwitchCallback, Adapter); */ - ODM_InitAllTimers(podmpriv ); -#endif ODM_InitDebugSetting(podmpriv); } @@ -379,15 +375,8 @@ void rtl8188e_deinit_dm_priv(IN struct adapter *Adapter) PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; PDM_ODM_T podmpriv = &pHalData->odmpriv; - /* _rtw_spinlock_free(&pHalData->odm_stainfo_lock); */ -#ifdef CONFIG_SW_ANTENNA_DIVERSITY - /* _cancel_timer_ex(&pdmpriv->SwAntennaSwitchTimer); */ - ODM_CancelAllTimers(podmpriv); -#endif } - -#ifdef CONFIG_ANTENNA_DIVERSITY /* Add new function to reset the state of antenna diversity before link. */ /* */ /* Compare RSSI for deciding antenna */ @@ -448,4 +437,3 @@ u8 AntDivBeforeLink8188E(struct adapter *Adapter ) } } -#endif diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c index 3c51774..bf730b7 100755 --- a/hal/rtl8188e_hal_init.c +++ b/hal/rtl8188e_hal_init.c @@ -2762,10 +2762,8 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) pHalFunc->run_thread= &rtl8188e_start_thread; pHalFunc->cancel_thread= &rtl8188e_stop_thread; -#ifdef CONFIG_ANTENNA_DIVERSITY pHalFunc->AntDivBeforeLinkHandler = &AntDivBeforeLink8188E; pHalFunc->AntDivCompareHandler = &AntDivCompare8188E; -#endif pHalFunc->read_bbreg = &rtl8188e_PHY_QueryBBReg; pHalFunc->write_bbreg = &rtl8188e_PHY_SetBBReg; diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c index a4f4c68..a5a9573 100755 --- a/hal/rtl8188eu_xmit.c +++ b/hal/rtl8188eu_xmit.c @@ -482,9 +482,7 @@ if (padapter->registrypriv.mp_mode == 0) ptxdesc->txdw4 |= cpu_to_le32(HW_SSN); /* Hw set sequence number */ } -#ifdef CONFIG_HW_ANTENNA_DIVERSITY /* CONFIG_ANTENNA_DIVERSITY */ ODM_SetTxAntByTxInfo_88E(&pHalData->odmpriv, pmem, pattrib->mac_id); -#endif rtl8188eu_cal_txdesc_chksum(ptxdesc); _dbg_dump_tx_info(padapter,pxmitframe->frame_tag,ptxdesc); diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index 920872a..311a9e4 100755 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -3101,14 +3101,6 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) } break; #endif -#ifdef CONFIG_SW_ANTENNA_DIVERSITY - - case HW_VAR_ANTENNA_DIVERSITY_LINK: - /* odm_SwAntDivRestAfterLink8192C(Adapter); */ - ODM_SwAntDivRestAfterLink(podmpriv); - break; -#endif -#ifdef CONFIG_ANTENNA_DIVERSITY case HW_VAR_ANTENNA_DIVERSITY_SELECT: { u8 Optimum_antenna = (*(u8 *)val); @@ -3125,7 +3117,6 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) } } break; -#endif case HW_VAR_EFUSE_BYTES: /* To set EFUE total used bytes, added by Roger, 2008.12.22. */ pHalData->EfuseUsedBytes = *((u16 *)val); break; @@ -3330,11 +3321,9 @@ static void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) } } break; -#ifdef CONFIG_ANTENNA_DIVERSITY case HW_VAR_CURRENT_ANTENNA: val[0] = pHalData->CurAntenna; break; -#endif case HW_VAR_EFUSE_BYTES: /* To get EFUE total used bytes, added by Roger, 2008.12.22. */ *((u16 *)(val)) = pHalData->EfuseUsedBytes; break; @@ -3344,11 +3333,8 @@ static void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) case HW_VAR_CHK_HI_QUEUE_EMPTY: *val = ((rtw_read32(Adapter, REG_HGQ_INFORMATION)&0x0000ff00)==0) ? true:false; break; - case HW_VAR_READ_LLT_TAB: - { - Read_LLT_Tab(Adapter); - } + Read_LLT_Tab(Adapter); break; case HW_VAR_GET_CPWM: break; @@ -3405,14 +3391,10 @@ static u8 GetHalDefVar8188EUsb( #endif break; case HAL_DEF_IS_SUPPORT_ANT_DIV: -#ifdef CONFIG_ANTENNA_DIVERSITY *((u8 *)pValue) = (pHalData->AntDivCfg==0)?false:true; -#endif break; case HAL_DEF_CURRENT_ANTENNA: -#ifdef CONFIG_ANTENNA_DIVERSITY *(( u8*)pValue) = pHalData->CurAntenna; -#endif break; case HAL_DEF_DRVINFO_SZ: *(( u32*)pValue) = DRVINFO_SZ; diff --git a/include/autoconf.h b/include/autoconf.h index 1041e7c..fafcff9 100755 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -32,14 +32,6 @@ #define CONFIG_SUPPORT_USB_INT - //befor link - #define CONFIG_ANTENNA_DIVERSITY - - //after link - #ifdef CONFIG_ANTENNA_DIVERSITY - #define CONFIG_HW_ANTENNA_DIVERSITY - #endif - #define CONFIG_IOL #define CONFIG_AP_MODE @@ -134,44 +126,6 @@ #define MP_DRIVER 0 -/* - * Platform Related Config - */ -#ifdef CONFIG_PLATFORM_MN10300 - #define CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV - #define CONFIG_USE_USB_BUFFER_ALLOC_RX - - #if defined (CONFIG_SW_ANTENNA_DIVERSITY) - #undef CONFIG_SW_ANTENNA_DIVERSITY - #define CONFIG_HW_ANTENNA_DIVERSITY - #endif - - #if defined (CONFIG_POWER_SAVING) - #undef CONFIG_POWER_SAVING - #endif - -#endif//CONFIG_PLATFORM_MN10300 - - - -#ifdef CONFIG_PLATFORM_TI_DM365 -#define CONFIG_USE_USB_BUFFER_ALLOC_RX -#endif - - -#if defined(CONFIG_PLATFORM_ACTIONS_ATM702X) - #ifdef CONFIG_USB_TX_AGGREGATION - #undef CONFIG_USB_TX_AGGREGATION - #endif - #ifndef CONFIG_USE_USB_BUFFER_ALLOC_TX - #define CONFIG_USE_USB_BUFFER_ALLOC_TX - #endif - #ifndef CONFIG_USE_USB_BUFFER_ALLOC_RX - #define CONFIG_USE_USB_BUFFER_ALLOC_RX - #endif -#endif - - /* * Outsource Related Config */ diff --git a/include/hal_intf.h b/include/hal_intf.h index 143fa38..21c36a3 100755 --- a/include/hal_intf.h +++ b/include/hal_intf.h @@ -214,10 +214,8 @@ struct hal_ops { void (*run_thread)(struct adapter *padapter); void (*cancel_thread)(struct adapter *padapter); -#ifdef CONFIG_ANTENNA_DIVERSITY u8 (*AntDivBeforeLinkHandler)(struct adapter *padapter); void (*AntDivCompareHandler)(struct adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); -#endif u8 (*interface_ps_func)(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val); s32 (*hal_xmit)(struct adapter *padapter, struct xmit_frame *pxmitframe); @@ -444,10 +442,8 @@ void rtw_hal_set_bwmode(struct adapter *padapter, HT_CHANNEL_WIDTH Bandwidth, u8 void rtw_hal_set_chan(struct adapter *padapter, u8 channel); void rtw_hal_dm_watchdog(struct adapter *padapter); -#ifdef CONFIG_ANTENNA_DIVERSITY u8 rtw_hal_antdiv_before_linked(struct adapter *padapter); void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); -#endif #ifdef CONFIG_HOSTAPD_MLME s32 rtw_hal_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt); diff --git a/include/rtl8188e_dm.h b/include/rtl8188e_dm.h index f8d90e6..dc93932 100755 --- a/include/rtl8188e_dm.h +++ b/include/rtl8188e_dm.h @@ -59,9 +59,7 @@ void rtl8188e_deinit_dm_priv(IN struct adapter *Adapter); void rtl8188e_InitHalDm(IN struct adapter *Adapter); void rtl8188e_HalDmWatchDog(IN struct adapter *Adapter); -#ifdef CONFIG_ANTENNA_DIVERSITY void AntDivCompare8188E(struct adapter *Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); u8 AntDivBeforeLink8188E(struct adapter *Adapter ); -#endif #endif diff --git a/include/rtl8192c_dm.h b/include/rtl8192c_dm.h index ac18c66..2890da3 100755 --- a/include/rtl8192c_dm.h +++ b/include/rtl8192c_dm.h @@ -210,41 +210,11 @@ struct dm_priv u32 prv_traffic_idx; // edca turbo -/* - // for dm_RF_Saving - u8 initialize; - u32 rf_saving_Reg874; - u32 rf_saving_RegC70; - u32 rf_saving_Reg85C; - u32 rf_saving_RegA74; -*/ - //for Antenna diversity -#ifdef CONFIG_ANTENNA_DIVERSITY -// SWAT_T DM_SWAT_Table; -#endif -#ifdef CONFIG_SW_ANTENNA_DIVERSITY -// _timer SwAntennaSwitchTimer; -/* - u64 lastTxOkCnt; - u64 lastRxOkCnt; - u64 TXByteCnt_A; - u64 TXByteCnt_B; - u64 RXByteCnt_A; - u64 RXByteCnt_B; - u8 DoubleComfirm; - u8 TrafficLoad; -*/ -#endif - s32 OFDM_Pkt_Cnt; u8 RSSI_Select; -// u8 DIG_Dynamic_MIN ; -//###### duplicate code,will move to ODM ######### - // Add for Reading Initial Data Rate SEL Register 0x484 during watchdog. Using for fill tx desc. 2011.3.21 by Thomas u8 INIDATA_RATE[32]; }; - //============================================================ // function prototype //============================================================ diff --git a/include/rtw_cmd.h b/include/rtw_cmd.h index ab07207..101e7b4 100755 --- a/include/rtw_cmd.h +++ b/include/rtw_cmd.h @@ -921,77 +921,74 @@ Result: #define H2C_CMD_OVERFLOW 0x06 #define H2C_RESERVED 0x07 -extern u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr); -extern u8 rtw_setstandby_cmd(struct adapter *padapter, uint action); +u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr); +u8 rtw_setstandby_cmd(struct adapter *padapter, uint action); u8 rtw_sitesurvey_cmd(struct adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num, struct rtw_ieee80211_channel *ch, int ch_num); -extern u8 rtw_createbss_cmd(struct adapter *padapter); -extern u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsigned int sz); -extern u8 rtw_setphy_cmd(struct adapter *padapter, u8 modem, u8 ch); -extern u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key, bool enqueue); -extern u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry, u8 enqueue); -extern u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork); +u8 rtw_createbss_cmd(struct adapter *padapter); +u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsigned int sz); +u8 rtw_setphy_cmd(struct adapter *padapter, u8 modem, u8 ch); +u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key, bool enqueue); +u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry, u8 enqueue); +u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork); u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueue); -extern u8 rtw_setopmode_cmd(struct adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue); -extern u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset); -extern u8 rtw_setbasicrate_cmd(struct adapter *padapter, u8 *rateset); -extern u8 rtw_setbbreg_cmd(struct adapter * padapter, u8 offset, u8 val); -extern u8 rtw_setrfreg_cmd(struct adapter * padapter, u8 offset, u32 val); -extern u8 rtw_getbbreg_cmd(struct adapter * padapter, u8 offset, u8 * pval); -extern u8 rtw_getrfreg_cmd(struct adapter * padapter, u8 offset, u8 * pval); -extern u8 rtw_setrfintfs_cmd(struct adapter *padapter, u8 mode); -extern u8 rtw_setrttbl_cmd(struct adapter *padapter, struct setratable_parm *prate_table); -extern u8 rtw_getrttbl_cmd(struct adapter *padapter, struct getratable_rsp *pval); +u8 rtw_setopmode_cmd(struct adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue); +u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset); +u8 rtw_setbasicrate_cmd(struct adapter *padapter, u8 *rateset); +u8 rtw_setbbreg_cmd(struct adapter * padapter, u8 offset, u8 val); +u8 rtw_setrfreg_cmd(struct adapter * padapter, u8 offset, u32 val); +u8 rtw_getbbreg_cmd(struct adapter * padapter, u8 offset, u8 * pval); +u8 rtw_getrfreg_cmd(struct adapter * padapter, u8 offset, u8 * pval); +u8 rtw_setrfintfs_cmd(struct adapter *padapter, u8 mode); +u8 rtw_setrttbl_cmd(struct adapter *padapter, struct setratable_parm *prate_table); +u8 rtw_getrttbl_cmd(struct adapter *padapter, struct getratable_rsp *pval); -extern u8 rtw_gettssi_cmd(struct adapter *padapter, u8 offset,u8 *pval); -extern u8 rtw_setfwdig_cmd(struct adapter*padapter, u8 type); -extern u8 rtw_setfwra_cmd(struct adapter*padapter, u8 type); +u8 rtw_gettssi_cmd(struct adapter *padapter, u8 offset,u8 *pval); +u8 rtw_setfwdig_cmd(struct adapter*padapter, u8 type); +u8 rtw_setfwra_cmd(struct adapter*padapter, u8 type); -extern u8 rtw_addbareq_cmd(struct adapter*padapter, u8 tid, u8 *addr); +u8 rtw_addbareq_cmd(struct adapter*padapter, u8 tid, u8 *addr); // add for CONFIG_IEEE80211W, none 11w also can use -extern u8 rtw_reset_securitypriv_cmd(struct adapter*padapter); -extern u8 rtw_free_assoc_resources_cmd(struct adapter *padapter); -extern u8 rtw_dynamic_chk_wk_cmd(struct adapter *adapter); +u8 rtw_reset_securitypriv_cmd(struct adapter*padapter); +u8 rtw_free_assoc_resources_cmd(struct adapter *padapter); +u8 rtw_dynamic_chk_wk_cmd(struct adapter *adapter); u8 rtw_lps_ctrl_wk_cmd(struct adapter*padapter, u8 lps_ctrl_type, u8 enqueue); #if (RATE_ADAPTIVE_SUPPORT==1) u8 rtw_rpt_timer_cfg_cmd(struct adapter*padapter, u16 minRptTime); #endif -#ifdef CONFIG_ANTENNA_DIVERSITY -extern u8 rtw_antenna_select_cmd(struct adapter*padapter, u8 antenna,u8 enqueue); -#endif +u8 rtw_antenna_select_cmd(struct adapter*padapter, u8 antenna,u8 enqueue); -extern u8 rtw_ps_cmd(struct adapter*padapter); +u8 rtw_ps_cmd(struct adapter*padapter); #ifdef CONFIG_AP_MODE u8 rtw_chk_hi_queue_cmd(struct adapter*padapter); #endif u8 rtw_set_ch_cmd(struct adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue); -extern u8 rtw_set_chplan_cmd(struct adapter*padapter, u8 chplan, u8 enqueue); -extern u8 rtw_led_blink_cmd(struct adapter*padapter, PLED_871x pLed); -extern u8 rtw_set_csa_cmd(struct adapter*padapter, u8 new_ch_no); -extern u8 rtw_tdls_cmd(struct adapter*padapter, u8 *addr, u8 option); +u8 rtw_set_chplan_cmd(struct adapter*padapter, u8 chplan, u8 enqueue); +u8 rtw_led_blink_cmd(struct adapter*padapter, PLED_871x pLed); +u8 rtw_set_csa_cmd(struct adapter*padapter, u8 new_ch_no); +u8 rtw_tdls_cmd(struct adapter*padapter, u8 *addr, u8 option); -extern u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt); +u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt); #ifdef CONFIG_DETECT_C2H_BY_POLLING -extern u8 rtw_event_polling_cmd(struct adapter*padapter); +u8 rtw_event_polling_cmd(struct adapter*padapter); #endif u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf); -extern void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_getbbrfreg_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_readtssi_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd); - -extern void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_getrttbl_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_getbbrfreg_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_readtssi_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd); +void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); +void rtw_getrttbl_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); struct _cmd_callback { u32 cmd_code;