Remove multifunc support

hal/rtl8812a/rtl8812a_hal_init.c

@@ -3393,11 +3393,11 @@ static void read_chip_version_8812a(PADAPTER Adapter)
 	pHalData->version_id.ROMVer = 0;	/* ROM code version. */
 
 	/* For multi-function consideration. Added by Roger, 2010.10.06. */
-	pHalData->MultiFunc = RT_MULTI_FUNC_NONE;
+	//pHalData->MultiFunc = RT_MULTI_FUNC_NONE;
-	value32 = rtw_read32(Adapter, REG_MULTI_FUNC_CTRL);
+	//value32 = rtw_read32(Adapter, REG_MULTI_FUNC_CTRL);
-	pHalData->MultiFunc |= ((value32 & WL_FUNC_EN) ? RT_MULTI_FUNC_WIFI : 0);
+	//pHalData->MultiFunc |= ((value32 & WL_FUNC_EN) ? RT_MULTI_FUNC_WIFI : 0);
-	pHalData->MultiFunc |= ((value32 & BT_FUNC_EN) ? RT_MULTI_FUNC_BT : 0);
+	//pHalData->MultiFunc |= ((value32 & BT_FUNC_EN) ? RT_MULTI_FUNC_BT : 0);
-	pHalData->PolarityCtl = ((value32 & WL_HWPDN_SL) ? RT_POLARITY_HIGH_ACT : RT_POLARITY_LOW_ACT);
+	//pHalData->PolarityCtl = ((value32 & WL_HWPDN_SL) ? RT_POLARITY_HIGH_ACT : RT_POLARITY_LOW_ACT);
 
 	rtw_hal_config_rftype(Adapter);
 #if 1

hal/rtl8814a/rtl8814a_hal_init.c

@@ -3976,21 +3976,21 @@ static void read_chip_version_8814a(PADAPTER Adapter)
 
 	if(Adapter->registrypriv.special_rf_path == 1)
 		pHalData->version_id.RFType = RF_TYPE_1T1R;	//RF_1T1R;
-	
+
 	vdr = (value32 & EXT_VENDOR_ID) >> EXT_VENDOR_ID_SHIFT;
 	if(vdr == 0x00)
 		pHalData->version_id.VendorType = CHIP_VENDOR_TSMC;
 	else if(vdr == 0x01)
 		pHalData->version_id.VendorType = CHIP_VENDOR_SMIC;
 	else if(vdr == 0x02)
-		pHalData->version_id.VendorType = CHIP_VENDOR_UMC;	
+		pHalData->version_id.VendorType = CHIP_VENDOR_UMC;
 
 	pHalData->version_id.CUTVersion = (value32 & CHIP_VER_RTL_MASK)>>CHIP_VER_RTL_SHIFT; // IC version (CUT)
 
-	pHalData->MultiFunc = RT_MULTI_FUNC_NONE;
+	//pHalData->MultiFunc = RT_MULTI_FUNC_NONE;
 
 	rtw_hal_config_rftype(Adapter);
-	
+
 #if 1
 	dump_chip_info(pHalData->version_id);
 #endif

include/hal_data.h

@@ -34,29 +34,6 @@
 #include "../hal/hal_dm_acs.h"
 #endif
 
-/*
- * <Roger_Notes> For RTL8723 WiFi/BT/GPS multi-function configuration. 2010.10.06.
- *   */
-typedef enum _RT_MULTI_FUNC {
-	RT_MULTI_FUNC_NONE	= 0x00,
-	RT_MULTI_FUNC_WIFI	= 0x01,
-	RT_MULTI_FUNC_BT		= 0x02,
-	RT_MULTI_FUNC_GPS	= 0x04,
-} RT_MULTI_FUNC, *PRT_MULTI_FUNC;
-/*
- * <Roger_Notes> For RTL8723 WiFi PDn/GPIO polarity control configuration. 2010.10.08.
- *   */
-typedef enum _RT_POLARITY_CTL {
-	RT_POLARITY_LOW_ACT	= 0,
-	RT_POLARITY_HIGH_ACT	= 1,
-} RT_POLARITY_CTL, *PRT_POLARITY_CTL;
-
-/* For RTL8723 regulator mode. by tynli. 2011.01.14. */
-typedef enum _RT_REGULATOR_MODE {
-	RT_SWITCHING_REGULATOR	= 0,
-	RT_LDO_REGULATOR			= 1,
-} RT_REGULATOR_MODE, *PRT_REGULATOR_MODE;
-
 /*
  * Interface type.
  *   */
