Date: Sat, 16 Apr 2011 13:47:17 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r220722 - head/sys/dev/ath/ath_hal/ar9002 Message-ID: <201104161347.p3GDlIxh007055@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Sat Apr 16 13:47:17 2011 New Revision: 220722 URL: http://svn.freebsd.org/changeset/base/220722 Log: Don't do Kite antenna switch selection this way (for now); antenna diversity is done elsewhere now. Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c Sat Apr 16 13:40:32 2011 (r220721) +++ head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c Sat Apr 16 13:47:17 2011 (r220722) @@ -399,36 +399,13 @@ ar9285FillCapabilityInfo(struct ath_hal return AH_TRUE; } +/* + * Antenna selection is not (currently) done this way. + */ HAL_BOOL ar9285SetAntennaSwitch(struct ath_hal *ah, HAL_ANT_SETTING settings) { -#define ANTENNA0_CHAINMASK 0x1 -#define ANTENNA1_CHAINMASK 0x2 - struct ath_hal_5416 *ahp = AH5416(ah); - - /* Antenna selection is done by setting the tx/rx chainmasks approp. */ - switch (settings) { - case HAL_ANT_FIXED_A: - /* Enable first antenna only */ - ahp->ah_tx_chainmask = ANTENNA0_CHAINMASK; - ahp->ah_rx_chainmask = ANTENNA0_CHAINMASK; - break; - case HAL_ANT_FIXED_B: - /* Enable second antenna only, after checking capability */ - if (AH_PRIVATE(ah)->ah_caps.halTxChainMask > ANTENNA1_CHAINMASK) - ahp->ah_tx_chainmask = ANTENNA1_CHAINMASK; - ahp->ah_rx_chainmask = ANTENNA1_CHAINMASK; - break; - case HAL_ANT_VARIABLE: - /* Restore original chainmask settings */ - /* XXX */ - ahp->ah_tx_chainmask = AR9285_DEFAULT_TXCHAINMASK; - ahp->ah_rx_chainmask = AR9285_DEFAULT_RXCHAINMASK; - break; - } return AH_TRUE; -#undef ANTENNA0_CHAINMASK -#undef ANTENNA1_CHAINMASK } static const char*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104161347.p3GDlIxh007055>