From cf743bff3d36af6ab1552ef3a4bacd76cc39509d Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 11 Mar 2015 20:44:10 -0500 Subject: [PATCH] rtl8188eu: Remove CONFIG_ADAPTOR_INFO_CACHING_FILE Signed-off-by: Larry Finger --- core/rtw_efuse.c | 64 -------------------------------------------- include/drv_types.h | 4 --- include/rtw_eeprom.h | 16 ++++------- os_dep/os_intfs.c | 11 -------- 4 files changed, 5 insertions(+), 90 deletions(-) diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index 69a77bb..0c69693 100755 --- a/core/rtw_efuse.c +++ b/core/rtw_efuse.c @@ -1093,28 +1093,11 @@ void EFUSE_ShadowMapUpdate( EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, bPseudoTest); if (pEEPROM->bautoload_fail_flag == true) - { 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 * @@ -1221,50 +1204,3 @@ Efuse_InitSomeVar( memset((void *)&fakeBTEfuseInitMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); 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_871X("%s NULL pointer\n",__FUNCTION__); - 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_871X("%s NULL pointer\n",__FUNCTION__); - ret = _FAIL; - } - return ret; -} -#endif /* CONFIG_ADAPTOR_INFO_CACHING_FILE */ diff --git a/include/drv_types.h b/include/drv_types.h index 69842b4..f89a479 100755 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -163,10 +163,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 a7b23ee..e0d20ec 100755 --- a/include/rtw_eeprom.h +++ b/include/rtw_eeprom.h @@ -132,17 +132,11 @@ struct eeprom_priv u8 efuse_eeprom_data[HWSET_MAX_SIZE_512]; //92C:256bytes, 88E:512bytes, we use union set (512bytes) }; -extern void eeprom_write16(struct adapter *padapter, u16 reg, u16 data); -extern u16 eeprom_read16(struct adapter *padapter, u16 reg); -extern void read_eeprom_content(struct adapter *padapter); -extern void eeprom_read_sz(struct adapter * padapter, u16 reg,u8* data, u32 sz); +void eeprom_write16(struct adapter *padapter, u16 reg, u16 data); +u16 eeprom_read16(struct adapter *padapter, u16 reg); +void read_eeprom_content(struct adapter *padapter); +void eeprom_read_sz(struct adapter *padapter, u16 reg,u8 *data, u32 sz); -extern void read_eeprom_content_by_attrib(struct 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 +void read_eeprom_content_by_attrib(struct adapter *padapter); #endif //__RTL871X_EEPROM_H__ diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index e33bd3f..5c4266e 100755 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -204,12 +204,6 @@ module_param(rtw_hwpwrp_detect, int, 0644); module_param(rtw_hw_wps_pbc, int, 0644); -#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); MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try"); @@ -350,11 +344,6 @@ static uint loadparam( struct adapter *padapter, _nic_hdl pnetdev) registry_par->qos_opt_enable = (u8)rtw_qos_opt_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; registry_par->fw_iol = rtw_fw_iol;