From owner-svn-src-head@FreeBSD.ORG  Tue Dec  4 00:01:42 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 99BBDC45;
 Tue,  4 Dec 2012 00:01:42 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 807ED8FC15;
 Tue,  4 Dec 2012 00:01:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB401gVR090606;
 Tue, 4 Dec 2012 00:01:42 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB401gor090605;
 Tue, 4 Dec 2012 00:01:42 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201212040001.qB401gor090605@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 4 Dec 2012 00:01:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243842 - head/sys/dev/ath/ath_hal/ar9002
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Tue, 04 Dec 2012 00:01:42 -0000

Author: adrian
Date: Tue Dec  4 00:01:42 2012
New Revision: 243842
URL: http://svnweb.freebsd.org/changeset/base/243842

Log:
  Override the BT coex parameter function for the AR9285.

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	Tue Dec  4 00:01:24 2012	(r243841)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c	Tue Dec  4 00:01:42 2012	(r243842)
@@ -148,15 +148,16 @@ ar9285Attach(uint16_t devid, HAL_SOFTC s
 		ah->ah_eepromdata = eepromdata;
 	}
 
-	/* XXX override with 9285 specific state */
-	/* override 5416 methods for our needs */
+	/* override with 9285 specific state */
 	AH5416(ah)->ah_initPLL = ar9280InitPLL;
+	AH5416(ah)->ah_btCoexSetDiversity = ar5416BTCoexAntennaDiversity;
 
 	ah->ah_setAntennaSwitch		= ar9285SetAntennaSwitch;
 	ah->ah_configPCIE		= ar9285ConfigPCIE;
 	ah->ah_disablePCIE		= ar9285DisablePCIE;
 	ah->ah_setTxPower		= ar9285SetTransmitPower;
 	ah->ah_setBoardValues		= ar9285SetBoardValues;
+	ah->ah_btcoexSetParameter	= ar9285BTCoexSetParameter;
 
 	AH5416(ah)->ah_cal.iqCalData.calData = &ar9280_iq_cal;
 	AH5416(ah)->ah_cal.adcGainCalData.calData = &ar9280_adc_gain_cal;