svn commit: r228517 - in head/sys/dev/ath/ath_hal: ar5416 ar9002
Adrian Chadd
adrian at FreeBSD.org
Thu Dec 15 00:59:12 UTC 2011
Author: adrian
Date: Thu Dec 15 00:59:11 2011
New Revision: 228517
URL: http://svn.freebsd.org/changeset/base/228517
Log:
Add the 11n chipset RF frontends to the linker set, even though they're not
attached this way.
The AR5212 based NICs have a variety of RF frontends, so there's a linker set
which the AR5212 attach routine calls. The same framework is used for the
AR5416 and later but as there's a fixed RF frontend for each 11n NIC, it
is just directly attached.
However in the case of compiling a cut down HAL (eg _just_ AR9130 WMAC support),
the linker set ends up being empty and this causes the compile to fail.
So this is just a workaround for that - it means those users who wish an 11n
only HAL can compile the 11n chipsets and RF frontend they need, and just
"ath_ar5212" for the AR5212/AR5416 common code, and it'll just work.
Sponsored by: Hobnob, Inc.
Modified:
head/sys/dev/ath/ath_hal/ar5416/ar2133.c
head/sys/dev/ath/ath_hal/ar9002/ar9280.c
head/sys/dev/ath/ath_hal/ar9002/ar9285.c
head/sys/dev/ath/ath_hal/ar9002/ar9287.c
Modified: head/sys/dev/ath/ath_hal/ar5416/ar2133.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar2133.c Thu Dec 15 00:55:27 2011 (r228516)
+++ head/sys/dev/ath/ath_hal/ar5416/ar2133.c Thu Dec 15 00:59:11 2011 (r228517)
@@ -549,3 +549,11 @@ ar2133RfAttach(struct ath_hal *ah, HAL_S
return AH_TRUE;
}
+
+static HAL_BOOL
+ar2133Probe(struct ath_hal *ah)
+{
+ return (AR_SREV_OWL(ah) || AR_SREV_HOWL(ah) || AR_SREV_SOWL(ah));
+}
+
+AH_RF(RF2133, ar2133Probe, ar2133RfAttach);
Modified: head/sys/dev/ath/ath_hal/ar9002/ar9280.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9280.c Thu Dec 15 00:55:27 2011 (r228516)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9280.c Thu Dec 15 00:59:11 2011 (r228517)
@@ -384,3 +384,11 @@ ar9280RfAttach(struct ath_hal *ah, HAL_S
return AH_TRUE;
}
+
+static HAL_BOOL
+ar9280RfProbe(struct ath_hal *ah)
+{
+ return (AR_SREV_MERLIN(ah));
+}
+
+AH_RF(RF9280, ar9280RfProbe, ar9280RfAttach);
Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285.c Thu Dec 15 00:55:27 2011 (r228516)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285.c Thu Dec 15 00:59:11 2011 (r228517)
@@ -77,3 +77,11 @@ ar9285RfAttach(struct ath_hal *ah, HAL_S
return AH_TRUE;
}
+
+static HAL_BOOL
+ar9285RfProbe(struct ath_hal *ah)
+{
+ return (AR_SREV_KITE(ah));
+}
+
+AH_RF(RF9285, ar9285RfProbe, ar9285RfAttach);
Modified: head/sys/dev/ath/ath_hal/ar9002/ar9287.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9287.c Thu Dec 15 00:55:27 2011 (r228516)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9287.c Thu Dec 15 00:59:11 2011 (r228517)
@@ -390,3 +390,11 @@ ar9287RfAttach(struct ath_hal *ah, HAL_S
return AH_TRUE;
}
+
+static HAL_BOOL
+ar9287RfProbe(struct ath_hal *ah)
+{
+ return (AR_SREV_KIWI(ah));
+}
+
+AH_RF(RF9287, ar9287RfProbe, ar9287RfAttach);
More information about the svn-src-head
mailing list