This commit is contained in:
pvvx 2017-04-28 05:00:05 +03:00
parent 01d402f038
commit b1d891c21e
30 changed files with 3219 additions and 3085 deletions

View file

@ -234,7 +234,7 @@ struct hal_ops {
void (*disable_interrupt)(_adapter *padapter);
s32 (*interrupt_handler)(_adapter *padapter);
void (*clear_interrupt)(_adapter *padapter);
//pvvx void (*clear_interrupt)(_adapter *padapter); // нету в SDK !
#ifdef CONFIG_WOWLAN
void (*disable_interrupt_but_cpwm2)(_adapter *padapter);

View file

@ -480,16 +480,16 @@ typedef struct _RT_CHANNEL_INFO
extern int rtw_is_channel_set_contains_channel(RT_CHANNEL_INFO *channel_set, const u32 channel_num, int *pchannel_idx);
#ifdef CONFIG_CUSTOM_IE
#ifndef _CUS_IE_
#define _CUS_IE_
typedef struct _cus_ie
//#ifdef CONFIG_CUSTOM_IE
//#ifndef _CUS_IE_
//#define _CUS_IE_
typedef struct __cus_ie
{
u8 *ie;
u8 type;
}rtw_custom_ie_t, *p_rtw_custom_ie_t;
#endif /* _CUS_IE_ */
#endif
}_rtw_custom_ie_t, *_p_rtw_custom_ie_t;
//#endif /* _CUS_IE_ */
//#endif
struct mlme_ext_priv
{
@ -563,7 +563,7 @@ struct mlme_ext_priv
#endif
u8 partial_scan;
#ifdef CONFIG_CUSTOM_IE
p_rtw_custom_ie_t cus_ven_ie;
_p_rtw_custom_ie_t cus_ven_ie;
u8 ie_num;
#endif

View file

@ -364,7 +364,7 @@ typedef int (*iw_handler)(struct net_device *, struct iw_request_info *,
union iwreq_data *, char *);
struct _NDIS_802_11_SSID {
uint32_t SsidLength;
uint32_t SsidLength; //+164
uint8_t Ssid[36];
};
typedef struct _NDIS_802_11_SSID NDIS_802_11_SSID;
@ -422,7 +422,7 @@ struct _WLAN_BSSID_EX {
uint32_t Length;
NDIS_802_11_MAC_ADDRESS MacAddress;
uint8_t Reserved[2];
NDIS_802_11_SSID Ssid;
NDIS_802_11_SSID Ssid; // +164
uint32_t Privacy;
NDIS_802_11_RSSI Rssi;
NDIS_802_11_NETWORK_TYPE NetworkTypeInUse;
@ -514,21 +514,21 @@ enum _RT_SCAN_TYPE //: sint32_t
typedef enum _RT_SCAN_TYPE RT_SCAN_TYPE;
struct mlme_priv {
_lock lock;
sint fw_state;
uint8_t bScanInProcess;
uint8_t to_join;
uint8_t *nic_hdl;
_list *pscanned;
_queue free_bss_pool;
_queue scanned_queue;
uint8_t *free_bss_buf;
uint16_t num_of_scanned;
uint8_t *scan_buf;
uint32_t scan_buf_len;
uint16_t scan_cnt;
uint16_t scan_type;
NDIS_802_11_SSID assoc_ssid;
_lock lock; //+12
sint fw_state; //+16
uint8_t bScanInProcess; //+20
uint8_t to_join; //+21
uint8_t *nic_hdl; //+24
_list *pscanned; //+28
_queue free_bss_pool; //+32
_queue scanned_queue; //+44
uint8_t *free_bss_buf; //+56
uint16_t num_of_scanned; //+60
uint8_t *scan_buf; //+64
uint32_t scan_buf_len; //+68
uint16_t scan_cnt; //+72
uint16_t scan_type; //+74
NDIS_802_11_SSID assoc_ssid; //+76
uint8_t assoc_bssid[6];
struct wlan_network cur_network;
uint32_t scan_interval;
@ -687,7 +687,7 @@ struct mlme_ext_priv { //__attribute__((packed))?
uint8_t mlmeext_init;
struct atomic_t event_seq;
uint16_t mgnt_seq;
uint8_t cur_channel;
uint8_t cur_channel; // padapter+1270
uint8_t cur_bwmode;
uint8_t cur_ch_offset;
uint8_t cur_wireless_mode;
@ -845,7 +845,7 @@ struct _atr_aligned8_ recv_priv {
uint16_t rxbuffersize;
uint8_t is_signal_dbg;
uint8_t signal_strength_dbg;
int8_t rssi;
int8_t rssi; // +2932
int8_t rxpwdb;
uint8_t signal_strength;
uint8_t signal_qual;
@ -1980,7 +1980,7 @@ struct hal_ops {
struct _atr_aligned4_ _ADAPTER {
uint16_t HardwareType;
uint16_t interface_type; //+2
uint32_t work_mode;
uint32_t work_mode; //+4
struct dvobj_priv *dvobj; //+8
struct mlme_priv mlmepriv; //+12 [1244]
struct mlme_ext_priv mlmeextpriv; //+1256 [912]

View file

@ -125,7 +125,7 @@ typedef struct rtw_scan_handler_result {
* @brief The structure is used to store the WIFI setting gotten from WIFI driver.
*/
typedef struct rtw_wifi_setting {
rtw_mode_t mode;
rtw_mode_t mode;
unsigned char ssid[33];
unsigned char channel;
rtw_security_t security_type;

View file

@ -617,7 +617,7 @@ typedef struct _WLAN_BSSID_EX
u8 Reserved[1]; //[0]: IS beacon frame
u8 bP2pNetwork;
#else
u8 Reserved[2]; //[0]: IS beacon frame
u8 Reserved[2]; //[0]: IS beacon frame (padapter+163)
#endif
NDIS_802_11_SSID Ssid;
u32 Privacy;

View file

@ -254,7 +254,7 @@ extern struct sk_buff *rltk_wlan_alloc_skb(unsigned int total_len);
extern void rltk_wlan_send_skb(int idx, struct sk_buff *skb);
extern void rltk_netif_rx(struct sk_buff *skb);
extern int rltk_del_station(const char *ifname, u8 *hwaddr);
extern int rltk_get_auto_chl(const char *ifname, u8 *channel_set, int channel_num, int a4);
extern int rltk_get_auto_chl(const char *ifname, u8 *channel_set, int channel_num);
extern int rltk_set_tx_power_percentage(rtw_tx_pwr_percentage_t power_percentage_idx);
extern int rltk_wlan_control(unsigned long cmd, void *data);
extern unsigned char rltk_wlan_running(unsigned char idx);

View file

@ -512,13 +512,13 @@ typedef long long __i64;
#define IW_QUAL_QUAL_UPDATED 0x01 /* Value was updated since last read */
#define IW_QUAL_LEVEL_UPDATED 0x02
#define IW_QUAL_NOISE_UPDATED 0x04
#define IW_QUAL_ALL_UPDATED 0x07
#define IW_QUAL_DBM 0x08 /* Level + Noise are dBm */
#define IW_QUAL_ALL_UPDATED 0x07
#define IW_QUAL_DBM 0x08 /* Level + Noise are dBm */
#define IW_QUAL_QUAL_INVALID 0x10 /* Driver doesn't provide value */
#define IW_QUAL_LEVEL_INVALID 0x20
#define IW_QUAL_NOISE_INVALID 0x40
#define IW_QUAL_RCPI 0x80 /* Level + Noise are 802.11k RCPI */
#define IW_QUAL_ALL_INVALID 0x70
#define IW_QUAL_RCPI 0x80 /* Level + Noise are 802.11k RCPI */
#define IW_QUAL_ALL_INVALID 0x70
/* Frequency flags */
#define IW_FREQ_AUTO 0x00 /* Let the driver decides */
@ -567,7 +567,7 @@ typedef long long __i64;
#define IW_TXPOW_RANGE 0x1000 /* Range of value between min/max */
/* Retry limits and lifetime flags available */
#define IW_RETRY_ON 0x0000 /* No details... */
#define IW_RETRY_ON 0x0000 /* No details... */
#define IW_RETRY_TYPE 0xF000 /* Type of parameter */
#define IW_RETRY_LIMIT 0x1000 /* Maximum number of retries*/
#define IW_RETRY_LIFETIME 0x2000 /* Maximum duration of retries in us */
@ -631,10 +631,10 @@ typedef long long __i64;
#define IW_AUTH_WPA_VERSION_WPA2 0x00000004
/* IW_AUTH_PAIRWISE_CIPHER and IW_AUTH_GROUP_CIPHER values (bit field) */
#define IW_AUTH_CIPHER_NONE 0x00000001
#define IW_AUTH_CIPHER_NONE 0x00000001
#define IW_AUTH_CIPHER_WEP40 0x00000002
#define IW_AUTH_CIPHER_TKIP 0x00000004
#define IW_AUTH_CIPHER_CCMP 0x00000008
#define IW_AUTH_CIPHER_TKIP 0x00000004
#define IW_AUTH_CIPHER_CCMP 0x00000008
#define IW_AUTH_CIPHER_WEP104 0x00000010
/* IW_AUTH_KEY_MGMT values (bit field) */
@ -644,7 +644,7 @@ typedef long long __i64;
/* IW_AUTH_80211_AUTH_ALG values (bit field) */
#define IW_AUTH_ALG_OPEN_SYSTEM 0x00000001
#define IW_AUTH_ALG_SHARED_KEY 0x00000002
#define IW_AUTH_ALG_LEAP 0x00000004
#define IW_AUTH_ALG_LEAP 0x00000004
/* IW_AUTH_ROAMING_CONTROL values */
#define IW_AUTH_ROAMING_ENABLE 0 /* driver/firmware based roaming */
@ -666,15 +666,15 @@ typedef long long __i64;
/* IWEVMICHAELMICFAILURE : struct iw_michaelmicfailure ->flags */
#define IW_MICFAILURE_KEY_ID 0x00000003 /* Key ID 0..3 */
#define IW_MICFAILURE_GROUP 0x00000004
#define IW_MICFAILURE_GROUP 0x00000004
#define IW_MICFAILURE_PAIRWISE 0x00000008
#define IW_MICFAILURE_STAKEY 0x00000010
#define IW_MICFAILURE_COUNT 0x00000060 /* 1 or 2 (0 = count not supported)
#define IW_MICFAILURE_COUNT 0x00000060 /* 1 or 2 (0 = count not supported)
*/
/* Bit field values for enc_capa in struct iw_range */
#define IW_ENC_CAPA_WPA 0x00000001
#define IW_ENC_CAPA_WPA2 0x00000002
#define IW_ENC_CAPA_WPA 0x00000001
#define IW_ENC_CAPA_WPA2 0x00000002
#define IW_ENC_CAPA_CIPHER_TKIP 0x00000004
#define IW_ENC_CAPA_CIPHER_CCMP 0x00000008
@ -698,8 +698,8 @@ typedef long long __i64;
/* Modulations bitmasks */
#define IW_MODUL_ALL 0x00000000 /* Everything supported */
#define IW_MODUL_FH 0x00000001 /* Frequency Hopping */
#define IW_MODUL_DS 0x00000002 /* Original Direct Sequence */
#define IW_MODUL_FH 0x00000001 /* Frequency Hopping */
#define IW_MODUL_DS 0x00000002 /* Original Direct Sequence */
#define IW_MODUL_CCK 0x00000004 /* 802.11b : 5.5 + 11 Mb/s */
#define IW_MODUL_11B (IW_MODUL_DS | IW_MODUL_CCK)
#define IW_MODUL_PBCC 0x00000008 /* TI : 5.5 + 11 + 22 Mb/s */
@ -714,8 +714,8 @@ typedef long long __i64;
#define IW_MODUL_CUSTOM 0x40000000 /* Driver specific */
/* Bitrate flags available */
#define IW_BITRATE_TYPE 0x00FF /* Type of value */
#define IW_BITRATE_UNICAST 0x0001 /* Maximum/Fixed unicast bitrate */
#define IW_BITRATE_TYPE 0x00FF /* Type of value */
#define IW_BITRATE_UNICAST 0x0001 /* Maximum/Fixed unicast bitrate */
#define IW_BITRATE_BROADCAST 0x0002 /* Fixed broadcast bitrate */
/****************************** TYPES ******************************/
@ -772,7 +772,7 @@ struct iw_freq
struct iw_quality
{
__u8 qual; /* link quality (%retries, SNR,
%missed beacons or better...) */
%missed beacons or better...) */
__u8 level; /* signal level (dBm) */
__u8 noise; /* noise level (dBm) */
__u8 updated; /* Flags to know if updated */
@ -988,7 +988,7 @@ union iwreq_data
struct iw_param txpower; /* default transmit power */
struct iw_param rts; /* RTS threshold threshold */
struct iw_param frag; /* Fragmentation threshold */
__u32 mode; /* Operation mode */
__u32 mode; /* Operation mode */
struct iw_param retry; /* Retry limits & lifetime */
struct iw_point encoding; /* Encoding stuff : tokens */