From owner-svn-src-all@FreeBSD.ORG Fri Aug 24 00:09:50 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 736DB1065672; Fri, 24 Aug 2012 00:09:50 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 45A628FC12; Fri, 24 Aug 2012 00:09:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7O09os3021007; Fri, 24 Aug 2012 00:09:50 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7O09o3u021005; Fri, 24 Aug 2012 00:09:50 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201208240009.q7O09o3u021005@svn.freebsd.org> From: Adrian Chadd Date: Fri, 24 Aug 2012 00:09:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239627 - head/sys/dev/ath/ath_hal X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 24 Aug 2012 00:09:50 -0000 Author: adrian Date: Fri Aug 24 00:09:49 2012 New Revision: 239627 URL: http://svn.freebsd.org/changeset/base/239627 Log: Add some new flags: * mfp support; * 4.9ghz support in the HAL; * device type - specifically, the bus type and whether it's a HB63 NIC (which requires some subtle chainmask handling differences in the AR5416 HAL.) Obtained from: Qualcomm Atheros Modified: head/sys/dev/ath/ath_hal/ah_internal.h Modified: head/sys/dev/ath/ath_hal/ah_internal.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_internal.h Thu Aug 23 22:38:37 2012 (r239626) +++ head/sys/dev/ath/ath_hal/ah_internal.h Fri Aug 24 00:09:49 2012 (r239627) @@ -228,7 +228,8 @@ typedef struct { halEnhancedDmaSupport : 1; uint32_t halIsrRacSupport : 1, halApmEnable : 1, - halIntrMitigation : 1; + halIntrMitigation : 1, + hal49GhzSupport : 1; uint32_t halWirelessModes; uint16_t halTotalQueues; @@ -245,7 +246,7 @@ typedef struct { uint32_t halIntrMask; uint8_t halTxStreams; uint8_t halRxStreams; - + HAL_MFP_OPT_T halMfpSupport; int halNumTxMaps; int halTxDescLen; int halTxStatusLen; @@ -258,6 +259,12 @@ typedef struct { struct regDomain; /* + * Definitions for ah_flags in ath_hal_private + */ +#define AH_USE_EEPROM 0x1 +#define AH_IS_HB63 0x2 + +/* * The ``private area'' follows immediately after the ``public area'' * in the data structure returned by ath_hal_attach. Private data are * used by device-independent code such as the regulatory domain support. @@ -316,7 +323,9 @@ struct ath_hal_private { uint16_t ah_phyRev; /* PHY revision */ uint16_t ah_analog5GhzRev; /* 2GHz radio revision */ uint16_t ah_analog2GhzRev; /* 5GHz radio revision */ + uint32_t ah_flags; /* misc flags */ uint8_t ah_ispcie; /* PCIE, special treatment */ + uint8_t ah_devType; /* card type - CB, PCI, PCIe */ HAL_OPMODE ah_opmode; /* operating mode from reset */ const struct ieee80211_channel *ah_curchan;/* operating channel */