staging: wilc1000: move macro and function prototype from wilc_wlan_if.h file (6b0b7d86) · Commits · 戴 / test

drivers/staging/wilc1000/host_interface.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		#define WILC_HIF_CONNECT_TIMEOUT_MS 9500

		#define WILC_FALSE_FRMWR_CHANNEL 100
		#define WILC_MAX_RATES_SUPPORTED 12

		struct wilc_rcvd_mac_info {
		u8 status;

+11 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,17 @@ enum conn_event {
		CONN_DISCONN_EVENT_FORCE_32BIT = 0xFFFFFFFF
		};

		enum {
		WILC_HIF_SDIO = 0,
		WILC_HIF_SPI = BIT(0)
		};

		enum {
		WILC_MAC_STATUS_INIT = -1,
		WILC_MAC_STATUS_DISCONNECTED = 0,
		WILC_MAC_STATUS_CONNECTED = 1
		};

		struct wilc_rcvd_net_info {
		s8 rssi;
		u8 ch;

+2 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,8 @@

		#include "wilc_wfi_cfgoperations.h"

		#define WILC_MULTICAST_TABLE_SIZE 8

		static irqreturn_t isr_uh_routine(int irq, void *user_data)
		{
		struct net_device *dev = user_data;

+9 −0

Original line number	Diff line number	Diff line
		@@ -250,6 +250,13 @@ struct wilc_hif_func {

		#define WILC_MAX_CFG_FRAME_SIZE 1468

		struct tx_complete_data {
		int size;
		void *buff;
		u8 *bssid;
		struct sk_buff *skb;
		};

		struct wilc_cfg_cmd_hdr {
		u8 cmd_type;
		u8 seq_no;
		@@ -301,4 +308,6 @@ void chip_allow_sleep(struct wilc *wilc);
		void chip_wakeup(struct wilc *wilc);
		int wilc_send_config_pkt(struct wilc_vif vif, u8 mode, struct wid wids,
		u32 count, u32 drv);
		int wilc_wlan_init(struct net_device *dev);
		u32 wilc_get_chipid(struct wilc *wilc, bool update);
		#endif

+0 −36

Original line number	Diff line number	Diff line
		@@ -9,43 +9,11 @@

		#include <linux/netdevice.h>

		/********************************************
		*
		* Host Interface Defines
		*
		********************************************/

		enum {
		WILC_HIF_SDIO = 0,
		WILC_HIF_SPI = BIT(0)
		};

		/********************************************
		*
		* Wlan Interface Defines
		*
		********************************************/

		enum {
		WILC_MAC_STATUS_INIT = -1,
		WILC_MAC_STATUS_DISCONNECTED = 0,
		WILC_MAC_STATUS_CONNECTED = 1
		};

		struct tx_complete_data {
		int size;
		void *buff;
		u8 *bssid;
		struct sk_buff *skb;
		};

		/********************************************
		*
		* Wlan Configuration ID
		*
		********************************************/
		#define WILC_MULTICAST_TABLE_SIZE 8
		#define WILC_MAX_RATES_SUPPORTED 12

		enum bss_types {
		WILC_FW_BSS_TYPE_INFRA = 0,
		@@ -832,8 +800,4 @@ enum {
		WID_MAX = 0xFFFF
		};

		struct wilc;
		int wilc_wlan_init(struct net_device *dev);
		u32 wilc_get_chipid(struct wilc *wilc, bool update);

		#endif