From d4d462411e74495269a009979cfc9df47457e2ef Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 16 Dec 2014 18:46:19 -0600 Subject: [PATCH] rtl8188eu: Remove code for other devices in include/*.h Signed-off-by: Larry Finger --- include/gspi_hal.h | 8 -------- include/gspi_ops.h | 7 ------- include/ieee80211.h | 17 +++++------------ include/pci_hal.h | 12 ------------ include/pci_ops.h | 35 ----------------------------------- include/rtw_cmd.h | 13 ------------- include/rtw_efuse.h | 15 --------------- include/rtw_event.h | 4 ---- include/rtw_mp.h | 15 --------------- include/rtw_sreset.h | 11 ----------- include/rtw_xmit.h | 4 ---- include/sdio_hal.h | 7 ------- include/sdio_ops.h | 5 ----- include/usb_hal.h | 17 ----------------- include/usb_ops.h | 37 ------------------------------------- 15 files changed, 5 insertions(+), 202 deletions(-) diff --git a/include/gspi_hal.h b/include/gspi_hal.h index 8146d6a..672269f 100755 --- a/include/gspi_hal.h +++ b/include/gspi_hal.h @@ -20,18 +20,10 @@ #ifndef __GSPI_HAL_H__ #define __GSPI_HAL_H__ - void spi_int_dpc(PADAPTER padapter); -#ifdef CONFIG_RTL8723A -void rtl8723as_set_hal_ops(PADAPTER padapter); -#define hal_set_hal_ops rtl8723as_set_hal_ops -#endif - -#ifdef CONFIG_RTL8188E void rtl8188es_set_hal_ops(PADAPTER padapter); #define hal_set_hal_ops rtl8188es_set_hal_ops -#endif #endif //__GSPI_HAL_H__ diff --git a/include/gspi_ops.h b/include/gspi_ops.h index ffd98c5..03f4333 100755 --- a/include/gspi_ops.h +++ b/include/gspi_ops.h @@ -146,15 +146,8 @@ struct spi_more_data { unsigned long len; }; -#ifdef CONFIG_RTL8723A -void rtl8723as_set_hal_ops(PADAPTER padapter); -#define set_hal_ops rtl8723as_set_hal_ops -#endif - -#ifdef CONFIG_RTL8188E void rtl8188es_set_hal_ops(PADAPTER padapter); #define set_hal_ops rtl8188es_set_hal_ops -#endif extern void spi_set_chip_endian(PADAPTER padapter); extern void spi_set_intf_ops(struct _io_ops *pops); extern void spi_set_chip_endian(PADAPTER padapter); diff --git a/include/ieee80211.h b/include/ieee80211.h index b01909d..f237740 100755 --- a/include/ieee80211.h +++ b/include/ieee80211.h @@ -21,19 +21,12 @@ #define __IEEE80211_H -#ifndef CONFIG_RTL8711FW +#include +#include +#include +#include "wifi.h" - #include - #include - #include - #include "wifi.h" - - #include -#else - - #include - -#endif +#include #define MGMT_QUEUE_NUM 5 diff --git a/include/pci_hal.h b/include/pci_hal.h index b6c95c2..2830d31 100755 --- a/include/pci_hal.h +++ b/include/pci_hal.h @@ -158,20 +158,8 @@ static inline void NdisRawReadPortUlong(u32 port, u32 *pval) //*pval = readl((u8 *)RegAddr(port)); } -#ifdef CONFIG_RTL8192C -void rtl8192ce_set_hal_ops(_adapter * padapter); -#define hal_set_hal_ops rtl8192ce_set_hal_ops -#endif -#ifdef CONFIG_RTL8192D -void rtl8192de_set_hal_ops(_adapter * padapter); -#define hal_set_hal_ops rtl8192de_set_hal_ops -#endif - - -#ifdef CONFIG_RTL8188E void rtl8188ee_set_hal_ops(_adapter * padapter); #define hal_set_hal_ops rtl8188ee_set_hal_ops -#endif #endif //__PCIE_HAL_H__ diff --git a/include/pci_ops.h b/include/pci_ops.h index be8cad5..9247be6 100755 --- a/include/pci_ops.h +++ b/include/pci_ops.h @@ -26,7 +26,6 @@ #include -#ifdef CONFIG_RTL8188E u32 rtl8188ee_init_desc_ring(_adapter * padapter); u32 rtl8188ee_free_desc_ring(_adapter * padapter); void rtl8188ee_reset_desc_ring(_adapter * padapter); @@ -39,40 +38,6 @@ void rtl8188ee_recv_tasklet(void *priv); void rtl8188ee_prepare_bcn_tasklet(void *priv); void rtl8188ee_set_intf_ops(struct _io_ops *pops); #define pci_set_intf_ops rtl8188ee_set_intf_ops -#endif - - -#ifdef CONFIG_RTL8192C -u32 rtl8192ce_init_desc_ring(_adapter * padapter); -u32 rtl8192ce_free_desc_ring(_adapter * padapter); -void rtl8192ce_reset_desc_ring(_adapter * padapter); -#ifdef CONFIG_64BIT_DMA -u8 PlatformEnable92CEDMA64(PADAPTER Adapter); -#endif -int rtl8192ce_interrupt(PADAPTER Adapter); -void rtl8192ce_xmit_tasklet(void *priv); -void rtl8192ce_recv_tasklet(void *priv); -void rtl8192ce_prepare_bcn_tasklet(void *priv); -void rtl8192ce_set_intf_ops(struct _io_ops *pops); -#define pci_set_intf_ops rtl8192ce_set_intf_ops -#endif - -#ifdef CONFIG_RTL8192D -u32 rtl8192de_init_desc_ring(_adapter * padapter); -u32 rtl8192de_free_desc_ring(_adapter * padapter); -void rtl8192de_reset_desc_ring(_adapter * padapter); -#ifdef CONFIG_64BIT_DMA -u8 PlatformEnable92DEDMA64(PADAPTER Adapter); -#endif -int rtl8192de_interrupt(PADAPTER Adapter); -void rtl8192de_xmit_tasklet(void *priv); -void rtl8192de_recv_tasklet(void *priv); -void rtl8192de_prepare_bcn_tasklet(void *priv); -void rtl8192de_set_intf_ops(struct _io_ops *pops); -#define pci_set_intf_ops rtl8192de_set_intf_ops -u32 MpReadPCIDwordDBI8192D(IN PADAPTER Adapter, IN u16 Offset, IN u8 Direct); -void MpWritePCIDwordDBI8192D(IN PADAPTER Adapter, IN u16 Offset, IN u32 Value, IN u8 Direct); -#endif #endif diff --git a/include/rtw_cmd.h b/include/rtw_cmd.h index 97a468c..3525514 100755 --- a/include/rtw_cmd.h +++ b/include/rtw_cmd.h @@ -27,8 +27,6 @@ #define C2H_MEM_SZ (16*1024) -#ifndef CONFIG_RTL8711FW - #include #include // @@ -39,11 +37,7 @@ #define MAX_RSPSZ 512 #define MAX_EVTSZ 1024 -#ifdef PLATFORM_OS_CE - #define CMDBUFF_ALIGN_SZ 4 -#else #define CMDBUFF_ALIGN_SZ 512 -#endif struct cmd_obj { _adapter *padapter; @@ -113,9 +107,6 @@ #if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) u8 *c2h_mem; u8 *allocated_c2h_mem; -#ifdef PLATFORM_OS_XP - PMDL pc2h_mdl; -#endif #endif }; @@ -163,10 +154,6 @@ extern void rtw_evt_notify_isr(struct evt_priv *pevtpriv); u8 p2p_protocol_wk_cmd(_adapter*padapter, int intCmdType ); #endif //CONFIG_P2P -#else - #include -#endif /* CONFIG_RTL8711FW */ - enum rtw_drvextra_cmd_id { NONE_WK_CID, diff --git a/include/rtw_efuse.h b/include/rtw_efuse.h index 41a6ef9..7edcce9 100755 --- a/include/rtw_efuse.h +++ b/include/rtw_efuse.h @@ -51,24 +51,9 @@ enum _EFUSE_DEF_TYPE { }; /* E-Fuse */ -#ifdef CONFIG_RTL8192D -#define EFUSE_MAP_SIZE 256 -#endif -#ifdef CONFIG_RTL8192C -#define EFUSE_MAP_SIZE 128 -#endif -#ifdef CONFIG_RTL8723A -#define EFUSE_MAP_SIZE 256 -#endif -#ifdef CONFIG_RTL8188E #define EFUSE_MAP_SIZE 512 -#endif -#ifdef CONFIG_RTL8188E #define EFUSE_MAX_SIZE 256 -#else -#define EFUSE_MAX_SIZE 512 -#endif /* end of E-Fuse */ #define EFUSE_MAX_MAP_LEN 256 diff --git a/include/rtw_event.h b/include/rtw_event.h index d1c3c6e..5de86e7 100755 --- a/include/rtw_event.h +++ b/include/rtw_event.h @@ -22,7 +22,6 @@ #include #include -#ifndef CONFIG_RTL8711FW #include #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) #include @@ -30,9 +29,6 @@ #include #endif #include -#else -#include -#endif//CONFIG_RTL8711FW #ifdef CONFIG_H2CLBK #include diff --git a/include/rtw_mp.h b/include/rtw_mp.h index d6a07d7..6197aa0 100755 --- a/include/rtw_mp.h +++ b/include/rtw_mp.h @@ -158,19 +158,7 @@ struct mp_tx _thread_hdl_ PktTxThread; }; -#if defined(CONFIG_RTL8192C) || defined(CONFIG_RTL8192D) || defined(CONFIG_RTL8723A) || defined(CONFIG_RTL8188E) -#ifdef CONFIG_RTL8192C -#include -#endif -#ifdef CONFIG_RTL8192D -#include -#endif -#ifdef CONFIG_RTL8723A -#include -#endif -#ifdef CONFIG_RTL8188E #include -#endif #define MP_MAX_LINES 1000 #define MP_MAX_LINES_BYTES 256 @@ -311,10 +299,7 @@ typedef struct _MPT_CONTEXT u1Byte mptOutBuf[100]; }MPT_CONTEXT, *PMPT_CONTEXT; -#endif -//#endif -//#define RTPRIV_IOCTL_MP ( SIOCIWFIRSTPRIV + 0x17) enum { WRITE_REG = 1, READ_REG, diff --git a/include/rtw_sreset.h b/include/rtw_sreset.h index 45dd2bf..67b85d3 100755 --- a/include/rtw_sreset.h +++ b/include/rtw_sreset.h @@ -40,18 +40,7 @@ struct sreset_priv { s32 dbg_trigger_point; }; -#ifdef CONFIG_RTL8192C -#include -#endif -#ifdef CONFIG_RTL8192D -#include -#endif -#ifdef CONFIG_RTL8723A -#include -#endif -#ifdef CONFIG_RTL8188E #include -#endif #define WIFI_STATUS_SUCCESS 0 #define USB_VEN_REQ_CMD_FAIL BIT0 diff --git a/include/rtw_xmit.h b/include/rtw_xmit.h index e6368c2..6975deb 100755 --- a/include/rtw_xmit.h +++ b/include/rtw_xmit.h @@ -429,10 +429,6 @@ struct xmit_frame u8 agg_num; #endif s8 pkt_offset; -#ifdef CONFIG_RTL8192D - u8 EMPktNum; - u16 EMPktLen[5];//The max value by HW -#endif #endif #ifdef CONFIG_XMIT_ACK diff --git a/include/sdio_hal.h b/include/sdio_hal.h index 60e261b..a938133 100755 --- a/include/sdio_hal.h +++ b/include/sdio_hal.h @@ -27,15 +27,8 @@ extern u8 sd_hal_bus_deinit(PADAPTER padapter); u8 sd_int_isr(PADAPTER padapter); void sd_int_dpc(PADAPTER padapter); -#ifdef CONFIG_RTL8723A -void rtl8723as_set_hal_ops(PADAPTER padapter); -#define hal_set_hal_ops rtl8723as_set_hal_ops -#endif - -#ifdef CONFIG_RTL8188E void rtl8188es_set_hal_ops(PADAPTER padapter); #define hal_set_hal_ops rtl8188es_set_hal_ops -#endif #endif //__SDIO_HAL_H__ diff --git a/include/sdio_ops.h b/include/sdio_ops.h index b409b7b..d26d539 100755 --- a/include/sdio_ops.h +++ b/include/sdio_ops.h @@ -45,12 +45,7 @@ extern void InitSysInterrupt8723ASdio(PADAPTER padapter); extern void EnableInterrupt8723ASdio(PADAPTER padapter); extern void DisableInterrupt8723ASdio(PADAPTER padapter); extern void sd_int_hdl(PADAPTER padapter); -#ifdef CONFIG_RTL8723A -extern u8 HalQueryTxBufferStatus8723ASdio(PADAPTER padapter); -#endif //CONFIG_RTL8723A -#ifdef CONFIG_RTL8188E extern u8 HalQueryTxBufferStatus8189ESdio(PADAPTER padapter); -#endif //CONFIG_RTL8188E extern void InitInterrupt8188ESdio(PADAPTER padapter); extern void EnableInterrupt8188ESdio(PADAPTER padapter); extern void DisableInterrupt8188ESdio(PADAPTER padapter); diff --git a/include/usb_hal.h b/include/usb_hal.h index c3ac5e9..e00edd5 100755 --- a/include/usb_hal.h +++ b/include/usb_hal.h @@ -20,25 +20,8 @@ #ifndef __USB_HAL_H__ #define __USB_HAL_H__ -#ifdef CONFIG_RTL8192C -void rtl8192cu_set_hal_ops(_adapter * padapter); -#define hal_set_hal_ops rtl8192cu_set_hal_ops -#endif - -#ifdef CONFIG_RTL8192D -void rtl8192du_set_hal_ops(_adapter * padapter); -#define hal_set_hal_ops rtl8192du_set_hal_ops -#endif - -#ifdef CONFIG_RTL8723A -void rtl8723au_set_hal_ops(_adapter * padapter); -#define hal_set_hal_ops rtl8723au_set_hal_ops -#endif - -#ifdef CONFIG_RTL8188E void rtl8188eu_set_hal_ops(_adapter * padapter); #define hal_set_hal_ops rtl8188eu_set_hal_ops -#endif #ifdef CONFIG_INTEL_PROXIM extern _adapter *rtw_usb_get_sw_pointer(void); diff --git a/include/usb_ops.h b/include/usb_ops.h index a68e5db..f6d7ef8 100755 --- a/include/usb_ops.h +++ b/include/usb_ops.h @@ -53,46 +53,10 @@ enum{ #endif #include -#ifdef CONFIG_RTL8192C -void rtl8192cu_set_hw_type(_adapter *padapter); -#define hal_set_hw_type rtl8192cu_set_hw_type - -void rtl8192cu_set_intf_ops(struct _io_ops *pops); -#define usb_set_intf_ops rtl8192cu_set_intf_ops - -void rtl8192cu_recv_tasklet(void *priv); - -void rtl8192cu_xmit_tasklet(void *priv); -#endif - -#ifdef CONFIG_RTL8723A -void rtl8723au_set_hw_type(_adapter *padapter); -#define hal_set_hw_type rtl8723au_set_hw_type - -void rtl8723au_set_intf_ops(struct _io_ops *pops); -#define usb_set_intf_ops rtl8723au_set_intf_ops - -void rtl8192cu_recv_tasklet(void *priv); - -void rtl8192cu_xmit_tasklet(void *priv); -#endif - -#ifdef CONFIG_RTL8192D -void rtl8192du_set_hw_type(_adapter *padapter); -#define hal_set_hw_type rtl8192du_set_hw_type -void rtl8192du_set_intf_ops(struct _io_ops *pops); -#define usb_set_intf_ops rtl8192du_set_intf_ops -void rtl8192du_recv_tasklet(void *priv); - -void rtl8192du_xmit_tasklet(void *priv); -#endif - -#ifdef CONFIG_RTL8188E void rtl8188eu_set_hw_type(_adapter *padapter); #define hal_set_hw_type rtl8188eu_set_hw_type void rtl8188eu_set_intf_ops(struct _io_ops *pops); #define usb_set_intf_ops rtl8188eu_set_intf_ops -#endif #define USB_HIGH_SPEED_BULK_SIZE 512 #define USB_FULL_SPEED_BULK_SIZE 64 @@ -109,6 +73,5 @@ static inline u8 rtw_usb_bulk_size_boundary(_adapter * padapter,int buf_len) return rst; } - #endif //__USB_OPS_H_