diff options
| author | adrian <adrian@FreeBSD.org> | 2011-05-08 15:25:22 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2011-05-08 15:25:22 +0000 |
| commit | e8652e874eae796fc0c177d880aabe12906e6e24 (patch) | |
| tree | f7d8cf628a7663321e31afc689d48527a7efd1fd | |
| parent | 4ef09d2b795b86a23ac3ddbe59a818fc3bb925d2 (diff) | |
| download | FreeBSD-src-e8652e874eae796fc0c177d880aabe12906e6e24.zip FreeBSD-src-e8652e874eae796fc0c177d880aabe12906e6e24.tar.gz | |
* Add AR_SREV_KITE macro for later use
* Modify AR_SREV_MERLIN_20() to match the Atheros/Linux ath9k behaviour -
its supposed to match Merlin 2.0 and later Merlin chips.
AR_SREV_MERLIN_20_OR_LATER() matches AR9280 2.0 and later chips
(AR9285, AR9287, etc.)
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5416/ar5416reg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416reg.h b/sys/dev/ath/ath_hal/ar5416/ar5416reg.h index 65a0a63..88d7e02 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416reg.h +++ b/sys/dev/ath/ath_hal/ar5416/ar5416reg.h @@ -701,7 +701,7 @@ #define AR_SREV_MERLIN_20(_ah) \ (AR_SREV_MERLIN(_ah) && \ - AH_PRIVATE((_ah))->ah_macRev == AR_XSREV_REVISION_MERLIN_20) + AH_PRIVATE((_ah))->ah_macRev >= AR_XSREV_REVISION_MERLIN_20) #define AR_SREV_MERLIN_20_OR_LATER(_ah) \ ((AH_PRIVATE((_ah))->ah_macVersion > AR_XSREV_VERSION_MERLIN) || \ @@ -741,5 +741,6 @@ /* Not yet implemented chips */ #define AR_SREV_9271(_ah) 0 #define AR_SREV_9287_11_OR_LATER(_ah) 0 +#define AR_SREV_KIWI_10_OR_LATER(_ah) 0 #endif /* _DEV_ATH_AR5416REG_H */ |
