svn commit: r221666 - head/sys/dev/ath/ath_hal/ar5416

[Adrian Chadd]

Author: adrian
Date: Sun May  8 15:25:22 2011
New Revision: 221666
URL: http://svn.freebsd.org/changeset/base/221666

Log:
  * 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.)

Modified:
  head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h	Sun May  8 14:57:01 2011	(r221665)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h	Sun May  8 15:25:22 2011	(r221666)
@@ -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 */