remove HAL_{BB,MAC,RF,FW}_ENABLE macros

remove HAL_{BB,MAC,RF,FW}_ENABLE macros.
They are used to turn on/off by hand some core
capabilities we want to be always 'on'.

port bb1c456d7f88b60b28b9f51e28031fc67cdb8d7b
port b4e1882d750facd317ac2572d6bf36a05b0b0c36

Link: https://lore.kernel.org/r/04248acbd22f9be30d21891926e134490b34036a.1623756906.git.fabioaiuto83@gmail.com
This commit is contained in:
Carlos Garces
2021-10-20 19:16:08 +02:00
parent 27246f4eb5
commit 539ec6269e
9 changed files with 1 additions and 72 deletions

View File

@@ -3633,10 +3633,6 @@ VOID _InitBeaconMaxError_8192E(
/* Set CCK and OFDM Block "ON" */
void _BBTurnOnBlock_8192E(PADAPTER padapter)
{
#if (DISABLE_BB_RF)
return;
#endif
phy_set_bb_reg(padapter, rFPGA0_RFMOD, bCCKEn, 0x1);
phy_set_bb_reg(padapter, rFPGA0_RFMOD, bOFDMEn, 0x1);
}
@@ -3647,11 +3643,7 @@ hal_ReadRFType_8192E(
{
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
#if DISABLE_BB_RF
pHalData->rf_chip = RF_PSEUDO_11N;
#else
pHalData->rf_chip = RF_6052;
#endif
pHalData->BandSet = BAND_ON_2_4G;

View File

@@ -51,10 +51,6 @@ PHY_QueryBBReg8192E(
{
u32 ReturnValue = 0, OriginalValue, BitShift;
#if (DISABLE_BB_RF == 1)
return 0;
#endif
/* RTW_INFO("--->PHY_QueryBBReg8812(): RegAddr(%#x), BitMask(%#x)\n", RegAddr, BitMask); */
@@ -77,10 +73,6 @@ PHY_SetBBReg8192E(
{
u4Byte OriginalValue, BitShift;
#if (DISABLE_BB_RF == 1)
return;
#endif
if (BitMask != bMaskDWord) {
/* if not "double word" write */
OriginalValue = rtw_read32(Adapter, RegAddr);
@@ -230,10 +222,6 @@ PHY_QueryRFReg8192E(
{
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);
@@ -252,9 +240,6 @@ PHY_SetRFReg8192E(
)
{
u32 Original_Value, BitShift;
#if (DISABLE_BB_RF == 1)
return;
#endif
if (BitMask == 0)
return;

View File

@@ -870,21 +870,17 @@ u32 rtl8192eu_hal_init(PADAPTER Adapter)
pHalData->current_channel = 6;/* default set to 6 */
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MAC);
#if (HAL_MAC_ENABLE == 1)
status = PHY_MACConfig8192E(Adapter);
if (status == _FAIL)
goto exit;
#endif
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BB);
#if (HAL_BB_ENABLE == 1)
status = PHY_BBConfig8192E(Adapter);
if (status == _FAIL)
goto exit;
#endif
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_RF);
#if (HAL_RF_ENABLE == 1)
status = PHY_RFConfig8192E(Adapter);
if (status == _FAIL)
goto exit;
@@ -975,7 +971,6 @@ u32 rtl8192eu_hal_init(PADAPTER Adapter)
#endif /* CONFIG_RTW_LED */
_BBTurnOnBlock_8192E(Adapter);
#endif
/* */
/* Joseph Note: Keep RfRegChnlVal for later use. */