Adapt to our isa_intr_establish interface

5 files changed, 18 insertions, 8 deletions

diff --git a/sys/arch/amiga/isa/cross.c b/sys/arch/amiga/isa/cross.c
index 2b1422c2970..0b98f664472 100644
--- a/sys/arch/amiga/isa/cross.c
+++ b/sys/arch/amiga/isa/cross.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: cross.c,v 1.2 1996/02/27 15:40:54 niklas Exp $	*/
 /*	$NetBSD: cross.c,v 1.0 1994/07/08 23:32:17 niklas Exp $	*/
 
 /*
@@ -62,7 +63,8 @@ u_char crossldb __P((struct device *, int));
 void crossstw __P((struct device *, int, u_short));
 u_short crossldw __P((struct device *, int));
 void    *cross_establish_intr __P((int intr, int type, int level,
-                                   int (*ih_fun) (void *), void *));
+                                   int (*ih_fun) (void *), void *ih_arg,
+				   char *ih_what));
 void    cross_disestablish_intr __P((void *handler));
 
 struct isa_intr_fcns cross_intr_fcns = {
@@ -278,12 +280,13 @@ crossintr(cid)
 }
 
 void *
-cross_establish_intr(intr, type, level, ih_fun, ih_arg)
+cross_establish_intr(intr, type, level, ih_fun, ih_arg, ih_what)
         int intr;
         int type;
         int level;
         int (*ih_fun)(void *);
         void *ih_arg;
+	char *ih_what;
 {
 	if (crid[intr]) {
 		log(LOG_WARNING, "ISA interrupt %d already handled\n", intr);
diff --git a/sys/arch/amiga/isa/ggbus.c b/sys/arch/amiga/isa/ggbus.c
index 40a1fd91df9..7faeb895c85 100644
--- a/sys/arch/amiga/isa/ggbus.c
+++ b/sys/arch/amiga/isa/ggbus.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: ggbus.c,v 1.2 1996/02/27 15:40:56 niklas Exp $	*/
 /*	$NetBSD: ggbus.c,v 1.1 1994/07/08 23:32:17 niklas Exp $	*/
 
 /*
@@ -63,7 +64,8 @@ u_char	ggbusldb __P((struct device *, int));
 void	ggbusstw __P((struct device *, int, u_short));
 u_short ggbusldw __P((struct device *, int));
 void	*ggbus_establish_intr __P((int intr, int type, int level,
-				   int (*ih_fun) (void *), void *));
+				   int (*ih_fun) (void *), void *ih_arg,
+				   char *ih_what));
 void	ggbus_disestablish_intr __P((void *handler));
 
 struct isa_intr_fcns ggbus_intr_fcns = {
@@ -224,12 +226,13 @@ ggbusintr(gid)
 }
 
 void *
-ggbus_establish_intr(intr, type, level, ih_fun, ih_arg)
+ggbus_establish_intr(intr, type, level, ih_fun, ih_arg, ih_what)
 	int intr;
 	int type;
 	int level;
 	int (*ih_fun)(void *);
 	void *ih_arg;
+	char *ih_what;
 {
 	if (ggid[intr]) {
 		log(LOG_WARNING, "ISA interrupt %d already handled\n", intr);
diff --git a/sys/arch/amiga/isa/if_isaed.c b/sys/arch/amiga/isa/if_isaed.c
index a97e746edac..d58ed943f0e 100644
--- a/sys/arch/amiga/isa/if_isaed.c
+++ b/sys/arch/amiga/isa/if_isaed.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: if_isaed.c,v 1.2 1996/02/27 15:40:57 niklas Exp $	*/
 /*	$NetBSD: if_isaed.c,v 1.7 1994/11/28 21:47:38 root Exp $	*/
 
 /*
@@ -1117,7 +1118,7 @@ isaedattach(parent, self, aux)
 #endif
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET,
-	    isaedintr, sc);
+	    isaedintr, sc, sc->sc_dev.dv_xname);
 }
 
 /*
diff --git a/sys/arch/amiga/isa/isa_intr.h b/sys/arch/amiga/isa/isa_intr.h
index 265506ab9cd..c25220f38f9 100644
--- a/sys/arch/amiga/isa/isa_intr.h
+++ b/sys/arch/amiga/isa/isa_intr.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: isa_intr.h,v 1.2 1996/02/27 15:40:58 niklas Exp $	*/
 /*	$NetBSD: isa_intr.h,v 1.1 1995/08/02 14:44:57 niklas Exp $	*/
 
 /*
@@ -42,7 +43,7 @@ struct	isa_intr_fcns {
 	void	(*isa_intr_setup) __P((void));
 
 	void	*(*isa_intr_establish) __P((int irq, int type, int level,
-	    int (*ih_fun)(void *), void *ih_arg));
+	    int (*ih_fun)(void *), void *ih_arg, char *ih_what));
 	void	(*isa_intr_disestablish) __P((void *handler));
 
 	void	(*isa_iointr) __P((void *framep, int vec));
diff --git a/sys/arch/amiga/isa/isa_machdep.c b/sys/arch/amiga/isa/isa_machdep.c
index 5a35142c5ce..b615e036783 100644
--- a/sys/arch/amiga/isa/isa_machdep.c
+++ b/sys/arch/amiga/isa/isa_machdep.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: isa_machdep.c,v 1.2 1996/02/27 15:40:59 niklas Exp $	*/
 /*	$NetBSD: isa_machdep.c,v 1.1 1995/08/02 14:10:17 niklas Exp $	*/
 
 /*
@@ -95,15 +96,16 @@ isaattach(parent, self, aux)
 }
 
 void *
-isa_intr_establish(intr, type, level, ih_fun, ih_arg)
+isa_intr_establish(intr, type, level, ih_fun, ih_arg, ih_what)
 	int intr;
 	int type;
 	int level;
 	int (*ih_fun)(void *);
 	void *ih_arg;
+	char *ih_what;
 {
 	return (*isa_intr_fcns->isa_intr_establish)(intr, type, level,
-	    ih_fun, ih_arg);
+	    ih_fun, ih_arg, ih_what);
 }
 
 void