From owner-svn-src-all@FreeBSD.ORG Sun Apr 3 20:15:42 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 56C6C106566C; Sun, 3 Apr 2011 20:15:42 +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 472AD8FC16; Sun, 3 Apr 2011 20:15:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p33KFgSg054467; Sun, 3 Apr 2011 20:15:42 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p33KFg9r054464; Sun, 3 Apr 2011 20:15:42 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201104032015.p33KFg9r054464@svn.freebsd.org> From: Adrian Chadd Date: Sun, 3 Apr 2011 20:15:42 +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: r220302 - in head/sys/dev/ath/ath_hal: . ar5416 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: Sun, 03 Apr 2011 20:15:42 -0000 Author: adrian Date: Sun Apr 3 20:15:41 2011 New Revision: 220302 URL: http://svn.freebsd.org/changeset/base/220302 Log: I missed committing this last time - it's needed for the 5ghz fast clock calculation. Modified: head/sys/dev/ath/ath_hal/ah_internal.h head/sys/dev/ath/ath_hal/ar5416/ar5416.h Modified: head/sys/dev/ath/ath_hal/ah_internal.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_internal.h Sun Apr 3 20:03:45 2011 (r220301) +++ head/sys/dev/ath/ath_hal/ah_internal.h Sun Apr 3 20:15:41 2011 (r220302) @@ -796,4 +796,10 @@ extern HAL_BOOL ath_ee_FillVpdTable(uint extern int16_t ath_ee_interpolate(uint16_t target, uint16_t srcLeft, uint16_t srcRight, int16_t targetLeft, int16_t targetRight); +/* Whether 5ghz fast clock is needed for Merlin and later */ +#define IS_5GHZ_FAST_CLOCK_EN(_ah, _c) \ + (IEEE80211_IS_CHAN_5GHZ(_c) && \ + ath_hal_eepromGetFlag(ah, AR_EEP_FSTCLK_5G)) + + #endif /* _ATH_AH_INTERAL_H_ */ Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416.h ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416.h Sun Apr 3 20:03:45 2011 (r220301) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416.h Sun Apr 3 20:15:41 2011 (r220302) @@ -133,10 +133,6 @@ extern void ar5416Detach(struct ath_hal extern void ar5416AttachPCIE(struct ath_hal *ah); extern HAL_BOOL ar5416FillCapabilityInfo(struct ath_hal *ah); -#define IS_5GHZ_FAST_CLOCK_EN(_ah, _c) \ - (IEEE80211_IS_CHAN_5GHZ(_c) && \ - ath_hal_eepromGetFlag(ah, AR_EEP_FSTCLK_5G)) - extern void ar5416AniAttach(struct ath_hal *, const struct ar5212AniParams *, const struct ar5212AniParams *, HAL_BOOL ena); extern void ar5416AniDetach(struct ath_hal *);