From owner-svn-src-head@FreeBSD.ORG  Sat Apr 16 13:47:18 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 64600106566C;
	Sat, 16 Apr 2011 13:47:18 +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 1A5F28FC0A;
	Sat, 16 Apr 2011 13:47:18 +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 p3GDlIHB007057;
	Sat, 16 Apr 2011 13:47:18 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3GDlIxh007055;
	Sat, 16 Apr 2011 13:47:18 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201104161347.p3GDlIxh007055@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 16 Apr 2011 13:47:17 +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: r220722 - head/sys/dev/ath/ath_hal/ar9002
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Apr 2011 13:47:19 -0000

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*