rtl8188eu: Remove CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

hal/odm.c

@@ -1434,17 +1434,7 @@ odm_DIG(
 	u8						CurrentIGI = pDM_DigTable->CurIGValue;
 	u8						Adap_IGI_Upper = pDM_Odm->IGI_target + 30 + (u8) pDM_Odm->TH_L2H_ini -(u8) pDM_Odm->TH_EDCCA_HL_diff;
 
-#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
-	if((pDM_Odm->bLinked) && (pDM_Odm->Adapter->registrypriv.force_igi !=0))
-	{
-		printk("pDM_Odm->RSSI_Min=%d \n",pDM_Odm->RSSI_Min);
-		ODM_Write_DIG(pDM_Odm,pDM_Odm->Adapter->registrypriv.force_igi);
-		return;
-	}
-#endif
-
 	ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG()==>\n"));
-	/* if(!(pDM_Odm->SupportAbility & (ODM_BB_DIG|ODM_BB_FA_CNT))) */
 	if((!(pDM_Odm->SupportAbility&ODM_BB_DIG)) ||(!(pDM_Odm->SupportAbility&ODM_BB_FA_CNT)))
 	{
 		ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: SupportAbility ODM_BB_DIG or ODM_BB_FA_CNT is disabled\n"));

hal/odm.h

@@ -1279,11 +1279,7 @@ typedef enum tag_DIG_Connect_Definition
 
 /* vivi 92c&92d has different definition, 20110504 */
 /* this is for 92c */
-#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
-#define		DM_DIG_FA_TH0				0x80/* 0x20 */
-#else
 #define		DM_DIG_FA_TH0				0x200/* 0x20 */
-#endif
 #define		DM_DIG_FA_TH1				0x300/* 0x100 */
 #define		DM_DIG_FA_TH2				0x400/* 0x200 */
 /* this is for 92d */

hal/odm_RTL8188E.c

@@ -459,37 +459,6 @@ ODM_AntennaDiversity_88E(
 		/* ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("ODM_AntennaDiversity_88E: Not Support 88E AntDiv\n")); */
 		return;
 	}
-#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
-	if(pDM_Odm->bLinked){
-		if(pDM_Odm->Adapter->registrypriv.force_ant != 0)
-		{
-			u32	Main_RSSI, Aux_RSSI;
-			u8 i=0;
-			Main_RSSI = (pDM_FatTable->MainAnt_Cnt[i]!=0)?(pDM_FatTable->MainAnt_Sum[i]/pDM_FatTable->MainAnt_Cnt[i]):0;
-			Aux_RSSI = (pDM_FatTable->AuxAnt_Cnt[i]!=0)?(pDM_FatTable->AuxAnt_Sum[i]/pDM_FatTable->AuxAnt_Cnt[i]):0;
-
-			ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("MacID=%d, MainAnt_Sum=%d, MainAnt_Cnt=%d\n", i, pDM_FatTable->MainAnt_Sum[i], pDM_FatTable->MainAnt_Cnt[i]));
-			ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("MacID=%d, AuxAnt_Sum=%d, AuxAnt_Cnt=%d\n",i, pDM_FatTable->AuxAnt_Sum[i], pDM_FatTable->AuxAnt_Cnt[i]));
-			ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("MacID=%d, Main_RSSI= %d, Aux_RSSI= %d\n", i, Main_RSSI, Aux_RSSI));
-			pDM_FatTable->MainAnt_Sum[i] = 0;
-			pDM_FatTable->AuxAnt_Sum[i] = 0;
-			pDM_FatTable->MainAnt_Cnt[i] = 0;
-			pDM_FatTable->AuxAnt_Cnt[i] = 0;
-		}
-		if(pDM_Odm->Adapter->registrypriv.force_ant==1){
-			ODM_UpdateRxIdleAnt_88E(pDM_Odm, MAIN_ANT);
-			printk("%s fixed antenna in Main ant\n",__FUNCTION__);
-			return;
-		}
-		else if(pDM_Odm->Adapter->registrypriv.force_ant==2){
-			ODM_UpdateRxIdleAnt_88E(pDM_Odm, AUX_ANT);
-			printk("%s fixed antenna in AUX ant\n",__FUNCTION__);
-			return;
-		}
-	}
-#endif
-
-
 
 	if(!pDM_Odm->bLinked)
 	{

include/drv_types.h

@@ -92,8 +92,7 @@ struct specific_device_id{
 
 };
 
-struct registry_priv
+struct registry_priv {
-{
 	u8	chip_version;
 	u8	rfintfs;
 	u8	lbkmode;
@@ -130,21 +129,16 @@ struct registry_priv
 	u8	uapsd_acbe_en;
 	u8	uapsd_acvi_en;
 	u8	uapsd_acvo_en;
-
 	struct wlan_bssid_ex    dev_network;
-
 	u8	ht_enable;
 	u8	cbw40_enable;
 	u8	ampdu_enable;//for tx
 	u8	rx_stbc;
 	u8	ampdu_amsdu;//A-MPDU Supports A-MSDU is permitted
 	u8	lowrate_two_xmit;
-
 	u8	rf_config ;
 	u8	low_power ;
-
 	u8	wifi_spec;// !turbo_mode
-
 	u8	channel_plan;
 #ifdef CONFIG_BT_COEXIST
 	u8	btcoex;
@@ -153,33 +147,20 @@ struct registry_priv
 	u8	bt_ampdu;
 #endif
 	bool	bAcceptAddbaReq;
-
 	u8	antdiv_cfg;
 	u8	antdiv_type;
-
 	u8	usbss_enable;//0:disable,1:enable
 	u8	hwpdn_mode;//0:disable,1:enable,2:decide by EFUSE config
 	u8	hwpwrp_detect;//0:disable,1:enable
-
 	u8	hw_wps_pbc;//0:disable,1:enable
-
 	u8	max_roaming_times; // the max number driver will try to roaming
-
 	u8 fw_iol; //enable iol without other concern
-
 #ifdef CONFIG_80211D
 	u8 enable80211d;
 #endif
-
 	u8 ifname[16];
 	u8 if2name[16];
-
 	u8 notch_filter;
-
-#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
-	u8 force_ant;//0 normal,1 main,2 aux
-	u8 force_igi;//0 normal
-#endif
 	u8 regulatory_tid;
 	u8 qos_opt_enable;
 };

os_dep/os_intfs.c

@@ -144,14 +144,6 @@ static int rtw_80211d = 0;
 static int rtw_regulatory_id =2;
 module_param(rtw_regulatory_id, int, 0644);
 
-
-#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
-static int rtw_force_ant = 2;/* 0 :normal, 1:Main ant, 2:Aux ant */
-static int rtw_force_igi =0;/* 0 :normal */
-module_param(rtw_force_ant, int, 0644);
-module_param(rtw_force_igi, int, 0644);
-#endif
-
 #ifdef CONFIG_QOS_OPTIMIZATION
 static int rtw_qos_opt_enable=1;/* 0: disable,1:enable */
 #else
@@ -356,15 +348,8 @@ static uint loadparam( struct adapter *padapter,  _nic_hdl	pnetdev)
 
 	registry_par->notch_filter = (u8)rtw_notch_filter;
 
-#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
-	registry_par->force_ant = (u8)rtw_force_ant;
-	registry_par->force_igi = (u8)rtw_force_igi;
-#endif
 	registry_par->regulatory_tid = (u8)rtw_regulatory_id;
 
-
-;
-
 	return status;
 }