@@ -110,47 +87,15 @@ typedef enum _RX_AGG_MODE {
 #endif /* RTW_RX_AGGREGATION */
 
 /* E-Fuse */
-#ifdef CONFIG_RTL8188E
-	#define EFUSE_MAP_SIZE	512
-#endif
 #if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A) || defined(CONFIG_RTL8814A)
 	#define EFUSE_MAP_SIZE	512
 #endif
-#ifdef CONFIG_RTL8192E
-	#define EFUSE_MAP_SIZE	512
-#endif
-#ifdef CONFIG_RTL8723B
-	#define EFUSE_MAP_SIZE	512
-#endif
 #ifdef CONFIG_RTL8814A
 	#define EFUSE_MAP_SIZE	512
 #endif
-#ifdef CONFIG_RTL8703B
-	#define EFUSE_MAP_SIZE	512
-#endif
-#ifdef CONFIG_RTL8723D
-	#define EFUSE_MAP_SIZE	512
-#endif
-#ifdef CONFIG_RTL8188F
-	#define EFUSE_MAP_SIZE	512
-#endif
-#ifdef CONFIG_RTL8188GTV
-	#define EFUSE_MAP_SIZE	512
-#endif
-#ifdef CONFIG_RTL8710B
-	#define EFUSE_MAP_SIZE	512
-#endif
-#ifdef CONFIG_RTL8192F
-	#define EFUSE_MAP_SIZE	512
-#endif
 
-#if defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8822B) || defined(CONFIG_RTL8821C)
+#if defined(CONFIG_RTL8814A)
 	#define EFUSE_MAX_SIZE	1024
-#elif defined(CONFIG_RTL8188E) || defined(CONFIG_RTL8188F) || defined(CONFIG_RTL8188GTV) || defined(CONFIG_RTL8703B) || defined(CONFIG_RTL8710B)
-	#define EFUSE_MAX_SIZE	256
-#else
-	#define EFUSE_MAX_SIZE	512
-#endif
 /* end of E-Fuse */
 
 #define Mac_OFDM_OK			0x00000000
@@ -165,16 +110,8 @@ typedef enum _RX_AGG_MODE {
 #define Mac_DropPacket		0xA0000000
 
 #ifdef CONFIG_RF_POWER_TRIM
-#if defined(CONFIG_RTL8723B)
+#define REG_RF_BB_GAIN_OFFSET	0x55
-	#define REG_RF_BB_GAIN_OFFSET	0x7f
+#define RF_GAIN_OFFSET_MASK		0xfffff
-	#define RF_GAIN_OFFSET_MASK		0xfffff
-#elif defined(CONFIG_RTL8188E)
-	#define REG_RF_BB_GAIN_OFFSET	0x55
-	#define RF_GAIN_OFFSET_MASK		0xfffff
-#else
-	#define REG_RF_BB_GAIN_OFFSET	0x55
-	#define RF_GAIN_OFFSET_MASK		0xfffff
-#endif /* CONFIG_RTL8723B */
 #endif /*CONFIG_RF_POWER_TRIM*/
 
 /* For store initial value of BB register */
@@ -338,9 +275,9 @@ struct txpwr_lmt_ent {
 
 typedef struct hal_com_data {
 	HAL_VERSION			version_id;
-	RT_MULTI_FUNC		MultiFunc; /* For multi-function consideration. */
+	//RT_MULTI_FUNC		MultiFunc; /* For multi-function consideration. */
-	RT_POLARITY_CTL		PolarityCtl; /* For Wifi PDn Polarity control. */
+	//RT_POLARITY_CTL		PolarityCtl; /* For Wifi PDn Polarity control. */
-	RT_REGULATOR_MODE	RegulatorMode; /* switching regulator or LDO */
+	//RT_REGULATOR_MODE	RegulatorMode; /* switching regulator or LDO */
 	u8	hw_init_completed;
 	/****** FW related ******/
 	u32 firmware_size;
@@ -397,7 +334,7 @@ typedef struct hal_com_data {
 	u16	ForcedDataRate;	/* Force Data Rate. 0: Auto, 0x02: 1M ~ 0x6C: 54M. */
 	u8	bDumpRxPkt;
 	u8	bDumpTxPkt;
-	u8	dis_turboedca; /* 1: disable turboedca, 
+	u8	dis_turboedca; /* 1: disable turboedca,
 						  2: disable turboedca and setting EDCA parameter based on the input parameter*/
 	u32 edca_param_mode;
 
@@ -417,10 +354,6 @@ typedef struct hal_com_data {
 	u16	EEPROMPID;
 	u16	EEPROMSDID;
 #endif
-#ifdef CONFIG_PCI_HCI
-	u16	EEPROMDID;
-	u16	EEPROMSMID;
-#endif
 
 	u8	EEPROMCustomerID;
 	u8	EEPROMSubCustomerID;
@@ -624,25 +557,8 @@ typedef struct hal_com_data {
 
 #ifndef RTW_HALMAC
 	u32			sdio_tx_max_len[SDIO_MAX_TX_QUEUE];/* H, N, L, used for sdio tx aggregation max length per queue */
-#else
+#endif
-#ifdef CONFIG_RTL8821C
-	u16			tx_high_page;
-	u16			tx_low_page;
-	u16			tx_normal_page;
-	u16			tx_extra_page;
-	u16			tx_pub_page;
-	u8			max_oqt_size;
-	#ifdef XMIT_BUF_SIZE
-	u32			max_xmit_size_vovi;
-	u32			max_xmit_size_bebk;
-	#endif /*XMIT_BUF_SIZE*/
-	u16			max_xmit_page;
-	u16			max_xmit_page_vo;
-	u16			max_xmit_page_vi;
-	u16			max_xmit_page_be;
-	u16			max_xmit_page_bk;
 
-#endif /*#ifdef CONFIG_RTL8821C*/
 #endif /* !RTW_HALMAC */
 #endif /* CONFIG_SDIO_HCI */
 
@@ -672,36 +588,6 @@ typedef struct hal_com_data {
 #endif/* CONFIG_USB_RX_AGGREGATION */
 #endif /* CONFIG_USB_HCI */
 
-
-#ifdef CONFIG_PCI_HCI
-	/*  */
-	/* EEPROM setting. */
-	/*  */
-	u32			TransmitConfig;
-	u32			IntrMaskToSet[2];
-	u32			IntArray[4];
-	u32			IntrMask[4];
-	u32			SysIntArray[1];
-	u32			SysIntrMask[1];
-	u32			IntrMaskReg[2];
-	u32			IntrMaskDefault[4];
-
-	BOOLEAN		bL1OffSupport;
-	BOOLEAN	bSupportBackDoor;
-	u32			pci_backdoor_ctrl;
-
-	u8			bDefaultAntenna;
-
-	u8			bInterruptMigration;
-	u8			bDisableTxInt;
-
-	u16			RxTag;
-#ifdef CONFIG_PCI_DYNAMIC_ASPM
-	BOOLEAN		bAspmL1LastIdle;
-#endif
-#endif /* CONFIG_PCI_HCI */
-
-
 #ifdef DBG_CONFIG_ERROR_DETECT
 	struct sreset_priv srestpriv;
 #endif /* #ifdef DBG_CONFIG_ERROR_DETECT */