From owner-svn-src-head@FreeBSD.ORG Tue Apr 10 07:11:34 2012 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 18A231065670; Tue, 10 Apr 2012 07:11:34 +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 030538FC15; Tue, 10 Apr 2012 07:11:34 +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 q3A7BXkt008891; Tue, 10 Apr 2012 07:11:33 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3A7BXJt008888; Tue, 10 Apr 2012 07:11:33 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201204100711.q3A7BXJt008888@svn.freebsd.org> From: Adrian Chadd Date: Tue, 10 Apr 2012 07:11:33 +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: r234088 - in head/sys/dev/ath/ath_hal: . 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, 10 Apr 2012 07:11:34 -0000 Author: adrian Date: Tue Apr 10 07:11:33 2012 New Revision: 234088 URL: http://svn.freebsd.org/changeset/base/234088 Log: Squirrel away the SYNC interrupt in case we're doing interrupt debugging. Modified: head/sys/dev/ath/ath_hal/ah.h head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c Modified: head/sys/dev/ath/ath_hal/ah.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah.h Tue Apr 10 06:52:39 2012 (r234087) +++ head/sys/dev/ath/ath_hal/ah.h Tue Apr 10 07:11:33 2012 (r234088) @@ -815,6 +815,7 @@ struct ath_hal { uint16_t *ah_eepromdata; /* eeprom buffer, if needed */ uint32_t ah_intrstate[8]; /* last int state */ + uint32_t ah_syncstate; /* last sync intr state */ HAL_OPS_CONFIG ah_config; const HAL_RATE_TABLE *__ahdecl(*ah_getRateTable)(struct ath_hal *, Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c Tue Apr 10 06:52:39 2012 (r234087) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c Tue Apr 10 07:11:33 2012 (r234088) @@ -75,6 +75,7 @@ ar5416GetPendingInterrupts(struct ath_ha * Blank the interrupt debugging area regardless. */ bzero(&ah->ah_intrstate, sizeof(ah->ah_intrstate)); + ah->ah_syncstate = 0; #endif /* @@ -89,6 +90,9 @@ ar5416GetPendingInterrupts(struct ath_ha isr = OS_REG_READ(ah, AR_ISR); else isr = 0; +#ifdef AH_INTERRUPT_DEBUGGING + ah->ah_syncstate = +#endif o_sync_cause = sync_cause = OS_REG_READ(ah, AR_INTR_SYNC_CAUSE); sync_cause &= AR_INTR_SYNC_DEFAULT; *masked = 0;