Skip to content

L
linux
Commit d6e25e70 authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman
Browse files
Options

staging: ks7010: indent ks_wlan.h 

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3d74826
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 125 deletions
drivers/staging/ks7010/ks_wlan.h
View file @ d6e25e70
...@@ -22,16 +22,16 @@ ...@@ -22,16 +22,16 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/spinlock.h> /* spinlock_t */ #include <linux/spinlock.h> /* spinlock_t */
#include <linux/sched.h> /* wait_queue_head_t */ #include <linux/sched.h> /* wait_queue_head_t */
#include <linux/types.h> /* pid_t */ #include <linux/types.h> /* pid_t */
#include <linux/netdevice.h> /* struct net_device_stats, struct sk_buff */ #include <linux/netdevice.h> /* struct net_device_stats, struct sk_buff */
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/wireless.h> #include <linux/wireless.h>
#include <asm/atomic.h> /* struct atmic_t */ #include <asm/atomic.h> /* struct atmic_t */
#include <linux/timer.h> /* struct timer_list */ #include <linux/timer.h> /* struct timer_list */
#include <linux/string.h> #include <linux/string.h>
#include <linux/completion.h> /* struct completion */ #include <linux/completion.h> /* struct completion */
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -46,37 +46,37 @@ ...@@ -46,37 +46,37 @@
#endif #endif
struct ks_wlan_parameter { struct ks_wlan_parameter {
uint8_t operation_mode; /* Operation Mode */ uint8_t operation_mode; /* Operation Mode */
uint8_t channel; /* Channel */ uint8_t channel; /* Channel */
uint8_t tx_rate; /* Transmit Rate */ uint8_t tx_rate; /* Transmit Rate */
struct { struct {
uint8_t size; uint8_t size;
uint8_t body[16]; uint8_t body[16];
} rate_set; } rate_set;
uint8_t bssid[ETH_ALEN]; /* BSSID */ uint8_t bssid[ETH_ALEN]; /* BSSID */
struct { struct {
uint8_t size; uint8_t size;
uint8_t body[32+1]; uint8_t body[32 + 1];
} ssid; /* SSID */ } ssid; /* SSID */
uint8_t preamble; /* Preamble */ uint8_t preamble; /* Preamble */
uint8_t powermgt; /* PowerManagementMode */ uint8_t powermgt; /* PowerManagementMode */
uint32_t scan_type; /* AP List Scan Type */ uint32_t scan_type; /* AP List Scan Type */
#define BEACON_LOST_COUNT_MIN 0 #define BEACON_LOST_COUNT_MIN 0
#define BEACON_LOST_COUNT_MAX 65535 #define BEACON_LOST_COUNT_MAX 65535
uint32_t beacon_lost_count; /* Beacon Lost Count */ uint32_t beacon_lost_count; /* Beacon Lost Count */
uint32_t rts; /* RTS Threashold */ uint32_t rts; /* RTS Threashold */
uint32_t fragment; /* Fragmentation Threashold */ uint32_t fragment; /* Fragmentation Threashold */
uint32_t privacy_invoked; uint32_t privacy_invoked;
uint32_t wep_index; uint32_t wep_index;
struct { struct {
uint8_t size; uint8_t size;
uint8_t val[13*2+1]; uint8_t val[13 * 2 + 1];
} wep_key[4]; } wep_key[4];
uint16_t authenticate_type; uint16_t authenticate_type;
uint16_t phy_type; /* 11b/11g/11bg mode type*/ uint16_t phy_type; /* 11b/11g/11bg mode type */
uint16_t cts_mode; /* for 11g/11bg mode cts mode */ uint16_t cts_mode; /* for 11g/11bg mode cts mode */
uint16_t phy_info_timer; /* phy information timer */ uint16_t phy_info_timer; /* phy information timer */
char rom_file[256]; char rom_file[256];
}; };
enum { enum {
...@@ -157,7 +157,6 @@ enum { ...@@ -157,7 +157,6 @@ enum {
SME_START_REQUEST, SME_START_REQUEST,
SME_GET_EEPROM_CKSUM, SME_GET_EEPROM_CKSUM,
SME_MIC_FAILURE_CONFIRM, SME_MIC_FAILURE_CONFIRM,
SME_START_CONFIRM, SME_START_CONFIRM,
...@@ -187,7 +186,7 @@ enum { ...@@ -187,7 +186,7 @@ enum {
SME_WEP_SET_CONFIRM, SME_WEP_SET_CONFIRM,
SME_TERMINATE, SME_TERMINATE,
SME_EVENT_SIZE /* end */ SME_EVENT_SIZE /* end */
}; };
/* SME Status */ /* SME Status */
...@@ -200,58 +199,58 @@ enum { ...@@ -200,58 +199,58 @@ enum {
#define SME_EVENT_BUFF_SIZE 128 #define SME_EVENT_BUFF_SIZE 128
struct sme_info{ struct sme_info {
int sme_status; int sme_status;
int event_buff[SME_EVENT_BUFF_SIZE]; int event_buff[SME_EVENT_BUFF_SIZE];
unsigned int qhead; unsigned int qhead;
unsigned int qtail; unsigned int qtail;
#ifdef KS_WLAN_DEBUG #ifdef KS_WLAN_DEBUG
/* for debug */ /* for debug */
unsigned int max_event_count; unsigned int max_event_count;
#endif #endif
spinlock_t sme_spin; spinlock_t sme_spin;
unsigned long sme_flag; unsigned long sme_flag;
}; };
struct hostt_t{ struct hostt_t {
int buff[SME_EVENT_BUFF_SIZE]; int buff[SME_EVENT_BUFF_SIZE];
unsigned int qhead; unsigned int qhead;
unsigned int qtail; unsigned int qtail;
}; };
#define RSN_IE_BODY_MAX 64 #define RSN_IE_BODY_MAX 64
struct rsn_ie_t { struct rsn_ie_t {
uint8_t id; /* 0xdd = WPA or 0x30 = RSN */ uint8_t id; /* 0xdd = WPA or 0x30 = RSN */
uint8_t size; /* max ? 255 ? */ uint8_t size; /* max ? 255 ? */
uint8_t body[RSN_IE_BODY_MAX]; uint8_t body[RSN_IE_BODY_MAX];
} __attribute__((packed)); } __attribute__ ((packed));
#ifdef WPS #ifdef WPS
#define WPS_IE_BODY_MAX 255 #define WPS_IE_BODY_MAX 255
struct wps_ie_t { struct wps_ie_t {
uint8_t id; /* 221 'dd <len> 00 50 F2 04' */ uint8_t id; /* 221 'dd <len> 00 50 F2 04' */
uint8_t size; /* max ? 255 ? */ uint8_t size; /* max ? 255 ? */
uint8_t body[WPS_IE_BODY_MAX]; uint8_t body[WPS_IE_BODY_MAX];
} __attribute__((packed)); } __attribute__ ((packed));
#endif /* WPS */ #endif /* WPS */
struct local_ap_t { struct local_ap_t {
uint8_t bssid[6]; uint8_t bssid[6];
uint8_t rssi; uint8_t rssi;
uint8_t sq; uint8_t sq;
struct { struct {
uint8_t size; uint8_t size;
uint8_t body[32]; uint8_t body[32];
uint8_t ssid_pad; uint8_t ssid_pad;
} ssid; } ssid;
struct { struct {
uint8_t size; uint8_t size;
uint8_t body[16]; uint8_t body[16];
uint8_t rate_pad; uint8_t rate_pad;
} rate_set; } rate_set;
uint16_t capability; uint16_t capability;
uint8_t channel; uint8_t channel;
uint8_t noise; uint8_t noise;
struct rsn_ie_t wpa_ie; struct rsn_ie_t wpa_ie;
struct rsn_ie_t rsn_ie; struct rsn_ie_t rsn_ie;
#ifdef WPS #ifdef WPS
...@@ -263,19 +262,19 @@ struct local_ap_t { ...@@ -263,19 +262,19 @@ struct local_ap_t {
#define LOCAL_CURRENT_AP LOCAL_APLIST_MAX #define LOCAL_CURRENT_AP LOCAL_APLIST_MAX
struct local_aplist_t { struct local_aplist_t {
int size; int size;
struct local_ap_t ap[LOCAL_APLIST_MAX+1]; struct local_ap_t ap[LOCAL_APLIST_MAX + 1];
}; };
struct local_gain_t{ struct local_gain_t {
uint8_t TxMode; uint8_t TxMode;
uint8_t RxMode; uint8_t RxMode;
uint8_t TxGain; uint8_t TxGain;
uint8_t RxGain; uint8_t RxGain;
}; };
struct local_eeprom_sum_t{ struct local_eeprom_sum_t {
uint8_t type; uint8_t type;
uint8_t result; uint8_t result;
}; };
enum { enum {
...@@ -285,7 +284,6 @@ enum { ...@@ -285,7 +284,6 @@ enum {
EEPROM_NG, EEPROM_NG,
}; };
/* Power Save Status */ /* Power Save Status */
enum { enum {
PS_NONE, PS_NONE,
...@@ -297,22 +295,22 @@ enum { ...@@ -297,22 +295,22 @@ enum {
}; };
struct power_save_status_t { struct power_save_status_t {
atomic_t status; /* initialvalue 0 */ atomic_t status; /* initialvalue 0 */
struct completion wakeup_wait; struct completion wakeup_wait;
atomic_t confirm_wait; atomic_t confirm_wait;
atomic_t snooze_guard; atomic_t snooze_guard;
}; };
struct sleep_status_t { struct sleep_status_t {
atomic_t status; /* initialvalue 0 */ atomic_t status; /* initialvalue 0 */
atomic_t doze_request; atomic_t doze_request;
atomic_t wakeup_request; atomic_t wakeup_request;
}; };
/* WPA */ /* WPA */
struct scan_ext_t { struct scan_ext_t {
unsigned int flag; unsigned int flag;
char ssid[IW_ESSID_MAX_SIZE+1]; char ssid[IW_ESSID_MAX_SIZE + 1];
}; };
enum { enum {
...@@ -337,7 +335,7 @@ enum { ...@@ -337,7 +335,7 @@ enum {
#define CIPHER_ID_LEN 4 #define CIPHER_ID_LEN 4
enum { enum {
KEY_MGMT_802_1X, KEY_MGMT_802_1X,
KEY_MGMT_PSK, KEY_MGMT_PSK,
KEY_MGMT_WPANONE, KEY_MGMT_WPANONE,
...@@ -358,26 +356,26 @@ enum { ...@@ -358,26 +356,26 @@ enum {
#define MIC_KEY_SIZE 8 #define MIC_KEY_SIZE 8
struct wpa_key_t { struct wpa_key_t {
uint32_t ext_flags; /* IW_ENCODE_EXT_xxx */ uint32_t ext_flags; /* IW_ENCODE_EXT_xxx */
uint8_t tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ uint8_t tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
uint8_t rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ uint8_t rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
struct sockaddr addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast struct sockaddr addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast
* (group) keys or unicast address for * (group) keys or unicast address for
* individual keys */ * individual keys */
uint16_t alg; uint16_t alg;
uint16_t key_len; /* WEP: 5 or 13, TKIP: 32, CCMP: 16 */ uint16_t key_len; /* WEP: 5 or 13, TKIP: 32, CCMP: 16 */
uint8_t key_val[IW_ENCODING_TOKEN_MAX]; uint8_t key_val[IW_ENCODING_TOKEN_MAX];
uint8_t tx_mic_key[MIC_KEY_SIZE]; uint8_t tx_mic_key[MIC_KEY_SIZE];
uint8_t rx_mic_key[MIC_KEY_SIZE]; uint8_t rx_mic_key[MIC_KEY_SIZE];
}; };
#define WPA_KEY_INDEX_MAX 4 #define WPA_KEY_INDEX_MAX 4
#define WPA_RX_SEQ_LEN 6 #define WPA_RX_SEQ_LEN 6
struct mic_failure_t { struct mic_failure_t {
uint16_t failure; /* MIC Failure counter 0 or 1 or 2 */ uint16_t failure; /* MIC Failure counter 0 or 1 or 2 */
uint16_t counter; /* 1sec counter 0-60 */ uint16_t counter; /* 1sec counter 0-60 */
uint32_t last_failure_time; uint32_t last_failure_time;
int stop; /* stop flag */ int stop; /* stop flag */
}; };
struct wpa_status_t { struct wpa_status_t {
...@@ -401,36 +399,36 @@ struct pmk_list_t { ...@@ -401,36 +399,36 @@ struct pmk_list_t {
struct list_head head; struct list_head head;
struct pmk_t { struct pmk_t {
struct list_head list; struct list_head list;
uint8_t bssid[ETH_ALEN]; uint8_t bssid[ETH_ALEN];
uint8_t pmkid[IW_PMKID_LEN]; uint8_t pmkid[IW_PMKID_LEN];
} pmk[PMK_LIST_MAX]; } pmk[PMK_LIST_MAX];
}; };
#ifdef WPS #ifdef WPS
struct wps_status_t { struct wps_status_t {
int wps_enabled; int wps_enabled;
int ielen; int ielen;
uint8_t ie[255]; uint8_t ie[255];
}; };
#endif /* WPS */ #endif /* WPS */
struct ks_wlan_private { struct ks_wlan_private {
struct hw_info_t ks_wlan_hw; /* hardware information */ struct hw_info_t ks_wlan_hw; /* hardware information */
struct net_device *net_dev; struct net_device *net_dev;
int reg_net; /* register_netdev */ int reg_net; /* register_netdev */
struct net_device_stats nstats; struct net_device_stats nstats;
struct iw_statistics wstats; struct iw_statistics wstats;
struct completion confirm_wait; struct completion confirm_wait;
/* trx device & sme */ /* trx device & sme */
struct tx_device tx_dev; struct tx_device tx_dev;
struct rx_device rx_dev; struct rx_device rx_dev;
struct sme_info sme_i; struct sme_info sme_i;
u8 *rxp; u8 *rxp;
unsigned int rx_size; unsigned int rx_size;
struct tasklet_struct sme_task; struct tasklet_struct sme_task;
struct work_struct ks_wlan_wakeup_task; struct work_struct ks_wlan_wakeup_task;
int scan_ind_count; int scan_ind_count;
...@@ -443,33 +441,33 @@ struct ks_wlan_private { ...@@ -443,33 +441,33 @@ struct ks_wlan_private {
struct sleep_status_t sleepstatus; struct sleep_status_t sleepstatus;
struct wpa_status_t wpa; struct wpa_status_t wpa;
struct pmk_list_t pmklist; struct pmk_list_t pmklist;
/* wireless parameter */ /* wireless parameter */
struct ks_wlan_parameter reg; struct ks_wlan_parameter reg;
uint8_t current_rate; uint8_t current_rate;
char nick[IW_ESSID_MAX_SIZE+1]; char nick[IW_ESSID_MAX_SIZE + 1];
spinlock_t multicast_spin; spinlock_t multicast_spin;
spinlock_t dev_read_lock; spinlock_t dev_read_lock;
wait_queue_head_t devread_wait; wait_queue_head_t devread_wait;
unsigned int need_commit; /* for ioctl */ unsigned int need_commit; /* for ioctl */
/* DeviceIoControl */ /* DeviceIoControl */
int device_open_status; int device_open_status;
atomic_t event_count; atomic_t event_count;
atomic_t rec_count; atomic_t rec_count;
int dev_count; int dev_count;
#define DEVICE_STOCK_COUNT 20 #define DEVICE_STOCK_COUNT 20
unsigned char *dev_data[DEVICE_STOCK_COUNT]; unsigned char *dev_data[DEVICE_STOCK_COUNT];
int dev_size[DEVICE_STOCK_COUNT]; int dev_size[DEVICE_STOCK_COUNT];
/* ioctl : IOCTL_FIRMWARE_VERSION */ /* ioctl : IOCTL_FIRMWARE_VERSION */
unsigned char firmware_version[128+1]; unsigned char firmware_version[128 + 1];
int version_size; int version_size;
int mac_address_valid; /* Mac Address Status */ int mac_address_valid; /* Mac Address Status */
int dev_state; int dev_state;
...@@ -478,35 +476,33 @@ struct ks_wlan_private { ...@@ -478,35 +476,33 @@ struct ks_wlan_private {
/* spinlock_t lock; */ /* spinlock_t lock; */
#define FORCE_DISCONNECT 0x80000000 #define FORCE_DISCONNECT 0x80000000
#define CONNECT_STATUS_MASK 0x7FFFFFFF #define CONNECT_STATUS_MASK 0x7FFFFFFF
uint32_t connect_status; /* connect status */ uint32_t connect_status; /* connect status */
int infra_status; /* Infractructure status */ int infra_status; /* Infractructure status */
uint8_t data_buff[0x1000]; uint8_t data_buff[0x1000];
uint8_t scan_ssid_len; uint8_t scan_ssid_len;
uint8_t scan_ssid[IW_ESSID_MAX_SIZE+1]; uint8_t scan_ssid[IW_ESSID_MAX_SIZE + 1];
struct local_gain_t gain; struct local_gain_t gain;
#ifdef WPS #ifdef WPS
struct net_device *l2_dev; struct net_device *l2_dev;
int l2_fd; int l2_fd;
struct wps_status_t wps; struct wps_status_t wps;
#endif /* WPS */ #endif /* WPS */
uint8_t sleep_mode; uint8_t sleep_mode;
uint8_t region; uint8_t region;
struct local_eeprom_sum_t eeprom_sum; struct local_eeprom_sum_t eeprom_sum;
uint8_t eeprom_checksum; uint8_t eeprom_checksum;
struct hostt_t hostt; struct hostt_t hostt;
unsigned long last_doze; unsigned long last_doze;
unsigned long last_wakeup; unsigned long last_wakeup;
uint sdio_error_count; /* SDIO error */ uint sdio_error_count; /* SDIO error */
uint wakeup_count; /* for detect wakeup loop */ uint wakeup_count; /* for detect wakeup loop */
};
};
#endif /* _KS_WLAN_H */ #endif /* _KS_WLAN_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7