From b0c8a54865d6d49202e06383d12743c0399f5ada Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 16 Dec 2014 18:58:56 -0600 Subject: [PATCH] rtl8188eu: Remove other device configurations from core and hal Signed-off-by: Larry Finger --- core/rtw_cmd.c | 26 -------------- core/rtw_eeprom.c | 46 ------------------------ core/rtw_mlme.c | 67 ----------------------------------- core/rtw_mlme_ext.c | 23 ------------ core/rtw_mp_ioctl.c | 3 -- core/rtw_odm.c | 11 ------ core/rtw_pwrctrl.c | 17 ++------- core/rtw_xmit.c | 64 ---------------------------------- hal/OUTSRC/odm.c | 85 --------------------------------------------- hal/hal_com.c | 11 ------ 10 files changed, 3 insertions(+), 350 deletions(-) diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 86e65e7..7cb3a20 100755 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -1126,13 +1126,6 @@ _func_enter_; pdev_network->Length = pcmd->cmdsz; -#ifdef CONFIG_RTL8712 - //notes: translate IELength & Length after assign the Length to cmdsz; - pdev_network->Length = cpu_to_le32(pcmd->cmdsz); - pdev_network->IELength = cpu_to_le32(pdev_network->IELength); - pdev_network->Ssid.SsidLength = cpu_to_le32(pdev_network->Ssid.SsidLength); -#endif - res = rtw_enqueue_cmd(pcmdpriv, pcmd); exit: @@ -1341,25 +1334,6 @@ _func_enter_; pcmd->cmdsz = get_WLAN_BSSID_EX_sz(psecnetwork);//get cmdsz before endian conversion -#ifdef CONFIG_RTL8712 - //wlan_network endian conversion - psecnetwork->Length = cpu_to_le32(psecnetwork->Length); - psecnetwork->Ssid.SsidLength= cpu_to_le32(psecnetwork->Ssid.SsidLength); - psecnetwork->Privacy = cpu_to_le32(psecnetwork->Privacy); - psecnetwork->Rssi = cpu_to_le32(psecnetwork->Rssi); - psecnetwork->NetworkTypeInUse = cpu_to_le32(psecnetwork->NetworkTypeInUse); - psecnetwork->Configuration.ATIMWindow = cpu_to_le32(psecnetwork->Configuration.ATIMWindow); - psecnetwork->Configuration.BeaconPeriod = cpu_to_le32(psecnetwork->Configuration.BeaconPeriod); - psecnetwork->Configuration.DSConfig = cpu_to_le32(psecnetwork->Configuration.DSConfig); - psecnetwork->Configuration.FHConfig.DwellTime=cpu_to_le32(psecnetwork->Configuration.FHConfig.DwellTime); - psecnetwork->Configuration.FHConfig.HopPattern=cpu_to_le32(psecnetwork->Configuration.FHConfig.HopPattern); - psecnetwork->Configuration.FHConfig.HopSet=cpu_to_le32(psecnetwork->Configuration.FHConfig.HopSet); - psecnetwork->Configuration.FHConfig.Length=cpu_to_le32(psecnetwork->Configuration.FHConfig.Length); - psecnetwork->Configuration.Length = cpu_to_le32(psecnetwork->Configuration.Length); - psecnetwork->InfrastructureMode = cpu_to_le32(psecnetwork->InfrastructureMode); - psecnetwork->IELength = cpu_to_le32(psecnetwork->IELength); -#endif - _rtw_init_listhead(&pcmd->list); pcmd->cmdcode = _JoinBss_CMD_;//GEN_CMD_CODE(_JoinBss) pcmd->parmbuf = (unsigned char *)psecnetwork; diff --git a/core/rtw_eeprom.c b/core/rtw_eeprom.c index fd07d64..e53b614 100755 --- a/core/rtw_eeprom.c +++ b/core/rtw_eeprom.c @@ -185,21 +185,6 @@ _func_exit_; void eeprom_write16(_adapter * padapter, u16 reg, u16 data) { u8 x; -#ifdef CONFIG_RTL8712 - u8 tmp8_ori,tmp8_new,tmp8_clk_ori,tmp8_clk_new; - tmp8_ori=rtw_read8(padapter, 0x102502f1); - tmp8_new=tmp8_ori & 0xf7; - if(tmp8_ori != tmp8_new){ - rtw_write8(padapter, 0x102502f1, tmp8_new); - RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x102502f1=====\n")); - } - tmp8_clk_ori=rtw_read8(padapter,0x10250003); - tmp8_clk_new=tmp8_clk_ori|0x20; - if(tmp8_clk_new!=tmp8_clk_ori){ - RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x10250003=====\n")); - rtw_write8(padapter, 0x10250003, tmp8_clk_new); - } -#endif _func_enter_; x = rtw_read8(padapter, EE_9346CR); @@ -255,13 +240,6 @@ _func_enter_; eeprom_clean(padapter ); exit: -#ifdef CONFIG_RTL8712 - if(tmp8_clk_new!=tmp8_clk_ori) - rtw_write8(padapter, 0x10250003, tmp8_clk_ori); - if(tmp8_new!=tmp8_ori) - rtw_write8(padapter, 0x102502f1, tmp8_ori); - -#endif _func_exit_; return; } @@ -271,21 +249,6 @@ u16 eeprom_read16(_adapter * padapter, u16 reg) //ReadEEprom u16 x; u16 data=0; -#ifdef CONFIG_RTL8712 - u8 tmp8_ori,tmp8_new,tmp8_clk_ori,tmp8_clk_new; - tmp8_ori= rtw_read8(padapter, 0x102502f1); - tmp8_new = tmp8_ori & 0xf7; - if(tmp8_ori != tmp8_new){ - rtw_write8(padapter, 0x102502f1, tmp8_new); - RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x102502f1=====\n")); - } - tmp8_clk_ori=rtw_read8(padapter,0x10250003); - tmp8_clk_new=tmp8_clk_ori|0x20; - if(tmp8_clk_new!=tmp8_clk_ori){ - RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x10250003=====\n")); - rtw_write8(padapter, 0x10250003, tmp8_clk_new); - } -#endif _func_enter_; if(padapter->bSurpriseRemoved==_TRUE){ @@ -314,17 +277,8 @@ _func_enter_; eeprom_clean(padapter); out: -#ifdef CONFIG_RTL8712 - if(tmp8_clk_new!=tmp8_clk_ori) - rtw_write8(padapter, 0x10250003, tmp8_clk_ori); - if(tmp8_new!=tmp8_ori) - rtw_write8(padapter, 0x102502f1, tmp8_ori); - -#endif _func_exit_; return data; - - } diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 84f5dad..52daa35 100755 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -1081,25 +1081,6 @@ _func_enter_; RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_survey_event_callback, ssid=%s\n", pnetwork->Ssid.Ssid)); -#ifdef CONFIG_RTL8712 - //endian_convert - pnetwork->Length = le32_to_cpu(pnetwork->Length); - pnetwork->Ssid.SsidLength = le32_to_cpu(pnetwork->Ssid.SsidLength); - pnetwork->Privacy =le32_to_cpu( pnetwork->Privacy); - pnetwork->Rssi = le32_to_cpu(pnetwork->Rssi); - pnetwork->NetworkTypeInUse =le32_to_cpu(pnetwork->NetworkTypeInUse); - pnetwork->Configuration.ATIMWindow = le32_to_cpu(pnetwork->Configuration.ATIMWindow); - pnetwork->Configuration.BeaconPeriod = le32_to_cpu(pnetwork->Configuration.BeaconPeriod); - pnetwork->Configuration.DSConfig =le32_to_cpu(pnetwork->Configuration.DSConfig); - pnetwork->Configuration.FHConfig.DwellTime=le32_to_cpu(pnetwork->Configuration.FHConfig.DwellTime); - pnetwork->Configuration.FHConfig.HopPattern=le32_to_cpu(pnetwork->Configuration.FHConfig.HopPattern); - pnetwork->Configuration.FHConfig.HopSet=le32_to_cpu(pnetwork->Configuration.FHConfig.HopSet); - pnetwork->Configuration.FHConfig.Length=le32_to_cpu(pnetwork->Configuration.FHConfig.Length); - pnetwork->Configuration.Length = le32_to_cpu(pnetwork->Configuration.Length); - pnetwork->InfrastructureMode = le32_to_cpu(pnetwork->InfrastructureMode); - pnetwork->IELength = le32_to_cpu(pnetwork->IELength); -#endif - len = get_WLAN_BSSID_EX_sz(pnetwork); if(len > (sizeof(WLAN_BSSID_EX))) { @@ -1846,27 +1827,6 @@ void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf) _func_enter_; -#ifdef CONFIG_RTL8712 - //endian_convert - pnetwork->join_res = le32_to_cpu(pnetwork->join_res); - pnetwork->network_type = le32_to_cpu(pnetwork->network_type); - pnetwork->network.Length = le32_to_cpu(pnetwork->network.Length); - pnetwork->network.Ssid.SsidLength = le32_to_cpu(pnetwork->network.Ssid.SsidLength); - pnetwork->network.Privacy =le32_to_cpu( pnetwork->network.Privacy); - pnetwork->network.Rssi = le32_to_cpu(pnetwork->network.Rssi); - pnetwork->network.NetworkTypeInUse =le32_to_cpu(pnetwork->network.NetworkTypeInUse) ; - pnetwork->network.Configuration.ATIMWindow = le32_to_cpu(pnetwork->network.Configuration.ATIMWindow); - pnetwork->network.Configuration.BeaconPeriod = le32_to_cpu(pnetwork->network.Configuration.BeaconPeriod); - pnetwork->network.Configuration.DSConfig = le32_to_cpu(pnetwork->network.Configuration.DSConfig); - pnetwork->network.Configuration.FHConfig.DwellTime=le32_to_cpu(pnetwork->network.Configuration.FHConfig.DwellTime); - pnetwork->network.Configuration.FHConfig.HopPattern=le32_to_cpu(pnetwork->network.Configuration.FHConfig.HopPattern); - pnetwork->network.Configuration.FHConfig.HopSet=le32_to_cpu(pnetwork->network.Configuration.FHConfig.HopSet); - pnetwork->network.Configuration.FHConfig.Length=le32_to_cpu(pnetwork->network.Configuration.FHConfig.Length); - pnetwork->network.Configuration.Length = le32_to_cpu(pnetwork->network.Configuration.Length); - pnetwork->network.InfrastructureMode = le32_to_cpu(pnetwork->network.InfrastructureMode); - pnetwork->network.IELength = le32_to_cpu(pnetwork->network.IELength ); -#endif - RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("joinbss event call back received with res=%d\n", pnetwork->join_res)); rtw_get_encrypt_decrypt_from_registrypriv(adapter); @@ -2241,12 +2201,6 @@ _func_enter_; mlmeext_sta_add_event_callback(adapter, psta); - -#ifdef CONFIG_RTL8711 - //submit SetStaKey_cmd to tell fw, fw will allocate an CAM entry for this sta - rtw_setstakey_cmd(adapter, (unsigned char*)psta, _FALSE, _TRUE); -#endif - exit: _func_exit_; @@ -3429,24 +3383,8 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui u32 rx_packet_offset, max_recvbuf_sz; rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset); rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz); - //if(max_recvbuf_sz-rx_packet_offset>(8191-256)) { - // DBG_871X("%s IEEE80211_HT_CAP_MAX_AMSDU is set\n", __FUNCTION__); - // ht_capie.cap_info = ht_capie.cap_info |IEEE80211_HT_CAP_MAX_AMSDU; - //} } - /* - AMPDU_para [1:0]:Max AMPDU Len => 0:8k , 1:16k, 2:32k, 3:64k - AMPDU_para [4:2]:Min MPDU Start Spacing - */ - /* - #if defined(CONFIG_RTL8188E )&& defined (CONFIG_SDIO_HCI) - ht_capie.ampdu_params_info = 2; - #else - ht_capie.ampdu_params_info = (IEEE80211_HT_CAP_AMPDU_FACTOR&0x03); - #endif - */ - rtw_hal_get_def_var(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor); ht_capie.ampdu_params_info = (max_rx_ampdu_factor&0x03); @@ -3459,11 +3397,6 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui pframe = rtw_set_ie(out_ie+out_len, _HT_CAPABILITY_IE_, sizeof(struct rtw_ieee80211_ht_cap), (unsigned char*)&ht_capie, pout_len); - - //_rtw_memcpy(out_ie+out_len, p, ielen+2);//gtest - //*pout_len = *pout_len + (ielen+2); - - phtpriv->ht_option = _TRUE; p = rtw_get_ie(in_ie+12, _HT_ADD_INFO_IE_, &ielen, in_len-12); diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index c36bc22..4e76823 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -8555,11 +8555,7 @@ void issue_action_BA(_adapter *padapter, unsigned char *raddr, unsigned char act else #endif { - #if defined(CONFIG_RTL8188E) && defined(CONFIG_SDIO_HCI) - BA_para_set = (0x0802 | ((status & 0xf) << 2)); //immediate ack & 16 buffer size - #else BA_para_set = (0x1002 | ((status & 0xf) << 2)); //immediate ack & 64 buffer size - #endif } //sys_mib.BA_para_set = 0x0802; //immediate ack & 32 buffer size BA_para_set = cpu_to_le16(BA_para_set); @@ -8589,14 +8585,6 @@ void issue_action_BA(_adapter *padapter, unsigned char *raddr, unsigned char act case 1: //ADDBA rsp pframe = rtw_set_fixed_ie(pframe, 1, &(pmlmeinfo->ADDBA_req.dialog_token), &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&status), &(pattrib->pktlen)); - /* - //BA_para_set = cpu_to_le16((le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f) | 0x1000); //64 buffer size - #if defined(CONFIG_RTL8188E )&& defined (CONFIG_SDIO_HCI) - BA_para_set = ((le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f) | 0x0800); //32buffer size - #else - BA_para_set = ((le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f) | 0x1000); //64 buffer size - #endif - */ rtw_hal_get_def_var(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor); if(MAX_AMPDU_FACTOR_64K == max_rx_ampdu_factor) BA_para_set = ((le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f) | 0x1000); //64 buffer size @@ -9328,18 +9316,7 @@ void site_survey(_adapter *padapter) report_surveydone_event(padapter); -#if defined(CONFIG_BT_COEXIST) && defined(CONFIG_RTL8723A) - if ((BT_1Ant(padapter) == _TRUE) && (BT_GetBtState(padapter) > BT_INFO_STATE_NO_CONNECTION)) - { - pmlmeext->chan_scan_time = SURVEY_TO * 2; - } - else - { - pmlmeext->chan_scan_time = SURVEY_TO; - } -#else pmlmeext->chan_scan_time = SURVEY_TO; -#endif pmlmeext->sitesurvey_res.state = SCAN_DISABLE; diff --git a/core/rtw_mp_ioctl.c b/core/rtw_mp_ioctl.c index e649680..0ed5944 100755 --- a/core/rtw_mp_ioctl.c +++ b/core/rtw_mp_ioctl.c @@ -2899,9 +2899,6 @@ _func_enter_; bpwrup = *(u8 *)poid_par_priv->information_buf; //CALL the power_down function -#if defined(CONFIG_RTL8712) //Linux MP insmod unknown symbol - dev_power_down(padapter,bpwrup); -#endif _irqlevel_changed_(&oldirql, RAISE); //DEBUG_ERR(("\n <=== Query OID_RT_PRO_READ_REGISTER. diff --git a/core/rtw_odm.c b/core/rtw_odm.c index b717626..1c92150 100755 --- a/core/rtw_odm.c +++ b/core/rtw_odm.c @@ -19,18 +19,7 @@ ******************************************************************************/ #include -#ifdef CONFIG_RTL8192C -#include -#endif -#ifdef CONFIG_RTL8192D -#include -#endif -#ifdef CONFIG_RTL8723A -#include -#endif -#ifdef CONFIG_RTL8188E #include -#endif const char *odm_comp_str[] = { "ODM_COMP_DIG", diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c index e02d0da..04625b0 100755 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -376,14 +376,7 @@ _func_enter_; else #endif // CONFIG_LPS_RPWM_TIMER { - if ( (pwrpriv->rpwm == pslv) -#ifdef CONFIG_LPS_LCLK -#ifndef CONFIG_RTL8723A - || ((pwrpriv->rpwm >= PS_STATE_S2)&&(pslv >= PS_STATE_S2)) -#endif -#endif - ) - { + if ((pwrpriv->rpwm == pslv)) { RT_TRACE(_module_rtl871x_pwrctrl_c_,_drv_err_, ("%s: Already set rpwm[0x%02X], new=0x%02X!\n", __FUNCTION__, pwrpriv->rpwm, pslv)); return; @@ -463,11 +456,7 @@ _func_enter_; if ((cpwm_orig ^ cpwm_now) & 0x80) { #ifdef CONFIG_LPS_LCLK - #ifdef CONFIG_RTL8723A - pwrpriv->cpwm = PS_STATE(cpwm_now); - #else // !CONFIG_RTL8723A pwrpriv->cpwm = PS_STATE_S4; - #endif // !CONFIG_RTL8723A pwrpriv->cpwm_tog = cpwm_now & PS_TOGGLE; #endif pollingRes = _SUCCESS; @@ -887,14 +876,14 @@ _func_enter_; else #endif { -#if defined(CONFIG_PLATFORM_SPRD) && defined(CONFIG_RTL8188E) +#if defined(CONFIG_PLATFORM_SPRD) #ifdef CONFIG_IPS if(_FALSE == ips_leave(Adapter)) { DBG_871X("======> ips_leave fail.............\n"); } #endif -#endif //CONFIG_PLATFORM_SPRD && CONFIG_RTL8188E +#endif //CONFIG_PLATFORM_SPRD } } } diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index b94f0a9..679530d 100755 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -2864,7 +2864,6 @@ _func_exit_; return pxmitframe; } -#if 1 struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, sint up, u8 *ac) { struct tx_servq *ptxservq=NULL; @@ -2908,69 +2907,6 @@ _func_exit_; return ptxservq; } -#else -__inline static struct tx_servq *rtw_get_sta_pending - (_adapter *padapter, _queue **ppstapending, struct sta_info *psta, sint up) -{ - struct tx_servq *ptxservq; - struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits; - -_func_enter_; - -#ifdef CONFIG_RTL8711 - - if(IS_MCAST(psta->hwaddr)) - { - ptxservq = &(psta->sta_xmitpriv.be_q); // we will use be_q to queue bc/mc frames in BCMC_stainfo - *ppstapending = &padapter->xmitpriv.bm_pending; - } - else -#endif - { - switch (up) - { - case 1: - case 2: - ptxservq = &(psta->sta_xmitpriv.bk_q); - *ppstapending = &padapter->xmitpriv.bk_pending; - (phwxmits+3)->accnt++; - RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BK \n")); - break; - - case 4: - case 5: - ptxservq = &(psta->sta_xmitpriv.vi_q); - *ppstapending = &padapter->xmitpriv.vi_pending; - (phwxmits+1)->accnt++; - RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : VI\n")); - break; - - case 6: - case 7: - ptxservq = &(psta->sta_xmitpriv.vo_q); - *ppstapending = &padapter->xmitpriv.vo_pending; - (phwxmits+0)->accnt++; - RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : VO \n")); - break; - - case 0: - case 3: - default: - ptxservq = &(psta->sta_xmitpriv.be_q); - *ppstapending = &padapter->xmitpriv.be_pending; - (phwxmits+2)->accnt++; - RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BE \n")); - break; - - } - - } - -_func_exit_; - - return ptxservq; -} -#endif /* * Will enqueue pxmitframe to the proper queue, diff --git a/hal/OUTSRC/odm.c b/hal/OUTSRC/odm.c index ae55875..a20edf7 100755 --- a/hal/OUTSRC/odm.c +++ b/hal/OUTSRC/odm.c @@ -4050,16 +4050,9 @@ odm_RefreshRateAdaptiveMaskAPADSL( ODM_PRINT_ADDR(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD, ("Target STA addr : "), pstat->hwaddr); ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD, ("RSSI:%d, RSSI_LEVEL:%d\n", pstat->rssi, pstat->rssi_level)); -#ifdef CONFIG_RTL_88E_SUPPORT if (GET_CHIP_VER(priv)==VERSION_8188E) { #ifdef TXREPORT add_RATid(priv, pstat); -#endif - } else -#endif - { -#if defined(CONFIG_RTL_92D_SUPPORT) || defined(CONFIG_RTL_92C_SUPPORT) - add_update_RATid(priv, pstat); #endif } } @@ -5307,27 +5300,6 @@ odm_RSSIMonitorCheckAP( IN PDM_ODM_T pDM_Odm ) { -#if (DM_ODM_SUPPORT_TYPE == ODM_AP) -#ifdef CONFIG_RTL_92C_SUPPORT || defined(CONFIG_RTL_92D_SUPPORT) - - u4Byte i; - PSTA_INFO_T pstat; - - for(i=0; ipODM_StaInfo[i]; - if(IS_STA_VALID(pstat) ) - { -#ifdef STA_EXT - if (REMAP_AID(pstat) < (FW_NUM_STAT - 1)) -#endif - add_update_rssi(pDM_Odm->priv, pstat); - - } - } -#endif -#endif - } @@ -5461,7 +5433,6 @@ odm_TXPowerTrackingThermalMeterInit( #endif//#if (MP_DRIVER != 1) ODM_RT_TRACE(pDM_Odm,COMP_POWER_TRACKING, DBG_LOUD, ("pMgntInfo->bTXPowerTracking = %d\n", pMgntInfo->bTXPowerTracking)); #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) - #ifdef CONFIG_RTL8188E { pDM_Odm->RFCalibrateInfo.bTXPowerTracking = _TRUE; pDM_Odm->RFCalibrateInfo.TXPowercount = 0; @@ -5472,27 +5443,6 @@ odm_TXPowerTrackingThermalMeterInit( //#endif//#if (MP_DRIVER != 1) MSG_8192C("pDM_Odm TxPowerTrackControl = %d\n", pDM_Odm->RFCalibrateInfo.TxPowerTrackControl); } - #else - { - PADAPTER Adapter = pDM_Odm->Adapter; - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); - struct dm_priv *pdmpriv = &pHalData->dmpriv; - - //if(IS_HARDWARE_TYPE_8192C(pHalData)) - { - pdmpriv->bTXPowerTracking = _TRUE; - pdmpriv->TXPowercount = 0; - pdmpriv->bTXPowerTrackingInit = _FALSE; - //#if (MP_DRIVER != 1) //for mp driver, turn off txpwrtracking as default - - if (*(pDM_Odm->mp_mode) != 1) - pdmpriv->TxPowerTrackControl = _TRUE; - //#endif//#if (MP_DRIVER != 1) - } - MSG_8192C("pdmpriv->TxPowerTrackControl = %d\n", pdmpriv->TxPowerTrackControl); - - } - #endif//endif (CONFIG_RTL8188E==1) #elif (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) #ifdef RTL8188E_SUPPORT { @@ -5640,17 +5590,6 @@ odm_TXPowerTrackingCheckAP( #if (DM_ODM_SUPPORT_TYPE == ODM_AP) prtl8192cd_priv priv = pDM_Odm->priv; - if ( (priv->pmib->dot11RFEntry.ther) && ((priv->up_time % priv->pshare->rf_ft_var.tpt_period) == 0)){ -#ifdef CONFIG_RTL_92D_SUPPORT - if (GET_CHIP_VER(priv)==VERSION_8192D){ - tx_power_tracking_92D(priv); - } else -#endif - { -#ifdef CONFIG_RTL_92C_SUPPORT - tx_power_tracking(priv); -#endif - } } #endif @@ -8462,12 +8401,7 @@ ODM_IotEdcaSwitch( #if((DM_ODM_SUPPORT_TYPE==ODM_AP)&&(defined LOW_TP_TXOP)) ODM_Write4Byte(pDM_Odm, ODM_EDCA_BE_PARAM, (BE_TXOP << 16) | (cw_max << 12) | (4 << 8) | (sifs_time + 3 * slot_time)); #else - #if defined(CONFIG_RTL_8196D) || defined(CONFIG_RTL_8196E) || (defined(CONFIG_RTL_8197D) && !defined(CONFIG_PORT0_EXT_GIGA)) - ODM_Write4Byte(pDM_Odm, ODM_EDCA_BE_PARAM, (BE_TXOP*2 << 16) | (cw_max << 12) | (5 << 8) | (sifs_time + 3 * slot_time)); - #else ODM_Write4Byte(pDM_Odm, ODM_EDCA_BE_PARAM, (BE_TXOP*2 << 16) | (cw_max << 12) | (4 << 8) | (sifs_time + 3 * slot_time)); - #endif - #endif } @@ -8799,25 +8733,6 @@ odm_IotEngine( switch_turbo--; } } -#if ((DM_ODM_SUPPORT_TYPE==ODM_AP)&&(defined CONFIG_RTL_819XD)) - else if( (priv->assoc_num == 1) && (AMPDU_ENABLE)) { - if (pstat) { - int en_thd = 14417920>>(priv->up_time % 2); - if ((priv->swq_en == 0) && (pstat->current_tx_bytes > en_thd) && (pstat->current_rx_bytes > en_thd) ) { //50Mbps - priv->swq_en = 1; - priv->swqen_keeptime = priv->up_time; - } - else if ((priv->swq_en == 1) && ((pstat->tx_avarage < 4587520) || (pstat->rx_avarage < 4587520))) { //35Mbps - priv->swq_en = 0; - priv->swqen_keeptime = 0; - } - } - else { - priv->swq_en = 0; - priv->swqen_keeptime = 0; - } - } -#endif #endif #ifdef WIFI_WMM diff --git a/hal/hal_com.c b/hal/hal_com.c index 9f413a0..519727a 100755 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -25,18 +25,7 @@ #include #include -#ifdef CONFIG_RTL8192C -#include -#endif -#ifdef CONFIG_RTL8192D -#include -#endif -#ifdef CONFIG_RTL8723A -#include -#endif -#ifdef CONFIG_RTL8188E #include -#endif #define _HAL_INIT_C_