More interrupt system cleaning and homogenization:

- switch all interrupt functions to an int (*)(void *) prototype.
- do not register dummy functions for all unhandled interrupts, instead
  let the dispatchers cope with NULL.
- add evcount interrupt counters.

2 files changed, 20 insertions, 8 deletions

diff --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h
index 37ee5df76b7..e043d428349 100644
--- a/sys/arch/mac68k/include/intr.h
+++ b/sys/arch/mac68k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.9 2004/11/25 18:32:10 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.10 2004/11/26 21:21:27 miod Exp $	*/
 /*	$NetBSD: intr.h,v 1.9 1998/08/12 06:58:42 scottr Exp $	*/
 
 /*
@@ -157,12 +157,24 @@ extern volatile u_int8_t ssir;
 #define	setsoftadb()	siron(SIR_ADB)
 
 /* intr.c */
-void	intr_establish (int (*)(void *), void *, int);
-void	intr_disestablish (int);
-void	intr_dispatch (int);
+void	intr_establish(int (*)(void *), void *, int, const char *);
+void	intr_disestablish(int);
+void	intr_dispatch(int);
 
 /* locore.s */
 int	spl0(void);
+
+/*
+ * Interrupt handler.
+ * There is no support for shared interrupts at the moment.
+ */
+#include <sys/evcount.h>
+struct intrhand {
+	int		(*ih_fn)(void *);
+	void		*ih_arg;
+	int		ih_ipl;
+	struct evcount	ih_count;
+};
 #endif /* _KERNEL */
 
 #endif /* _MAC68K_INTR_H_ */
diff --git a/sys/arch/mac68k/include/viareg.h b/sys/arch/mac68k/include/viareg.h
index 4dfd890c8d4..d82bd1fbb4e 100644
--- a/sys/arch/mac68k/include/viareg.h
+++ b/sys/arch/mac68k/include/viareg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: viareg.h,v 1.10 2002/03/14 03:15:55 millert Exp $	*/
+/*	$OpenBSD: viareg.h,v 1.11 2004/11/26 21:21:27 miod Exp $	*/
 /*	$NetBSD: viareg.h,v 1.6 1997/02/28 07:41:41 scottr Exp $	*/
 
 /*-
@@ -194,10 +194,10 @@ void	via_init(void);
 int	rbv_vidstatus(void);
 void	via_shutdown(void);
 void	via_set_modem(int);
-int	add_nubus_intr(int, void (*)(void *, int), void *);
+void	add_nubus_intr(int, int (*)(void *), void *, const char *);
 void	enable_nubus_intr(void);
-void	via1_register_irq(int, void (*)(void *), void *);
-void	via2_register_irq(int, void (*)(void *), void *);
+void	via1_register_irq(int, int (*)(void *), void *, const char *);
+void	via2_register_irq(int, int (*)(void *), void *, const char *);
 
 extern void	(*via1itab[7])(void *);
 extern void	(*via2itab[7])(void *);