diff options
Diffstat (limited to 'drivers/staging/wilc1000/wilc_wlan_if.h')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan_if.h | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h index 618903caff54..83cf84dd63b5 100644 --- a/drivers/staging/wilc1000/wilc_wlan_if.h +++ b/drivers/staging/wilc1000/wilc_wlan_if.h @@ -11,7 +11,6 @@ #define WILC_WLAN_IF_H #include <linux/semaphore.h> -#include "linux_wlan_common.h" #include <linux/netdevice.h> /******************************************** @@ -51,26 +50,24 @@ * ********************************************/ -typedef struct { +struct sdio_cmd52 { u32 read_write: 1; u32 function: 3; u32 raw: 1; u32 address: 17; u32 data: 8; -} sdio_cmd52_t; +}; -typedef struct { - /* struct { */ +struct sdio_cmd53 { u32 read_write: 1; u32 function: 3; u32 block_mode: 1; u32 increment: 1; u32 address: 17; u32 count: 9; - /* } bit; */ u8 *buffer; u32 block_size; -} sdio_cmd53_t; +}; #define WILC_MAC_INDICATE_STATUS 0x1 #define WILC_MAC_STATUS_INIT -1 @@ -82,7 +79,7 @@ typedef struct { struct tx_complete_data { int size; void *buff; - u8 *pBssid; + u8 *bssid; struct sk_buff *skb; }; @@ -95,12 +92,10 @@ typedef void (*wilc_tx_complete_func_t)(void *, int); * Wlan Configuration ID * ********************************************/ - +#define WILC_MULTICAST_TABLE_SIZE 8 #define MAX_SSID_LEN 33 #define MAX_RATES_SUPPORTED 12 -#define INFINITE_SLEEP_TIME ((u32)0xFFFFFFFF) - typedef enum { SUPP_RATES_IE = 1, EXT_SUPP_RATES_IE = 50, @@ -300,6 +295,13 @@ enum wid_type { WID_TYPE_FORCE_32BIT = 0xFFFFFFFF }; +struct wid { + u16 id; + enum wid_type type; + s32 size; + s8 *val; +}; + typedef enum { WID_NIL = 0xffff, @@ -761,6 +763,7 @@ typedef enum { WID_DEL_BEACON = 0x00CA, WID_LOGTerminal_Switch = 0x00CD, + WID_TX_POWER = 0x00CE, /* EMAC Short WID list */ /* RTS Threshold */ /* @@ -832,7 +835,6 @@ typedef enum { /* Custom Integer WID list */ WID_GET_INACTIVE_TIME = 0x2084, - WID_SET_DRV_HANDLER = 0X2085, WID_SET_OPERATION_MODE = 0X2086, /* EMAC String WID list */ WID_SSID = 0x3000, @@ -865,6 +867,7 @@ typedef enum { WID_MODEL_NAME = 0x3027, /*Added for CAPI tool */ WID_MODEL_NUM = 0x3028, /*Added for CAPI tool */ WID_DEVICE_NAME = 0x3029, /*Added for CAPI tool */ + WID_SET_DRV_HANDLER = 0x3030, /* NMAC String WID list */ WID_11N_P_ACTION_REQ = 0x3080, @@ -911,8 +914,6 @@ typedef enum { struct wilc; int wilc_wlan_init(struct net_device *dev); -void wilc_bus_set_max_speed(void); -void wilc_bus_set_default_speed(void); -u32 wilc_get_chipid(struct wilc *wilc, u8 update); +u32 wilc_get_chipid(struct wilc *wilc, bool update); #endif |