summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2016-05-31 16:08:06 +0000
committeradrian <adrian@FreeBSD.org>2016-05-31 16:08:06 +0000
commit49e1f823b8d60362e9ed8f8a8a3ac0df578bbef4 (patch)
tree288badfd22408656408a07ac37f9fb86898d301e /sys/contrib
parent2464a2129217e8c501b929f7c2403a810742b3c7 (diff)
downloadFreeBSD-src-49e1f823b8d60362e9ed8f8a8a3ac0df578bbef4.zip
FreeBSD-src-49e1f823b8d60362e9ed8f8a8a3ac0df578bbef4.tar.gz
[ath_hal] rename the MCI state info routine.
It's not /really/ "get state".
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
index d00f7c8..e914057 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
@@ -303,6 +303,15 @@ ar9300_attach_freebsd_ops(struct ath_hal *ah)
/* MCI bluetooth functions */
if (AR_SREV_JUPITER(ah) || AR_SREV_APHRODITE(ah)) {
+ /*
+ * Note: these are done in attach too for now, because
+ * at this point we haven't yet setup the mac/bb revision
+ * values, so this code is effectively NULL.
+ * However, I'm leaving this here so people digging
+ * into the code (a) see the MCI bits here, and (b)
+ * are now told they should look elsewhere for
+ * these methods.
+ */
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;
@@ -310,7 +319,7 @@ ar9300_attach_freebsd_ops(struct ath_hal *ah)
ah->ah_btMciSetup = ar9300_mci_setup;
ah->ah_btMciSendMessage = ar9300_mci_send_message;
ah->ah_btMciGetInterrupt = ar9300_mci_get_interrupt;
- ah->ah_btMciGetState = ar9300_mci_state;
+ ah->ah_btMciState = ar9300_mci_state;
ah->ah_btMciDetach = ar9300_mci_detach;
/* LNA diversity functions */
OpenPOWER on IntegriCloud