Thread: [Madwifi-cvs] revision 2682 committed
Status: Beta
Brought to you by:
otaku
From: Matthew W. S. B. <svn...@ma...> - 2007-08-26 23:04:43
|
Project : madwifi Revision : 2682 Author : mentor (Matthew W. S. Bell) Date : 2007-08-27 01:04:40 +0200 (Mon, 27 Aug 2007) Log Message : Move hardware register access to ath5k_hw.h and use new-style io access primitves. Affected Files: * branches/ath5k/ath5k.h updated * branches/ath5k/ath5k_hw.h updated Modified: branches/ath5k/ath5k.h =================================================================== --- branches/ath5k/ath5k.h 2007-08-26 22:50:16 UTC (rev 2681) +++ branches/ath5k/ath5k.h 2007-08-26 23:04:40 UTC (rev 2682) @@ -1449,42 +1449,4 @@ u64 ath5k_get_tsf(struct ieee80211_hw *hw); void ath5k_reset_tsf(struct ieee80211_hw *hw); - -/* - * Read from a device register - */ -static inline u32 ath5k_hw_reg_read(struct ath_hal *hal, u16 reg) -{ - return readl(hal->ah_sh + reg); -} - -/* - * Write to a device register - */ -static inline void ath5k_hw_reg_write(struct ath_hal *hal, u32 val, u16 reg) -{ - writel(val, hal->ah_sh + reg); -} - -static inline __u16 ath5k_hw_unaligned_read_16(__le16 *p) -{ - return le16_to_cpu(get_unaligned(p)); -} - -static inline void ath5k_hw_unaligned_write_16(__u16 v, __le16* p) -{ - put_unaligned(cpu_to_le16(v), p); -} - -static inline __u32 ath5k_hw_unaligned_read_32(__le32 *p) -{ - return le32_to_cpu(get_unaligned(p)); -} - -static inline void ath5k_hw_unaligned_write_32(__u32 v, __le32 *p) -{ - put_unaligned(cpu_to_le32(v), p); -} - - #endif /* _AR5K_H */ Modified: branches/ath5k/ath5k_hw.h =================================================================== --- branches/ath5k/ath5k_hw.h 2007-08-26 22:50:16 UTC (rev 2681) +++ branches/ath5k/ath5k_hw.h 2007-08-26 23:04:40 UTC (rev 2682) @@ -453,6 +453,36 @@ * AR5K REGISTER ACCESS */ +static inline u32 ath5k_hw_reg_read(struct ath_hal *hal, u16 reg) +{ + return ioread32(hal->ah_sh + reg); +} + +static inline void ath5k_hw_reg_write(struct ath_hal *hal, u32 val, u16 reg) +{ + iowrite32(val, hal->ah_sh + reg); +} + +static inline __u16 ath5k_hw_unaligned_read_16(__le16 *p) +{ + return le16_to_cpu(get_unaligned(p)); +} + +static inline void ath5k_hw_unaligned_write_16(__u16 v, __le16* p) +{ + put_unaligned(cpu_to_le16(v), p); +} + +static inline __u32 ath5k_hw_unaligned_read_32(__le32 *p) +{ + return le32_to_cpu(get_unaligned(p)); +} + +static inline void ath5k_hw_unaligned_write_32(__u32 v, __le32 *p) +{ + put_unaligned(cpu_to_le32(v), p); +} + /*Swap RX/TX Descriptor for big endian archs*/ #if defined(__BIG_ENDIAN) #define AR5K_INIT_CFG ( \ |