Commit d4376ebe authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

ath9k: move ar9100 version checking macros into a more appropriate place 



All other version checking macros are in a common location within the
reg.h file. The AR_SREV_9100_OR_LATER macro is wrong currently, but will
be fixed with the next patch.

Changes-licensed-under: ISC

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarImre Kaloz <kaloz@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a8c96d3b

drivers/net/wireless/ath9k/reg.h

+6 −7
Original line number Diff line number Diff line
@@ -158,10 +158,6 @@ 
#define AR_CST_TIMEOUT_LIMIT      0xFFFF0000

#define AR_CST_TIMEOUT_LIMIT_S    16



#define AR_SREV_VERSION_9100                  0x014



#define AR_SREV_9100(ah) ((ah->hw_version.macVersion) == AR_SREV_VERSION_9100)



#define AR_ISR               0x0080

#define AR_ISR_RXOK          0x00000001

#define AR_ISR_RXDESC        0x00000002
@@ -730,6 +726,7 @@ 
#define AR_SREV_REVISION_5416_10               0

#define AR_SREV_REVISION_5416_20               1

#define AR_SREV_REVISION_5416_22               2

#define AR_SREV_VERSION_9100                  0x14

#define AR_SREV_VERSION_9160        	      0x40

#define AR_SREV_REVISION_9160_10    	      0

#define AR_SREV_REVISION_9160_11    	      1
@@ -742,9 +739,6 @@ 
#define AR_SREV_REVISION_9285_11              1

#define AR_SREV_REVISION_9285_12              2



#define AR_SREV_9100_OR_LATER(_ah) \

	(((_ah)->hw_version.macVersion >= AR_SREV_VERSION_5416_PCIE))



#define AR_SREV_5416(_ah) \

	(((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCI) || \

	 ((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCIE))
@@ -757,6 +751,11 @@ 
	 ((_ah)->hw_version.macRev >= AR_SREV_REVISION_5416_22)) || \

	 ((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9100))



#define AR_SREV_9100(ah) \

	((ah->hw_version.macVersion) == AR_SREV_VERSION_9100)

#define AR_SREV_9100_OR_LATER(_ah) \

	(((_ah)->hw_version.macVersion >= AR_SREV_VERSION_5416_PCIE))



#define AR_SREV_9160(_ah) \

	(((_ah)->hw_version.macVersion == AR_SREV_VERSION_9160))

#define AR_SREV_9160_10_OR_LATER(_ah) \

CRA Git | Maintained and supported by SUSTech CRA and CCSE