Commit 931be260 authored by Pavel Roskin's avatar Pavel Roskin Committed by John W. Linville
Browse files

ath5k: clean up base.h and its use



Remove unnecessary includes from base.h.  Add includes to other files as
necessary.  Don't include base.h unless needed.

Move declarations for functions in base.c from ath5k.h to base.h.

Use a better named define to protect base.h against double inclusion.
Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d601d9ca
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
*/ */
#include "ath5k.h" #include "ath5k.h"
#include "base.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
#include "ani.h" #include "ani.h"
......
...@@ -16,6 +16,10 @@ ...@@ -16,6 +16,10 @@
#ifndef ANI_H #ifndef ANI_H
#define ANI_H #define ANI_H
#include "../ath.h"
enum ath5k_phy_error_code;
/* these thresholds are relative to the ATH5K_ANI_LISTEN_PERIOD */ /* these thresholds are relative to the ATH5K_ANI_LISTEN_PERIOD */
#define ATH5K_ANI_LISTEN_PERIOD 100 #define ATH5K_ANI_LISTEN_PERIOD 100
#define ATH5K_ANI_OFDM_TRIG_HIGH 500 #define ATH5K_ANI_OFDM_TRIG_HIGH 500
......
...@@ -287,17 +287,6 @@ enum ath5k_radio { ...@@ -287,17 +287,6 @@ enum ath5k_radio {
* Common silicon revision/version values * Common silicon revision/version values
*/ */
enum ath5k_srev_type {
AR5K_VERSION_MAC,
AR5K_VERSION_RAD,
};
struct ath5k_srev_name {
const char *sr_name;
enum ath5k_srev_type sr_type;
u_int sr_val;
};
#define AR5K_SREV_UNKNOWN 0xffff #define AR5K_SREV_UNKNOWN 0xffff
#define AR5K_SREV_AR5210 0x00 /* Crete */ #define AR5K_SREV_AR5210 0x00 /* Crete */
...@@ -1271,36 +1260,13 @@ struct ath_bus_ops { ...@@ -1271,36 +1260,13 @@ struct ath_bus_ops {
extern const struct ieee80211_ops ath5k_hw_ops; extern const struct ieee80211_ops ath5k_hw_ops;
/* Initialization and detach functions */ /* Initialization and detach functions */
int ath5k_init_softc(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops);
void ath5k_deinit_softc(struct ath5k_hw *ah);
int ath5k_hw_init(struct ath5k_hw *ah); int ath5k_hw_init(struct ath5k_hw *ah);
void ath5k_hw_deinit(struct ath5k_hw *ah); void ath5k_hw_deinit(struct ath5k_hw *ah);
int ath5k_sysfs_register(struct ath5k_hw *ah); int ath5k_sysfs_register(struct ath5k_hw *ah);
void ath5k_sysfs_unregister(struct ath5k_hw *ah); void ath5k_sysfs_unregister(struct ath5k_hw *ah);
/* base.c */
struct ath5k_buf;
struct ath5k_txq;
void ath5k_set_beacon_filter(struct ieee80211_hw *hw, bool enable);
bool ath5k_any_vif_assoc(struct ath5k_hw *ah);
void ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb,
struct ath5k_txq *txq);
int ath5k_start(struct ieee80211_hw *hw);
void ath5k_stop(struct ieee80211_hw *hw);
void ath5k_mode_setup(struct ath5k_hw *ah, struct ieee80211_vif *vif);
void ath5k_update_bssid_mask_and_opmode(struct ath5k_hw *ah,
struct ieee80211_vif *vif);
int ath5k_chan_set(struct ath5k_hw *ah, struct ieee80211_channel *chan);
void ath5k_beacon_update_timers(struct ath5k_hw *ah, u64 bc_tsf);
int ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
void ath5k_beacon_config(struct ath5k_hw *ah);
void ath5k_txbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf);
void ath5k_rxbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf);
/*Chip id helper functions */ /*Chip id helper functions */
const char *ath5k_chip_name(enum ath5k_srev_type type, u_int16_t val);
int ath5k_hw_read_srev(struct ath5k_hw *ah); int ath5k_hw_read_srev(struct ath5k_hw *ah);
/* LED functions */ /* LED functions */
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
#include "base.h"
/** /**
* ath5k_hw_post - Power On Self Test helper function * ath5k_hw_post - Power On Self Test helper function
......
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/nl80211.h>
#include <net/ieee80211_radiotap.h> #include <net/ieee80211_radiotap.h>
...@@ -61,6 +62,8 @@ ...@@ -61,6 +62,8 @@
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
#include "ani.h" #include "ani.h"
#include "ath5k.h"
#include "../regd.h"
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include "trace.h" #include "trace.h"
......
...@@ -38,18 +38,27 @@ ...@@ -38,18 +38,27 @@
/* /*
* Definitions for the Atheros Wireless LAN controller driver. * Definitions for the Atheros Wireless LAN controller driver.
*/ */
#ifndef _DEV_ATH_ATHVAR_H #ifndef _DEV_ATH5K_BASE_H
#define _DEV_ATH_ATHVAR_H #define _DEV_ATH5K_BASE_H
#include <linux/interrupt.h> struct ieee80211_vif;
#include <linux/list.h> struct ieee80211_hw;
#include <linux/if_ether.h> struct ath5k_hw;
#include <linux/rfkill.h> struct ath5k_txq;
#include <linux/workqueue.h> struct ieee80211_channel;
struct ath_bus_ops;
enum nl80211_iftype;
#include "ath5k.h" enum ath5k_srev_type {
#include "../regd.h" AR5K_VERSION_MAC,
#include "../ath.h" AR5K_VERSION_RAD,
};
struct ath5k_srev_name {
const char *sr_name;
enum ath5k_srev_type sr_type;
u_int sr_val;
};
struct ath5k_buf { struct ath5k_buf {
struct list_head list; struct list_head list;
...@@ -76,8 +85,30 @@ struct ath5k_vif_iter_data { ...@@ -76,8 +85,30 @@ struct ath5k_vif_iter_data {
enum nl80211_iftype opmode; enum nl80211_iftype opmode;
int n_stas; int n_stas;
}; };
void ath5k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif); void ath5k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif);
bool ath5k_any_vif_assoc(struct ath5k_hw *ah);
int ath5k_start(struct ieee80211_hw *hw);
void ath5k_stop(struct ieee80211_hw *hw);
void ath5k_beacon_update_timers(struct ath5k_hw *ah, u64 bc_tsf);
int ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
void ath5k_beacon_config(struct ath5k_hw *ah);
void ath5k_set_beacon_filter(struct ieee80211_hw *hw, bool enable);
void ath5k_update_bssid_mask_and_opmode(struct ath5k_hw *ah,
struct ieee80211_vif *vif);
int ath5k_chan_set(struct ath5k_hw *ah, struct ieee80211_channel *chan);
void ath5k_txbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf);
void ath5k_rxbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf);
void ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb,
struct ath5k_txq *txq);
const char *ath5k_chip_name(enum ath5k_srev_type type, u_int16_t val);
int ath5k_init_softc(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops);
void ath5k_deinit_softc(struct ath5k_hw *ah);
/* Check whether BSSID mask is supported */ /* Check whether BSSID mask is supported */
#define ath5k_hw_hasbssidmask(_ah) (ah->ah_version == AR5K_AR5212) #define ath5k_hw_hasbssidmask(_ah) (ah->ah_version == AR5K_AR5212)
...@@ -85,4 +116,4 @@ void ath5k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif); ...@@ -85,4 +116,4 @@ void ath5k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif);
/* Check whether virtual EOL is supported */ /* Check whether virtual EOL is supported */
#define ath5k_hw_hasveol(_ah) (ah->ah_version != AR5K_AR5210) #define ath5k_hw_hasveol(_ah) (ah->ah_version != AR5K_AR5210)
#endif #endif /* _DEV_ATH5K_BASE_H */
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
#include "base.h" #include "../regd.h"
/* /*
* Fill the capabilities struct * Fill the capabilities struct
......
...@@ -58,19 +58,18 @@ ...@@ -58,19 +58,18 @@
* THE POSSIBILITY OF SUCH DAMAGES. * THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#include "base.h" #include <linux/module.h>
#include <linux/seq_file.h>
#include <linux/list.h>
#include "debug.h" #include "debug.h"
#include "ath5k.h"
#include "reg.h"
#include "base.h"
static unsigned int ath5k_debug; static unsigned int ath5k_debug;
module_param_named(debug, ath5k_debug, uint, 0); module_param_named(debug, ath5k_debug, uint, 0);
#ifdef CONFIG_ATH5K_DEBUG
#include <linux/seq_file.h>
#include "reg.h"
#include "ani.h"
static int ath5k_debugfs_open(struct inode *inode, struct file *file) static int ath5k_debugfs_open(struct inode *inode, struct file *file)
{ {
file->private_data = inode->i_private; file->private_data = inode->i_private;
...@@ -1031,5 +1030,3 @@ ath5k_debug_printtxbuf(struct ath5k_hw *ah, struct ath5k_buf *bf) ...@@ -1031,5 +1030,3 @@ ath5k_debug_printtxbuf(struct ath5k_hw *ah, struct ath5k_buf *bf)
td->tx_stat.tx_status_0, td->tx_stat.tx_status_1, td->tx_stat.tx_status_0, td->tx_stat.tx_status_1,
done ? ' ' : (ts.ts_status == 0) ? '*' : '!'); done ? ' ' : (ts.ts_status == 0) ? '*' : '!');
} }
#endif /* ifdef CONFIG_ATH5K_DEBUG */
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
#include "base.h"
/************************\ /************************\
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
#include "base.h"
/*********\ /*********\
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
#include "base.h"
/******************\ /******************\
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
#include "base.h"
/* /*
* Set led state * Set led state
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
#include "base.h"
/* /*
* Mode-independent initial register writes * Mode-independent initial register writes
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include "ath5k.h" #include "ath5k.h"
#include "base.h"
#define ATH_SDEVICE(subv, subd) \ #define ATH_SDEVICE(subv, subd) \
.vendor = PCI_ANY_ID, .device = PCI_ANY_ID, \ .vendor = PCI_ANY_ID, .device = PCI_ANY_ID, \
......
...@@ -41,8 +41,10 @@ ...@@ -41,8 +41,10 @@
* *
*/ */
#include <net/mac80211.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include "ath5k.h"
#include "base.h" #include "base.h"
#include "reg.h" #include "reg.h"
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
#include "base.h"
/* /*
* AR5212+ can use higher rates for ack transmission * AR5212+ can use higher rates for ack transmission
......
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "base.h"
#include "rfbuffer.h" #include "rfbuffer.h"
#include "rfgain.h" #include "rfgain.h"
#include "../regd.h"
/******************\ /******************\
......
...@@ -23,7 +23,6 @@ Queue Control Unit, DFS Control Unit Functions ...@@ -23,7 +23,6 @@ Queue Control Unit, DFS Control Unit Functions
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "debug.h" #include "debug.h"
#include "base.h"
/******************\ /******************\
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include "ath5k.h" #include "ath5k.h"
#include "reg.h" #include "reg.h"
#include "base.h"
#include "debug.h" #include "debug.h"
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
* THE POSSIBILITY OF SUCH DAMAGES. * THE POSSIBILITY OF SUCH DAMAGES.
*/ */
#include "base.h" #include "ath5k.h"
static inline void ath5k_rfkill_disable(struct ath5k_hw *ah) static inline void ath5k_rfkill_disable(struct ath5k_hw *ah)
......
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