Use new event counter API for interrupt counting on alpha. By me, with some

edits by Theo.  deraadt@ ok

3 files changed, 5 insertions, 154 deletions

diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h
index 25fdcba079d..979d823ab93 100644
--- a/sys/arch/alpha/include/intr.h
+++ b/sys/arch/alpha/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.17 2004/06/13 21:49:12 niklas Exp $ */
+/* $OpenBSD: intr.h,v 1.18 2004/06/28 02:28:42 aaron Exp $ */
 /* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */
 
 /*-
@@ -68,6 +68,7 @@
 #ifndef _ALPHA_INTR_H_
 #define _ALPHA_INTR_H_
 
+#include <sys/evcount.h>
 #include <sys/lock.h>
 #include <sys/queue.h>
 #include <machine/atomic.h>
@@ -173,6 +174,7 @@ struct alpha_shared_intrhand {
 	void	*ih_arg;
 	int	ih_level;
 	unsigned int ih_num;
+	struct evcount ih_count;
 };
 
 struct alpha_shared_intr {
diff --git a/sys/arch/alpha/include/intrcnt.h b/sys/arch/alpha/include/intrcnt.h
deleted file mode 100644
index 568ae353458..00000000000
--- a/sys/arch/alpha/include/intrcnt.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*	$OpenBSD: intrcnt.h,v 1.6 2003/02/28 23:02:09 jason Exp $	*/
-/*	$NetBSD: intrcnt.h,v 1.7 1996/11/16 23:11:57 cgd Exp $	*/
-
-/*
- * Copyright (c) 1995, 1996 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#define	INTRNAMES_DEFINITION						\
-/* 0x00 */	ASCIZ "clock";						\
-		ASCIZ "isa irq 0";					\
-		ASCIZ "isa irq 1";					\
-		ASCIZ "isa irq 2";					\
-		ASCIZ "isa irq 3";					\
-		ASCIZ "isa irq 4";					\
-		ASCIZ "isa irq 5";					\
-		ASCIZ "isa irq 6";					\
-		ASCIZ "isa irq 7";					\
-		ASCIZ "isa irq 8";					\
-		ASCIZ "isa irq 9";					\
-		ASCIZ "isa irq 10";					\
-		ASCIZ "isa irq 11";					\
-		ASCIZ "isa irq 12";					\
-		ASCIZ "isa irq 13";					\
-		ASCIZ "isa irq 14";					\
-/* 0x10 */	ASCIZ "isa irq 15";					\
-		ASCIZ "kn20aa irq 0";					\
-		ASCIZ "kn20aa irq 1";					\
-		ASCIZ "kn20aa irq 2";					\
-		ASCIZ "kn20aa irq 3";					\
-		ASCIZ "kn20aa irq 4";					\
-		ASCIZ "kn20aa irq 5";					\
-		ASCIZ "kn20aa irq 6";					\
-		ASCIZ "kn20aa irq 7";					\
-		ASCIZ "kn20aa irq 8";					\
-		ASCIZ "kn20aa irq 9";					\
-		ASCIZ "kn20aa irq 10";					\
-		ASCIZ "kn20aa irq 11";					\
-		ASCIZ "kn20aa irq 12";					\
-		ASCIZ "kn20aa irq 13";					\
-		ASCIZ "kn20aa irq 14";					\
-/* 0x20 */	ASCIZ "kn20aa irq 15";					\
-		ASCIZ "kn20aa irq 16";					\
-		ASCIZ "kn20aa irq 17";					\
-		ASCIZ "kn20aa irq 18";					\
-		ASCIZ "kn20aa irq 19";					\
-		ASCIZ "kn20aa irq 20";					\
-		ASCIZ "kn20aa irq 21";					\
-		ASCIZ "kn20aa irq 22";					\
-		ASCIZ "kn20aa irq 23";					\
-		ASCIZ "kn20aa irq 24";					\
-		ASCIZ "kn20aa irq 25";					\
-		ASCIZ "kn20aa irq 26";					\
-		ASCIZ "kn20aa irq 27";					\
-		ASCIZ "kn20aa irq 28";					\
-		ASCIZ "kn20aa irq 29";					\
-		ASCIZ "kn20aa irq 30";					\
-/* 0x30 */	ASCIZ "kn20aa irq 31";					\
-		ASCIZ "kn15 tc slot 0";					\
-		ASCIZ "kn15 tc slot 1";					\
-		ASCIZ "kn15 tc slot 2";					\
-		ASCIZ "kn15 tc slot 3";					\
-		ASCIZ "kn15 tc slot 4";					\
-		ASCIZ "kn15 tc slot 5";					\
-		ASCIZ "kn15 tcds";					\
-		ASCIZ "kn15 ioasic";					\
-		ASCIZ "kn15 sfb";					\
-		ASCIZ "kn16 tc slot 0";					\
-		ASCIZ "kn16 tc slot 1";					\
-		ASCIZ "kn16 tcds";					\
-		ASCIZ "kn16 ioasic";					\
-		ASCIZ "kn16 sfb";					\
-		ASCIZ "tcds esp 0";					\
-/* 0x40 */	ASCIZ "tcds esp 1";					\
-		ASCIZ "ioasic le";					\
-		ASCIZ "ioasic scc 0";					\
-		ASCIZ "ioasic scc 1";					\
-		ASCIZ "ioasic am79c30";					\
-		ASCIZ "eb164 irq 0";					\
-		ASCIZ "eb164 irq 1";					\
-		ASCIZ "eb164 irq 2";					\
-		ASCIZ "eb164 irq 3";					\
-		ASCIZ "eb164 irq 4";					\
-		ASCIZ "eb164 irq 5";					\
-		ASCIZ "eb164 irq 6";					\
-		ASCIZ "eb164 irq 7";					\
-		ASCIZ "eb164 irq 8";					\
-		ASCIZ "eb164 irq 9";					\
-		ASCIZ "eb164 irq 10";					\
-/* 0x50 */	ASCIZ "eb164 irq 11";					\
-		ASCIZ "eb164 irq 12";					\
-		ASCIZ "eb164 irq 13";					\
-		ASCIZ "eb164 irq 14";					\
-		ASCIZ "eb164 irq 15";					\
-		ASCIZ "eb164 irq 16";					\
-		ASCIZ "eb164 irq 17";					\
-		ASCIZ "eb164 irq 18";					\
-		ASCIZ "eb164 irq 19";					\
-		ASCIZ "eb164 irq 20";					\
-		ASCIZ "eb164 irq 21";					\
-		ASCIZ "eb164 irq 22";					\
-		ASCIZ "eb164 irq 23";
-
-#define INTRCNT_DEFINITION						\
-/* 0x00 */	.long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0;	\
-/* 0x10 */	.long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0;	\
-/* 0x20 */	.long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0;	\
-/* 0x30 */	.long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0;	\
-/* 0x40 */	.long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0;	\
-/* 0x50 */	.long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0;
-
-#define	INTRCNT_CLOCK		0
-#define	INTRCNT_ISA_IRQ		(INTRCNT_CLOCK + 1)
-#define	INTRCNT_ISA_IRQ_LEN	16
-#define	INTRCNT_KN20AA_IRQ	(INTRCNT_ISA_IRQ + INTRCNT_ISA_IRQ_LEN)
-#define	INTRCNT_KN20AA_IRQ_LEN	32
-#define	INTRCNT_KN15		(INTRCNT_KN20AA_IRQ + INTRCNT_KN20AA_IRQ_LEN)
-#define	INTRCNT_KN15_LEN	9
-#define	INTRCNT_KN16		(INTRCNT_KN15 + INTRCNT_KN15_LEN)
-#define	INTRCNT_KN16_LEN	5
-#define	INTRCNT_TCDS		(INTRCNT_KN16 + INTRCNT_KN16_LEN)
-#define	INTRCNT_TCDS_LEN	2
-#define	INTRCNT_IOASIC		(INTRCNT_TCDS + INTRCNT_TCDS_LEN)
-#define	INTRCNT_IOASIC_LEN	4
-#define	INTRCNT_EB164_IRQ	(INTRCNT_IOASIC + INTRCNT_IOASIC_LEN)
-#define	INTRCNT_EB164_IRQ_LEN	24
-
-#ifndef _LOCORE
-extern volatile int intrcnt[];
-#endif
diff --git a/sys/arch/alpha/include/types.h b/sys/arch/alpha/include/types.h
index 1967be2ba53..b24bedab8bf 100644
--- a/sys/arch/alpha/include/types.h
+++ b/sys/arch/alpha/include/types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: types.h,v 1.12 2003/06/02 23:27:43 millert Exp $	*/
+/*	$OpenBSD: types.h,v 1.13 2004/06/28 02:28:42 aaron Exp $	*/
 /*	$NetBSD: types.h,v 1.6 1996/12/05 00:13:47 cgd Exp $	*/
 
 /*-
@@ -74,5 +74,6 @@ typedef long			register_t;
 #define	__BROKEN_INDIRECT_CONFIG
 #define	__HAVE_DEVICE_REGISTER
 #define	__HAVE_NWSCONS
+#define	__HAVE_EVCOUNT
 
 #endif	/* _MACHTYPES_H_ */