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

[Adrian Chadd]

Author: adrian
Date: Sun Jun  5 02:16:16 2016
New Revision: 301420
URL: https://svnweb.freebsd.org/changeset/base/301420

Log:
  [ath_hal] teach the reset path(s) about Jupiter 2.1.
  
  This was just .. not programming in things, and thus large chunks
  of the radio wouldn't work.  Notably, 5GHz didn't work.

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

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c	Sun Jun  5 02:15:29 2016	(r301419)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c	Sun Jun  5 02:16:16 2016	(r301420)
@@ -3000,7 +3000,7 @@ ar9300_process_ini(struct ath_hal *ah, s
         ar9300_prog_ini(ah, &ahp->ah_ini_mac[i], modes_index);
         ar9300_prog_ini(ah, &ahp->ah_ini_bb[i], modes_index);
         ar9300_prog_ini(ah, &ahp->ah_ini_radio[i], modes_index);
-        if ((i == ATH_INI_POST) && (AR_SREV_JUPITER_20(ah) || AR_SREV_APHRODITE(ah))) {
+        if ((i == ATH_INI_POST) && (AR_SREV_JUPITER_20_OR_LATER(ah) || AR_SREV_APHRODITE(ah))) {
             ar9300_prog_ini(ah, &ahp->ah_ini_radio_post_sys2ant, modes_index);
         }
 
@@ -3118,7 +3118,8 @@ ar9300_process_ini(struct ath_hal *ah, s
     }
 
 #if 0
-    if (AR_SREV_JUPITER_20(ah) || AR_SREV_APHRODITE(ah)) {
+    /* XXX TODO! */
+    if (AR_SREV_JUPITER_20_OR_LATER(ah) || AR_SREV_APHRODITE(ah)) {
         ar9300_prog_ini(ah, &ahp->ah_ini_BTCOEX_MAX_TXPWR, 1);
     }
 #endif
@@ -4497,7 +4498,7 @@ ar9300_reset(struct ath_hal *ah, HAL_OPM
 
 #if ATH_SUPPORT_MCI
     if (AH_PRIVATE(ah)->ah_caps.halMciSupport &&
-        (AR_SREV_JUPITER_20(ah) || AR_SREV_APHRODITE(ah)))
+        (AR_SREV_JUPITER_20_OR_LATER(ah) || AR_SREV_APHRODITE(ah)))
     {
         ar9300_mci_2g5g_changed(ah, IEEE80211_IS_CHAN_2GHZ(chan));
     }