From owner-svn-src-all@freebsd.org Mon Feb 29 02:40:59 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 D629CAB7F76; Mon, 29 Feb 2016 02:40:59 +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 AF20D1831; Mon, 29 Feb 2016 02:40:59 +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 u1T2ewuj066607; Mon, 29 Feb 2016 02:40:58 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1T2ewYv066605; Mon, 29 Feb 2016 02:40:58 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201602290240.u1T2ewYv066605@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Mon, 29 Feb 2016 02:40:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296176 - in head/sys/dev/ath: . ath_hal 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.20 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: Mon, 29 Feb 2016 02:41:00 -0000 Author: adrian Date: Mon Feb 29 02:40:58 2016 New Revision: 296176 URL: https://svnweb.freebsd.org/changeset/base/296176 Log: Fix up the ath(4) device names for QCA chipsets. Submitted by: Tobias Kortkamp Modified: head/sys/dev/ath/ath_hal/ah.c head/sys/dev/ath/if_ath.c Modified: head/sys/dev/ath/ath_hal/ah.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah.c Mon Feb 29 00:15:25 2016 (r296175) +++ head/sys/dev/ath/ath_hal/ah.c Mon Feb 29 02:40:58 2016 (r296176) @@ -91,63 +91,60 @@ ath_hal_mac_name(struct ath_hal *ah) switch (ah->ah_macVersion) { case AR_SREV_VERSION_CRETE: case AR_SREV_VERSION_MAUI_1: - return "5210"; + return "AR5210"; case AR_SREV_VERSION_MAUI_2: case AR_SREV_VERSION_OAHU: - return "5211"; + return "AR5211"; case AR_SREV_VERSION_VENICE: - return "5212"; + return "AR5212"; case AR_SREV_VERSION_GRIFFIN: - return "2413"; + return "AR2413"; case AR_SREV_VERSION_CONDOR: - return "5424"; + return "AR5424"; case AR_SREV_VERSION_EAGLE: - return "5413"; + return "AR5413"; case AR_SREV_VERSION_COBRA: - return "2415"; + return "AR2415"; case AR_SREV_2425: /* Swan */ - return "2425"; + return "AR2425"; case AR_SREV_2417: /* Nala */ - return "2417"; + return "AR2417"; case AR_XSREV_VERSION_OWL_PCI: - return "5416"; + return "AR5416"; case AR_XSREV_VERSION_OWL_PCIE: - return "5418"; + return "AR5418"; case AR_XSREV_VERSION_HOWL: - return "9130"; + return "AR9130"; case AR_XSREV_VERSION_SOWL: - return "9160"; + return "AR9160"; case AR_XSREV_VERSION_MERLIN: if (AH_PRIVATE(ah)->ah_ispcie) - return "9280"; - return "9220"; + return "AR9280"; + return "AR9220"; case AR_XSREV_VERSION_KITE: - return "9285"; + return "AR9285"; case AR_XSREV_VERSION_KIWI: if (AH_PRIVATE(ah)->ah_ispcie) - return "9287"; - return "9227"; + return "AR9287"; + return "AR9227"; case AR_SREV_VERSION_AR9380: if (ah->ah_macRev >= AR_SREV_REVISION_AR9580_10) - return "9580"; - return "9380"; + return "AR9580"; + return "AR9380"; case AR_SREV_VERSION_AR9460: - return "9460"; + return "AR9460"; case AR_SREV_VERSION_AR9330: - return "9330"; + return "AR9330"; case AR_SREV_VERSION_AR9340: - return "9340"; + return "AR9340"; case AR_SREV_VERSION_QCA9550: - /* XXX should say QCA, not AR */ - return "9550"; + return "QCA9550"; case AR_SREV_VERSION_AR9485: - return "9485"; + return "AR9485"; case AR_SREV_VERSION_QCA9565: - /* XXX should say QCA, not AR */ - return "9565"; + return "QCA9565"; case AR_SREV_VERSION_QCA9530: - /* XXX should say QCA, not AR */ - return "9530"; + return "QCA9530"; } return "????"; } Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Mon Feb 29 00:15:25 2016 (r296175) +++ head/sys/dev/ath/if_ath.c Mon Feb 29 02:40:58 2016 (r296176) @@ -6160,7 +6160,7 @@ ath_announce(struct ath_softc *sc) { struct ath_hal *ah = sc->sc_ah; - device_printf(sc->sc_dev, "AR%s mac %d.%d RF%s phy %d.%d\n", + device_printf(sc->sc_dev, "%s mac %d.%d RF%s phy %d.%d\n", ath_hal_mac_name(ah), ah->ah_macVersion, ah->ah_macRev, ath_hal_rf_name(ah), ah->ah_phyRev >> 4, ah->ah_phyRev & 0xf); device_printf(sc->sc_dev, "2GHz radio: 0x%.4x; 5GHz radio: 0x%.4x\n",