From 2b8372b0af3ecfda2b4a03e504f8c78e540d713e Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 3 Nov 2018 14:09:41 -0500 Subject: [PATCH] rtl8188eu: Remove dead code for devices other than RTL8188EU This commit handles files in os_dep/. Signed-off-by: Larry Finger --- os_dep/ioctl_linux.c | 119 ------------------------------------------- os_dep/os_intfs.c | 10 +--- 2 files changed, 1 insertion(+), 128 deletions(-) diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index cc590f6..f0e9b5c 100644 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -9319,43 +9319,12 @@ static int rtw_mp_efuse_get(struct net_device *dev, } /* RTW_INFO("}\n"); */ } else if (strcmp(tmp[0], "vidpid") == 0) { -#ifdef CONFIG_RTL8188E #ifdef CONFIG_USB_HCI addr = EEPROM_VID_88EU; #endif #ifdef CONFIG_PCI_HCI addr = EEPROM_VID_88EE; #endif -#endif /* CONFIG_RTL8188E */ - -#ifdef CONFIG_RTL8192E -#ifdef CONFIG_USB_HCI - addr = EEPROM_VID_8192EU; -#endif -#ifdef CONFIG_PCI_HCI - addr = EEPROM_VID_8192EE; -#endif -#endif /* CONFIG_RTL8192E */ -#ifdef CONFIG_RTL8723B - addr = EEPROM_VID_8723BU; -#endif /* CONFIG_RTL8192E */ - -#ifdef CONFIG_RTL8188F - addr = EEPROM_VID_8188FU; -#endif /* CONFIG_RTL8188F */ - -#ifdef CONFIG_RTL8703B -#ifdef CONFIG_USB_HCI - addr = EEPROM_VID_8703BU; -#endif -#endif /* CONFIG_RTL8703B */ - -#ifdef CONFIG_RTL8723D -#ifdef CONFIG_USB_HCI - addr = EEPROM_VID_8723DU; -#endif /* CONFIG_USB_HCI */ -#endif /* CONFIG_RTL8723D */ - cnts = 4; EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&max_available_len, _FALSE); @@ -9943,44 +9912,12 @@ static int rtw_mp_efuse_set(struct net_device *dev, } /* pidvid,da0b7881 */ -#ifdef CONFIG_RTL8188E #ifdef CONFIG_USB_HCI addr = EEPROM_VID_88EU; #endif #ifdef CONFIG_PCI_HCI addr = EEPROM_VID_88EE; #endif -#endif /* CONFIG_RTL8188E */ - -#ifdef CONFIG_RTL8192E -#ifdef CONFIG_USB_HCI - addr = EEPROM_VID_8192EU; -#endif -#ifdef CONFIG_PCI_HCI - addr = EEPROM_VID_8192EE; -#endif -#endif /* CONFIG_RTL8188E */ - -#ifdef CONFIG_RTL8723B - addr = EEPROM_VID_8723BU; -#endif - -#ifdef CONFIG_RTL8188F - addr = EEPROM_VID_8188FU; -#endif - -#ifdef CONFIG_RTL8703B -#ifdef CONFIG_USB_HCI - addr = EEPROM_VID_8703BU; -#endif /* CONFIG_USB_HCI */ -#endif /* CONFIG_RTL8703B */ - -#ifdef CONFIG_RTL8723D -#ifdef CONFIG_USB_HCI - addr = EEPROM_VID_8723DU; -#endif /* CONFIG_USB_HCI */ -#endif /* CONFIG_RTL8723D */ - cnts = strlen(tmp[1]); if (cnts % 2) { err = -EINVAL; @@ -10069,21 +10006,6 @@ static int rtw_mp_efuse_set(struct net_device *dev, for (jj = 0, kk = 0; jj < cnts; jj++, kk += 2) setdata[jj] = key_2char2num(tmp[2][kk], tmp[2][kk + 1]); -#ifdef CONFIG_RTL8703B - if (cnts == 1 && addr == 0x189) { - setdata[1] = setdata[0]; - setdata[0] = 0x00; - cnts += 1; - addr = 0x188; - RTW_INFO("addr 0x%x ,setdata=0x%X 0x%X\n", addr, setdata[0], setdata[1]); - } else if (cnts == 1 && addr == 0x161) { - setdata[1] = setdata[0]; - setdata[0] = 0xFE; - cnts += 1; - addr = 0x160; - RTW_INFO("addr 0x%x ,setdata=0x%X 0x%X\n", addr, setdata[0], setdata[1]); - } -#endif #ifndef RTW_HALMAC EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (PVOID)&max_available_len, _FALSE); if ((addr + cnts) > max_available_len) { @@ -10894,12 +10816,6 @@ static int rtw_priv_get(struct net_device *dev, } switch (subcmd) { -#if defined(CONFIG_RTL8723B) - case MP_SetBT: - RTW_INFO("set MP_SetBT\n"); - rtw_mp_SetBT(dev, info, wdata, extra); - break; -#endif #ifdef CONFIG_SDIO_INDIRECT_ACCESS case MP_SD_IREAD: rtw_mp_sd_iread(dev, info, wrqu, extra); @@ -11852,7 +11768,6 @@ static int rtw_widi_set_probe_request(struct net_device *dev, #ifdef CONFIG_MAC_LOOPBACK_DRIVER -#if defined(CONFIG_RTL8188E) #include extern void rtl8188e_cal_txdesc_chksum(struct tx_desc *ptxdesc); #define cal_txdesc_chksum rtl8188e_cal_txdesc_chksum @@ -11860,36 +11775,6 @@ extern void rtl8188e_cal_txdesc_chksum(struct tx_desc *ptxdesc); extern void rtl8188es_fill_default_txdesc(struct xmit_frame *pxmitframe, u8 *pbuf); #define fill_default_txdesc rtl8188es_fill_default_txdesc #endif /* CONFIG_SDIO_HCI */ -#endif /* CONFIG_RTL8188E */ -#if defined(CONFIG_RTL8723B) -extern void rtl8723b_cal_txdesc_chksum(struct tx_desc *ptxdesc); -#define cal_txdesc_chksum rtl8723b_cal_txdesc_chksum -extern void rtl8723b_fill_default_txdesc(struct xmit_frame *pxmitframe, u8 *pbuf); -#define fill_default_txdesc rtl8723b_fill_default_txdesc -#endif /* CONFIG_RTL8723B */ - -#if defined(CONFIG_RTL8703B) -/* extern void rtl8703b_cal_txdesc_chksum(struct tx_desc *ptxdesc); */ -#define cal_txdesc_chksum rtl8703b_cal_txdesc_chksum -/* extern void rtl8703b_fill_default_txdesc(struct xmit_frame *pxmitframe, u8 *pbuf); */ -#define fill_default_txdesc rtl8703b_fill_default_txdesc -#endif /* CONFIG_RTL8703B */ - -#if defined(CONFIG_RTL8723D) -/* extern void rtl8723d_cal_txdesc_chksum(struct tx_desc *ptxdesc); */ -#define cal_txdesc_chksum rtl8723d_cal_txdesc_chksum -/* extern void rtl8723d_fill_default_txdesc(struct xmit_frame *pxmitframe, u8 *pbuf); */ -#define fill_default_txdesc rtl8723d_fill_default_txdesc -#endif /* CONFIG_RTL8723D */ - -#if defined(CONFIG_RTL8192E) -extern void rtl8192e_cal_txdesc_chksum(struct tx_desc *ptxdesc); -#define cal_txdesc_chksum rtl8192e_cal_txdesc_chksum -#ifdef CONFIG_SDIO_HCI || defined(CONFIG_GSPI_HCI) -extern void rtl8192es_fill_default_txdesc(struct xmit_frame *pxmitframe, u8 *pbuf); -#define fill_default_txdesc rtl8192es_fill_default_txdesc -#endif /* CONFIG_SDIO_HCI */ -#endif /* CONFIG_RTL8192E */ static s32 initLoopback(PADAPTER padapter) { @@ -12710,10 +12595,6 @@ static const struct iw_priv_args rtw_private_args[] = { { VENDOR_IE_SET, IW_PRIV_TYPE_CHAR | 1024 , 0 , "vendor_ie_set" }, { VENDOR_IE_GET, IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "vendor_ie_get" }, #endif -#if defined(CONFIG_RTL8723B) - { MP_SetBT, IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "mp_setbt" }, - { MP_DISABLE_BT_COEXIST, IW_PRIV_TYPE_CHAR | 1024, 0, "mp_disa_btcoex"}, -#endif #ifdef CONFIG_WOWLAN { MP_WOW_ENABLE , IW_PRIV_TYPE_CHAR | 1024, 0, "wow_mode" }, { MP_WOW_SET_PATTERN , IW_PRIV_TYPE_CHAR | 1024, 0, "wow_set_pattern" }, diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index 1cf03fb..abac6d6 100644 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -108,11 +108,7 @@ static int rtw_uapsd_acbk_en = 0; static int rtw_uapsd_acbe_en = 0; static int rtw_uapsd_acvi_en = 0; static int rtw_uapsd_acvo_en = 0; -#if defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8822B) || defined(CONFIG_RTL8821C) - static int rtw_pwrtrim_enable = 2; /* disable kfree , rename to power trim disable */ -#else - static int rtw_pwrtrim_enable = 0; /* Default Enalbe power trim by efuse config */ -#endif +static int rtw_pwrtrim_enable = 0; /* Default Enalbe power trim by efuse config */ static uint rtw_tx_bw_mode = 0x21; module_param(rtw_tx_bw_mode, uint, 0644); @@ -126,11 +122,7 @@ int rtw_ht_enable = 1; int rtw_bw_mode = 0x21; int rtw_ampdu_enable = 1;/* for enable tx_ampdu , */ /* 0: disable, 0x1:enable */ static int rtw_rx_stbc = 1;/* 0: disable, bit(0):enable 2.4g, bit(1):enable 5g, default is set to enable 2.4GHZ for IOT issue with bufflao's AP at 5GHZ */ -#if (defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8822B)) && defined(CONFIG_PCI_HCI) -static int rtw_ampdu_amsdu = 2;/* 0: disabled, 1:enabled, 2:auto . There is an IOT issu with DLINK DIR-629 when the flag turn on */ -#else static int rtw_ampdu_amsdu = 0;/* 0: disabled, 1:enabled, 2:auto . There is an IOT issu with DLINK DIR-629 when the flag turn on */ -#endif /* Short GI support Bit Map * BIT0 - 20MHz, 0: non-support, 1: support * BIT1 - 40MHz, 0: non-support, 1: support