diff options
Diffstat (limited to 'drivers/staging/r8188eu/include/drv_types.h')
| -rw-r--r-- | drivers/staging/r8188eu/include/drv_types.h | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h index 3e4928320f17..2dd5ebaaa921 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -34,6 +34,7 @@ #include "rtw_p2p.h" #include "rtw_ap.h" #include "rtw_br_ext.h" +#include "rtl8188e_hal.h" #define DRIVERVERSION "v4.1.4_6773.20130222" @@ -85,7 +86,6 @@ struct registry_priv { u8 ampdu_amsdu;/* A-MPDU Supports A-MSDU is permitted */ u8 lowrate_two_xmit; - u8 rf_config; u8 low_power; u8 wifi_spec;/* !turbo_mode */ @@ -114,12 +114,6 @@ struct registry_priv { u8 notch_filter; }; -/* For registry parameters */ -#define RGTRY_OFT(field) ((u32)FIELD_OFFSET(struct registry_priv, field)) -#define RGTRY_SZ(field) sizeof(((struct registry_priv *)0)->field) -#define BSSID_OFT(field) ((u32)FIELD_OFFSET(struct wlan_bssid_ex, field)) -#define BSSID_SZ(field) sizeof(((struct wlan_bssid_ex *)0)->field) - #define MAX_CONTINUAL_URB_ERR 4 struct rt_firmware { @@ -129,14 +123,13 @@ struct rt_firmware { struct dvobj_priv { struct adapter *if1; - struct adapter *if2; /* For 92D, DMDP have 2 interface. */ u8 InterfaceNumber; u8 NumInterfaces; /* In /Out Pipe information */ - int RtInPipe[2]; + int RtInPipe; int RtOutPipe[3]; u8 Queue2Pipe[HW_QUEUE_ENTRY];/* for out pipe mapping */ @@ -146,11 +139,8 @@ struct dvobj_priv { /*-------- below is for USB INTERFACE --------*/ - u8 nr_endpoint; u8 ishighspeed; - u8 RtNumInPipes; u8 RtNumOutPipes; - int ep_num[5]; /* endpoint number */ int RegUsbSS; struct semaphore usb_suspend_sema; struct mutex usb_vendor_req_mutex; @@ -210,8 +200,7 @@ struct adapter { struct hostapd_priv *phostapdpriv; struct wifidirect_info wdinfo; - void *HalData; - u32 hal_data_sz; + struct hal_data_8188e haldata; s32 bDriverStopped; s32 bSurpriseRemoved; @@ -275,8 +264,6 @@ struct adapter { unsigned char br_ip[4]; struct br_ext_info ethBrExtInfo; - u8 fix_rate; - unsigned char in_cta_test; }; |