Changeset 3639

Timestamp:

05/17/08 06:41:01 (3 months ago)

Author:

mentor

Message:

Interference mitigation control code changes:

• More pedanting of comments
  
• Update sysctl to return early if no change is made and OPNOTSUPP if !sc_hasintmit
  
• Tidy call to set HAL int. mit. status. Remove chatty printf as it is known that this does not work.
  
• Preprocessor out HAL call as the int. mit. status is unconditionally set manually.
  
• Misc. churn.
  

Files:

• madwifi/trunk/ath/if_ath.c (modified) (8 diffs)

madwifi/trunk/ath/if_ath.c

@@ -617 +617 @@
-         * problems for OFDM. */
-        sc->sc_hasintmit = ath_hal_hasintmit(ah);
-
-
-
-
-
-
-
-
+
+
+
+
+
-        }
-        else {
-(sc->sc_useintmit = intmit)
+sc->sc_useintmit
-                IPRINTF(sc, "Interference mitigation is supported.  Currently %s.\n",
-                        (sc->sc_useintmit ? "enabled" : "disabled"));
@@ -1603 +1600 @@
-}
-
-NTMIT
+nt. mit.
- * and actually in 0.9.30.13 HAL it really can't even be disabled because
- * it will start adjusting registers even when we turn off the capability
@@ -1609 +1606 @@
- *
- * NB: This helper function basically clobbers all the related registers
-INTMIT
+int. mit.
- * work around the bug preventing it from being disabled. */
-static inline void ath_override_intmit_if_disabled(struct ath_softc *sc) {
-mit registers if we turned off intmit!
+. mit. registers if they were turned off.
-        if (sc->sc_hasintmit && !sc->sc_useintmit)
-                ath_hal_restore_default_intmit(sc->sc_ah);
-remove later
+ remove later.
-        if (!sc->sc_useintmit) {
-                ath_hal_verify_default_intmit(sc->sc_ah);
-INTMIT
-!
+int. mit.
+.
-                if (!ath_radar_is_dfs_required(sc, &sc->sc_curchan)) {
- 
+
-                                ath_hal_getrxfilter(sc->sc_ah) & 
-           
+
-                }
-        }
-        else {
-rx filter cause ANI needs 
+RX filter because ANI needs
-                 * them. */
-                ath_hal_setrxfilter(sc->sc_ah, 
@@ -1691 +1688 @@
-        }
-
-        if (sc->sc_hasintmit) {
-                u_int32_t intmit_on = 0;
-                ath_hal_getintmit(sc->sc_ah, &intmit_on);
-                if (intmit_on != sc->sc_useintmit) {
-                        WPRINTF(sc, "Int. Mit. HAL capability out of sync.  Got %d!\n", intmit);
-                        ath_hal_setintmit(sc->sc_ah, (sc->sc_hasintmit && sc->sc_useintmit));
-                }
-        }
-#ifdef ATH_CAP_TPC
-        if (sc->sc_hastpc && (hal_tpc != ath_hal_gettpc(sc->sc_ah))) {
@@ -1705 +1694 @@
-        }
-#endif
-
+
+
+
+
-        ath_override_intmit_if_disabled(sc);
-        if (sc->sc_softled)
-                ath_hal_gpioCfgOutput(sc->sc_ah, sc->sc_ledpin);
-
+
+
+
+
-        ath_radar_update(sc);
-        ath_setdefantenna(sc, sc->sc_defant);
-        ath_rp_flush(sc);
-
@@ -10699 +10693 @@
-        u_int tab_3_val[3];
-        int ret = 0;
-        int oldval = 0;
-
-        ctl->data = &val;
@@ -10922 +10915 @@
-                                break;
-                        case ATH_INTMIT:
-
-
+
+
+
+
+
+
+
-                                sc->sc_needmib = ath_hal_hwphycounters(ah) && 
-                                        sc->sc_hasintmit && 
-                                        sc->sc_useintmit;
-                                /* Update the HAL and MIB interrupt mask bits */
-val ? 1 : 0
+!!val
-                                sc->sc_imask = (sc->sc_imask & ~HAL_INT_MIB) | 
-                                        (sc->sc_needmib ? HAL_INT_MIB : 0);
@@ -10934 +10931 @@
-                                /* Only do a reset if device is valid and UP 
-                                 * and we just made a change to the settings. */
-
-
-
-
+
+
-                                        ath_reset(sc->sc_dev); 
-                                /* NB: Run this step to cleanup if HAL doesn't