From owner-svn-src-all@FreeBSD.ORG Thu May 2 00:59:41 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3DEC55CD; Thu, 2 May 2013 00:59:41 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 169831D4A; Thu, 2 May 2013 00:59:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r420xegF095257; Thu, 2 May 2013 00:59:40 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r420xe3Y095253; Thu, 2 May 2013 00:59:40 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201305020059.r420xe3Y095253@svn.freebsd.org> From: Adrian Chadd Date: Thu, 2 May 2013 00:59:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250166 - in head/sys: contrib/dev/ath/ath_hal/ar9300 dev/ath/ath_hal dev/ath/ath_hal/ar9003 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.14 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: Thu, 02 May 2013 00:59:41 -0000 Author: adrian Date: Thu May 2 00:59:39 2013 New Revision: 250166 URL: http://svnweb.freebsd.org/changeset/base/250166 Log: Add device identification and probe/attach support for the QCA9565. The QCA9565 is a 1x1 2.4GHz 11n chip with integrated on-chip bluetooth. The AR9300 HAL already has support for this chip; it just wasn't included in the probe/attach path. Tested: * This commit brought to you over a QCA9565 wifi connection from FreeBSD. * .. ie, basic STA, pings, no iperf or antenna diversity checking just yet. Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c head/sys/dev/ath/ath_hal/ah.c head/sys/dev/ath/ath_hal/ah_devid.h head/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c ============================================================================== --- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c Thu May 2 00:40:45 2013 (r250165) +++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c Thu May 2 00:59:39 2013 (r250166) @@ -4089,6 +4089,8 @@ ar9300_probe(uint16_t vendorid, uint16_t return "Atheros AR933x"; case AR9300_DEVID_QCA955X: /* Scorpion */ return "Qualcomm Atheros QCA955x"; + case AR9300_DEVID_QCA9565: /* Aphrodite */ + return "Qualcomm Atheros AR9565"; default: return AH_NULL; } Modified: head/sys/dev/ath/ath_hal/ah.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah.c Thu May 2 00:40:45 2013 (r250165) +++ head/sys/dev/ath/ath_hal/ah.c Thu May 2 00:59:39 2013 (r250166) @@ -139,6 +139,9 @@ ath_hal_mac_name(struct ath_hal *ah) return "9550"; case AR_SREV_VERSION_AR9485: return "9485"; + case AR_SREV_VERSION_QCA9565: + /* XXX should say QCA, not AR */ + return "9565"; } return "????"; } Modified: head/sys/dev/ath/ath_hal/ah_devid.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_devid.h Thu May 2 00:40:45 2013 (r250165) +++ head/sys/dev/ath/ath_hal/ah_devid.h Thu May 2 00:59:39 2013 (r250166) @@ -91,6 +91,7 @@ #define AR9300_DEVID_AR9580_PCIE 0x0033 #define AR9300_DEVID_AR946X_PCIE 0x0034 #define AR9300_DEVID_AR9330 0x0035 +#define AR9300_DEVID_QCA9565 0x0036 #define AR9300_DEVID_QCA955X 0x0039 #define AR_SUBVENDOR_ID_NOG 0x0e11 /* No 11G subvendor ID */ Modified: head/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h ============================================================================== --- head/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h Thu May 2 00:40:45 2013 (r250165) +++ head/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h Thu May 2 00:59:39 2013 (r250166) @@ -48,6 +48,7 @@ #define AR_SREV_VERSION_AR9380 0x1C0 #define AR_SREV_VERSION_AR9580 0x1C0 #define AR_SREV_VERSION_AR9460 0x280 +#define AR_SREV_VERSION_QCA9565 0x2c0 #define AR_SREV_VERSION_AR9330 0x200 #define AR_SREV_VERSION_AR9340 0x300