Module Name: src
Committed By: jmcneill
Date: Mon Aug 1 10:21:32 UTC 2011
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5416: ar5416reg.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h
diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h:1.4 src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h:1.5
--- src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h:1.4 Mon Mar 7 11:25:44 2011
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h Mon Aug 1 10:21:32 2011
@@ -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)
