svn commit: r301043 - in head/sys: contrib/dev/ath/ath_hal/ar9300 dev/ath/ath_hal

[Adrian Chadd]

Author: adrian
Date: Tue May 31 16:08:06 2016
New Revision: 301043
URL: https://svnweb.freebsd.org/changeset/base/301043

Log:
  [ath_hal] rename the MCI state info routine.
  
  It's not /really/ "get state".

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

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c	Tue May 31 16:07:15 2016	(r301042)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c	Tue May 31 16:08:06 2016	(r301043)
@@ -303,6 +303,15 @@ ar9300_attach_freebsd_ops(struct ath_hal
 
 	/* 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_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 */

Modified: head/sys/dev/ath/ath_hal/ah.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.h	Tue May 31 16:07:15 2016	(r301042)
+++ head/sys/dev/ath/ath_hal/ah.h	Tue May 31 16:08:06 2016	(r301043)
@@ -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 *);