diff options
Diffstat (limited to 'drivers/staging/wilc1000/wilc_wlan.h')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.h | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h index fa157a67b045..a5b9c68e1b9c 100644 --- a/drivers/staging/wilc1000/wilc_wlan.h +++ b/drivers/staging/wilc1000/wilc_wlan.h @@ -202,13 +202,6 @@ /******************************************** * - * Debug Type - * - ********************************************/ -typedef void (*wilc_debug_func)(u32, char *, ...); - -/******************************************** - * * Tx/Rx Queue Structure * ********************************************/ @@ -222,7 +215,7 @@ struct txq_entry_t { int buffer_size; void *priv; int status; - void (*tx_complete_func)(void *, int); + void (*tx_complete_func)(void *priv, int status); }; struct rxq_entry_t { @@ -238,18 +231,18 @@ struct rxq_entry_t { ********************************************/ struct wilc; struct wilc_hif_func { - int (*hif_init)(struct wilc *, bool resume); - int (*hif_deinit)(struct wilc *); - int (*hif_read_reg)(struct wilc *, u32, u32 *); - int (*hif_write_reg)(struct wilc *, u32, u32); - int (*hif_block_rx)(struct wilc *, u32, u8 *, u32); - int (*hif_block_tx)(struct wilc *, u32, u8 *, u32); - int (*hif_read_int)(struct wilc *, u32 *); - int (*hif_clear_int_ext)(struct wilc *, u32); - int (*hif_read_size)(struct wilc *, u32 *); - int (*hif_block_tx_ext)(struct wilc *, u32, u8 *, u32); - int (*hif_block_rx_ext)(struct wilc *, u32, u8 *, u32); - int (*hif_sync_ext)(struct wilc *, int); + int (*hif_init)(struct wilc *wilc, bool resume); + int (*hif_deinit)(struct wilc *wilc); + int (*hif_read_reg)(struct wilc *wilc, u32 addr, u32 *data); + int (*hif_write_reg)(struct wilc *wilc, u32 addr, u32 data); + int (*hif_block_rx)(struct wilc *wilc, u32 addr, u8 *buf, u32 size); + int (*hif_block_tx)(struct wilc *wilc, u32 addr, u8 *buf, u32 size); + int (*hif_read_int)(struct wilc *wilc, u32 *int_status); + int (*hif_clear_int_ext)(struct wilc *wilc, u32 val); + int (*hif_read_size)(struct wilc *wilc, u32 *size); + int (*hif_block_tx_ext)(struct wilc *wilc, u32 addr, u8 *buf, u32 size); + int (*hif_block_rx_ext)(struct wilc *wilc, u32 addr, u8 *buf, u32 size); + int (*hif_sync_ext)(struct wilc *wilc, int nint); int (*enable_interrupt)(struct wilc *nic); void (*disable_interrupt)(struct wilc *nic); }; @@ -298,9 +291,9 @@ void wilc_chip_sleep_manually(struct wilc *wilc); void wilc_enable_tcp_ack_filter(bool value); int wilc_wlan_get_num_conn_ifcs(struct wilc *wilc); -int wilc_mac_xmit(struct sk_buff *skb, struct net_device *dev); +netdev_tx_t wilc_mac_xmit(struct sk_buff *skb, struct net_device *dev); -void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size); +void wilc_wfi_p2p_rx(struct net_device *dev, u8 *buff, u32 size); void host_wakeup_notify(struct wilc *wilc); void host_sleep_notify(struct wilc *wilc); extern bool wilc_enable_ps; |