Staging: wilc1000: coreconfigurator: Remove trailing whitespace

[firefly-linux-kernel-4.4.55.git] / drivers / staging / wilc1000 / wilc_wlan_if.h

diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index e3b112c00a14900104bcb7ba992d10009d96178d..be972afe6e620f0f32df1c65048cc40d59c0cedc 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -10,10 +10,7 @@
 #ifndef WILC_WLAN_IF_H
 #define WILC_WLAN_IF_H
 
-/* #define MEMORY_STATIC */
-/* #define USE_OLD_SPI_SW */
-
-#include "wilc_oswrapper.h"
+#include <linux/semaphore.h>
 #include "linux_wlan_common.h"
 
 /********************************************
@@ -74,10 +71,6 @@ typedef struct {
        u32 block_size;
 } sdio_cmd53_t;
 
-typedef struct {
-       int (*os_wait)(void *, u32);
-} wilc_wlan_os_func_t;
-
 typedef struct {
        int io_type;
        int (*io_init)(void *);
@@ -107,24 +100,10 @@ typedef struct {
 
 typedef struct {
        void *os_private;
-
-       struct mutex *hif_critical_section;
-
-       u32 tx_buffer_size;
-       void *txq_critical_section;
-
-       void *txq_add_to_head_critical_section;
-
-#if defined(MEMORY_STATIC)
-       u32 rx_buffer_size;
-#endif
-
-       struct semaphore *cfg_wait_event;
 } wilc_wlan_os_context_t;
 
 typedef struct {
        wilc_wlan_os_context_t os_context;
-       wilc_wlan_os_func_t os_func;
        wilc_wlan_io_func_t io_func;
 } wilc_wlan_inp_t;
 
@@ -139,21 +118,6 @@ typedef void (*wilc_tx_complete_func_t)(void *, int);
 
 #define WILC_TX_ERR_NO_BUF     (-2)
 
-typedef struct {
-       int (*wlan_firmware_download)(const u8 *, u32);
-       int (*wlan_start)(void);
-       int (*wlan_stop)(void);
-       int (*wlan_add_to_tx_que)(void *, u8 *, u32, wilc_tx_complete_func_t);
-       int (*wlan_handle_tx_que)(u32 *);
-       void (*wlan_handle_rx_isr)(void);
-       void (*wlan_cleanup)(void);
-       int (*wlan_cfg_set)(int, u32, u8 *, u32, int, u32);
-       int (*wlan_cfg_get)(int, u32, int, u32);
-       int (*wlan_cfg_get_value)(u32, u8 *, u32);
-       int (*wlan_add_mgmt_to_tx_que)(void *, u8 *, u32,
-                                      wilc_tx_complete_func_t);
-} wilc_wlan_oup_t;
-
 /********************************************
  *
  *      Wlan Configuration ID
@@ -165,7 +129,6 @@ typedef struct {
 
 #define INFINITE_SLEEP_TIME    ((u32)0xFFFFFFFF)
 
-#ifdef WILC_PARSE_SCAN_IN_HOST
 typedef enum {
        SUPP_RATES_IE           = 1,
        EXT_SUPP_RATES_IE       = 50,
@@ -175,7 +138,7 @@ typedef enum {
        WMM_IE                  = 221,
        P2P_IE                  = 221,
 } BEACON_IE;
-#endif
+
 typedef enum {
        INFRASTRUCTURE          = 0,
        INDEPENDENT,
@@ -256,18 +219,18 @@ typedef enum {
        WPA2_AES_TKIP           = 0x71, /* Aes or Tkip */
 } SECURITY_T;
 
-typedef enum {
+enum AUTHTYPE {
        OPEN_SYSTEM             = 1,
        SHARED_KEY              = 2,
        ANY                     = 3,
        IEEE8021                = 5
-} AUTHTYPE_T;
+};
 
-typedef enum {
+enum SITESURVEY {
        SITE_SURVEY_1CH         = 0,
        SITE_SURVEY_ALL_CH      = 1,
        SITE_SURVEY_OFF         = 2
-} SITE_SURVEY_T;
+};
 
 typedef enum {
        NORMAL_ACK              = 0,
@@ -352,7 +315,7 @@ typedef enum {
        SW_TRIGGER_ABORT,
 } TX_ABORT_OPTION_T;
 
-typedef enum {
+enum WID_TYPE {
        WID_CHAR                = 0,
        WID_SHORT               = 1,
        WID_INT                 = 2,
@@ -363,8 +326,7 @@ typedef enum {
        WID_ADR                 = 7,
        WID_UNDEF               = 8,
        WID_TYPE_FORCE_32BIT    = 0xFFFFFFFF
-
-} WID_TYPE_T, tenuWIDtype;
+};
 
 typedef enum {
        WID_NIL                         = 0xffff,
@@ -975,11 +937,10 @@ typedef enum {
        WID_MAX                         = 0xFFFF
 } WID_T;
 
-int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup);
+int wilc_wlan_init(wilc_wlan_inp_t *inp);
 
 void wilc_bus_set_max_speed(void);
 void wilc_bus_set_default_speed(void);
 u32 wilc_get_chipid(u8 update);
-extern wilc_wlan_oup_t *gpstrWlanOps;
 
 #endif