mirror of https://github.com/hak5/openwrt.git
61 lines
2.2 KiB
Diff
61 lines
2.2 KiB
Diff
From 895dd2cb9def6733323719312ead20155b43b8e5 Mon Sep 17 00:00:00 2001
|
|
From: Gabor Juhos <juhosg@openwrt.org>
|
|
Date: Thu, 5 Mar 2009 09:56:14 +0100
|
|
Subject: [PATCH v2 2/3] 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: Gabor Juhos <juhosg@openwrt.org>
|
|
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|
---
|
|
drivers/net/wireless/ath9k/reg.h | 13 ++++++-------
|
|
1 files changed, 6 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath9k/reg.h
|
|
+++ b/drivers/net/wireless/ath9k/reg.h
|
|
@@ -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) \
|