diff options
| -rw-r--r-- | drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 14 | ||||
| -rw-r--r-- | drivers/staging/rtl8188eu/hal/usb_halinit.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h | 4 |
3 files changed, 8 insertions, 14 deletions
diff --git a/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c b/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c index 93cda39..e2c9b54 100644 --- a/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c +++ b/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c @@ -234,7 +234,7 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt) /* Delta temperature is equal to or larger than 20 centigrade.*/ if ((delta_lck >= 8)) { dm_odm->RFCalibrateInfo.ThermalValue_LCK = thermal_val; - PHY_LCCalibrate_8188E(adapt); + rtl88eu_phy_lc_calibrate(adapt); } if (delta > 0 && dm_odm->RFCalibrateInfo.TxPowerTrackControl) { @@ -1179,16 +1179,15 @@ void rtl88eu_phy_iq_calibrate(struct adapter *adapt, bool recovery) dm_odm->RFCalibrateInfo.IQK_BB_backup_recover, 9); } -void PHY_LCCalibrate_8188E(struct adapter *adapt) +void rtl88eu_phy_lc_calibrate(struct adapter *adapt) { bool singletone = false, carrier_sup = false; u32 timeout = 2000, timecount = 0; - struct hal_data_8188e *pHalData = GET_HAL_DATA(adapt); - struct odm_dm_struct *dm_odm = &pHalData->odmpriv; + struct hal_data_8188e *hal_data = GET_HAL_DATA(adapt); + struct odm_dm_struct *dm_odm = &hal_data->odmpriv; if (!(dm_odm->SupportAbility & ODM_RF_CALIBRATION)) return; - /* 20120213<Kordan> Turn on when continuous Tx to pass lab testing. (required by Edlu) */ if (singletone || carrier_sup) return; @@ -1202,14 +1201,11 @@ void PHY_LCCalibrate_8188E(struct adapter *adapt) if (dm_odm->RFType == ODM_2T2R) { phy_lc_calibrate(adapt, true); } else { - /* For 88C 1T1R */ + /* For 88C 1T1R */ phy_lc_calibrate(adapt, false); } dm_odm->RFCalibrateInfo.bLCKInProgress = false; - - ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, - ("LCK:Finish!!!interface %d\n", dm_odm->InterfaceIndex)); } static void phy_setrfpathswitch_8188e(struct adapter *adapt, bool main, bool is2t) diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c index 45655b1..c4c0087 100644 --- a/drivers/staging/rtl8188eu/hal/usb_halinit.c +++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c @@ -701,7 +701,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter) } ODM_TXPowerTrackingCheck(&haldata->odmpriv); - PHY_LCCalibrate_8188E(Adapter); + rtl88eu_phy_lc_calibrate(Adapter); goto exit; } @@ -893,7 +893,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_PW_TRACK); ODM_TXPowerTrackingCheck(&haldata->odmpriv); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_LCK); - PHY_LCCalibrate_8188E(Adapter); + rtl88eu_phy_lc_calibrate(Adapter); } /* HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_PABIAS); */ diff --git a/drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h b/drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h index 9fbfe77..6f5a66d 100644 --- a/drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h +++ b/drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h @@ -36,9 +36,7 @@ void rtl88eu_dm_txpower_track_adjust(struct odm_dm_struct *dm_odm, void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt); void rtl88eu_phy_iq_calibrate(struct adapter *adapter, bool recovery); - -/* LC calibrate */ -void PHY_LCCalibrate_8188E(struct adapter *pAdapter); +void rtl88eu_phy_lc_calibrate(struct adapter *adapter); /* AP calibrate */ void PHY_DigitalPredistortion_8188E(struct adapter *pAdapter); |