From owner-svn-src-all@freebsd.org Sun Jun 5 02:15:31 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 118ACB68F1C; Sun, 5 Jun 2016 02:15:31 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC8431EA4; Sun, 5 Jun 2016 02:15:30 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u552FUNr055463; Sun, 5 Jun 2016 02:15:30 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u552FUOa055462; Sun, 5 Jun 2016 02:15:30 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201606050215.u552FUOa055462@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sun, 5 Jun 2016 02:15:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r301419 - head/sys/contrib/dev/ath/ath_hal/ar9300 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jun 2016 02:15:31 -0000 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); }