diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2009-02-09 02:57:12 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-13 13:45:05 -0500 |
commit | cbe61d8a41210600bc76b212edcd4dc0f55c014f (patch) | |
tree | d8bd8e43d3556c58d410f1bef0d2ca3bf7d75c92 /drivers/net/wireless/ath9k/mac.h | |
parent | ba52da58be0acf3b7775972b2b5234ce64388c79 (diff) |
ath9k: Merge ath_hal and ath_hal_5416 structures
Finally, merge these structures and have a single
HW specific data structure.
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/mac.h')
-rw-r--r-- | drivers/net/wireless/ath9k/mac.h | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/drivers/net/wireless/ath9k/mac.h b/drivers/net/wireless/ath9k/mac.h index 9012af247797..74b660ae8add 100644 --- a/drivers/net/wireless/ath9k/mac.h +++ b/drivers/net/wireless/ath9k/mac.h | |||
@@ -619,58 +619,58 @@ enum ath9k_ht_extprotspacing { | |||
619 | ATH9K_HT_EXTPROTSPACING_25 = 1, | 619 | ATH9K_HT_EXTPROTSPACING_25 = 1, |
620 | }; | 620 | }; |
621 | 621 | ||
622 | struct ath_hal; | 622 | struct ath_hw; |
623 | struct ath9k_channel; | 623 | struct ath9k_channel; |
624 | struct ath_rate_table; | 624 | struct ath_rate_table; |
625 | 625 | ||
626 | u32 ath9k_hw_gettxbuf(struct ath_hal *ah, u32 q); | 626 | u32 ath9k_hw_gettxbuf(struct ath_hw *ah, u32 q); |
627 | bool ath9k_hw_puttxbuf(struct ath_hal *ah, u32 q, u32 txdp); | 627 | bool ath9k_hw_puttxbuf(struct ath_hw *ah, u32 q, u32 txdp); |
628 | bool ath9k_hw_txstart(struct ath_hal *ah, u32 q); | 628 | bool ath9k_hw_txstart(struct ath_hw *ah, u32 q); |
629 | u32 ath9k_hw_numtxpending(struct ath_hal *ah, u32 q); | 629 | u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q); |
630 | bool ath9k_hw_updatetxtriglevel(struct ath_hal *ah, bool bIncTrigLevel); | 630 | bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel); |
631 | bool ath9k_hw_stoptxdma(struct ath_hal *ah, u32 q); | 631 | bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q); |
632 | bool ath9k_hw_filltxdesc(struct ath_hal *ah, struct ath_desc *ds, | 632 | bool ath9k_hw_filltxdesc(struct ath_hw *ah, struct ath_desc *ds, |
633 | u32 segLen, bool firstSeg, | 633 | u32 segLen, bool firstSeg, |
634 | bool lastSeg, const struct ath_desc *ds0); | 634 | bool lastSeg, const struct ath_desc *ds0); |
635 | void ath9k_hw_cleartxdesc(struct ath_hal *ah, struct ath_desc *ds); | 635 | void ath9k_hw_cleartxdesc(struct ath_hw *ah, struct ath_desc *ds); |
636 | int ath9k_hw_txprocdesc(struct ath_hal *ah, struct ath_desc *ds); | 636 | int ath9k_hw_txprocdesc(struct ath_hw *ah, struct ath_desc *ds); |
637 | void ath9k_hw_set11n_txdesc(struct ath_hal *ah, struct ath_desc *ds, | 637 | void ath9k_hw_set11n_txdesc(struct ath_hw *ah, struct ath_desc *ds, |
638 | u32 pktLen, enum ath9k_pkt_type type, u32 txPower, | 638 | u32 pktLen, enum ath9k_pkt_type type, u32 txPower, |
639 | u32 keyIx, enum ath9k_key_type keyType, u32 flags); | 639 | u32 keyIx, enum ath9k_key_type keyType, u32 flags); |
640 | void ath9k_hw_set11n_ratescenario(struct ath_hal *ah, struct ath_desc *ds, | 640 | void ath9k_hw_set11n_ratescenario(struct ath_hw *ah, struct ath_desc *ds, |
641 | struct ath_desc *lastds, | 641 | struct ath_desc *lastds, |
642 | u32 durUpdateEn, u32 rtsctsRate, | 642 | u32 durUpdateEn, u32 rtsctsRate, |
643 | u32 rtsctsDuration, | 643 | u32 rtsctsDuration, |
644 | struct ath9k_11n_rate_series series[], | 644 | struct ath9k_11n_rate_series series[], |
645 | u32 nseries, u32 flags); | 645 | u32 nseries, u32 flags); |
646 | void ath9k_hw_set11n_aggr_first(struct ath_hal *ah, struct ath_desc *ds, | 646 | void ath9k_hw_set11n_aggr_first(struct ath_hw *ah, struct ath_desc *ds, |
647 | u32 aggrLen); | 647 | u32 aggrLen); |
648 | void ath9k_hw_set11n_aggr_middle(struct ath_hal *ah, struct ath_desc *ds, | 648 | void ath9k_hw_set11n_aggr_middle(struct ath_hw *ah, struct ath_desc *ds, |
649 | u32 numDelims); | 649 | u32 numDelims); |
650 | void ath9k_hw_set11n_aggr_last(struct ath_hal *ah, struct ath_desc *ds); | 650 | void ath9k_hw_set11n_aggr_last(struct ath_hw *ah, struct ath_desc *ds); |
651 | void ath9k_hw_clr11n_aggr(struct ath_hal *ah, struct ath_desc *ds); | 651 | void ath9k_hw_clr11n_aggr(struct ath_hw *ah, struct ath_desc *ds); |
652 | void ath9k_hw_set11n_burstduration(struct ath_hal *ah, struct ath_desc *ds, | 652 | void ath9k_hw_set11n_burstduration(struct ath_hw *ah, struct ath_desc *ds, |
653 | u32 burstDuration); | 653 | u32 burstDuration); |
654 | void ath9k_hw_set11n_virtualmorefrag(struct ath_hal *ah, struct ath_desc *ds, | 654 | void ath9k_hw_set11n_virtualmorefrag(struct ath_hw *ah, struct ath_desc *ds, |
655 | u32 vmf); | 655 | u32 vmf); |
656 | void ath9k_hw_gettxintrtxqs(struct ath_hal *ah, u32 *txqs); | 656 | void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs); |
657 | bool ath9k_hw_set_txq_props(struct ath_hal *ah, int q, | 657 | bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q, |
658 | const struct ath9k_tx_queue_info *qinfo); | 658 | const struct ath9k_tx_queue_info *qinfo); |
659 | bool ath9k_hw_get_txq_props(struct ath_hal *ah, int q, | 659 | bool ath9k_hw_get_txq_props(struct ath_hw *ah, int q, |
660 | struct ath9k_tx_queue_info *qinfo); | 660 | struct ath9k_tx_queue_info *qinfo); |
661 | int ath9k_hw_setuptxqueue(struct ath_hal *ah, enum ath9k_tx_queue type, | 661 | int ath9k_hw_setuptxqueue(struct ath_hw *ah, enum ath9k_tx_queue type, |
662 | const struct ath9k_tx_queue_info *qinfo); | 662 | const struct ath9k_tx_queue_info *qinfo); |
663 | bool ath9k_hw_releasetxqueue(struct ath_hal *ah, u32 q); | 663 | bool ath9k_hw_releasetxqueue(struct ath_hw *ah, u32 q); |
664 | bool ath9k_hw_resettxqueue(struct ath_hal *ah, u32 q); | 664 | bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q); |
665 | int ath9k_hw_rxprocdesc(struct ath_hal *ah, struct ath_desc *ds, | 665 | int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds, |
666 | u32 pa, struct ath_desc *nds, u64 tsf); | 666 | u32 pa, struct ath_desc *nds, u64 tsf); |
667 | bool ath9k_hw_setuprxdesc(struct ath_hal *ah, struct ath_desc *ds, | 667 | bool ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds, |
668 | u32 size, u32 flags); | 668 | u32 size, u32 flags); |
669 | bool ath9k_hw_setrxabort(struct ath_hal *ah, bool set); | 669 | bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set); |
670 | void ath9k_hw_putrxbuf(struct ath_hal *ah, u32 rxdp); | 670 | void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp); |
671 | void ath9k_hw_rxena(struct ath_hal *ah); | 671 | void ath9k_hw_rxena(struct ath_hw *ah); |
672 | void ath9k_hw_startpcureceive(struct ath_hal *ah); | 672 | void ath9k_hw_startpcureceive(struct ath_hw *ah); |
673 | void ath9k_hw_stoppcurecv(struct ath_hal *ah); | 673 | void ath9k_hw_stoppcurecv(struct ath_hw *ah); |
674 | bool ath9k_hw_stopdmarecv(struct ath_hal *ah); | 674 | bool ath9k_hw_stopdmarecv(struct ath_hw *ah); |
675 | 675 | ||
676 | #endif /* MAC_H */ | 676 | #endif /* MAC_H */ |