diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c index 68ec95c..0371538 100755 --- a/hal/rtl8188e_phycfg.c +++ b/hal/rtl8188e_phycfg.c @@ -679,19 +679,9 @@ s32 PHY_MACConfig8188E(struct adapter *Adapter) pszMACRegFile = sz8188EMACRegFile; - /* */ /* Config MAC */ - /* */ -#ifdef CONFIG_EMBEDDED_FWIMG if(HAL_STATUS_FAILURE == ODM_ConfigMACWithHeaderFile(&pHalData->odmpriv)) rtStatus = _FAIL; -#else - - /* Not make sure EEPROM, add later */ - /* RT_TRACE(COMP_INIT, DBG_LOUD, ("Read MACREG.txt\n")); */ - rtStatus = phy_ConfigMACWithParaFile(Adapter, pszMACRegFile); -#endif/* CONFIG_EMBEDDED_FWIMG */ - /* 2010.07.13 AMPDU aggregation number B */ rtw_write8(Adapter, REG_MAX_AGGR_NUM, MAX_AGGR_NUM); @@ -1073,14 +1063,8 @@ phy_BB8188E_Config_ParaFile( /* 1. Read PHY_REG.TXT BB INIT!! */ /* We will seperate as 88C / 92C according to chip version */ /* */ -#ifdef CONFIG_EMBEDDED_FWIMG if(HAL_STATUS_FAILURE ==ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_PHY_REG)) rtStatus = _FAIL; -#else - /* No matter what kind of CHIP we always read PHY_REG.txt. We must copy different */ - /* type of parameter files to phy_reg.txt at first. */ - rtStatus = phy_ConfigBBWithParaFile(Adapter,pszBBRegFile); -#endif/* ifdef CONFIG_EMBEDDED_FWIMG */ if(rtStatus != _SUCCESS){ /* RT_TRACE(COMP_INIT, DBG_SERIOUS, ("phy_BB8192S_Config_ParaFile():Write BB Reg Fail!!")); */ @@ -1099,16 +1083,11 @@ phy_BB8188E_Config_ParaFile( /* */ /* 2. If EEPROM or EFUSE autoload OK, We must config by PHY_REG_PG.txt */ /* */ - if (pEEPROM->bautoload_fail_flag == false) - { + if (pEEPROM->bautoload_fail_flag == false) { pHalData->pwrGroupCnt = 0; -#ifdef CONFIG_EMBEDDED_FWIMG if(HAL_STATUS_FAILURE ==ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_PHY_REG_PG)) rtStatus = _FAIL; -#else - rtStatus = phy_ConfigBBWithPgParaFile(Adapter, pszBBRegPgFile); -#endif } if(rtStatus != _SUCCESS){ @@ -1116,16 +1095,9 @@ phy_BB8188E_Config_ParaFile( goto phy_BB8190_Config_ParaFile_Fail; } - /* */ /* 3. BB AGC table Initialization */ - /* */ -#ifdef CONFIG_EMBEDDED_FWIMG if(HAL_STATUS_FAILURE ==ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_AGC_TAB)) rtStatus = _FAIL; -#else - rtStatus = phy_ConfigBBWithParaFile(Adapter, pszAGCTableFile); -#endif/* ifdef CONFIG_EMBEDDED_FWIMG */ - if(rtStatus != _SUCCESS){ /* RT_TRACE(COMP_FPGA, DBG_SERIOUS, ("phy_BB8192S_Config_ParaFile():AGC Table Fail\n")); */ goto phy_BB8190_Config_ParaFile_Fail; diff --git a/hal/rtl8188e_rf6052.c b/hal/rtl8188e_rf6052.c index 517474d..5111cb7 100755 --- a/hal/rtl8188e_rf6052.c +++ b/hal/rtl8188e_rf6052.c @@ -686,20 +686,12 @@ phy_RF6052_Config_ParaFile( switch(eRFPath) { case RF_PATH_A: -#ifdef CONFIG_EMBEDDED_FWIMG if(HAL_STATUS_FAILURE ==ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv,(ODM_RF_RADIO_PATH_E)eRFPath, (ODM_RF_RADIO_PATH_E)eRFPath)) rtStatus= _FAIL; -#else - rtStatus = rtl8188e_PHY_ConfigRFWithParaFile(Adapter, pszRadioAFile, (RF_RADIO_PATH_E)eRFPath); -#endif/* ifdef CONFIG_EMBEDDED_FWIMG */ break; case RF_PATH_B: -#ifdef CONFIG_EMBEDDED_FWIMG if(HAL_STATUS_FAILURE ==ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv,(ODM_RF_RADIO_PATH_E)eRFPath, (ODM_RF_RADIO_PATH_E)eRFPath)) rtStatus= _FAIL; -#else - rtStatus =rtl8188e_PHY_ConfigRFWithParaFile(Adapter, pszRadioBFile, (RF_RADIO_PATH_E)eRFPath); -#endif break; case RF_PATH_C: break; diff --git a/include/autoconf.h b/include/autoconf.h index a7eb9ed..cd8c78b 100755 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -28,8 +28,6 @@ * Internal General Config */ -#define CONFIG_EMBEDDED_FWIMG - #define CONFIG_AP_MODE #define CONFIG_P2P