From 49e1f823b8d60362e9ed8f8a8a3ac0df578bbef4 Mon Sep 17 00:00:00 2001 From: adrian Date: Tue, 31 May 2016 16:08:06 +0000 Subject: [ath_hal] rename the MCI state info routine. It's not /really/ "get state". --- sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c | 11 ++++++++++- sys/dev/ath/ath_hal/ah.h | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'sys') 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 */ diff --git a/sys/dev/ath/ath_hal/ah.h b/sys/dev/ath/ath_hal/ah.h index 2c1fb68..ecf2227 100644 --- a/sys/dev/ath/ath_hal/ah.h +++ b/sys/dev/ath/ath_hal/ah.h @@ -1513,7 +1513,7 @@ struct ath_hal { HAL_BOOL, HAL_BOOL); uint32_t __ahdecl(*ah_btMciGetInterrupt)(struct ath_hal *, uint32_t *, uint32_t *); - uint32_t __ahdecl(*ah_btMciGetState)(struct ath_hal *, + uint32_t __ahdecl(*ah_btMciState)(struct ath_hal *, uint32_t, uint32_t *); void __ahdecl(*ah_btMciDetach)(struct ath_hal *); -- cgit v1.1