diff --git a/Makefile b/Makefile index a6d51a9..087734f 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,6 @@ CONFIG_RTL8723D = y CONFIG_RTL8821C = n ######################### Interface ########################### CONFIG_USB_HCI = n -CONFIG_PCI_HCI = n CONFIG_SDIO_HCI = y CONFIG_GSPI_HCI = n ########################## Features ########################### @@ -163,11 +162,6 @@ ifeq ($(CONFIG_USB_HCI), y) HCI_NAME = usb endif -ifeq ($(CONFIG_PCI_HCI), y) -HCI_NAME = pci -endif - - _OS_INTFS_FILES := os_dep/osdep_service.o \ os_dep/linux/os_intfs.o \ os_dep/linux/$(HCI_NAME)_intf.o \ @@ -275,9 +269,6 @@ ifeq ($(CONFIG_USB_HCI), y) MODULE_NAME = 8188eu endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8188ee -endif EXTRA_CFLAGS += -DCONFIG_RTL8188E _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ @@ -311,9 +302,6 @@ endif ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188E_USB.o endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188E_PCIE.o -endif ifeq ($(CONFIG_SDIO_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188E_SDIO.o endif @@ -343,9 +331,6 @@ ifeq ($(CONFIG_USB_HCI), y) MODULE_NAME = 8192eu endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8192ee -endif EXTRA_CFLAGS += -DCONFIG_RTL8192E _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ hal/$(RTL871X)/Hal8192EPwrSeq.o\ @@ -377,9 +362,6 @@ endif ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8192E_USB.o endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8192E_PCIE.o -endif #hal/OUTSRC/$(RTL871X)/HalHWImg8188E_FW.o _OUTSRC_FILES += hal/phydm/$(RTL871X)/halhwimg8192e_mac.o\ @@ -400,9 +382,6 @@ RTL871X = rtl8812a ifeq ($(CONFIG_USB_HCI), y) MODULE_NAME = 8812au endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8812ae -endif ifeq ($(CONFIG_SDIO_HCI), y) MODULE_NAME = 8812as endif @@ -438,17 +417,11 @@ ifeq ($(CONFIG_RTL8812A), y) ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8812A_USB.o endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8812A_PCIE.o -endif endif ifeq ($(CONFIG_RTL8821A), y) ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8821A_USB.o endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8821A_PCIE.o -endif endif ifeq ($(CONFIG_RTL8812A), y) @@ -477,9 +450,6 @@ else MODULE_NAME := 8811au endif endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME := 8821ae -endif ifeq ($(CONFIG_SDIO_HCI), y) MODULE_NAME := 8821as endif @@ -511,9 +481,6 @@ RTL871X = rtl8723b ifeq ($(CONFIG_USB_HCI), y) MODULE_NAME = 8723bu endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8723be -endif ifeq ($(CONFIG_SDIO_HCI), y) MODULE_NAME = 8723bs endif @@ -538,18 +505,11 @@ _HAL_INTFS_FILES += \ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_xmit.o \ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_recv.o -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -else _HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -endif ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723B_USB.o endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723B_PCIE.o -endif _OUTSRC_FILES += hal/phydm/$(RTL871X)/halhwimg8723b_bb.o\ hal/phydm/$(RTL871X)/halhwimg8723b_mac.o\ @@ -572,9 +532,6 @@ RTL871X = rtl8814a ifeq ($(CONFIG_USB_HCI), y) MODULE_NAME = 8814au endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8814ae -endif ifeq ($(CONFIG_SDIO_HCI), y) MODULE_NAME = 8814as endif @@ -614,9 +571,6 @@ endif ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8814A_USB.o endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8814A_PCIE.o -endif _OUTSRC_FILES += hal/phydm/$(RTL871X)/halhwimg8814a_bb.o\ hal/phydm/$(RTL871X)/halhwimg8814a_mac.o\ @@ -638,10 +592,6 @@ ifeq ($(CONFIG_USB_HCI), y) MODULE_NAME = 8723cu MODULE_SUB_NAME = 8703bu endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8723ce -MODULE_SUB_NAME = 8703be -endif ifeq ($(CONFIG_SDIO_HCI), y) MODULE_NAME = 8723cs MODULE_SUB_NAME = 8703bs @@ -667,18 +617,11 @@ _HAL_INTFS_FILES += \ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_xmit.o \ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_recv.o -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -else _HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -endif ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8703B_USB.o endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8703B_PCIE.o -endif _OUTSRC_FILES += hal/phydm/$(RTL871X)/halhwimg8703b_bb.o\ hal/phydm/$(RTL871X)/halhwimg8703b_mac.o\ @@ -696,10 +639,6 @@ ifeq ($(CONFIG_USB_HCI), y) MODULE_NAME = 8723du MODULE_SUB_NAME = 8723du endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8723de -MODULE_SUB_NAME = 8723de -endif ifeq ($(CONFIG_SDIO_HCI), y) MODULE_NAME = 8723ds MODULE_SUB_NAME = 8723ds @@ -727,18 +666,11 @@ _HAL_INTFS_FILES += \ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_xmit.o \ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_recv.o -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -else _HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -endif ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723D_USB.o endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723D_PCIE.o -endif _OUTSRC_FILES += hal/phydm/$(RTL871X)/halhwimg8723d_bb.o\ hal/phydm/$(RTL871X)/halhwimg8723d_mac.o\ @@ -756,9 +688,6 @@ RTL871X = rtl8188f ifeq ($(CONFIG_USB_HCI), y) MODULE_NAME = 8188fu endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8188fe -endif ifeq ($(CONFIG_SDIO_HCI), y) MODULE_NAME = 8189fs endif @@ -783,11 +712,7 @@ _HAL_INTFS_FILES += \ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_xmit.o \ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_recv.o -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -else _HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -endif ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188F_USB.o @@ -1805,11 +1730,6 @@ ifeq ($(CONFIG_USB_HCI), y) MODULE_NAME := rtw_usb endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME := rtw_pci -endif - - endif USER_MODULE_NAME ?= diff --git a/include/Hal8703BPhyCfg.h b/include/Hal8703BPhyCfg.h index e9d422f..3217c08 100644 --- a/include/Hal8703BPhyCfg.h +++ b/include/Hal8703BPhyCfg.h @@ -27,11 +27,7 @@ #define MAX_TXPWR_IDX_NMODE_92S 63 #define Reset_Cnt_Limit 3 -#ifdef CONFIG_PCI_HCI - #define MAX_AGGR_NUM 0x0B -#else - #define MAX_AGGR_NUM 0x07 -#endif /* CONFIG_PCI_HCI */ +#define MAX_AGGR_NUM 0x07 /*--------------------------Define Parameters End-------------------------------*/ diff --git a/include/Hal8723DPhyCfg.h b/include/Hal8723DPhyCfg.h index 09afeb1..ed6ca2c 100644 --- a/include/Hal8723DPhyCfg.h +++ b/include/Hal8723DPhyCfg.h @@ -27,11 +27,7 @@ #define MAX_TXPWR_IDX_NMODE_92S 63 #define Reset_Cnt_Limit 3 -#ifdef CONFIG_PCI_HCI - #define MAX_AGGR_NUM 0x0B -#else - #define MAX_AGGR_NUM 0x07 -#endif /* CONFIG_PCI_HCI */ +#define MAX_AGGR_NUM 0x07 /*--------------------------Define Parameters End-------------------------------*/ diff --git a/include/hal_intf.h b/include/hal_intf.h index a05b680..2faf2dd 100644 --- a/include/hal_intf.h +++ b/include/hal_intf.h @@ -280,7 +280,7 @@ struct hal_ops { /*** recv section ***/ s32(*init_recv_priv)(_adapter *padapter); void (*free_recv_priv)(_adapter *padapter); -#if defined(CONFIG_USB_HCI) || defined(CONFIG_PCI_HCI) +#if defined(CONFIG_USB_HCI) u32(*inirp_init)(_adapter *padapter); u32(*inirp_deinit)(_adapter *padapter); #endif @@ -288,18 +288,11 @@ struct hal_ops { void (*enable_interrupt)(_adapter *padapter); void (*disable_interrupt)(_adapter *padapter); u8(*check_ips_status)(_adapter *padapter); -#if defined(CONFIG_PCI_HCI) - s32(*interrupt_handler)(_adapter *padapter); -#endif #if defined(CONFIG_USB_HCI) && defined(CONFIG_SUPPORT_USB_INT) void (*interrupt_handler)(_adapter *padapter, u16 pkt_len, u8 *pbuf); #endif -#if defined(CONFIG_PCI_HCI) - void (*irp_reset)(_adapter *padapter); -#endif - /*** DM section ***/ void (*InitSwLeds)(_adapter *padapter); @@ -376,7 +369,7 @@ struct hal_ops { u8 IsPsPoll, u8 IsBTQosNull, u8 bDataFrame); s32(*fw_dl)(_adapter *adapter, u8 wowlan); -#if defined(CONFIG_WOWLAN) || defined(CONFIG_AP_WOWLAN) || defined(CONFIG_PCI_HCI) +#if defined(CONFIG_WOWLAN) || defined(CONFIG_AP_WOWLAN) void (*clear_interrupt)(_adapter *padapter); #endif u8(*hal_get_tx_buff_rsvd_page_num)(_adapter *adapter, bool wowlan); @@ -602,15 +595,11 @@ void rtw_hal_disable_interrupt(_adapter *padapter); u8 rtw_hal_check_ips_status(_adapter *padapter); -#if defined(CONFIG_USB_HCI) || defined(CONFIG_PCI_HCI) +#if defined(CONFIG_USB_HCI) u32 rtw_hal_inirp_init(_adapter *padapter); u32 rtw_hal_inirp_deinit(_adapter *padapter); #endif -#if defined(CONFIG_PCI_HCI) - void rtw_hal_irp_reset(_adapter *padapter); -#endif - u8 rtw_hal_intf_ps_func(_adapter *padapter, HAL_INTF_PS_FUNC efunc_id, u8 *val); s32 rtw_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); @@ -644,9 +633,6 @@ void rtw_hal_write_rfreg(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMa #define PHY_SetMacReg PHY_SetBBReg #define PHY_QueryMacReg PHY_QueryBBReg -#if defined(CONFIG_PCI_HCI) - s32 rtw_hal_interrupt_handler(_adapter *padapter); -#endif #if defined(CONFIG_USB_HCI) && defined(CONFIG_SUPPORT_USB_INT) void rtw_hal_interrupt_handler(_adapter *padapter, u16 pkt_len, u8 *pbuf); #endif diff --git a/include/rtl8188e_recv.h b/include/rtl8188e_recv.h index d1ccb7b..bf0d7f7 100644 --- a/include/rtl8188e_recv.h +++ b/include/rtl8188e_recv.h @@ -42,14 +42,6 @@ #endif #endif /* !MAX_RECVBUF_SZ */ -#elif defined(CONFIG_PCI_HCI) - /* #ifndef CONFIG_MINIMAL_MEMORY_USAGE */ - /* #define MAX_RECVBUF_SZ (9100) */ - /* #else */ - #define MAX_RECVBUF_SZ (4000) /* about 4K - * #endif */ - - #elif defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) #define MAX_RECVBUF_SZ (10240) @@ -156,11 +148,6 @@ typedef struct rxreport_8188e { void rtl8188eu_free_recv_priv(PADAPTER padapter); #endif -#ifdef CONFIG_PCI_HCI - s32 rtl8188ee_init_recv_priv(PADAPTER padapter); - void rtl8188ee_free_recv_priv(PADAPTER padapter); -#endif - void rtl8188e_query_rx_desc_status(union recv_frame *precvframe, struct recv_stat *prxstat); #endif /* __RTL8188E_RECV_H__ */ diff --git a/include/rtl8192e_xmit.h b/include/rtl8192e_xmit.h index 23deb8d..069b5d4 100644 --- a/include/rtl8192e_xmit.h +++ b/include/rtl8192e_xmit.h @@ -368,17 +368,6 @@ void rtl8192e_cal_txdesc_chksum(u8 *ptxdesc); s32 rtl8192eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); #endif -#ifdef CONFIG_PCI_HCI - s32 rtl8192ee_init_xmit_priv(PADAPTER padapter); - void rtl8192ee_free_xmit_priv(PADAPTER padapter); - struct xmit_buf *rtl8192ee_dequeue_xmitbuf(struct rtw_tx_ring *ring); - s32 rtl8192ee_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); - void rtl8192ee_xmitframe_resume(_adapter *padapter); - s32 rtl8192ee_hal_xmit(PADAPTER padapter, struct xmit_frame *pxmitframe); - s32 rtl8192ee_mgnt_xmit(PADAPTER padapter, struct xmit_frame *pmgntframe); - void rtl8192ee_xmit_tasklet(void *priv); -#endif - #if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) s32 rtl8192es_init_xmit_priv(PADAPTER padapter); void rtl8192es_free_xmit_priv(PADAPTER padapter); diff --git a/include/rtl8814a_recv.h b/include/rtl8814a_recv.h index 710b1b2..5a50d5e 100644 --- a/include/rtl8814a_recv.h +++ b/include/rtl8814a_recv.h @@ -39,14 +39,6 @@ #endif #endif /* !MAX_RECVBUF_SZ */ -#elif defined(CONFIG_PCI_HCI) - /* #ifndef CONFIG_MINIMAL_MEMORY_USAGE */ - /* #define MAX_RECVBUF_SZ (9100) */ - /* #else */ - #define MAX_RECVBUF_SZ (4000) /* about 4K - * #endif */ - - #elif defined(CONFIG_SDIO_HCI) #if 0 /* temp solution */ @@ -169,11 +161,6 @@ void rtl8814au_free_recv_priv(PADAPTER padapter); #endif -#ifdef CONFIG_PCI_HCI - s32 rtl8814ae_init_recv_priv(PADAPTER padapter); - void rtl8814ae_free_recv_priv(PADAPTER padapter); -#endif - #if 0 /* temp solution */ #ifdef CONFIG_SDIO_HCI diff --git a/include/rtl8821a_xmit.h b/include/rtl8821a_xmit.h index d7a97e3..21d79a6 100644 --- a/include/rtl8821a_xmit.h +++ b/include/rtl8821a_xmit.h @@ -164,15 +164,6 @@ void rtl8821au_xmit_tasklet(void *priv); s32 rtl8821au_xmitframe_complete(PADAPTER padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); #endif /* CONFIG_USB_HCI */ -#ifdef CONFIG_PCI_HCI -s32 rtl8821e_init_xmit_priv(PADAPTER padapter); -void rtl8821e_free_xmit_priv(PADAPTER padapter); -struct xmit_buf *rtl8821e_dequeue_xmitbuf(struct rtw_tx_ring *ring); -void rtl8821e_xmitframe_resume(PADAPTER padapter); -s32 rtl8821e_hal_xmit(PADAPTER padapter, struct xmit_frame *pxmitframe); -s32 rtl8821e_mgnt_xmit(PADAPTER padapter, struct xmit_frame *pmgntframe); -void rtl8821e_xmit_tasklet(void *priv); -#endif /* CONFIG_PCI_HCI */ #endif #endif /* __RTL8821_XMIT_H__ */ diff --git a/include/rtl8821c_hal.h b/include/rtl8821c_hal.h index d99d9d3..6bf85b7 100644 --- a/include/rtl8821c_hal.h +++ b/include/rtl8821c_hal.h @@ -44,13 +44,6 @@ #endif #endif/* !MAX_RECVBUF_SZ*/ -#elif defined(CONFIG_PCI_HCI) - /*#ifndef CONFIG_MINIMAL_MEMORY_USAGE - #define MAX_RECVBUF_SZ (9100) - #else*/ - #define MAX_RECVBUF_SZ (4096) /* about 4K */ - /*#endif*/ - #elif defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) #define MAX_RECVBUF_SZ HALMAC_RX_FIFO_SIZE_8821C diff --git a/include/rtw_io.h b/include/rtw_io.h index abe0c14..61a282c 100644 --- a/include/rtw_io.h +++ b/include/rtw_io.h @@ -282,9 +282,6 @@ struct reg_protocol_wt { #endif }; -#ifdef CONFIG_PCI_HCI -#define MAX_CONTINUAL_IO_ERR 4 -#endif #ifdef CONFIG_USB_HCI #define MAX_CONTINUAL_IO_ERR 4 diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c index 2b17c6f..f986a02 100644 --- a/os_dep/linux/ioctl_linux.c +++ b/os_dep/linux/ioctl_linux.c @@ -9238,18 +9238,12 @@ static int rtw_mp_efuse_get(struct net_device *dev, #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; @@ -9847,18 +9841,12 @@ static int rtw_mp_efuse_set(struct net_device *dev, #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 @@ -12012,16 +12000,6 @@ static struct xmit_frame *createloopbackpkt(PADAPTER padapter, u32 size) desc->txdw5 = cpu_to_le32(desc->txdw5); desc->txdw6 = cpu_to_le32(desc->txdw6); desc->txdw7 = cpu_to_le32(desc->txdw7); -#ifdef CONFIG_PCI_HCI - desc->txdw8 = cpu_to_le32(desc->txdw8); - desc->txdw9 = cpu_to_le32(desc->txdw9); - desc->txdw10 = cpu_to_le32(desc->txdw10); - desc->txdw11 = cpu_to_le32(desc->txdw11); - desc->txdw12 = cpu_to_le32(desc->txdw12); - desc->txdw13 = cpu_to_le32(desc->txdw13); - desc->txdw14 = cpu_to_le32(desc->txdw14); - desc->txdw15 = cpu_to_le32(desc->txdw15); -#endif cal_txdesc_chksum(desc); diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index e11d462..90b73c8 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -1333,12 +1333,6 @@ int rtw_os_ndev_alloc(_adapter *adapter) SET_NETDEV_DEV(ndev, dvobj_to_dev(adapter_to_dvobj(adapter))); #endif -#ifdef CONFIG_PCI_HCI - if (adapter_to_dvobj(adapter)->bdma64) - ndev->features |= NETIF_F_HIGHDMA; - ndev->irq = adapter_to_dvobj(adapter)->irq; -#endif - #if defined(CONFIG_IOCTL_CFG80211) if (rtw_cfg80211_ndev_res_alloc(adapter) != _SUCCESS) { rtw_warn_on(1); @@ -1775,9 +1769,6 @@ struct dvobj_priv *devobj_init(void) rtw_macid_ctl_init(&pdvobj->macid_ctl); _rtw_spinlock_init(&pdvobj->cam_ctl.lock); _rtw_mutex_init(&pdvobj->cam_ctl.sec_cam_access_mutex); -#if defined(RTK_129X_PLATFORM) && defined(CONFIG_PCI_HCI) - _rtw_spinlock_init(&pdvobj->io_reg_lock); -#endif #ifdef CONFIG_MBSSID_CAM rtw_mbid_cam_init(pdvobj); #endif @@ -1835,9 +1826,6 @@ void devobj_deinit(struct dvobj_priv *pdvobj) _rtw_spinlock_free(&pdvobj->cam_ctl.lock); _rtw_mutex_free(&pdvobj->cam_ctl.sec_cam_access_mutex); -#if defined(RTK_129X_PLATFORM) && defined(CONFIG_PCI_HCI) - _rtw_spinlock_free(&pdvobj->io_reg_lock); -#endif #ifdef CONFIG_MBSSID_CAM rtw_mbid_cam_deinit(pdvobj); #endif diff --git a/os_dep/linux/rtw_proc.c b/os_dep/linux/rtw_proc.c index 01cbc18..74c4e19 100644 --- a/os_dep/linux/rtw_proc.c +++ b/os_dep/linux/rtw_proc.c @@ -2213,11 +2213,6 @@ const struct rtw_proc_hdl adapter_proc_hdls[] = { RTW_PROC_HDL_SSEQ("int_logs", proc_get_int_logs, NULL), #endif -#ifdef CONFIG_PCI_HCI - RTW_PROC_HDL_SSEQ("rx_ring", proc_get_rx_ring, NULL), - RTW_PROC_HDL_SSEQ("tx_ring", proc_get_tx_ring, NULL), -#endif - #ifdef CONFIG_WOWLAN RTW_PROC_HDL_SSEQ("wow_pattern_info", proc_get_pattern_info, proc_set_pattern_info), RTW_PROC_HDL_SSEQ("wowlan_last_wake_reason", proc_get_wakeup_reason, NULL),