Author: adrian
Date: Sun Jun 5 02:15:29 2016
New Revision: 301419
URL: https://svnweb.freebsd.org/changeset/base/301419
Log:
[ath_hal] convert the MCI code over to work on Jupiter 2.1.
(Note: jupiter 1.0 was emulation / test silicon, and was never released
in production. So, yes, AR_SREV_JUPITER() would really be fine.)
Modified:
head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_mci.c
Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_mci.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_mci.c Sun Jun 5
02:02:51 2016 (r301418)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_mci.c Sun Jun 5
02:15:29 2016 (r301419)
@@ -107,7 +107,7 @@ void ar9300_mci_osla_setup(struct ath_ha
static void ar9300_mci_reset_req_wakeup(struct ath_hal *ah)
{
/* to be tested in emulation */
- if (AR_SREV_JUPITER_20(ah) || AR_SREV_APHRODITE(ah)) {
+ if (AR_SREV_JUPITER_20_OR_LATER(ah) || AR_SREV_APHRODITE(ah)) {
OS_REG_RMW_FIELD(ah, AR_MCI_COMMAND2,
AR_MCI_COMMAND2_RESET_REQ_WAKEUP, 1);
OS_DELAY(1);
@@ -364,7 +364,7 @@ static void ar9300_mci_send_2g5g_status(
struct ath_hal_9300 *ahp = AH9300(ah);
u_int32_t new_flags, to_set, to_clear;
- if ((AR_SREV_JUPITER_20(ah) || AR_SREV_APHRODITE(ah)) &&
+ if ((AR_SREV_JUPITER_20_OR_LATER(ah) || AR_SREV_APHRODITE(ah)) &&
(ahp->ah_mci_coex_2g5g_update == AH_TRUE) &&
(ahp->ah_mci_bt_state != MCI_BT_SLEEP))
{
@@ -409,7 +409,7 @@ void ar9300_mci_2g5g_switch(struct ath_h
OS_REG_CLR_BIT(ah, AR_MCI_TX_CTRL,
AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
- if (AR_SREV_JUPITER_20(ah) || AR_SREV_APHRODITE(ah)) {
+ if (AR_SREV_JUPITER_20_OR_LATER(ah) || AR_SREV_APHRODITE(ah)) {
OS_REG_CLR_BIT(ah, AR_GLB_CONTROL,
AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
if (!(ah->ah_config.ath_hal_mci_config &
@@ -425,7 +425,7 @@ void ar9300_mci_2g5g_switch(struct ath_h
OS_REG_SET_BIT(ah, AR_MCI_TX_CTRL,
AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
- if (AR_SREV_JUPITER_20(ah) || AR_SREV_APHRODITE(ah)) {
+ if (AR_SREV_JUPITER_20_OR_LATER(ah) || AR_SREV_APHRODITE(ah)) {
OS_REG_SET_BIT(ah, AR_GLB_CONTROL,
AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
ar9300_mci_osla_setup(ah, AH_FALSE);
@@ -1035,7 +1035,7 @@ void ar9300_mci_reset(struct ath_hal *ah
}
- if (is_2g && (AR_SREV_JUPITER_20(ah) || AR_SREV_APHRODITE(ah)) &&
+ if (is_2g && (AR_SREV_JUPITER_20_OR_LATER(ah) || AR_SREV_APHRODITE(ah)) &&
!(ah->ah_config.ath_hal_mci_config &
ATH_MCI_CONFIG_DISABLE_OSLA))
{
@@ -1045,7 +1045,7 @@ void ar9300_mci_reset(struct ath_hal *ah
ar9300_mci_osla_setup(ah, AH_FALSE);
}
- if (AR_SREV_JUPITER_20(ah) || AR_SREV_APHRODITE(ah)) {
+ if (AR_SREV_JUPITER_20_OR_LATER(ah) || AR_SREV_APHRODITE(ah)) {
OS_REG_SET_BIT(ah, AR_GLB_CONTROL, AR_BTCOEX_CTRL_SPDT_ENABLE);
OS_REG_RMW_FIELD(ah, AR_BTCOEX_CTRL3,
@@ -1743,7 +1743,7 @@ ar9300_mci_state(struct ath_hal *ah, u_i
ar9300_mci_send_coex_bt_status_query(ah, AH_TRUE,
MCI_GPM_COEX_QUERY_BT_DEBUG);
OS_DELAY(10);
- if (AR_SREV_JUPITER_20(ah) || AR_SREV_APHRODITE(ah)) {
+ if (AR_SREV_JUPITER_20_OR_LATER(ah) ||
AR_SREV_APHRODITE(ah)) {
ar9300_mci_send_coex_bt_flags(ah, AH_TRUE,
MCI_GPM_COEX_BT_FLAGS_READ, 0);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
