From owner-svn-src-all@FreeBSD.ORG Thu Dec 15 00:59:12 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B869106568A; Thu, 15 Dec 2011 00:59:12 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0A69C8FC0A; Thu, 15 Dec 2011 00:59:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBF0xBSU022371; Thu, 15 Dec 2011 00:59:11 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBF0xBCE022366; Thu, 15 Dec 2011 00:59:11 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201112150059.pBF0xBCE022366@svn.freebsd.org> From: Adrian Chadd Date: Thu, 15 Dec 2011 00:59:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228517 - in head/sys/dev/ath/ath_hal: ar5416 ar9002 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Dec 2011 00:59:12 -0000 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);