rtl8188eu: Remove configuration parameters and dead code for other devices

The vendor code includes some code that is needed for RTL8182CU, RTL8192DU,
RTL8711, RTL8712, and RTL8723AU. This dead code is removed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-11 10:59:02 -05:00
parent 1c5cb9ca00
commit c5e461c221
18 changed files with 202 additions and 1200 deletions

View file

@ -20,19 +20,11 @@
#ifndef __IEEE80211_H
#define __IEEE80211_H
#ifndef CONFIG_RTL8711FW
#include <drv_conf.h>
#include <osdep_service.h>
#include <drv_types.h>
#include "wifi.h"
#include <linux/wireless.h>
#else
#include <list.h>
#endif
#include <drv_conf.h>
#include <osdep_service.h>
#include <drv_types.h>
#include "wifi.h"
#include <linux/wireless.h>
#define MGMT_QUEUE_NUM 5

View file

@ -27,90 +27,88 @@
#define C2H_MEM_SZ (16*1024)
#ifndef CONFIG_RTL8711FW
#include <osdep_service.h>
#include <ieee80211.h> // <ieee80211/ieee80211.h>
#include <osdep_service.h>
#include <ieee80211.h> // <ieee80211/ieee80211.h>
#define FREE_CMDOBJ_SZ 128
#define FREE_CMDOBJ_SZ 128
#define MAX_CMDSZ 1024
#define MAX_RSPSZ 512
#define MAX_EVTSZ 1024
#define MAX_CMDSZ 1024
#define MAX_RSPSZ 512
#define MAX_EVTSZ 1024
#define CMDBUFF_ALIGN_SZ 512
#define CMDBUFF_ALIGN_SZ 512
struct cmd_obj {
_adapter *padapter;
u16 cmdcode;
u8 res;
u8 *parmbuf;
u32 cmdsz;
u8 *rsp;
u32 rspsz;
//_sema cmd_sem;
_list list;
};
struct cmd_obj {
_adapter *padapter;
u16 cmdcode;
u8 res;
u8 *parmbuf;
u32 cmdsz;
u8 *rsp;
u32 rspsz;
//_sema cmd_sem;
_list list;
};
struct cmd_priv {
_sema cmd_queue_sema;
//_sema cmd_done_sema;
_sema terminate_cmdthread_sema;
_queue cmd_queue;
u8 cmd_seq;
u8 *cmd_buf; //shall be non-paged, and 4 bytes aligned
u8 *cmd_allocated_buf;
u8 *rsp_buf; //shall be non-paged, and 4 bytes aligned
u8 *rsp_allocated_buf;
u32 cmd_issued_cnt;
u32 cmd_done_cnt;
u32 rsp_cnt;
u8 cmdthd_running;
_adapter *padapter;
};
struct cmd_priv {
_sema cmd_queue_sema;
//_sema cmd_done_sema;
_sema terminate_cmdthread_sema;
_queue cmd_queue;
u8 cmd_seq;
u8 *cmd_buf; //shall be non-paged, and 4 bytes aligned
u8 *cmd_allocated_buf;
u8 *rsp_buf; //shall be non-paged, and 4 bytes aligned
u8 *rsp_allocated_buf;
u32 cmd_issued_cnt;
u32 cmd_done_cnt;
u32 rsp_cnt;
u8 cmdthd_running;
_adapter *padapter;
};
#ifdef CONFIG_EVENT_THREAD_MODE
struct evt_obj {
u16 evtcode;
u8 res;
u8 *parmbuf;
u32 evtsz;
_list list;
};
struct evt_obj {
u16 evtcode;
u8 res;
u8 *parmbuf;
u32 evtsz;
_list list;
};
#endif
struct evt_priv {
struct evt_priv {
#ifdef CONFIG_EVENT_THREAD_MODE
_sema evt_notify;
_sema terminate_evtthread_sema;
_queue evt_queue;
_sema evt_notify;
_sema terminate_evtthread_sema;
_queue evt_queue;
#endif
#define CONFIG_C2H_WK
#ifdef CONFIG_C2H_WK
_workitem c2h_wk;
bool c2h_wk_alive;
struct rtw_cbuf *c2h_queue;
#define C2H_QUEUE_MAX_LEN 10
_workitem c2h_wk;
bool c2h_wk_alive;
struct rtw_cbuf *c2h_queue;
#define C2H_QUEUE_MAX_LEN 10
#endif
#ifdef CONFIG_H2CLBK
_sema lbkevt_done;
u8 lbkevt_limit;
u8 lbkevt_num;
u8 *cmdevt_parm;
_sema lbkevt_done;
u8 lbkevt_limit;
u8 lbkevt_num;
u8 *cmdevt_parm;
#endif
ATOMIC_T event_seq;
u8 *evt_buf; //shall be non-paged, and 4 bytes aligned
u8 *evt_allocated_buf;
u32 evt_done_cnt;
ATOMIC_T event_seq;
u8 *evt_buf; //shall be non-paged, and 4 bytes aligned
u8 *evt_allocated_buf;
u32 evt_done_cnt;
#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
u8 *c2h_mem;
u8 *allocated_c2h_mem;
u8 *c2h_mem;
u8 *allocated_c2h_mem;
#endif
};
};
#define init_h2fwcmd_w_parm_no_rsp(pcmd, pparm, code) \
do {\
@ -154,10 +152,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 <ieee80211.h>
#endif /* CONFIG_RTL8711FW */
enum rtw_drvextra_cmd_id
{
NONE_WK_CID,

View file

@ -51,24 +51,8 @@ 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

View file

@ -22,7 +22,6 @@
#include <drv_conf.h>
#include <osdep_service.h>
#ifndef CONFIG_RTL8711FW
#include <wlan_bssdef.h>
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
#include <asm/semaphore.h>
@ -30,11 +29,6 @@
#include <linux/semaphore.h>
#endif
#include <linux/sem.h>
#else
#include <wlan_bssdef.h>
#endif//CONFIG_RTL8711FW
#ifdef CONFIG_H2CLBK
#include <h2clbk.h>

View file

@ -361,10 +361,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

View file

@ -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);

View file

@ -53,46 +53,10 @@ enum{
#endif
#include <usb_ops_linux.h>
#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
/*
* Increase and check if the continual_urb_error of this @param dvobjprive is larger than MAX_CONTINUAL_URB_ERR