mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2024-11-25 14:03:40 +00:00
rtl8188eu: Remove code for ENABLE_USB_DROP_INCORRECT_OUT and DISABLE_BB_RF
Neither is selected. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
6b83fa17db
commit
90575aca87
4 changed files with 3 additions and 65 deletions
|
@ -1925,10 +1925,6 @@ if (*(pDM_Odm->mp_mode) == 1)
|
|||
if (bSingleTone || bCarrierSuppression)
|
||||
return;
|
||||
|
||||
#if DISABLE_BB_RF
|
||||
return;
|
||||
#endif
|
||||
|
||||
if (bReCovery)
|
||||
{
|
||||
ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("PHY_IQCalibrate_8188E: Return due to bReCovery!\n"));
|
||||
|
@ -2089,12 +2085,6 @@ if (*(pDM_Odm->mp_mode) == 1)
|
|||
bCarrierSuppression = pMptCtx->bCarrierSuppression;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#if DISABLE_BB_RF
|
||||
return;
|
||||
#endif
|
||||
|
||||
if (!(pDM_Odm->SupportAbility & ODM_RF_CALIBRATION))
|
||||
{
|
||||
return;
|
||||
|
@ -2136,10 +2126,6 @@ PHY_APCalibrate_8188E(
|
|||
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
|
||||
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
|
||||
|
||||
#if DISABLE_BB_RF
|
||||
return;
|
||||
#endif
|
||||
|
||||
return;
|
||||
if (!(pDM_Odm->SupportAbility & ODM_RF_CALIBRATION))
|
||||
return;
|
||||
|
@ -2200,10 +2186,6 @@ void PHY_SetRFPathSwitch_8188E(
|
|||
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
|
||||
struct odm_dm_struct * pDM_Odm = &pHalData->odmpriv;
|
||||
|
||||
#if DISABLE_BB_RF
|
||||
return;
|
||||
#endif
|
||||
|
||||
if (pDM_Odm->RFType == ODM_2T2R) {
|
||||
phy_SetRFPathSwitch_8188E(pAdapter, bMain, true);
|
||||
} else {
|
||||
|
|
|
@ -271,10 +271,6 @@ rtl8188e_PHY_QueryBBReg(
|
|||
u32 ReturnValue = 0, OriginalValue, BitShift;
|
||||
u16 BBWaitCounter = 0;
|
||||
|
||||
#if (DISABLE_BB_RF == 1)
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
#if (SIC_ENABLE == 1)
|
||||
return SIC_QueryBBReg(Adapter, RegAddr, BitMask);
|
||||
#endif
|
||||
|
@ -316,10 +312,6 @@ rtl8188e_PHY_SetBBReg(
|
|||
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
|
||||
u32 OriginalValue, BitShift;
|
||||
|
||||
#if (DISABLE_BB_RF == 1)
|
||||
return;
|
||||
#endif
|
||||
|
||||
#if (SIC_ENABLE == 1)
|
||||
SIC_SetBBReg(Adapter, RegAddr, BitMask, Data);
|
||||
return;
|
||||
|
@ -514,10 +506,6 @@ u32 rtl8188e_PHY_QueryRFReg(struct adapter * Adapter, enum rf_radio_path eRFPath
|
|||
{
|
||||
u32 Original_Value, Readback_Value, BitShift;
|
||||
|
||||
#if (DISABLE_BB_RF == 1)
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
Original_Value = phy_RFSerialRead(Adapter, eRFPath, RegAddr);
|
||||
|
||||
BitShift = phy_CalculateBitShift(BitMask);
|
||||
|
@ -554,10 +542,6 @@ rtl8188e_PHY_SetRFReg(
|
|||
{
|
||||
u32 Original_Value, BitShift;
|
||||
|
||||
#if (DISABLE_BB_RF == 1)
|
||||
return;
|
||||
#endif
|
||||
|
||||
/* RF data is 12 bits only */
|
||||
if (BitMask != bRFRegOffsetMask)
|
||||
{
|
||||
|
|
|
@ -30,16 +30,9 @@
|
|||
#include <usb_hal.h>
|
||||
#include <usb_osintf.h>
|
||||
|
||||
#if DISABLE_BB_RF
|
||||
#define HAL_MAC_ENABLE 0
|
||||
#define HAL_BB_ENABLE 0
|
||||
#define HAL_RF_ENABLE 0
|
||||
#else
|
||||
#define HAL_MAC_ENABLE 1
|
||||
#define HAL_BB_ENABLE 1
|
||||
#define HAL_RF_ENABLE 1
|
||||
#endif
|
||||
|
||||
#define HAL_MAC_ENABLE 1
|
||||
#define HAL_BB_ENABLE 1
|
||||
#define HAL_RF_ENABLE 1
|
||||
|
||||
static void
|
||||
_ConfigNormalChipOutEP_8188E(
|
||||
|
@ -965,11 +958,6 @@ _InitRFType(
|
|||
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
|
||||
bool is92CU = IS_92C_SERIAL(pHalData->VersionID);
|
||||
|
||||
#if DISABLE_BB_RF
|
||||
pHalData->rf_chip = RF_PSEUDO_11N;
|
||||
return;
|
||||
#endif
|
||||
|
||||
pHalData->rf_chip = RF_6052;
|
||||
|
||||
if (false == is92CU){
|
||||
|
@ -1003,10 +991,6 @@ static void _BBTurnOnBlock(
|
|||
struct adapter * Adapter
|
||||
)
|
||||
{
|
||||
#if (DISABLE_BB_RF)
|
||||
return;
|
||||
#endif
|
||||
|
||||
PHY_SetBBReg(Adapter, rFPGA0_RFMOD, bCCKEn, 0x1);
|
||||
PHY_SetBBReg(Adapter, rFPGA0_RFMOD, bOFDMEn, 0x1);
|
||||
}
|
||||
|
@ -1313,10 +1297,6 @@ _func_enter_;
|
|||
value16 |= (MACTXEN | MACRXEN);
|
||||
rtw_write8(Adapter, REG_CR, value16);
|
||||
|
||||
#if ENABLE_USB_DROP_INCORRECT_OUT
|
||||
_InitHardwareDropIncorrectBulkOut(Adapter);
|
||||
#endif
|
||||
|
||||
if (pHalData->bRDGEnable){
|
||||
_InitRDGSetting(Adapter);
|
||||
}
|
||||
|
@ -1837,11 +1817,7 @@ _ReadRFType(
|
|||
{
|
||||
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
|
||||
|
||||
#if DISABLE_BB_RF
|
||||
pHalData->rf_chip = RF_PSEUDO_11N;
|
||||
#else
|
||||
pHalData->rf_chip = RF_6052;
|
||||
#endif
|
||||
}
|
||||
|
||||
static int _ReadAdapterInfo8188EU(struct adapter * Adapter)
|
||||
|
|
|
@ -62,10 +62,6 @@
|
|||
|
||||
#define CONFIG_OUT_EP_WIFI_MODE 0
|
||||
|
||||
#define ENABLE_USB_DROP_INCORRECT_OUT 0
|
||||
|
||||
#define DISABLE_BB_RF 0
|
||||
|
||||
#define MP_DRIVER 1
|
||||
#define CONFIG_MP_IWPRIV_SUPPORT
|
||||
|
||||
|
|
Loading…
Reference in a new issue