staging: r8188eu: misc cleanups
v2 cover staging: r8188eu: misc cleanups
This series consists of various cleanups.
Tested on x86_64 with InterTech DMG-02.
v2:
Removed patch 11 and 12.
As mentionied by Pavel the hal data allocation is never checked for success. I'll work on that and send a separate series that also removes the GET_HAL_DATA macro.
Michael Straube (10):
staging: r8188eu: remove RF_PATH_{C,D}
staging: r8188eu: struct odm_mac_status_info is not used
staging: r8188eu: remove macro PHY_SetRFReg
staging: r8188eu: remove macro PHY_QueryRFReg
staging: r8188eu: remove macro PHY_SetBBReg
staging: r8188eu: remove macro PHY_QueryBBReg
staging: r8188eu: remove duplicate defines
staging: r8188eu: bWIFI_Direct is set but never used
staging: r8188eu: bWIFI_Display is set but never used
staging: r8188eu: remove unused macro IS_FW_81xxC
drivers/staging/r8188eu/core/rtw_p2p.c | 3 - drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 6 +- drivers/staging/r8188eu/hal/odm.c | 8 +-- drivers/staging/r8188eu/hal/odm_interface.c | 12 ++-- .../staging/r8188eu/hal/rtl8188e_hal_init.c | 8 --- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 60 ++++++------------- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 26 ++++---- drivers/staging/r8188eu/hal/usb_halinit.c | 12 ++-- .../staging/r8188eu/include/Hal8188EPhyCfg.h | 16 ----- drivers/staging/r8188eu/include/hal_intf.h | 2 - drivers/staging/r8188eu/include/odm.h | 8 --- drivers/staging/r8188eu/include/rtl8188e_dm.h | 7 +-- .../staging/r8188eu/include/rtl8188e_hal.h | 2 +- 13 files changed, 49 insertions(+), 121 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/10 staging: r8188eu: remove RF_PATH_{C,D}
pHalData->PHYRegDef[RF_PATH_C] and pHalData->PHYRegDef[RF_PATH_D] are initialized but not used. Remove them and remove RF_PATH_C and RF_PATH_D from the rf_radio_path enum.
--- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 24 ------------------- .../staging/r8188eu/include/Hal8188EPhyCfg.h | 2 -- .../staging/r8188eu/include/rtl8188e_hal.h | 2 +- 3 files changed, 1 insertion(+), 27 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +0 -24
@@ -392,14 +392,10 @@ phy_InitBBRFRegisterDefinition(/* RF Interface Sowrtware Control */ pHalData->PHYRegDef[RF_PATH_A ].rfintfs = rFPGA0_XAB_RFInterfaceSW;/* 16 LSBs if read 32-bit from 0x870 */ pHalData->PHYRegDef[RF_PATH_B ].rfintfs = rFPGA0_XAB_RFInterfaceSW;/* 16 MSBs if read 32-bit from 0x870 (16-bit for 0x872) */ - pHalData->PHYRegDef[RF_PATH_C ].rfintfs = rFPGA0_XCD_RFInterfaceSW;/* 16 LSBs if read 32-bit from 0x874 */ - pHalData->PHYRegDef[RF_PATH_D ].rfintfs = rFPGA0_XCD_RFInterfaceSW;/* 16 MSBs if read 32-bit from 0x874 (16-bit for 0x876) */ /* RF Interface Readback Value */ pHalData->PHYRegDef[RF_PATH_A ].rfintfi = rFPGA0_XAB_RFInterfaceRB;/* 16 LSBs if read 32-bit from 0x8E0 */ pHalData->PHYRegDef[RF_PATH_B ].rfintfi = rFPGA0_XAB_RFInterfaceRB;/* 16 MSBs if read 32-bit from 0x8E0 (16-bit for 0x8E2) */ - pHalData->PHYRegDef[RF_PATH_C ].rfintfi = rFPGA0_XCD_RFInterfaceRB;/* 16 LSBs if read 32-bit from 0x8E4 */ - pHalData->PHYRegDef[RF_PATH_D ].rfintfi = rFPGA0_XCD_RFInterfaceRB;/* 16 MSBs if read 32-bit from 0x8E4 (16-bit for 0x8E6) */ /* RF Interface Output (and Enable) */ pHalData->PHYRegDef[RF_PATH_A ].rfintfo = rFPGA0_XA_RFInterfaceOE;/* 16 LSBs if read 32-bit from 0x860 */
@@ -416,14 +412,10 @@ phy_InitBBRFRegisterDefinition(/* RF parameter */ pHalData->PHYRegDef[RF_PATH_A ].rfLSSI_Select = rFPGA0_XAB_RFParameter;/* BB Band Select */ pHalData->PHYRegDef[RF_PATH_B ].rfLSSI_Select = rFPGA0_XAB_RFParameter; - pHalData->PHYRegDef[RF_PATH_C ].rfLSSI_Select = rFPGA0_XCD_RFParameter; - pHalData->PHYRegDef[RF_PATH_D ].rfLSSI_Select = rFPGA0_XCD_RFParameter;/* Tx AGC Gain Stage (same for all path. Should we remove this?) */ pHalData->PHYRegDef[RF_PATH_A ].rfTxGainStage = rFPGA0_TxGainStage;/* Tx gain stage */ pHalData->PHYRegDef[RF_PATH_B ].rfTxGainStage = rFPGA0_TxGainStage;/* Tx gain stage */ - pHalData->PHYRegDef[RF_PATH_C ].rfTxGainStage = rFPGA0_TxGainStage;/* Tx gain stage */ - pHalData->PHYRegDef[RF_PATH_D ].rfTxGainStage = rFPGA0_TxGainStage;/* Tx gain stage */ /* Tranceiver A~D HSSI Parameter-1 */ pHalData->PHYRegDef[RF_PATH_A ].rfHSSIPara1 = rFPGA0_XA_HSSIParameter1;/* wire control parameter1 */
@@ -436,50 +428,34 @@ phy_InitBBRFRegisterDefinition(/* RF switch Control */ pHalData->PHYRegDef[RF_PATH_A ].rfSwitchControl = rFPGA0_XAB_SwitchControl;/* TR/Ant switch control */ pHalData->PHYRegDef[RF_PATH_B ].rfSwitchControl = rFPGA0_XAB_SwitchControl; - pHalData->PHYRegDef[RF_PATH_C ].rfSwitchControl = rFPGA0_XCD_SwitchControl; - pHalData->PHYRegDef[RF_PATH_D ].rfSwitchControl = rFPGA0_XCD_SwitchControl;/* AGC control 1 */ pHalData->PHYRegDef[RF_PATH_A ].rfAGCControl1 = rOFDM0_XAAGCCore1; pHalData->PHYRegDef[RF_PATH_B ].rfAGCControl1 = rOFDM0_XBAGCCore1; - pHalData->PHYRegDef[RF_PATH_C ].rfAGCControl1 = rOFDM0_XCAGCCore1; - pHalData->PHYRegDef[RF_PATH_D ].rfAGCControl1 = rOFDM0_XDAGCCore1;/* AGC control 2 */ pHalData->PHYRegDef[RF_PATH_A ].rfAGCControl2 = rOFDM0_XAAGCCore2; pHalData->PHYRegDef[RF_PATH_B ].rfAGCControl2 = rOFDM0_XBAGCCore2; - pHalData->PHYRegDef[RF_PATH_C ].rfAGCControl2 = rOFDM0_XCAGCCore2; - pHalData->PHYRegDef[RF_PATH_D ].rfAGCControl2 = rOFDM0_XDAGCCore2;/* RX AFE control 1 */ pHalData->PHYRegDef[RF_PATH_A ].rfRxIQImbalance = rOFDM0_XARxIQImbalance; pHalData->PHYRegDef[RF_PATH_B ].rfRxIQImbalance = rOFDM0_XBRxIQImbalance; - pHalData->PHYRegDef[RF_PATH_C ].rfRxIQImbalance = rOFDM0_XCRxIQImbalance; - pHalData->PHYRegDef[RF_PATH_D ].rfRxIQImbalance = rOFDM0_XDRxIQImbalance;/* RX AFE control 1 */ pHalData->PHYRegDef[RF_PATH_A ].rfRxAFE = rOFDM0_XARxAFE; pHalData->PHYRegDef[RF_PATH_B ].rfRxAFE = rOFDM0_XBRxAFE; - pHalData->PHYRegDef[RF_PATH_C ].rfRxAFE = rOFDM0_XCRxAFE; - pHalData->PHYRegDef[RF_PATH_D ].rfRxAFE = rOFDM0_XDRxAFE;/* Tx AFE control 1 */ pHalData->PHYRegDef[RF_PATH_A ].rfTxIQImbalance = rOFDM0_XATxIQImbalance; pHalData->PHYRegDef[RF_PATH_B ].rfTxIQImbalance = rOFDM0_XBTxIQImbalance; - pHalData->PHYRegDef[RF_PATH_C ].rfTxIQImbalance = rOFDM0_XCTxIQImbalance; - pHalData->PHYRegDef[RF_PATH_D ].rfTxIQImbalance = rOFDM0_XDTxIQImbalance;/* Tx AFE control 2 */ pHalData->PHYRegDef[RF_PATH_A ].rfTxAFE = rOFDM0_XATxAFE; pHalData->PHYRegDef[RF_PATH_B ].rfTxAFE = rOFDM0_XBTxAFE; - pHalData->PHYRegDef[RF_PATH_C ].rfTxAFE = rOFDM0_XCTxAFE; - pHalData->PHYRegDef[RF_PATH_D ].rfTxAFE = rOFDM0_XDTxAFE;/* Tranceiver LSSI Readback SI mode */ pHalData->PHYRegDef[RF_PATH_A ].rfLSSIReadBack = rFPGA0_XA_LSSIReadBack; pHalData->PHYRegDef[RF_PATH_B ].rfLSSIReadBack = rFPGA0_XB_LSSIReadBack; - pHalData->PHYRegDef[RF_PATH_C ].rfLSSIReadBack = rFPGA0_XC_LSSIReadBack; - pHalData->PHYRegDef[RF_PATH_D ].rfLSSIReadBack = rFPGA0_XD_LSSIReadBack;/* Tranceiver LSSI Readback PI mode */ pHalData->PHYRegDef[RF_PATH_A ].rfLSSIReadBackPi = TransceiverA_HSPI_Readback;
drivers/staging/r8188eu/include/Hal8188EPhyCfg.h +0 -2
@@ -33,8 +33,6 @@ enum hw90_block {enum rf_radio_path {RF_PATH_A =0 ,/* Radio Path A */ RF_PATH_B =1 ,/* Radio Path B */ -RF_PATH_C =2 ,/* Radio Path C */ -RF_PATH_D =3 ,/* Radio Path D */ };#define MAX_PG_GROUP 13
drivers/staging/r8188eu/include/rtl8188e_hal.h +1 -1
@@ -227,7 +227,7 @@ struct hal_data_8188e {u32 AcParam_BE;/* Original parameter for BE, use for EDCA turbo. */ -struct bb_reg_def PHYRegDef[4 ];/* Radio A/B/C/D */ +struct bb_reg_def PHYRegDef[2 ];/* Radio A/B */ u32 RfRegChnlVal[2 ];
Signature · 1 line
2.34.1
PATCH v2 2/10 staging: r8188eu: struct odm_mac_status_info is not used
In reply to Michael StraubeThe structure odm_mac_status_info is not used. Remove it.
--- drivers/staging/r8188eu/include/odm.h | 4 ---- 1 file changed, 4 deletions(-)
drivers/staging/r8188eu/include/odm.h +0 -4
@@ -176,10 +176,6 @@ struct odm_per_pkt_info {bool bPacketBeacon; }; -struct odm_mac_status_info { -u8 test; -}; -enum odm_ability {/* BB Team */ ODM_DIG =0x00000001 ,
Signature · 1 line
2.34.1
PATCH v2 3/10 staging: r8188eu: remove macro PHY_SetRFReg
In reply to Michael StraubeThe macro PHY_SetRFReg just re-defines rtl8188e_PHY_SetRFReg(). Call rtl8188e_PHY_SetRFReg() directly and remove the macro.
--- drivers/staging/r8188eu/hal/odm.c | 2 +- drivers/staging/r8188eu/hal/odm_interface.c | 2 +- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 2 +- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 4 ++-- drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 2 -- 5 files changed, 5 insertions(+), 7 deletions(-)
drivers/staging/r8188eu/hal/odm.c +1 -1
@@ -890,7 +890,7 @@ void ODM_TXPowerTrackingCheck(struct odm_dm_struct *pDM_Odm)return ;if (!pDM_Odm->RFCalibrateInfo.TM_Trigger) {/* at least delay 1 sec */ -PHY_SetRFReg (Adapter,RF_PATH_A ,RF_T_METER_88E ,BIT (17 ) |BIT (16 ),0x03 ); +rtl8188e_PHY_SetRFReg (Adapter,RF_PATH_A ,RF_T_METER_88E ,BIT (17 ) |BIT (16 ),0x03 ); pDM_Odm->RFCalibrateInfo.TM_Trigger =1 ;return ;
drivers/staging/r8188eu/hal/odm_interface.c +1 -1
@@ -31,7 +31,7 @@ u32 ODM_GetBBReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask)void ODM_SetRFReg (struct odm_dm_struct *pDM_Odm,enum rf_radio_path eRFPath,u32 RegAddr,u32 BitMask,u32 Data) {struct adapter *Adapter = pDM_Odm->Adapter; -PHY_SetRFReg (Adapter, (enum rf_radio_path )eRFPath, RegAddr, BitMask, Data); +rtl8188e_PHY_SetRFReg (Adapter, (enum rf_radio_path )eRFPath, RegAddr, BitMask, Data); }u32 ODM_GetRFReg (struct odm_dm_struct *pDM_Odm,enum rf_radio_path eRFPath,u32 RegAddr,u32 BitMask)
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +1 -1
@@ -771,7 +771,7 @@ static void _PHY_SwChnl8192C(struct adapter *Adapter, u8 channel) param1 =RF_CHNLBW ; param2 = channel; pHalData->RfRegChnlVal[eRFPath] = ((pHalData->RfRegChnlVal[eRFPath] &0xfffffc00 ) | param2); -PHY_SetRFReg (Adapter, (enum rf_radio_path )eRFPath, param1, bRFRegOffsetMask, pHalData->RfRegChnlVal[eRFPath]); +rtl8188e_PHY_SetRFReg (Adapter, (enum rf_radio_path )eRFPath, param1, bRFRegOffsetMask, pHalData->RfRegChnlVal[eRFPath]); }void PHY_SwChnl8188E (struct adapter *Adapter,u8 channel)
drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +2 -2
@@ -51,11 +51,11 @@ void rtl8188e_PHY_RF6052SetBandwidth(struct adapter *Adapter,switch (Bandwidth) {case HT_CHANNEL_WIDTH_20 : pHalData->RfRegChnlVal[0 ] = ((pHalData->RfRegChnlVal[0 ] &0xfffff3ff ) |BIT (10 ) |BIT (11 )); -PHY_SetRFReg (Adapter,RF_PATH_A ,RF_CHNLBW , bRFRegOffsetMask, pHalData->RfRegChnlVal[0 ]); +rtl8188e_PHY_SetRFReg (Adapter,RF_PATH_A ,RF_CHNLBW , bRFRegOffsetMask, pHalData->RfRegChnlVal[0 ]);break ;case HT_CHANNEL_WIDTH_40 : pHalData->RfRegChnlVal[0 ] = ((pHalData->RfRegChnlVal[0 ] &0xfffff3ff ) |BIT (10 )); -PHY_SetRFReg (Adapter,RF_PATH_A ,RF_CHNLBW , bRFRegOffsetMask, pHalData->RfRegChnlVal[0 ]); +rtl8188e_PHY_SetRFReg (Adapter,RF_PATH_A ,RF_CHNLBW , bRFRegOffsetMask, pHalData->RfRegChnlVal[0 ]);break ;default :break ;
drivers/staging/r8188eu/include/Hal8188EPhyCfg.h +0 -2
@@ -140,7 +140,5 @@ void storePwrIndexDiffRateOffset(struct adapter *adapter, u32 regaddr, rtl8188e_PHY_SetBBReg((adapt), (regaddr), (bitmask), (data))#define PHY_QueryRFReg (adapt, rfpath, regaddr, bitmask) \ rtl8188e_PHY_QueryRFReg((adapt), (rfpath), (regaddr), (bitmask)) -#define PHY_SetRFReg (adapt, rfpath, regaddr, bitmask, data) \ - rtl8188e_PHY_SetRFReg((adapt), (rfpath), (regaddr), (bitmask), (data))#endif /* __INC_HAL8192CPHYCFG_H */
Signature · 1 line
2.34.1
PATCH v2 4/10 staging: r8188eu: remove macro PHY_QueryRFReg
In reply to Michael StraubeThe macro PHY_QueryRFReg just re-defines rtl8188e_PHY_QueryRFReg(). Call rtl8188e_PHY_QueryRFReg() directly and remove the macro.
--- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 6 +++--- drivers/staging/r8188eu/hal/odm_interface.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 4 ++-- drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-)
drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +3 -3
@@ -853,11 +853,11 @@ static void phy_LCCalibrate_8188E(struct adapter *adapt, bool is2t)if ((tmpreg &0x70 ) !=0 ) {/* 1. Read original RF mode */ /* Path-A */ - RF_Amode =PHY_QueryRFReg (adapt,RF_PATH_A ,RF_AC , bMask12Bits); + RF_Amode =rtl8188e_PHY_QueryRFReg (adapt,RF_PATH_A ,RF_AC , bMask12Bits);/* Path-B */ if (is2t) - RF_Bmode =PHY_QueryRFReg (adapt,RF_PATH_B ,RF_AC , bMask12Bits); + RF_Bmode =rtl8188e_PHY_QueryRFReg (adapt,RF_PATH_B ,RF_AC , bMask12Bits);/* 2. Set RF mode = standby mode */ /* Path-A */
@@ -869,7 +869,7 @@ static void phy_LCCalibrate_8188E(struct adapter *adapt, bool is2t) }/* 3. Read RF reg18 */ - LC_Cal =PHY_QueryRFReg (adapt,RF_PATH_A ,RF_CHNLBW , bMask12Bits); + LC_Cal =rtl8188e_PHY_QueryRFReg (adapt,RF_PATH_A ,RF_CHNLBW , bMask12Bits);/* 4. Set LC calibration begin bit15 */ ODM_SetRFReg (dm_odm,RF_PATH_A ,RF_CHNLBW , bMask12Bits, LC_Cal |0x08000 );
drivers/staging/r8188eu/hal/odm_interface.c +1 -1
@@ -37,7 +37,7 @@ void ODM_SetRFReg(struct odm_dm_struct *pDM_Odm, enum rf_radio_path eRFPath, u32u32 ODM_GetRFReg (struct odm_dm_struct *pDM_Odm,enum rf_radio_path eRFPath,u32 RegAddr,u32 BitMask) {struct adapter *Adapter = pDM_Odm->Adapter; -return PHY_QueryRFReg (Adapter, (enum rf_radio_path )eRFPath, RegAddr, BitMask); +return rtl8188e_PHY_QueryRFReg (Adapter, (enum rf_radio_path )eRFPath, RegAddr, BitMask); }/* ODM Memory relative API. */
drivers/staging/r8188eu/hal/usb_halinit.c +2 -2
@@ -745,8 +745,8 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)rtw_write16 (Adapter,REG_PKT_BE_BK_LIFE_TIME ,0x0400 );/* unit: 256us. 256ms */ /* Keep RfRegChnlVal for later use. */ - haldata->RfRegChnlVal[0 ] =PHY_QueryRFReg (Adapter, (enum rf_radio_path )0 ,RF_CHNLBW , bRFRegOffsetMask); - haldata->RfRegChnlVal[1 ] =PHY_QueryRFReg (Adapter, (enum rf_radio_path )1 ,RF_CHNLBW , bRFRegOffsetMask); + haldata->RfRegChnlVal[0 ] =rtl8188e_PHY_QueryRFReg (Adapter, (enum rf_radio_path )0 ,RF_CHNLBW , bRFRegOffsetMask); + haldata->RfRegChnlVal[1 ] =rtl8188e_PHY_QueryRFReg (Adapter, (enum rf_radio_path )1 ,RF_CHNLBW , bRFRegOffsetMask);HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_TURN_ON_BLOCK );_BBTurnOnBlock (Adapter);
drivers/staging/r8188eu/include/Hal8188EPhyCfg.h +0 -2
@@ -138,7 +138,5 @@ void storePwrIndexDiffRateOffset(struct adapter *adapter, u32 regaddr, rtl8188e_PHY_QueryBBReg((adapt), (regaddr), (mask))#define PHY_SetBBReg (adapt, regaddr, bitmask, data) \ rtl8188e_PHY_SetBBReg((adapt), (regaddr), (bitmask), (data)) -#define PHY_QueryRFReg (adapt, rfpath, regaddr, bitmask) \ - rtl8188e_PHY_QueryRFReg((adapt), (rfpath), (regaddr), (bitmask))#endif /* __INC_HAL8192CPHYCFG_H */
Signature · 1 line
2.34.1
PATCH v2 5/10 staging: r8188eu: remove macro PHY_SetBBReg
In reply to Michael StraubeThe macro PHY_SetBBReg just re-defines rtl8188e_PHY_SetBBReg(). Call rtl8188e_PHY_SetBBReg() directly and remove the macro.
--- drivers/staging/r8188eu/hal/odm_interface.c | 4 ++-- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 22 +++++++++---------- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 20 ++++++++--------- drivers/staging/r8188eu/hal/usb_halinit.c | 6 ++--- .../staging/r8188eu/include/Hal8188EPhyCfg.h | 2 -- 5 files changed, 26 insertions(+), 28 deletions(-)
drivers/staging/r8188eu/hal/odm_interface.c +2 -2
@@ -7,7 +7,7 @@void ODM_SetMACReg (struct odm_dm_struct *pDM_Odm,u32 RegAddr,u32 BitMask,u32 Data) {struct adapter *Adapter = pDM_Odm->Adapter; -PHY_SetBBReg (Adapter, RegAddr, BitMask, Data); +rtl8188e_PHY_SetBBReg (Adapter, RegAddr, BitMask, Data); }u32 ODM_GetMACReg (struct odm_dm_struct *pDM_Odm,u32 RegAddr,u32 BitMask)
@@ -19,7 +19,7 @@ u32 ODM_GetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask)void ODM_SetBBReg (struct odm_dm_struct *pDM_Odm,u32 RegAddr,u32 BitMask,u32 Data) {struct adapter *Adapter = pDM_Odm->Adapter; -PHY_SetBBReg (Adapter, RegAddr, BitMask, Data); +rtl8188e_PHY_SetBBReg (Adapter, RegAddr, BitMask, Data); }u32 ODM_GetBBReg (struct odm_dm_struct *pDM_Odm,u32 RegAddr,u32 BitMask)
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +11 -11
@@ -169,10 +169,10 @@ phy_RFSerialRead( tmplong2 = (tmplong2 & (~bLSSIReadAddress)) | (NewOffset <<23 ) | bLSSIReadEdge;/* T65 RF */ -PHY_SetBBReg (Adapter, rFPGA0_XA_HSSIParameter2, bMaskDWord, tmplong & (~bLSSIReadEdge)); +rtl8188e_PHY_SetBBReg (Adapter, rFPGA0_XA_HSSIParameter2, bMaskDWord, tmplong & (~bLSSIReadEdge));udelay (10 );/* PlatformStallExecution(10); */ -PHY_SetBBReg (Adapter, pPhyReg->rfHSSIPara2, bMaskDWord, tmplong2); +rtl8188e_PHY_SetBBReg (Adapter, pPhyReg->rfHSSIPara2, bMaskDWord, tmplong2);udelay (100 );/* PlatformStallExecution(100); */ udelay (10 );/* PlatformStallExecution(10); */
@@ -263,7 +263,7 @@ phy_RFSerialWrite(/* */ /* Write Operation */ /* */ -PHY_SetBBReg (Adapter, pPhyReg->rf3wireOffset, bMaskDWord, DataAndAddr); +rtl8188e_PHY_SetBBReg (Adapter, pPhyReg->rf3wireOffset, bMaskDWord, DataAndAddr); }/**
@@ -567,7 +567,7 @@ PHY_BBConfig8188E(/* write 0x24[16:11] = 0x24[22:17] = CrystalCap */ CrystalCap = pHalData->CrystalCap &0x3F ; -PHY_SetBBReg (Adapter,REG_AFE_XTAL_CTRL ,0x7ff800 , (CrystalCap | (CrystalCap <<6 ))); +rtl8188e_PHY_SetBBReg (Adapter,REG_AFE_XTAL_CTRL ,0x7ff800 , (CrystalCap | (CrystalCap <<6 )));return rtStatus; }
@@ -704,17 +704,17 @@ _PHY_SetBWMode92C(switch (pHalData->CurrentChannelBW) {/* 20 MHz channel*/ case HT_CHANNEL_WIDTH_20 : -PHY_SetBBReg (Adapter, rFPGA0_RFMOD, bRFMOD,0x0 ); -PHY_SetBBReg (Adapter, rFPGA1_RFMOD, bRFMOD,0x0 ); +rtl8188e_PHY_SetBBReg (Adapter, rFPGA0_RFMOD, bRFMOD,0x0 ); +rtl8188e_PHY_SetBBReg (Adapter, rFPGA1_RFMOD, bRFMOD,0x0 );break ;/* 40 MHz channel*/ case HT_CHANNEL_WIDTH_40 : -PHY_SetBBReg (Adapter, rFPGA0_RFMOD, bRFMOD,0x1 ); -PHY_SetBBReg (Adapter, rFPGA1_RFMOD, bRFMOD,0x1 ); +rtl8188e_PHY_SetBBReg (Adapter, rFPGA0_RFMOD, bRFMOD,0x1 ); +rtl8188e_PHY_SetBBReg (Adapter, rFPGA1_RFMOD, bRFMOD,0x1 );/* Set Control channel to upper or lower. These settings are required only for 40MHz */ -PHY_SetBBReg (Adapter, rCCK0_System, bCCKSideBand, (pHalData->nCur40MhzPrimeSC >>1 )); -PHY_SetBBReg (Adapter, rOFDM1_LSTF,0xC00 , pHalData->nCur40MhzPrimeSC); -PHY_SetBBReg (Adapter,0x818 , (BIT (26 ) |BIT (27 )), +rtl8188e_PHY_SetBBReg (Adapter, rCCK0_System, bCCKSideBand, (pHalData->nCur40MhzPrimeSC >>1 )); +rtl8188e_PHY_SetBBReg (Adapter, rOFDM1_LSTF,0xC00 , pHalData->nCur40MhzPrimeSC); +rtl8188e_PHY_SetBBReg (Adapter,0x818 , (BIT (26 ) |BIT (27 )), (pHalData->nCur40MhzPrimeSC ==HAL_PRIME_CHNL_OFFSET_LOWER ) ?2 :1 );break ;default :
drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +10 -10
@@ -148,15 +148,15 @@ rtl8188e_PHY_RF6052SetCckTxPower(/* rf-A cck tx power */ tmpval = TxAGC[RF_PATH_A ] &0xff ; -PHY_SetBBReg (Adapter, rTxAGC_A_CCK1_Mcs32, bMaskByte1, tmpval); +rtl8188e_PHY_SetBBReg (Adapter, rTxAGC_A_CCK1_Mcs32, bMaskByte1, tmpval); tmpval = TxAGC[RF_PATH_A ] >>8 ; -PHY_SetBBReg (Adapter, rTxAGC_B_CCK11_A_CCK2_11,0xffffff00 , tmpval); +rtl8188e_PHY_SetBBReg (Adapter, rTxAGC_B_CCK11_A_CCK2_11,0xffffff00 , tmpval);/* rf-B cck tx power */ tmpval = TxAGC[RF_PATH_B ] >>24 ; -PHY_SetBBReg (Adapter, rTxAGC_B_CCK11_A_CCK2_11, bMaskByte0, tmpval); +rtl8188e_PHY_SetBBReg (Adapter, rTxAGC_B_CCK11_A_CCK2_11, bMaskByte0, tmpval); tmpval = TxAGC[RF_PATH_B ] &0x00ffffff ; -PHY_SetBBReg (Adapter, rTxAGC_B_CCK1_55_Mcs32,0xffffff00 , tmpval); +rtl8188e_PHY_SetBBReg (Adapter, rTxAGC_B_CCK1_55_Mcs32,0xffffff00 , tmpval); }/* PHY_RF6052SetCckTxPower */ /* */
@@ -298,7 +298,7 @@ static void writeOFDMPowerReg88E(struct adapter *Adapter, u8 index, u32 *pValue)else regoffset = regoffset_b[index]; -PHY_SetBBReg (Adapter, regoffset, bMaskDWord, writeVal); +rtl8188e_PHY_SetBBReg (Adapter, regoffset, bMaskDWord, writeVal);/* 201005115 Joseph: Set Tx Power diff for Tx power training mechanism. */ if (regoffset == rTxAGC_A_Mcs07_Mcs04 || regoffset == rTxAGC_B_Mcs07_Mcs04) {
@@ -392,18 +392,18 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter) u4RegValue =PHY_QueryBBReg (Adapter, pPhyReg->rfintfs, bRFSI_RFENV);/*----Set RF_ENV enable----*/ -PHY_SetBBReg (Adapter, pPhyReg->rfintfe, bRFSI_RFENV <<16 ,0x1 ); +rtl8188e_PHY_SetBBReg (Adapter, pPhyReg->rfintfe, bRFSI_RFENV <<16 ,0x1 );udelay (1 );/* PlatformStallExecution(1); */ /*----Set RF_ENV output high----*/ -PHY_SetBBReg (Adapter, pPhyReg->rfintfo, bRFSI_RFENV,0x1 ); +rtl8188e_PHY_SetBBReg (Adapter, pPhyReg->rfintfo, bRFSI_RFENV,0x1 );udelay (1 );/* PlatformStallExecution(1); */ /* Set bit number of Address and Data for RF register */ -PHY_SetBBReg (Adapter, pPhyReg->rfHSSIPara2, b3WireAddressLength,0x0 );/* Set 1 to 4 bits for 8255 */ +rtl8188e_PHY_SetBBReg (Adapter, pPhyReg->rfHSSIPara2, b3WireAddressLength,0x0 );/* Set 1 to 4 bits for 8255 */ udelay (1 );/* PlatformStallExecution(1); */ -PHY_SetBBReg (Adapter, pPhyReg->rfHSSIPara2, b3WireDataLength,0x0 );/* Set 0 to 12 bits for 8255 */ +rtl8188e_PHY_SetBBReg (Adapter, pPhyReg->rfHSSIPara2, b3WireDataLength,0x0 );/* Set 0 to 12 bits for 8255 */ udelay (1 );/* PlatformStallExecution(1); */ /*----Initialize RF fom connfiguration file----*/
@@ -411,7 +411,7 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter) rtStatus = _FAIL;/*----Restore RFENV control type----*/ ; -PHY_SetBBReg (Adapter, pPhyReg->rfintfs, bRFSI_RFENV, u4RegValue); +rtl8188e_PHY_SetBBReg (Adapter, pPhyReg->rfintfs, bRFSI_RFENV, u4RegValue);if (rtStatus != _SUCCESS) goto phy_RF6052_Config_ParaFile_Fail;
drivers/staging/r8188eu/hal/usb_halinit.c +3 -3
@@ -558,8 +558,8 @@ static void _BeaconFunctionEnable(struct adapter *Adapter,/* Set CCK and OFDM Block "ON" */ static void _BBTurnOnBlock (struct adapter *Adapter) { -PHY_SetBBReg (Adapter, rFPGA0_RFMOD, bCCKEn,0x1 ); -PHY_SetBBReg (Adapter, rFPGA0_RFMOD, bOFDMEn,0x1 ); +rtl8188e_PHY_SetBBReg (Adapter, rFPGA0_RFMOD, bCCKEn,0x1 ); +rtl8188e_PHY_SetBBReg (Adapter, rFPGA0_RFMOD, bOFDMEn,0x1 ); }enum {
@@ -576,7 +576,7 @@ static void _InitAntenna_Selection(struct adapter *Adapter)DBG_88E ("==> %s ....\n" , __func__);rtw_write32 (Adapter,REG_LEDCFG0 ,rtw_read32 (Adapter,REG_LEDCFG0 ) |BIT (23 )); -PHY_SetBBReg (Adapter, rFPGA0_XAB_RFParameter,BIT (13 ),0x01 ); +rtl8188e_PHY_SetBBReg (Adapter, rFPGA0_XAB_RFParameter,BIT (13 ),0x01 );if (PHY_QueryBBReg (Adapter, rFPGA0_XA_RFInterfaceOE,0x300 ) == Antenna_A) haldata->CurAntenna = Antenna_A;
drivers/staging/r8188eu/include/Hal8188EPhyCfg.h +0 -2
@@ -136,7 +136,5 @@ void storePwrIndexDiffRateOffset(struct adapter *adapter, u32 regaddr,#define PHY_QueryBBReg (adapt, regaddr, mask) \ rtl8188e_PHY_QueryBBReg((adapt), (regaddr), (mask)) -#define PHY_SetBBReg (adapt, regaddr, bitmask, data) \ - rtl8188e_PHY_SetBBReg((adapt), (regaddr), (bitmask), (data))#endif /* __INC_HAL8192CPHYCFG_H */
Signature · 1 line
2.34.1
PATCH v2 6/10 staging: r8188eu: remove macro PHY_QueryBBReg
In reply to Michael StraubeThe macro PHY_QueryBBReg just re-defines rtl8188e_PHY_QueryBBReg(). Call rtl8188e_PHY_QueryBBReg() directly and remove the macro.
--- drivers/staging/r8188eu/hal/odm_interface.c | 4 ++-- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 12 ++++++------ drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 2 +- drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 3 --- 5 files changed, 10 insertions(+), 13 deletions(-)
drivers/staging/r8188eu/hal/odm_interface.c +2 -2
@@ -13,7 +13,7 @@ void ODM_SetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask, u32u32 ODM_GetMACReg (struct odm_dm_struct *pDM_Odm,u32 RegAddr,u32 BitMask) {struct adapter *Adapter = pDM_Odm->Adapter; -return PHY_QueryBBReg (Adapter, RegAddr, BitMask); +return rtl8188e_PHY_QueryBBReg (Adapter, RegAddr, BitMask); }void ODM_SetBBReg (struct odm_dm_struct *pDM_Odm,u32 RegAddr,u32 BitMask,u32 Data)
@@ -25,7 +25,7 @@ void ODM_SetBBReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask, u32 Du32 ODM_GetBBReg (struct odm_dm_struct *pDM_Odm,u32 RegAddr,u32 BitMask) {struct adapter *Adapter = pDM_Odm->Adapter; -return PHY_QueryBBReg (Adapter, RegAddr, BitMask); +return rtl8188e_PHY_QueryBBReg (Adapter, RegAddr, BitMask); }void ODM_SetRFReg (struct odm_dm_struct *pDM_Odm,enum rf_radio_path eRFPath,u32 RegAddr,u32 BitMask,u32 Data)
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +6 -6
@@ -161,11 +161,11 @@ phy_RFSerialRead(/* For 92S LSSI Read RFLSSIRead */ /* For RF A/B write 0x824/82c(does not work in the future) */ /* We must use 0x824 for RF A and B to execute read trigger */ - tmplong =PHY_QueryBBReg (Adapter, rFPGA0_XA_HSSIParameter2, bMaskDWord); + tmplong =rtl8188e_PHY_QueryBBReg (Adapter, rFPGA0_XA_HSSIParameter2, bMaskDWord);if (eRFPath ==RF_PATH_A ) tmplong2 = tmplong;else - tmplong2 =PHY_QueryBBReg (Adapter, pPhyReg->rfHSSIPara2, bMaskDWord); + tmplong2 =rtl8188e_PHY_QueryBBReg (Adapter, pPhyReg->rfHSSIPara2, bMaskDWord); tmplong2 = (tmplong2 & (~bLSSIReadAddress)) | (NewOffset <<23 ) | bLSSIReadEdge;/* T65 RF */
@@ -178,14 +178,14 @@ phy_RFSerialRead(udelay (10 );/* PlatformStallExecution(10); */ if (eRFPath ==RF_PATH_A ) - RfPiEnable = (u8 )PHY_QueryBBReg (Adapter, rFPGA0_XA_HSSIParameter1,BIT (8 )); + RfPiEnable = (u8 )rtl8188e_PHY_QueryBBReg (Adapter, rFPGA0_XA_HSSIParameter1,BIT (8 ));else if (eRFPath ==RF_PATH_B ) - RfPiEnable = (u8 )PHY_QueryBBReg (Adapter, rFPGA0_XB_HSSIParameter1,BIT (8 )); + RfPiEnable = (u8 )rtl8188e_PHY_QueryBBReg (Adapter, rFPGA0_XB_HSSIParameter1,BIT (8 ));if (RfPiEnable) {/* Read from BBreg8b8, 12 bits for 8190, 20bits for T65 RF */ - retValue =PHY_QueryBBReg (Adapter, pPhyReg->rfLSSIReadBackPi, bLSSIReadBackData); + retValue =rtl8188e_PHY_QueryBBReg (Adapter, pPhyReg->rfLSSIReadBackPi, bLSSIReadBackData); }else {/* Read from BBreg8a0, 12 bits for 8190, 20 bits for T65 RF */ - retValue =PHY_QueryBBReg (Adapter, pPhyReg->rfLSSIReadBack, bLSSIReadBackData); + retValue =rtl8188e_PHY_QueryBBReg (Adapter, pPhyReg->rfLSSIReadBack, bLSSIReadBackData); }return retValue; }
drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +1 -1
@@ -389,7 +389,7 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter) pPhyReg = &pHalData->PHYRegDef[eRFPath];/*----Store original RFENV control type----*/ - u4RegValue =PHY_QueryBBReg (Adapter, pPhyReg->rfintfs, bRFSI_RFENV); + u4RegValue =rtl8188e_PHY_QueryBBReg (Adapter, pPhyReg->rfintfs, bRFSI_RFENV);/*----Set RF_ENV enable----*/ rtl8188e_PHY_SetBBReg (Adapter, pPhyReg->rfintfe, bRFSI_RFENV <<16 ,0x1 );
drivers/staging/r8188eu/hal/usb_halinit.c +1 -1
@@ -578,7 +578,7 @@ static void _InitAntenna_Selection(struct adapter *Adapter)rtw_write32 (Adapter,REG_LEDCFG0 ,rtw_read32 (Adapter,REG_LEDCFG0 ) |BIT (23 ));rtl8188e_PHY_SetBBReg (Adapter, rFPGA0_XAB_RFParameter,BIT (13 ),0x01 ); -if (PHY_QueryBBReg (Adapter, rFPGA0_XA_RFInterfaceOE,0x300 ) == Antenna_A) +if (rtl8188e_PHY_QueryBBReg (Adapter, rFPGA0_XA_RFInterfaceOE,0x300 ) == Antenna_A) haldata->CurAntenna = Antenna_A;else haldata->CurAntenna = Antenna_B;
drivers/staging/r8188eu/include/Hal8188EPhyCfg.h +0 -3
@@ -134,7 +134,4 @@ void storePwrIndexDiffRateOffset(struct adapter *adapter, u32 regaddr, u32 mask, u32 data);/*--------------------------Exported Function prototype---------------------*/ -#define PHY_QueryBBReg (adapt, regaddr, mask) \ - rtl8188e_PHY_QueryBBReg((adapt), (regaddr), (mask)) -#endif /* __INC_HAL8192CPHYCFG_H */
Signature · 1 line
2.34.1
PATCH v2 7/10 staging: r8188eu: remove duplicate defines
In reply to Michael StraubeThe following constants are defined in three different header files.
IQK_MAC_REG_NUMIQK_ADDA_REG_NUMIQK_BB_REG_NUMHP_THERMAL_NUM
Keep them in odm.h and remove them from Hal8188EPhyCfg.h and rtl8188e_dm.h.
--- drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 5 ----- drivers/staging/r8188eu/include/rtl8188e_dm.h | 7 +------ 2 files changed, 1 insertion(+), 11 deletions(-)
drivers/staging/r8188eu/include/Hal8188EPhyCfg.h +0 -5
@@ -11,11 +11,6 @@#define MAX_TXPWR_IDX_NMODE_92S 63#define Reset_Cnt_Limit 3 -#define IQK_MAC_REG_NUM 4 -#define IQK_ADDA_REG_NUM 16 -#define IQK_BB_REG_NUM 9 -#define HP_THERMAL_NUM 8 -#define MAX_AGGR_NUM 0x07/*--------------------------Define Parameters-------------------------------*/
drivers/staging/r8188eu/include/rtl8188e_dm.h +1 -6
@@ -8,12 +8,7 @@ enum{ UP_LINK, DOWN_LINK, }; -/* duplicate code,will move to ODM ######### */ -#define IQK_MAC_REG_NUM 4 -#define IQK_ADDA_REG_NUM 16 -#define IQK_BB_REG_NUM 9 -#define HP_THERMAL_NUM 8 -/* duplicate code,will move to ODM ######### */ +struct dm_priv {u32 InitODMFlag;
Signature · 1 line
2.34.1
PATCH v2 8/10 staging: r8188eu: bWIFI_Direct is set but never used
In reply to Michael StraubebWIFI_Direct in odm_dm_struct is set but never used. Remove it.
--- drivers/staging/r8188eu/core/rtw_p2p.c | 3 --- drivers/staging/r8188eu/hal/odm.c | 3 --- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 3 --- drivers/staging/r8188eu/include/hal_intf.h | 1 - drivers/staging/r8188eu/include/odm.h | 2 -- 5 files changed, 12 deletions(-)
drivers/staging/r8188eu/core/rtw_p2p.c +0 -3
@@ -1944,7 +1944,6 @@ int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role)/* Enable P2P function */ init_wifidirect_info (padapter, role); -rtl8188e_SetHalODMVar (padapter,HAL_ODM_P2P_STATE ,NULL , true); }else if (role ==P2P_ROLE_DISABLE ) {if (_FAIL ==rtw_pwr_wakeup (padapter)) { ret = _FAIL;
@@ -1963,8 +1962,6 @@ int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role)memset (&pwdinfo->rx_prov_disc_info,0x00 ,sizeof (struct rx_provdisc_req_info )); } -rtl8188e_SetHalODMVar (padapter,HAL_ODM_P2P_STATE ,NULL , false); -/* Restore to initial setting. */ update_tx_basic_rate (padapter, padapter->registrypriv.wireless_mode); }
drivers/staging/r8188eu/hal/odm.c +0 -3
@@ -260,9 +260,6 @@ void ODM_CmnInfoUpdate(struct odm_dm_struct *pDM_Odm, u32 CmnInfo, u64 Value)case ODM_CMNINFO_ABILITY : pDM_Odm->SupportAbility = (u32 )Value;break ; -case ODM_CMNINFO_WIFI_DIRECT : - pDM_Odm->bWIFI_Direct = (bool )Value; -break ;case ODM_CMNINFO_WIFI_DISPLAY : pDM_Odm->bWIFI_Display = (bool )Value;break ;
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +0 -3
@@ -874,9 +874,6 @@ void rtl8188e_SetHalODMVar(struct adapter *Adapter, enum hal_odm_variable eVaria } }break ; -case HAL_ODM_P2P_STATE : -ODM_CmnInfoUpdate (podmpriv,ODM_CMNINFO_WIFI_DIRECT , bSet); -break ;case HAL_ODM_WIFI_DISPLAY_STATE :ODM_CmnInfoUpdate (podmpriv,ODM_CMNINFO_WIFI_DISPLAY , bSet);break ;
drivers/staging/r8188eu/include/hal_intf.h +0 -1
@@ -96,7 +96,6 @@ enum hal_def_variable {enum hal_odm_variable {HAL_ODM_STA_INFO , -HAL_ODM_P2P_STATE ,HAL_ODM_WIFI_DISPLAY_STATE , };
drivers/staging/r8188eu/include/odm.h +0 -2
@@ -230,7 +230,6 @@ enum odm_common_info_def {/* POINTER REFERENCE----------- */ /* CALL BY VALUE------------- */ -ODM_CMNINFO_WIFI_DIRECT ,ODM_CMNINFO_WIFI_DISPLAY ,ODM_CMNINFO_LINK , ODM_CMNINFO_RSSI_MIN,
@@ -480,7 +479,6 @@ struct odm_dm_struct {/* POINTER REFERENCE----------- */ /* */ /* CALL BY VALUE------------- */ -bool bWIFI_Direct;bool bWIFI_Display;bool bLinked;u8 RSSI_Min;
Signature · 1 line
2.34.1
PATCH v2 9/10 staging: r8188eu: bWIFI_Display is set but never used
In reply to Michael StraubebWIFI_Display in odm_dm_struct is set but never used. Remove it.
--- drivers/staging/r8188eu/hal/odm.c | 3 --- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 3 --- drivers/staging/r8188eu/include/hal_intf.h | 1 - drivers/staging/r8188eu/include/odm.h | 2 -- 4 files changed, 9 deletions(-)
drivers/staging/r8188eu/hal/odm.c +0 -3
@@ -260,9 +260,6 @@ void ODM_CmnInfoUpdate(struct odm_dm_struct *pDM_Odm, u32 CmnInfo, u64 Value)case ODM_CMNINFO_ABILITY : pDM_Odm->SupportAbility = (u32 )Value;break ; -case ODM_CMNINFO_WIFI_DISPLAY : - pDM_Odm->bWIFI_Display = (bool )Value; -break ;case ODM_CMNINFO_LINK : pDM_Odm->bLinked = (bool )Value;break ;
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +0 -3
@@ -874,9 +874,6 @@ void rtl8188e_SetHalODMVar(struct adapter *Adapter, enum hal_odm_variable eVaria } }break ; -case HAL_ODM_WIFI_DISPLAY_STATE : -ODM_CmnInfoUpdate (podmpriv,ODM_CMNINFO_WIFI_DISPLAY , bSet); -break ;default :break ; }
drivers/staging/r8188eu/include/hal_intf.h +0 -1
@@ -96,7 +96,6 @@ enum hal_def_variable {enum hal_odm_variable {HAL_ODM_STA_INFO , -HAL_ODM_WIFI_DISPLAY_STATE , };typedef s32 (*c2h_id_filter )(u8 id);
drivers/staging/r8188eu/include/odm.h +0 -2
@@ -230,7 +230,6 @@ enum odm_common_info_def {/* POINTER REFERENCE----------- */ /* CALL BY VALUE------------- */ -ODM_CMNINFO_WIFI_DISPLAY ,ODM_CMNINFO_LINK ,ODM_CMNINFO_RSSI_MIN , ODM_CMNINFO_RF_ANTENNA_TYPE, /* u8 */
@@ -479,7 +478,6 @@ struct odm_dm_struct {/* POINTER REFERENCE----------- */ /* */ /* CALL BY VALUE------------- */ -bool bWIFI_Display;bool bLinked;u8 RSSI_Min;bool bIsMPChip;
Signature · 1 line
2.34.1
PATCH v2 10/10 staging: r8188eu: remove unused macro IS_FW_81xxC
In reply to Michael StraubeThe macro IS_FW_81xxC is not used. Remove it.
--- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +0 -2
@@ -508,8 +508,6 @@ static s32 _FWFreeToGo(struct adapter *padapter)return _FAIL; } -#define IS_FW_81xxC (padapter) (((GET_HAL_DATA(padapter))->FirmwareSignature & 0xFFF0) == 0x88C0) -static int load_firmware (struct rt_firmware *pFirmware,struct device *device) {s32 rtStatus = _SUCCESS;
Signature · 1 line
2.34.1