From dcefeda1caabbe00a0463f85dc55ba61da0d7082 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 20 Jul 2013 17:14:58 -0500 Subject: [PATCH] rtl8188eu: Remove CONFIG_ADAPTOR_INFO_CACHING_FILE - not defined Signed-off-by: Larry Finger --- core/rtw_efuse.c | 64 -------------------------------------------- include/drv_types.h | 4 --- include/rtw_eeprom.h | 7 ----- os_dep/os_intfs.c | 9 ------- 4 files changed, 84 deletions(-) diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index 110bea9..952676f 100644 --- a/core/rtw_efuse.c +++ b/core/rtw_efuse.c @@ -1071,28 +1071,11 @@ void EFUSE_ShadowMapUpdate( EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, bPseudoTest); if (pEEPROM->bautoload_fail_flag == true) - { _rtw_memset(pEEPROM->efuse_eeprom_data, 0xFF, mapLen); - } else - { - #ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE - if (_SUCCESS != retriveAdaptorInfoFile(pAdapter->registrypriv.adaptor_info_caching_file_path, pEEPROM)) { - #endif - Efuse_ReadAllMap(pAdapter, efuseType, pEEPROM->efuse_eeprom_data, bPseudoTest); - - #ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE - storeAdaptorInfoFile(pAdapter->registrypriv.adaptor_info_caching_file_path, pEEPROM); - } - #endif - } - - /* PlatformMoveMemory((void *)&pHalData->EfuseMap[EFUSE_MODIFY_MAP][0], */ - /* void *)&pHalData->EfuseMap[EFUSE_INIT_MAP][0], mapLen); */ }/* EFUSE_ShadowMapUpdate */ - /*----------------------------------------------------------------------------- * Function: EFUSE_ShadowRead * @@ -1199,50 +1182,3 @@ Efuse_InitSomeVar( _rtw_memset((void *)&fakeBTEfuseInitMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); _rtw_memset((void *)&fakeBTEfuseModifiedMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); } - -#ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE -/* include */ - - int isAdaptorInfoFileValid(void) -{ - return true; -} - -int storeAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv) -{ - int ret =_SUCCESS; - - if (path && eeprom_priv) { - ret = rtw_store_to_file(path, eeprom_priv->efuse_eeprom_data, EEPROM_MAX_SIZE_512); - if (ret == EEPROM_MAX_SIZE) - ret = _SUCCESS; - else - ret = _FAIL; - } else { - DBG_88E("%s NULL pointer\n",__func__); - ret = _FAIL; - } - return ret; -} - -int retriveAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv) -{ - int ret = _SUCCESS; - mm_segment_t oldfs; - struct file *fp; - - if (path && eeprom_priv) { - - ret = rtw_retrive_from_file(path, eeprom_priv->efuse_eeprom_data, EEPROM_MAX_SIZE); - - if (ret == EEPROM_MAX_SIZE) - ret = _SUCCESS; - else - ret = _FAIL; - } else { - DBG_88E("%s NULL pointer\n",__func__); - ret = _FAIL; - } - return ret; -} -#endif /* CONFIG_ADAPTOR_INFO_CACHING_FILE */ diff --git a/include/drv_types.h b/include/drv_types.h index 11e6302..a6c752b 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -168,10 +168,6 @@ struct registry_priv u8 hw_wps_pbc;//0:disable,1:enable -#ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE - char adaptor_info_caching_file_path[PATH_LENGTH_MAX]; -#endif - u8 max_roaming_times; // the max number driver will try to roaming u8 fw_iol; //enable iol without other concern diff --git a/include/rtw_eeprom.h b/include/rtw_eeprom.h index d44f596..b8828ad 100644 --- a/include/rtw_eeprom.h +++ b/include/rtw_eeprom.h @@ -130,13 +130,6 @@ extern void eeprom_write16(_adapter *padapter, u16 reg, u16 data); extern u16 eeprom_read16(_adapter *padapter, u16 reg); extern void read_eeprom_content(_adapter *padapter); extern void eeprom_read_sz(_adapter * padapter, u16 reg,u8* data, u32 sz); - extern void read_eeprom_content_by_attrib(_adapter * padapter ); -#ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE -extern int isAdaptorInfoFileValid(void); -extern int storeAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv); -extern int retriveAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv); -#endif //CONFIG_ADAPTOR_INFO_CACHING_FILE - #endif //__RTL871X_EEPROM_H__ diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index 4b28f0f..3e1c7a1 100644 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -199,11 +199,6 @@ module_param(rtw_hw_wps_pbc, int, 0644); #ifdef CONFIG_TX_EARLY_MODE module_param(rtw_early_mode, int, 0644); #endif -#ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE -char *rtw_adaptor_info_caching_file_path= "/data/misc/wifi/rtw_cache"; -module_param(rtw_adaptor_info_caching_file_path, charp, 0644); -MODULE_PARM_DESC(rtw_adaptor_info_caching_file_path, "The path of adapter info cache file"); -#endif //CONFIG_ADAPTOR_INFO_CACHING_FILE static uint rtw_max_roaming_times=2; module_param(rtw_max_roaming_times, uint, 0644); @@ -711,10 +706,6 @@ _func_enter_; registry_par->hwpdn_mode = (u8)rtw_hwpdn_mode;//0:disable,1:enable,2:by EFUSE config registry_par->hwpwrp_detect = (u8)rtw_hwpwrp_detect;//0:disable,1:enable registry_par->hw_wps_pbc = (u8)rtw_hw_wps_pbc; -#ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE - snprintf(registry_par->adaptor_info_caching_file_path, PATH_LENGTH_MAX, "%s", rtw_adaptor_info_caching_file_path); - registry_par->adaptor_info_caching_file_path[PATH_LENGTH_MAX-1]=0; -#endif registry_par->max_roaming_times = (u8)rtw_max_roaming_times;