From owner-svn-src-head@FreeBSD.ORG Tue May 19 17:30:14 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B092106567C; Tue, 19 May 2009 17:30:14 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4623E8FC33; Tue, 19 May 2009 17:30:14 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4JHUEPS004730; Tue, 19 May 2009 17:30:14 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4JHUDu7004723; Tue, 19 May 2009 17:30:13 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200905191730.n4JHUDu7004723@svn.freebsd.org> From: Sam Leffler Date: Tue, 19 May 2009 17:30:13 +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: r192396 - in head/sys/dev/ath/ath_hal: . ar5210 ar5211 ar5212 ar5416 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 May 2009 17:30:17 -0000 Author: sam Date: Tue May 19 17:30:13 2009 New Revision: 192396 URL: http://svn.freebsd.org/changeset/base/192396 Log: add HAL_CAP_INTRMASK to return the set of interrupts supported by the device Modified: head/sys/dev/ath/ath_hal/ah.c head/sys/dev/ath/ath_hal/ah.h head/sys/dev/ath/ath_hal/ah_internal.h head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Modified: head/sys/dev/ath/ath_hal/ah.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah.c Tue May 19 17:17:53 2009 (r192395) +++ head/sys/dev/ath/ath_hal/ah.c Tue May 19 17:30:13 2009 (r192396) @@ -500,6 +500,9 @@ ath_hal_getcapability(struct ath_hal *ah case HAL_CAP_RXTSTAMP_PREC: /* rx desc tstamp precision (bits) */ *result = pCap->halTstampPrecision; return HAL_OK; + case HAL_CAP_INTRMASK: /* mask of supported interrupts */ + *result = pCap->halIntrMask; + return HAL_OK; default: return HAL_EINVAL; } Modified: head/sys/dev/ath/ath_hal/ah.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah.h Tue May 19 17:17:53 2009 (r192395) +++ head/sys/dev/ath/ath_hal/ah.h Tue May 19 17:30:13 2009 (r192396) @@ -109,6 +109,7 @@ typedef enum { HAL_CAP_RXTSTAMP_PREC = 34, /* rx desc tstamp precision (bits) */ HAL_CAP_BB_HANG = 35, /* can baseband hang */ HAL_CAP_MAC_HANG = 36, /* can MAC hang */ + HAL_CAP_INTRMASK = 37, /* bitmask of supported interrupts */ } HAL_CAPABILITY_TYPE; /* @@ -348,8 +349,8 @@ typedef enum { | HAL_INT_RXDESC | HAL_INT_RXEOL | HAL_INT_RXORN - | HAL_INT_TXURN | HAL_INT_TXDESC + | HAL_INT_TXURN | HAL_INT_MIB | HAL_INT_RXPHY | HAL_INT_RXKCM Modified: head/sys/dev/ath/ath_hal/ah_internal.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_internal.h Tue May 19 17:17:53 2009 (r192395) +++ head/sys/dev/ath/ath_hal/ah_internal.h Tue May 19 17:30:13 2009 (r192396) @@ -206,6 +206,7 @@ typedef struct { uint8_t halNumGpioPins; uint8_t halNumAntCfg2GHz; uint8_t halNumAntCfg5GHz; + uint32_t halIntrMask; } HAL_CAPABILITIES; struct regDomain; Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c Tue May 19 17:17:53 2009 (r192395) +++ head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c Tue May 19 17:30:13 2009 (r192396) @@ -369,6 +369,11 @@ ar5210FillCapabilityInfo(struct ath_hal } pCap->halTstampPrecision = 15; /* NB: s/w extended from 13 */ + pCap->halIntrMask = HAL_INT_COMMON + | HAL_INT_RX + | HAL_INT_TX + | HAL_INT_FATAL + ; ahpriv->ah_rxornIsFatal = AH_TRUE; return AH_TRUE; Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c Tue May 19 17:17:53 2009 (r192395) +++ head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c Tue May 19 17:30:13 2009 (r192396) @@ -498,6 +498,13 @@ ar5211FillCapabilityInfo(struct ath_hal } pCap->halTstampPrecision = 13; + pCap->halIntrMask = HAL_INT_COMMON + | HAL_INT_RX + | HAL_INT_TX + | HAL_INT_FATAL + | HAL_INT_BNR + | HAL_INT_TIM + ; /* XXX might be ok w/ some chip revs */ ahpriv->ah_rxornIsFatal = AH_TRUE; Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c Tue May 19 17:17:53 2009 (r192395) +++ head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c Tue May 19 17:30:13 2009 (r192396) @@ -840,6 +840,13 @@ ar5212FillCapabilityInfo(struct ath_hal AH_PRIVATE(ah)->ah_macVersion > AR_SREV_VERSION_VENICE; pCap->halTstampPrecision = 15; + pCap->halIntrMask = HAL_INT_COMMON + | HAL_INT_RX + | HAL_INT_TX + | HAL_INT_FATAL + | HAL_INT_BNR + | HAL_INT_BMISC + ; return AH_TRUE; #undef IS_COBRA Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Tue May 19 17:17:53 2009 (r192395) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Tue May 19 17:30:13 2009 (r192396) @@ -781,6 +781,17 @@ ar5416FillCapabilityInfo(struct ath_hal pCap->halTstampPrecision = 32; pCap->halHwPhyCounterSupport = AH_TRUE; + pCap->halIntrMask = HAL_INT_COMMON + | HAL_INT_RX + | HAL_INT_TX + | HAL_INT_FATAL + | HAL_INT_BNR + | HAL_INT_BMISC + | HAL_INT_DTIMSYNC + | HAL_INT_TSFOOR + | HAL_INT_CST + | HAL_INT_GTT + ; pCap->halFastCCSupport = AH_TRUE; pCap->halNumGpioPins = 6;