mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-06-23 00:24:20 +00:00
rtl8188eu: Revert part of 76e49ee
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
76e49eeec2
commit
eac0a699d8
16 changed files with 1004 additions and 86 deletions
|
|
@ -24,7 +24,18 @@
|
|||
#include <hal_intf.h>
|
||||
#include <hal_com.h>
|
||||
|
||||
#ifdef CONFIG_RTL8192C
|
||||
#include <rtl8192c_hal.h>
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8192D
|
||||
#include <rtl8192d_hal.h>
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8723A
|
||||
#include <rtl8723a_hal.h>
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8188E
|
||||
#include <rtl8188e_hal.h>
|
||||
#endif
|
||||
|
||||
#define _HAL_INIT_C_
|
||||
|
||||
|
|
@ -35,37 +46,43 @@ void dump_chip_info(HAL_VERSION ChipVersion)
|
|||
|
||||
if (IS_81XXC(ChipVersion)){
|
||||
cnt += sprintf((buf+cnt), "Chip Version Info: %s_", IS_92C_SERIAL(ChipVersion)?"CHIP_8192C":"CHIP_8188C");
|
||||
}
|
||||
else if (IS_92D(ChipVersion)){
|
||||
} else if (IS_92D(ChipVersion)){
|
||||
cnt += sprintf((buf+cnt), "Chip Version Info: CHIP_8192D_");
|
||||
}
|
||||
else if (IS_8723_SERIES(ChipVersion)){
|
||||
} else if (IS_8723_SERIES(ChipVersion)){
|
||||
cnt += sprintf((buf+cnt), "Chip Version Info: CHIP_8723A_");
|
||||
}
|
||||
else if (IS_8188E(ChipVersion)){
|
||||
} else if (IS_8188E(ChipVersion)){
|
||||
cnt += sprintf((buf+cnt), "Chip Version Info: CHIP_8188E_");
|
||||
}
|
||||
|
||||
cnt += sprintf((buf+cnt), "%s_", IS_NORMAL_CHIP(ChipVersion)?"Normal_Chip":"Test_Chip");
|
||||
cnt += sprintf((buf+cnt), "%s_", IS_CHIP_VENDOR_TSMC(ChipVersion)?"TSMC":"UMC");
|
||||
if (IS_A_CUT(ChipVersion)) cnt += sprintf((buf+cnt), "A_CUT_");
|
||||
else if (IS_B_CUT(ChipVersion)) cnt += sprintf((buf+cnt), "B_CUT_");
|
||||
else if (IS_C_CUT(ChipVersion)) cnt += sprintf((buf+cnt), "C_CUT_");
|
||||
else if (IS_D_CUT(ChipVersion)) cnt += sprintf((buf+cnt), "D_CUT_");
|
||||
else if (IS_E_CUT(ChipVersion)) cnt += sprintf((buf+cnt), "E_CUT_");
|
||||
else cnt += sprintf((buf+cnt), "UNKNOWN_CUT(%d)_", ChipVersion.CUTVersion);
|
||||
if (IS_A_CUT(ChipVersion))
|
||||
cnt += sprintf((buf+cnt), "A_CUT_");
|
||||
else if (IS_B_CUT(ChipVersion))
|
||||
cnt += sprintf((buf+cnt), "B_CUT_");
|
||||
else if (IS_C_CUT(ChipVersion))
|
||||
cnt += sprintf((buf+cnt), "C_CUT_");
|
||||
else if (IS_D_CUT(ChipVersion))
|
||||
cnt += sprintf((buf+cnt), "D_CUT_");
|
||||
else if (IS_E_CUT(ChipVersion))
|
||||
cnt += sprintf((buf+cnt), "E_CUT_");
|
||||
else
|
||||
cnt += sprintf((buf+cnt), "UNKNOWN_CUT(%d)_", ChipVersion.CUTVersion);
|
||||
|
||||
if (IS_1T1R(ChipVersion)) cnt += sprintf((buf+cnt), "1T1R_");
|
||||
else if (IS_1T2R(ChipVersion)) cnt += sprintf((buf+cnt), "1T2R_");
|
||||
else if (IS_2T2R(ChipVersion)) cnt += sprintf((buf+cnt), "2T2R_");
|
||||
else cnt += sprintf((buf+cnt), "UNKNOWN_RFTYPE(%d)_", ChipVersion.RFType);
|
||||
if (IS_1T1R(ChipVersion))
|
||||
cnt += sprintf((buf+cnt), "1T1R_");
|
||||
else if (IS_1T2R(ChipVersion))
|
||||
cnt += sprintf((buf+cnt), "1T2R_");
|
||||
else if (IS_2T2R(ChipVersion))
|
||||
cnt += sprintf((buf+cnt), "2T2R_");
|
||||
else
|
||||
cnt += sprintf((buf+cnt), "UNKNOWN_RFTYPE(%d)_", ChipVersion.RFType);
|
||||
|
||||
cnt += sprintf((buf+cnt), "RomVer(%d)\n", ChipVersion.ROMVer);
|
||||
|
||||
DBG_88E("%s", buf);
|
||||
pr_info("%s", buf);
|
||||
}
|
||||
|
||||
|
||||
#define EEPROM_CHANNEL_PLAN_BY_HW_MASK 0x80
|
||||
|
||||
u8 //return the final channel plan decision
|
||||
|
|
|
|||
27
hal/odm.c
27
hal/odm.c
|
|
@ -4431,6 +4431,7 @@ 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;
|
||||
|
|
@ -4441,13 +4442,36 @@ odm_TXPowerTrackingThermalMeterInit(
|
|||
//#endif//#if (MP_DRIVER != 1)
|
||||
MSG_88E("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_88E("pdmpriv->TxPowerTrackControl = %d\n", pdmpriv->TxPowerTrackControl);
|
||||
|
||||
}
|
||||
#endif//endif (CONFIG_RTL8188E==1)
|
||||
#elif (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
|
||||
#ifdef RTL8188E_SUPPORT
|
||||
{
|
||||
pDM_Odm->RFCalibrateInfo.bTXPowerTracking = true;
|
||||
pDM_Odm->RFCalibrateInfo.TXPowercount = 0;
|
||||
pDM_Odm->RFCalibrateInfo.bTXPowerTrackingInit = false;
|
||||
pDM_Odm->RFCalibrateInfo.TxPowerTrackControl = true;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
pDM_Odm->RFCalibrateInfo.TxPowerTrackControl = TRUE;
|
||||
|
|
@ -4466,6 +4490,9 @@ ODM_TXPowerTrackingCheck(
|
|||
PADAPTER pAdapter = pDM_Odm->Adapter;
|
||||
prtl8192cd_priv priv = pDM_Odm->priv;
|
||||
|
||||
//if (!(pDM_Odm->SupportAbility & ODM_RF_TX_PWR_TRACK))
|
||||
//return;
|
||||
|
||||
//
|
||||
// 2011/09/29 MH In HW integration first stage, we provide 4 different handle to operate
|
||||
// at the same time. In the stage2/3, we need to prive universal interface and merge all
|
||||
|
|
|
|||
|
|
@ -2465,10 +2465,7 @@ rtl8188e_Efuse_PgPacketWrite( PADAPTER pAdapter,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static HAL_VERSION
|
||||
ReadChipVersion8188E(
|
||||
PADAPTER padapter
|
||||
)
|
||||
static HAL_VERSION ReadChipVersion8188E(PADAPTER padapter)
|
||||
{
|
||||
u32 value32;
|
||||
HAL_VERSION ChipVersion;
|
||||
|
|
@ -2478,7 +2475,7 @@ ReadChipVersion8188E(
|
|||
pHalData = GET_HAL_DATA(padapter);
|
||||
|
||||
value32 = rtw_read32(padapter, REG_SYS_CFG);
|
||||
ChipVersion.ICType = CHIP_8188E ;
|
||||
ChipVersion.ICType = CHIP_8188E;
|
||||
ChipVersion.ChipType = ((value32 & RTL_ID) ? TEST_CHIP : NORMAL_CHIP);
|
||||
|
||||
ChipVersion.RFType = RF_TYPE_1T1R;
|
||||
|
|
@ -2492,10 +2489,7 @@ ReadChipVersion8188E(
|
|||
pHalData->MultiFunc = RT_MULTI_FUNC_NONE;
|
||||
|
||||
|
||||
//#if DBG
|
||||
#if 1
|
||||
dump_chip_info(ChipVersion);
|
||||
#endif
|
||||
|
||||
pHalData->VersionID = ChipVersion;
|
||||
|
||||
|
|
@ -2506,8 +2500,7 @@ ReadChipVersion8188E(
|
|||
else if (IS_2T2R(ChipVersion)){
|
||||
pHalData->rf_type = RF_2T2R;
|
||||
pHalData->NumTotalRFPath = 2;
|
||||
}
|
||||
else{
|
||||
} else{
|
||||
pHalData->rf_type = RF_1T1R;
|
||||
pHalData->NumTotalRFPath = 1;
|
||||
}
|
||||
|
|
@ -2521,6 +2514,7 @@ static void rtl8188e_read_chip_version(PADAPTER padapter)
|
|||
{
|
||||
ReadChipVersion8188E(padapter);
|
||||
}
|
||||
|
||||
void rtl8188e_GetHalODMVar(
|
||||
PADAPTER Adapter,
|
||||
HAL_ODM_VARIABLE eVariable,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue