diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8712/drv_types.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8712/drv_types.h')
-rw-r--r-- | drivers/staging/rtl8712/drv_types.h | 165 |
1 files changed, 165 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/drv_types.h b/drivers/staging/rtl8712/drv_types.h new file mode 100644 index 0000000..3bb66dc --- /dev/null +++ b/drivers/staging/rtl8712/drv_types.h @@ -0,0 +1,165 @@ +/*--------------------------------------------------------------------- + + For type defines and data structure defines + +-----------------------------------------------------------------------*/ +#ifndef __DRV_TYPES_H__ +#define __DRV_TYPES_H__ + +struct _adapter; + +#include "osdep_service.h" +#include "wlan_bssdef.h" +#include "rtl8712_spec.h" +#include "rtl8712_hal.h" + +enum _NIC_VERSION { + RTL8711_NIC, + RTL8712_NIC, + RTL8713_NIC, + RTL8716_NIC +}; + +struct _adapter; + +struct qos_priv { + /* bit mask option: u-apsd, s-apsd, ts, block ack... */ + unsigned int qos_option; +}; + +#include "rtl871x_ht.h" +#include "rtl871x_cmd.h" +#include "wlan_bssdef.h" +#include "rtl871x_xmit.h" +#include "rtl871x_recv.h" +#include "rtl871x_security.h" +#include "rtl871x_pwrctrl.h" +#include "rtl871x_io.h" +#include "rtl871x_eeprom.h" +#include "sta_info.h" +#include "rtl871x_mlme.h" +#include "rtl871x_mp.h" +#include "rtl871x_debug.h" +#include "rtl871x_rf.h" +#include "rtl871x_event.h" +#include "rtl871x_led.h" + +#define SPEC_DEV_ID_NONE BIT(0) +#define SPEC_DEV_ID_DISABLE_HT BIT(1) +#define SPEC_DEV_ID_ENABLE_PS BIT(2) + +struct specific_device_id { + u32 flags; + u16 idVendor; + u16 idProduct; + +}; + +struct registry_priv { + u8 chip_version; + u8 rfintfs; + u8 lbkmode; + u8 hci; + u8 network_mode; /*infra, ad-hoc, auto*/ + struct ndis_802_11_ssid ssid; + u8 channel;/* ad-hoc support requirement */ + u8 wireless_mode;/* A, B, G, auto */ + u8 vrtl_carrier_sense; /*Enable, Disable, Auto*/ + u8 vcs_type;/*RTS/CTS, CTS-to-self*/ + u16 rts_thresh; + u16 frag_thresh; + u8 preamble;/*long, short, auto*/ + u8 scan_mode;/*active, passive*/ + u8 adhoc_tx_pwr; + u8 soft_ap; + u8 smart_ps; + u8 power_mgnt; + u8 radio_enable; + u8 long_retry_lmt; + u8 short_retry_lmt; + u16 busy_thresh; + u8 ack_policy; + u8 mp_mode; + u8 software_encrypt; + u8 software_decrypt; + /* UAPSD */ + u8 wmm_enable; + u8 uapsd_enable; + u8 uapsd_max_sp; + u8 uapsd_acbk_en; + u8 uapsd_acbe_en; + u8 uapsd_acvi_en; + u8 uapsd_acvo_en; + + struct wlan_bssid_ex dev_network; + + u8 ht_enable; + u8 cbw40_enable; + u8 ampdu_enable;/*for tx*/ + u8 rf_config; + u8 low_power; + u8 wifi_test; +}; + +/* For registry parameters */ +#define RGTRY_OFT(field) ((addr_t)FIELD_OFFSET(struct registry_priv, field)) +#define RGTRY_SZ(field) sizeof(((struct registry_priv *)0)->field) +#define BSSID_OFT(field) ((addr_t)FIELD_OFFSET(struct ndis_wlan_bssid_ex, \ + field)) +#define BSSID_SZ(field) sizeof(((struct ndis_wlan_bssid_ex *)0)->field) + +struct dvobj_priv { + struct _adapter *padapter; + u32 nr_endpoint; + u8 ishighspeed; + uint(*inirp_init)(struct _adapter *adapter); + uint(*inirp_deinit)(struct _adapter *adapter); + struct semaphore usb_suspend_sema; + struct usb_device *pusbdev; +}; + +struct _adapter { + struct dvobj_priv dvobjpriv; + struct mlme_priv mlmepriv; + struct cmd_priv cmdpriv; + struct evt_priv evtpriv; + struct io_queue *pio_queue; + struct xmit_priv xmitpriv; + struct recv_priv recvpriv; + struct sta_priv stapriv; + struct security_priv securitypriv; + struct registry_priv registrypriv; + struct wlan_acl_pool acl_list; + struct pwrctrl_priv pwrctrlpriv; + struct eeprom_priv eeprompriv; + struct hal_priv halpriv; + struct led_priv ledpriv; + struct mp_priv mppriv; + s32 bDriverStopped; + s32 bSurpriseRemoved; + u32 IsrContent; + u32 ImrContent; + u8 EepromAddressSize; + u8 hw_init_completed; + struct task_struct *cmdThread; + pid_t evtThread; + struct task_struct *xmitThread; + pid_t recvThread; + uint(*dvobj_init)(struct _adapter *adapter); + void (*dvobj_deinit)(struct _adapter *adapter); + struct net_device *pnetdev; + int bup; + struct net_device_stats stats; + struct iw_statistics iwstats; + int pid; /*process id from UI*/ +}; + +static inline u8 *myid(struct eeprom_priv *peepriv) +{ + return peepriv->mac_addr; +} + +u8 r8712_usb_hal_bus_init(struct _adapter *adapter); + +#endif /*__DRV_TYPES_H__*/ + |