ath5k: Maintain naming scheme
This time i used mutt ;-)
---
drivers/net/wireless/ath5k/ath5k.h +111 -106
@@ -26,7 +26,7 @@#define CHAN_DEBUG 0/* Uncomment this for debuging (warning that it results in TOO much output) */ -/*#define AR5K_DEBUG 1 */ +/* #define AR5K_DEBUG 1 */ #include <linux/io.h> #include <linux/types.h>
@@ -206,6 +206,7 @@ enum ath5k_radio {* algorithm. This is done transparently. Once this feature is enabled, * compression and decompression takes place inside the chipset, without * putting additional load on the host CPU. +* */ #define MODULATION_TURBO 0x00000080
@@ -230,7 +231,7 @@ enum ath5k_vendor_mode {/* * Tx Descriptor */ -struct ath_tx_status { +struct ath5k_tx_status {u16 ts_seqnum;u16 ts_tstamp;u8 ts_status;
@@ -277,7 +278,7 @@ enum ath5k_tx_queue_subtype { };/* -* Queue ID numbers as returned by the HAL, each number +* Queue ID numbers as returned by the hw functions, each number * represents a hw queue. If hw does not support hw queues * (eg 5210) all data goes in one queue. These match * d80211 definitions (net80211/MadWiFi don't use them).
@@ -297,6 +298,8 @@ enum ath5k_tx_queue_id {/* * Flags to set hw queue's parameters... +* TODO: Implement missing stuff (almost there, +* probably have to tweak with SISR). */ #define AR5K_TXQ_FLAG_TXINT_ENABLE 0x0001/* Enable TXOK and TXERR interrupts -not used- */ #define AR5K_TXQ_FLAG_TXDESCINT_ENABLE 0x0002/* Enable TXDESC interrupt -not implemented- */
@@ -321,7 +324,6 @@ struct ath5k_txq_info {u32 tqi_cbr_overflow_limit;u32 tqi_burst_time;u32 tqi_ready_time;/* Not used */ -u32 tqi_comp_buffer;/* Compression Buffer's phys addr */ };/*
@@ -342,11 +344,11 @@ enum ath5k_pkt_type {*/ #define AR5K_TXPOWER_OFDM (_r, _v) ( \ ((0 & 1) << ((_v) + 6)) | \ - (((hal->ah_txpower.txp_rates[(_r)]) & 0x3f) << (_v)) \ + (((ah->ah_txpower.txp_rates[(_r)]) & 0x3f) << (_v)) \ )#define AR5K_TXPOWER_CCK (_r, _v) ( \ - (hal->ah_txpower.txp_rates[(_r)] & 0x3f) << (_v) \ + (ah->ah_txpower.txp_rates[(_r)] & 0x3f) << (_v) \ )/*
@@ -451,7 +453,7 @@ enum ath5k_dmasize {/* * Rx Descriptor */ -struct ath_rx_status { +struct ath5k_rx_status {u16 rs_datalen;u16 rs_tstamp;u8 rs_status;
@@ -519,7 +521,7 @@ struct ath5k_beacon_state {/* * Atheros descriptor */ -struct ath_desc { +struct ath5k_desc {u32 ds_link;u32 ds_data;u32 ds_ctl0;
@@ -527,8 +529,8 @@ struct ath_desc {u32 ds_hw[4 ];union { -struct ath_rx_status rx; -struct ath_tx_status tx; +struct ath5k_rx_status rx; +struct ath5k_tx_status tx; } ds_us;#define ds_rxstat ds_us.rx
@@ -593,6 +595,8 @@ struct ath5k_athchan_2ghz {/* * Rate definitions +* TODO: Clean them up or move them on mac80211 -most of these infos are +* used by the rate control algorytm on MadWiFi. */ #define AR5K_MAX_RATES 32/*max number of rates on the rate table*/
@@ -600,14 +604,15 @@ struct ath5k_athchan_2ghz {struct ath5k_rate {u8 valid;/* Valid for rate control */ u32 modulation; -u16 rate_kbps; +u16 rate_kbps;/* Rate in kbps used in computetxtime */ u8 rate_code;/* Rate mapping for h/w descriptors */ u8 dot11_rate; -u8 control_rate; -u16 lp_ack_duration;/* long preamble ACK duration */ -u16 sp_ack_duration;/* short preamble ACK duration*/ +u8 control_rate;/* Rate for management frames -not used */ +u16 lp_ack_duration;/* long preamble ACK duration -not used */ +u16 sp_ack_duration;/* short preamble ACK duration -not used */ }; +/* XXX: GRR all this stuff to get leds blinking ??? (check out setcurmode) */ struct ath5k_rate_table {u16 rate_count;u8 rate_code_to_index[AR5K_MAX_RATES ];/* Back-mapping */
@@ -720,7 +725,7 @@ enum ath5k_ant_setting { };/* -* HAL interrupt abstraction +* Hardware interrupt abstraction */ /**
@@ -734,7 +739,7 @@ enum ath5k_ant_setting {* Queue Control Unit (QCU) signals an EOL interrupt only if a descriptor's * LinkPtr is NULL. For more details, refer to: * http://www.freepatentsonline.com/20030225739.html -* @AR5K_INT_RXORN: indicates a hardware reset is required on certain hardware. +* @AR5K_INT_RXORN: Indicates we got RX overrun (eg. no more descriptors). * Note that Rx overrun is not always fatal, on some chips we can continue * operation without reseting the card, that's why int_fatal is not * common for all chips.
@@ -836,7 +841,7 @@ enum ath5k_power_mode {#define AR5K_SOFTLED_OFF 1/* -* Chipset capabilities -see ath_hal_getcapability- +* Chipset capabilities -see ath5k_hw_get_capability- * get_capability function is not yet fully implemented * in OpenHAL so most of these don't work yet... */
@@ -913,7 +918,7 @@ struct ath5k_capabilities {#define AR5K_MAX_GPIO 10#define AR5K_MAX_RF_BANKS 8 -struct ath_hw { +struct ath5k_hw {u32 ah_magic;void *ah_sc;
@@ -997,17 +1002,17 @@ struct ath_hw {/* * Function pointers */ -int (*ah_setup_tx_desc)(struct ath_hw *,struct ath_desc *, +int (*ah_setup_tx_desc)(struct ath5k_hw *,struct ath5k_desc *,unsigned int ,unsigned int ,enum ath5k_pkt_type ,unsigned int ,unsigned int ,unsigned int ,unsigned int ,unsigned int ,unsigned int ,unsigned int ,unsigned int ); -bool (*ah_setup_xtx_desc)(struct ath_hw *,struct ath_desc *, +bool (*ah_setup_xtx_desc)(struct ath5k_hw *,struct ath5k_desc *,unsigned int ,unsigned int ,unsigned int ,unsigned int ,unsigned int ,unsigned int ); -int (*ah_fill_tx_desc)(struct ath_hw *,struct ath_desc *, +int (*ah_fill_tx_desc)(struct ath5k_hw *,struct ath5k_desc *,unsigned int ,bool ,bool ); -int (*ah_proc_tx_desc)(struct ath_hw *,struct ath_desc *); -int (*ah_proc_rx_desc)(struct ath_hw *,struct ath_desc *); +int (*ah_proc_tx_desc)(struct ath5k_hw *,struct ath5k_desc *); +int (*ah_proc_rx_desc)(struct ath5k_hw *,struct ath5k_desc *); };/*
@@ -1015,123 +1020,123 @@ struct ath_hw {*/ /* General Functions */ -extern int ath5k_hw_register_timeout (struct ath_hw *hal,u32 reg,u32 flag,u32 val,bool is_set); +extern int ath5k_hw_register_timeout (struct ath5k_hw *ah,u32 reg,u32 flag,u32 val,bool is_set);/* Attach/Detach Functions */ -extern struct ath_hw *ath5k_hw_attach (u16 device,u8 mac_version,void *sc,void __iomem *sh); -extern const struct ath5k_rate_table *ath5k_hw_get_rate_table (struct ath_hw *hal,unsigned int mode); -extern void ath5k_hw_detach (struct ath_hw *hal); +extern struct ath5k_hw *ath5k_hw_attach (u16 device,u8 mac_version,void *sc,void __iomem *sh); +extern const struct ath5k_rate_table *ath5k_hw_get_rate_table (struct ath5k_hw *ah,unsigned int mode); +extern void ath5k_hw_detach (struct ath5k_hw *ah);/* Reset Functions */ -extern int ath5k_hw_reset (struct ath_hw *hal,enum ieee80211_if_types op_mode,struct ieee80211_channel *channel,bool change_channel); +extern int ath5k_hw_reset (struct ath5k_hw *ah,enum ieee80211_if_types op_mode,struct ieee80211_channel *channel,bool change_channel);/* Power management functions */ -extern int ath5k_hw_set_power (struct ath_hw *hal,enum ath5k_power_mode mode,bool set_chip,u16 sleep_duration); +extern int ath5k_hw_set_power (struct ath5k_hw *ah,enum ath5k_power_mode mode,bool set_chip,u16 sleep_duration);/* DMA Related Functions */ -extern void ath5k_hw_start_rx (struct ath_hw *hal); -extern int ath5k_hw_stop_rx_dma (struct ath_hw *hal); -extern u32 ath5k_hw_get_rx_buf (struct ath_hw *hal); -extern void ath5k_hw_put_rx_buf (struct ath_hw *hal,u32 phys_addr); -extern int ath5k_hw_tx_start (struct ath_hw *hal,unsigned int queue); -extern int ath5k_hw_stop_tx_dma (struct ath_hw *hal,unsigned int queue); -extern u32 ath5k_hw_get_tx_buf (struct ath_hw *hal,unsigned int queue); -extern int ath5k_hw_put_tx_buf (struct ath_hw *hal,unsigned int queue,u32 phys_addr); -extern int ath5k_hw_update_tx_triglevel (struct ath_hw *hal,bool increase); +extern void ath5k_hw_start_rx (struct ath5k_hw *ah); +extern int ath5k_hw_stop_rx_dma (struct ath5k_hw *ah); +extern u32 ath5k_hw_get_rx_buf (struct ath5k_hw *ah); +extern void ath5k_hw_put_rx_buf (struct ath5k_hw *ah,u32 phys_addr); +extern int ath5k_hw_tx_start (struct ath5k_hw *ah,unsigned int queue); +extern int ath5k_hw_stop_tx_dma (struct ath5k_hw *ah,unsigned int queue); +extern u32 ath5k_hw_get_tx_buf (struct ath5k_hw *ah,unsigned int queue); +extern int ath5k_hw_put_tx_buf (struct ath5k_hw *ah,unsigned int queue,u32 phys_addr); +extern int ath5k_hw_update_tx_triglevel (struct ath5k_hw *ah,bool increase);/* Interrupt handling */ -extern bool ath5k_hw_is_intr_pending (struct ath_hw *hal); -extern int ath5k_hw_get_isr (struct ath_hw *hal,enum ath5k_int *interrupt_mask); -extern enum ath5k_int ath5k_hw_set_intr (struct ath_hw *hal,enum ath5k_int new_mask); +extern bool ath5k_hw_is_intr_pending (struct ath5k_hw *ah); +extern int ath5k_hw_get_isr (struct ath5k_hw *ah,enum ath5k_int *interrupt_mask); +extern enum ath5k_int ath5k_hw_set_intr (struct ath5k_hw *ah,enum ath5k_int new_mask);/* EEPROM access functions */ -extern int ath5k_hw_set_regdomain (struct ath_hw *hal,u16 regdomain); +extern int ath5k_hw_set_regdomain (struct ath5k_hw *ah,u16 regdomain);/* Protocol Control Unit Functions */ -extern int ath5k_hw_set_opmode (struct ath_hw *hal); +extern int ath5k_hw_set_opmode (struct ath5k_hw *ah);/* BSSID Functions */ -extern void ath5k_hw_get_lladdr (struct ath_hw *hal,u8 *mac); -extern int ath5k_hw_set_lladdr (struct ath_hw *hal,const u8 *mac); -extern void ath5k_hw_set_associd (struct ath_hw *hal,const u8 *bssid,u16 assoc_id); -extern int ath5k_hw_set_bssid_mask (struct ath_hw *hal,const u8 *mask); +extern void ath5k_hw_get_lladdr (struct ath5k_hw *ah,u8 *mac); +extern int ath5k_hw_set_lladdr (struct ath5k_hw *ah,const u8 *mac); +extern void ath5k_hw_set_associd (struct ath5k_hw *ah,const u8 *bssid,u16 assoc_id); +extern int ath5k_hw_set_bssid_mask (struct ath5k_hw *ah,const u8 *mask);/* Receive start/stop functions */ -extern void ath5k_hw_start_rx_pcu (struct ath_hw *hal); -extern void ath5k_hw_stop_pcu_recv (struct ath_hw *hal); +extern void ath5k_hw_start_rx_pcu (struct ath5k_hw *ah); +extern void ath5k_hw_stop_pcu_recv (struct ath5k_hw *ah);/* RX Filter functions */ -extern void ath5k_hw_set_mcast_filter (struct ath_hw *hal,u32 filter0,u32 filter1); -extern int ath5k_hw_set_mcast_filterindex (struct ath_hw *hal,u32 index); -extern int ath5k_hw_clear_mcast_filter_idx (struct ath_hw *hal,u32 index); -extern u32 ath5k_hw_get_rx_filter (struct ath_hw *ah); -extern void ath5k_hw_set_rx_filter (struct ath_hw *ah,u32 filter); +extern void ath5k_hw_set_mcast_filter (struct ath5k_hw *ah,u32 filter0,u32 filter1); +extern int ath5k_hw_set_mcast_filterindex (struct ath5k_hw *ah,u32 index); +extern int ath5k_hw_clear_mcast_filter_idx (struct ath5k_hw *ah,u32 index); +extern u32 ath5k_hw_get_rx_filter (struct ath5k_hw *ah); +extern void ath5k_hw_set_rx_filter (struct ath5k_hw *ah,u32 filter);/* Beacon related functions */ -extern u32 ath5k_hw_get_tsf32 (struct ath_hw *hal); -extern u64 ath5k_hw_get_tsf64 (struct ath_hw *hal); -extern void ath5k_hw_reset_tsf (struct ath_hw *hal); -extern void ath5k_hw_init_beacon (struct ath_hw *hal,u32 next_beacon,u32 interval); -extern int ath5k_hw_set_beacon_timers (struct ath_hw *hal,const struct ath5k_beacon_state *state); -extern void ath5k_hw_reset_beacon (struct ath_hw *hal); -extern int ath5k_hw_wait_for_beacon (struct ath_hw *hal,unsigned long phys_addr); -extern void ath5k_hw_update_mib_counters (struct ath_hw *hal,struct ath5k_mib_stats *statistics); +extern u32 ath5k_hw_get_tsf32 (struct ath5k_hw *ah); +extern u64 ath5k_hw_get_tsf64 (struct ath5k_hw *ah); +extern void ath5k_hw_reset_tsf (struct ath5k_hw *ah); +extern void ath5k_hw_init_beacon (struct ath5k_hw *ah,u32 next_beacon,u32 interval); +extern int ath5k_hw_set_beacon_timers (struct ath5k_hw *ah,const struct ath5k_beacon_state *state); +extern void ath5k_hw_reset_beacon (struct ath5k_hw *ah); +extern int ath5k_hw_wait_for_beacon (struct ath5k_hw *ah,unsigned long phys_addr); +extern void ath5k_hw_update_mib_counters (struct ath5k_hw *ah,struct ath5k_mib_stats *statistics);/* ACK/CTS Timeouts */ -extern int ath5k_hw_set_ack_timeout (struct ath_hw *hal,unsigned int timeout); -extern unsigned int ath5k_hw_get_ack_timeout (struct ath_hw *hal); -extern int ath5k_hw_set_cts_timeout (struct ath_hw *hal,unsigned int timeout); -extern unsigned int ath5k_hw_get_cts_timeout (struct ath_hw *hal); +extern int ath5k_hw_set_ack_timeout (struct ath5k_hw *ah,unsigned int timeout); +extern unsigned int ath5k_hw_get_ack_timeout (struct ath5k_hw *ah); +extern int ath5k_hw_set_cts_timeout (struct ath5k_hw *ah,unsigned int timeout); +extern unsigned int ath5k_hw_get_cts_timeout (struct ath5k_hw *ah);/* Key table (WEP) functions */ -extern int ath5k_hw_reset_key (struct ath_hw *hal,u16 entry); -extern int ath5k_hw_is_key_valid (struct ath_hw *hal,u16 entry); -extern int ath5k_hw_set_key (struct ath_hw *hal,u16 entry,const struct ieee80211_key_conf *key,const u8 *mac); -extern int ath5k_hw_set_key_lladdr (struct ath_hw *hal,u16 entry,const u8 *mac); +extern int ath5k_hw_reset_key (struct ath5k_hw *ah,u16 entry); +extern int ath5k_hw_is_key_valid (struct ath5k_hw *ah,u16 entry); +extern int ath5k_hw_set_key (struct ath5k_hw *ah,u16 entry,const struct ieee80211_key_conf *key,const u8 *mac); +extern int ath5k_hw_set_key_lladdr (struct ath5k_hw *ah,u16 entry,const u8 *mac);/* Queue Control Unit, DFS Control Unit Functions */ -extern int ath5k_hw_setup_tx_queue (struct ath_hw *hal,enum ath5k_tx_queue queue_type,struct ath5k_txq_info *queue_info); -extern int ath5k_hw_setup_tx_queueprops (struct ath_hw *hal,int queue,const struct ath5k_txq_info *queue_info); -extern int ath5k_hw_get_tx_queueprops (struct ath_hw *hal,int queue,struct ath5k_txq_info *queue_info); -extern void ath5k_hw_release_tx_queue (struct ath_hw *hal,unsigned int queue); -extern int ath5k_hw_reset_tx_queue (struct ath_hw *hal,unsigned int queue); -extern u32 ath5k_hw_num_tx_pending (struct ath_hw *hal,unsigned int queue); -extern int ath5k_hw_set_slot_time (struct ath_hw *hal,unsigned int slot_time); -extern unsigned int ath5k_hw_get_slot_time (struct ath_hw *hal); +extern int ath5k_hw_setup_tx_queue (struct ath5k_hw *ah,enum ath5k_tx_queue queue_type,struct ath5k_txq_info *queue_info); +extern int ath5k_hw_setup_tx_queueprops (struct ath5k_hw *ah,int queue,const struct ath5k_txq_info *queue_info); +extern int ath5k_hw_get_tx_queueprops (struct ath5k_hw *ah,int queue,struct ath5k_txq_info *queue_info); +extern void ath5k_hw_release_tx_queue (struct ath5k_hw *ah,unsigned int queue); +extern int ath5k_hw_reset_tx_queue (struct ath5k_hw *ah,unsigned int queue); +extern u32 ath5k_hw_num_tx_pending (struct ath5k_hw *ah,unsigned int queue); +extern int ath5k_hw_set_slot_time (struct ath5k_hw *ah,unsigned int slot_time); +extern unsigned int ath5k_hw_get_slot_time (struct ath5k_hw *ah);/* Hardware Descriptor Functions */ -extern int ath5k_hw_setup_rx_desc (struct ath_hw *hal,struct ath_desc *desc,u32 size,unsigned int flags); +extern int ath5k_hw_setup_rx_desc (struct ath5k_hw *ah,struct ath5k_desc *desc,u32 size,unsigned int flags);/* GPIO Functions */ -extern void ath5k_hw_set_ledstate (struct ath_hw *hal,unsigned int state); -extern int ath5k_hw_set_gpio_output (struct ath_hw *hal,u32 gpio); -extern int ath5k_hw_set_gpio_input (struct ath_hw *hal,u32 gpio); -extern u32 ath5k_hw_get_gpio (struct ath_hw *hal,u32 gpio); -extern int ath5k_hw_set_gpio (struct ath_hw *hal,u32 gpio,u32 val); -extern void ath5k_hw_set_gpio_intr (struct ath_hw *hal,unsigned int gpio,u32 interrupt_level); +extern void ath5k_hw_set_ledstate (struct ath5k_hw *ah,unsigned int state); +extern int ath5k_hw_set_gpio_output (struct ath5k_hw *ah,u32 gpio); +extern int ath5k_hw_set_gpio_input (struct ath5k_hw *ah,u32 gpio); +extern u32 ath5k_hw_get_gpio (struct ath5k_hw *ah,u32 gpio); +extern int ath5k_hw_set_gpio (struct ath5k_hw *ah,u32 gpio,u32 val); +extern void ath5k_hw_set_gpio_intr (struct ath5k_hw *ah,unsigned int gpio,u32 interrupt_level);/* Regulatory Domain/Channels Setup */ -extern u16 ath5k_get_regdomain (struct ath_hw *hal); +extern u16 ath5k_get_regdomain (struct ath5k_hw *ah);/* Misc functions */ -extern void ath5k_hw_dump_state (struct ath_hw *hal); -extern int ath5k_hw_get_capability (struct ath_hw *hal,enum ath5k_capability_type cap_type,u32 capability,u32 *result); +extern void ath5k_hw_dump_state (struct ath5k_hw *ah); +extern int ath5k_hw_get_capability (struct ath5k_hw *ah,enum ath5k_capability_type cap_type,u32 capability,u32 *result);/* Initial register settings functions */ -extern int ath5k_hw_write_initvals (struct ath_hw *hal,u8 mode,bool change_channel); +extern int ath5k_hw_write_initvals (struct ath5k_hw *ah,u8 mode,bool change_channel);/* Initialize RF */ -extern int ath5k_hw_rfregs (struct ath_hw *hal,struct ieee80211_channel *channel,unsigned int mode); -extern int ath5k_hw_rfgain (struct ath_hw *hal,unsigned int freq); -extern enum ath5k_rfgain ath5k_hw_get_rf_gain (struct ath_hw *hal); -extern int ath5k_hw_set_rfgain_opt (struct ath_hw *hal); +extern int ath5k_hw_rfregs (struct ath5k_hw *ah,struct ieee80211_channel *channel,unsigned int mode); +extern int ath5k_hw_rfgain (struct ath5k_hw *ah,unsigned int freq); +extern enum ath5k_rfgain ath5k_hw_get_rf_gain (struct ath5k_hw *ah); +extern int ath5k_hw_set_rfgain_opt (struct ath5k_hw *ah);/* PHY/RF channel functions */ -extern bool ath5k_channel_ok (struct ath_hw *hal,u16 freq,unsigned int flags); -extern int ath5k_hw_channel (struct ath_hw *hal,struct ieee80211_channel *channel); +extern bool ath5k_channel_ok (struct ath5k_hw *ah,u16 freq,unsigned int flags); +extern int ath5k_hw_channel (struct ath5k_hw *ah,struct ieee80211_channel *channel);/* PHY calibration */ -extern int ath5k_hw_phy_calibrate (struct ath_hw *hal,struct ieee80211_channel *channel); -extern int ath5k_hw_phy_disable (struct ath_hw *hal); +extern int ath5k_hw_phy_calibrate (struct ath5k_hw *ah,struct ieee80211_channel *channel); +extern int ath5k_hw_phy_disable (struct ath5k_hw *ah);/* Misc PHY functions */ -extern u16 ath5k_hw_radio_revision (struct ath_hw *hal,unsigned int chan); -extern void ath5k_hw_set_def_antenna (struct ath_hw *hal,unsigned int ant); -extern unsigned int ath5k_hw_get_def_antenna (struct ath_hw *hal); +extern u16 ath5k_hw_radio_revision (struct ath5k_hw *ah,unsigned int chan); +extern void ath5k_hw_set_def_antenna (struct ath5k_hw *ah,unsigned int ant); +extern unsigned int ath5k_hw_get_def_antenna (struct ath5k_hw *ah);/* TX power setup */ -extern int ath5k_hw_txpower (struct ath_hw *hal,struct ieee80211_channel *channel,unsigned int txpower); -extern int ath5k_hw_set_txpower_limit (struct ath_hw *hal,unsigned int power); +extern int ath5k_hw_txpower (struct ath5k_hw *ah,struct ieee80211_channel *channel,unsigned int txpower); +extern int ath5k_hw_set_txpower_limit (struct ath5k_hw *ah,unsigned int power); -static inline u32 ath5k_hw_reg_read (struct ath_hw *hal,u16 reg) +static inline u32 ath5k_hw_reg_read (struct ath5k_hw *ah,u16 reg) { -return ioread32 (hal->ah_sh + reg); +return ioread32 (ah->ah_sh + reg); } -static inline void ath5k_hw_reg_write (struct ath_hw *hal,u32 val,u16 reg) +static inline void ath5k_hw_reg_write (struct ath5k_hw *ah,u32 val,u16 reg) { -iowrite32 (val, hal->ah_sh + reg); +iowrite32 (val, ah->ah_sh + reg); }#endif
drivers/net/wireless/ath5k/base.c +297 -300
1,506 lines not on this page · raw message
drivers/net/wireless/ath5k/base.h +11 -11
@@ -52,10 +52,10 @@#define ATH_TXBUF 200/* number of TX buffers */ #define ATH_BCBUF 1/* number of beacon buffers */ -struct ath_buf { +struct ath5k_buf {struct list_head list;unsigned int flags;/* tx descriptor flags */ -struct ath_desc *desc;/* virtual addr of desc */ +struct ath5k_desc *desc;/* virtual addr of desc */ dma_addr_t daddr;/* physical addr of desc */ struct sk_buff *skb;/* skbuff for buf */ dma_addr_t skbaddr;/* physical addr of skb data */
@@ -71,7 +71,7 @@ struct ath_buf {* priorities to fewer hardware queues (typically all to one * hardware queue). */ -struct ath_txq { +struct ath5k_txq {unsigned int qnum;/* hardware q number */ u32 *link;/* link ptr in last TX desc */ struct list_head q;/* transmit queue */
@@ -87,7 +87,7 @@ struct ath_txq {/* Software Carrier, keeps track of the driver state * associated with an instance of a device */ -struct ath_softc { +struct ath5k_softc {struct pci_dev *pdev;/* for dma mapping */ void __iomem *iobase;/* address of the device */ struct mutex lock;/* dev-level lock */
@@ -98,12 +98,12 @@ struct ath_softc {struct ieee80211_channel channels[ATH_CHAN_MAX ];struct ieee80211_rate rates[AR5K_MAX_RATES *NUM_DRIVER_MODES ];enum ieee80211_if_types opmode; -struct ath_hw *ah;/* Atheros HW */ +struct ath5k_hw *ah;/* Atheros HW */ int debug; -struct ath_buf *bufptr;/* allocated buffer ptr */ -struct ath_desc *desc;/* TX/RX descriptors */ +struct ath5k_buf *bufptr;/* allocated buffer ptr */ +struct ath5k_desc *desc;/* TX/RX descriptors */ dma_addr_t desc_daddr;/* DMA (physical) address */ size_t desc_len;/* size of TX/RX descriptors */ u16 cachelsz;/* cache line size */
@@ -153,13 +153,13 @@ struct ath_softc {struct list_head txbuf;/* transmit buffer */ spinlock_t txbuflock;unsigned int txbuf_len;/* buf count in txbuf list */ -struct ath_txq txqs[2 ];/* beacon and tx */ +struct ath5k_txq txqs[2 ];/* beacon and tx */ -struct ath_txq *txq;/* beacon and tx*/ +struct ath5k_txq *txq;/* beacon and tx*/ struct tasklet_struct txtq;/* tx intr tasklet */ -struct ath_buf *bbuf;/* beacon buffer */ -unsigned int bhalq,/* HAL q for outgoing beacons */ +struct ath5k_buf *bbuf;/* beacon buffer */ +unsigned int bhalq,/* SW q for outgoing beacons */ bmisscount,/* missed beacon transmits */ bintval,/* beacon interval */ bsent;
drivers/net/wireless/ath5k/hw.c +681 -681
1,062 lines not on this page · raw message
drivers/net/wireless/ath5k/hw.h +22 -22
44 lines not on this page · raw message
drivers/net/wireless/ath5k/initvals.c +28 -28
56 lines not on this page · raw message
drivers/net/wireless/ath5k/phy.c +243 -243
486 lines not on this page · raw message
drivers/net/wireless/ath5k/reg.h +35 -35
70 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.