Deleted Added
full compact
ar5416reg.h (226759) ar5416reg.h (227408)
1/*
2 * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
3 * Copyright (c) 2002-2008 Atheros Communications, Inc.
4 *
5 * Permission to use, copy, modify, and/or distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 *
1/*
2 * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
3 * Copyright (c) 2002-2008 Atheros Communications, Inc.
4 *
5 * Permission to use, copy, modify, and/or distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 *
17 * $FreeBSD: head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h 226759 2011-10-25 23:09:07Z adrian $
17 * $FreeBSD: head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h 227408 2011-11-09 21:41:18Z adrian $
18 */
19#ifndef _DEV_ATH_AR5416REG_H
20#define _DEV_ATH_AR5416REG_H
21
22#include <dev/ath/ath_hal/ar5212/ar5212reg.h>
23
24/*
25 * Register added starting with the AR5416

--- 581 unchanged lines hidden (view full) ---

607#define AR_XSREV_REVISION_MERLIN_10 0 /* Merlin 1.0 */
608#define AR_XSREV_REVISION_MERLIN_20 1 /* Merlin 2.0 */
609#define AR_XSREV_REVISION_MERLIN_21 2 /* Merlin 2.1 */
610#define AR_XSREV_VERSION_KITE 0xC0 /* Kite Version */
611#define AR_XSREV_REVISION_KITE_10 0 /* Kite 1.0 */
612#define AR_XSREV_REVISION_KITE_11 1 /* Kite 1.1 */
613#define AR_XSREV_REVISION_KITE_12 2 /* Kite 1.2 */
614#define AR_XSREV_VERSION_KIWI 0x180 /* Kiwi (AR9287) */
18 */
19#ifndef _DEV_ATH_AR5416REG_H
20#define _DEV_ATH_AR5416REG_H
21
22#include <dev/ath/ath_hal/ar5212/ar5212reg.h>
23
24/*
25 * Register added starting with the AR5416

--- 581 unchanged lines hidden (view full) ---

607#define AR_XSREV_REVISION_MERLIN_10 0 /* Merlin 1.0 */
608#define AR_XSREV_REVISION_MERLIN_20 1 /* Merlin 2.0 */
609#define AR_XSREV_REVISION_MERLIN_21 2 /* Merlin 2.1 */
610#define AR_XSREV_VERSION_KITE 0xC0 /* Kite Version */
611#define AR_XSREV_REVISION_KITE_10 0 /* Kite 1.0 */
612#define AR_XSREV_REVISION_KITE_11 1 /* Kite 1.1 */
613#define AR_XSREV_REVISION_KITE_12 2 /* Kite 1.2 */
614#define AR_XSREV_VERSION_KIWI 0x180 /* Kiwi (AR9287) */
615#define AR_XSREV_REVISION_KIWI_10 0
616#define AR_XSREV_REVISION_KIWI_11 1
617#define AR_XSREV_REVISION_KIWI_12 2
618#define AR_XSREV_REVISION_KIWI_13 3
615#define AR_XSREV_REVISION_KIWI_10 0 /* Kiwi 1.0 */
616#define AR_XSREV_REVISION_KIWI_11 1 /* Kiwi 1.1 */
617#define AR_XSREV_REVISION_KIWI_12 2 /* Kiwi 1.2 */
618#define AR_XSREV_REVISION_KIWI_13 3 /* Kiwi 1.3 */
619
620/* Owl (AR5416) */
621#define AR_SREV_OWL(_ah) \
622 ((AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_OWL_PCI) || \
623 (AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_OWL_PCIE))
624
625#define AR_SREV_OWL_20_OR_LATER(_ah) \
626 ((AR_SREV_OWL(_ah) && \

--- 69 unchanged lines hidden (view full) ---

696
697#define AR_SREV_9285E_20(_ah) \
698 (AR_SREV_KITE_12_OR_LATER(_ah) && \
699 ((OS_REG_READ(_ah, AR_AN_SYNTH9) & 0x7) == 0x1))
700
701#define AR_SREV_KIWI(_ah) \
702 (AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_KIWI)
703
619
620/* Owl (AR5416) */
621#define AR_SREV_OWL(_ah) \
622 ((AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_OWL_PCI) || \
623 (AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_OWL_PCIE))
624
625#define AR_SREV_OWL_20_OR_LATER(_ah) \
626 ((AR_SREV_OWL(_ah) && \

--- 69 unchanged lines hidden (view full) ---

696
697#define AR_SREV_9285E_20(_ah) \
698 (AR_SREV_KITE_12_OR_LATER(_ah) && \
699 ((OS_REG_READ(_ah, AR_AN_SYNTH9) & 0x7) == 0x1))
700
701#define AR_SREV_KIWI(_ah) \
702 (AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_KIWI)
703
704#define AR_SREV_KIWI_10_OR_LATER(_ah) \
705 (AH_PRIVATE((_ah))->ah_macVersion >= AR_XSREV_VERSION_KIWI)
706
707/* XXX TODO: make these handle macVersion > Kiwi */
704#define AR_SREV_KIWI_11_OR_LATER(_ah) \
705 (AR_SREV_KIWI(_ah) && \
706 AH_PRIVATE((_ah))->ah_macRev >= AR_XSREV_REVISION_KIWI_11)
707
708#define AR_SREV_KIWI_11(_ah) \
709 (AR_SREV_KIWI(_ah) && \
710 AH_PRIVATE((_ah))->ah_macRev == AR_XSREV_REVISION_KIWI_11)
711

--- 17 unchanged lines hidden ---
708#define AR_SREV_KIWI_11_OR_LATER(_ah) \
709 (AR_SREV_KIWI(_ah) && \
710 AH_PRIVATE((_ah))->ah_macRev >= AR_XSREV_REVISION_KIWI_11)
711
712#define AR_SREV_KIWI_11(_ah) \
713 (AR_SREV_KIWI(_ah) && \
714 AH_PRIVATE((_ah))->ah_macRev == AR_XSREV_REVISION_KIWI_11)
715

--- 17 unchanged lines hidden ---