[src/trunk]: src/sys/external/isc/atheros_hal/dist/ar5416 Fix AR_SREV_MERLIN_...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/98b8275c21a7
branches:  trunk
changeset: 767839:98b8275c21a7
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Aug 01 10:21:32 2011 +0000

description:
Fix AR_SREV_MERLIN_20 and AR_SREV_MERLIN_20_OR_LATER macros to match
rev 2.1 as well as 2.0, from FreeBSD. Fixes 5GHz mode on my 9280.

diffstat:

 sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r cfa56fd3af71 -r 98b8275c21a7 sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h
--- a/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h      Mon Aug 01 10:18:23 2011 +0000
+++ b/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h      Mon Aug 01 10:21:32 2011 +0000
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: ar5416reg.h,v 1.4 2011/03/07 11:25:44 cegger Exp $
+ * $Id: ar5416reg.h,v 1.5 2011/08/01 10:21:32 jmcneill Exp $
  */
 #ifndef _DEV_ATH_AR5416REG_H
 #define        _DEV_ATH_AR5416REG_H
@@ -609,10 +609,11 @@
        (AH_PRIVATE((_ah))->ah_macVersion >= AR_XSREV_VERSION_MERLIN)
 #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) \
-       (AR_SREV_MERLIN_20(_ah) || \
-        AH_PRIVATE((_ah))->ah_macVersion >= AR_XSREV_VERSION_MERLIN)
+       ((AH_PRIVATE((_ah))->ah_macVersion > AR_XSREV_VERSION_MERLIN) || \
+        (AR_SREV_MERLIN((_ah)) && \
+        AH_PRIVATE((_ah))->ah_macRev >= AR_XSREV_REVISION_MERLIN_20))
 
 #define        AR_SREV_KITE(_ah) \
        (AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_KITE)