Author: adrian
Date: Fri Feb 3 05:15:35 2017
New Revision: 313136
URL: https://svnweb.freebsd.org/changeset/base/313136
Log:
[ath_hal] [ar9300] link in the CAC enable/diable methods and expose it via
the HAL.
Modified:
head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c
head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c Fri Feb 3
05:15:08 2017 (r313135)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c Fri Feb 3
05:15:35 2017 (r313136)
@@ -417,7 +417,8 @@ ar9300_attach_freebsd_ops(struct ath_hal
ah->ah_getDfsDefaultThresh = ar9300_get_default_dfs_thresh;
ah->ah_procRadarEvent = ar9300_freebsd_proc_radar_event;
ah->ah_isFastClockEnabled = ar9300_is_fast_clock_enabled;
- ah->ah_get11nExtBusy = ar9300_get_11n_ext_busy;
+ ah->ah_get11nExtBusy = ar9300_get_11n_ext_busy;
+ ah->ah_setDfsCacTxQuiet = ar9300_cac_tx_quiet;
/* Spectral Scan Functions */
ah->ah_spectralConfigure = ar9300_configure_spectral_scan;
Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c Fri Feb 3
05:15:08 2017 (r313135)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c Fri Feb 3
05:15:35 2017 (r313136)
@@ -649,11 +649,12 @@ ar9300_set_quiet(struct ath_hal *ah, u_i
return status;
#undef TU_TO_USEC
}
-#ifdef ATH_SUPPORT_DFS
+
+//#ifdef ATH_SUPPORT_DFS
void
ar9300_cac_tx_quiet(struct ath_hal *ah, HAL_BOOL enable)
{
- u32 reg1, reg2;
+ uint32_t reg1, reg2;
reg1 = OS_REG_READ(ah, AR_MAC_PCU_OFFSET(MAC_PCU_MISC_MODE));
reg2 = OS_REG_READ(ah, AR_MAC_PCU_OFFSET(MAC_PCU_QUIET_TIME_1));
@@ -671,7 +672,7 @@ ar9300_cac_tx_quiet(struct ath_hal *ah,
reg2 | AR_QUIET1_QUIET_ACK_CTS_ENABLE);
}
}
-#endif /* ATH_SUPPORT_DFS */
+//#endif /* ATH_SUPPORT_DFS */
void
ar9300_set_pcu_config(struct ath_hal *ah)
Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c Fri Feb 3
05:15:08 2017 (r313135)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c Fri Feb 3
05:15:35 2017 (r313136)
@@ -4263,11 +4263,11 @@ ar9300_init_user_settings(struct ath_hal
if (ahp->ah_beacon_rssi_threshold != 0) {
ar9300_set_hw_beacon_rssi_threshold(ah, ahp->ah_beacon_rssi_threshold);
}
-#ifdef ATH_SUPPORT_DFS
+//#ifdef ATH_SUPPORT_DFS
if (ahp->ah_cac_quiet_enabled) {
ar9300_cac_tx_quiet(ah, 1);
}
-#endif /* ATH_SUPPORT_DFS */
+//#endif /* ATH_SUPPORT_DFS */
}
int
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
