From owner-svn-src-head@FreeBSD.ORG  Sat Jan 17 06:43:31 2015
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:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D32474A2;
 Sat, 17 Jan 2015 06:43:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BEAFFEAF;
 Sat, 17 Jan 2015 06:43:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0H6hV52062863;
 Sat, 17 Jan 2015 06:43:31 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0H6hVLm062862;
 Sat, 17 Jan 2015 06:43:31 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201501170643.t0H6hVLm062862@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 17 Jan 2015 06:43:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277288 - head/sys/contrib/dev/ath/ath_hal/ar9300
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.18-1
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: Sat, 17 Jan 2015 06:43:31 -0000

Author: adrian
Date: Sat Jan 17 06:43:30 2015
New Revision: 277288
URL: https://svnweb.freebsd.org/changeset/base/277288

Log:
  Override the bt enable/disable methods for AR9462 (jupiter) and
  AR9565 (Aphrodite.)  These need to use the MCI routines, not
  the legacy 2-wire / 3-wire bluetooth coexistence methods.
  
  Tested:
  
  * AR9462 (WB222); STA mode

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c	Sat Jan 17 06:18:45 2015	(r277287)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c	Sat Jan 17 06:43:30 2015	(r277288)
@@ -250,6 +250,11 @@ ar9300_attach_freebsd_ops(struct ath_hal
 	ah->ah_btCoexEnable		= ar9300_bt_coex_enable;
 
 	/* MCI bluetooth functions */
+	if (AR_SREV_JUPITER(ah) || AR_SREV_APHRODITE(ah)) {
+		ah->ah_btCoexSetWeights = ar9300_mci_bt_coex_set_weights;
+		ah->ah_btCoexDisable = ar9300_mci_bt_coex_disable;
+		ah->ah_btCoexEnable = ar9300_mci_bt_coex_enable;
+	}
 	ah->ah_btMciSetup		= ar9300_mci_setup;
 	ah->ah_btMciSendMessage		= ar9300_mci_send_message;
 	ah->ah_btMciGetInterrupt	= ar9300_mci_get_interrupt;