From 51e85d07b99660fd143275f8ad78ab20f0a5368e Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Thu, 11 Apr 1996 22:27:59 +0000
Subject: [PATCH] update for addition of a machine-dependent cookie as the
 first argument to isa_intr_{,dis}establish().

---
 sys/dev/ata/wd.c        |  6 +++---
 sys/dev/ic/aic6360.c    |  6 +++---
 sys/dev/ic/com.c        | 22 +++++++++++++++++-----
 sys/dev/ic/lpt.c        | 12 ++++++++----
 sys/dev/ic/lptvar.h     | 12 ++++++++----
 sys/dev/ic/mb86960.c    |  4 ++--
 sys/dev/ic/mb86960var.h |  4 ++--
 sys/dev/isa/aha.c       |  6 +++---
 sys/dev/isa/aha284x.c   |  6 +++---
 sys/dev/isa/aic6360.c   |  6 +++---
 sys/dev/isa/ast.c       | 11 ++++++++---
 sys/dev/isa/boca.c      | 11 ++++++++---
 sys/dev/isa/bt.c        |  6 +++---
 sys/dev/isa/com.c       | 22 +++++++++++++++++-----
 sys/dev/isa/gus.c       |  6 +++---
 sys/dev/isa/if_ate.c    |  4 ++--
 sys/dev/isa/if_ed.c     |  6 +++---
 sys/dev/isa/if_eg.c     |  6 +++---
 sys/dev/isa/if_el.c     |  6 +++---
 sys/dev/isa/if_ep.c     |  6 +++---
 sys/dev/isa/if_fe.c     |  4 ++--
 sys/dev/isa/if_fmv.c    |  4 ++--
 sys/dev/isa/if_ie.c     |  6 +++---
 sys/dev/isa/if_le.c     |  6 +++---
 sys/dev/isa/lpt.c       | 12 ++++++++----
 sys/dev/isa/lpt_isa.c   | 12 ++++++++----
 sys/dev/isa/mcd.c       |  6 +++---
 sys/dev/isa/pas.c       |  6 +++---
 sys/dev/isa/pss.c       | 18 ++++++++++--------
 sys/dev/isa/rtfps.c     | 11 ++++++++---
 sys/dev/isa/sb.c        |  6 +++---
 sys/dev/isa/seagate.c   |  4 ++--
 sys/dev/isa/ultra14f.c  |  6 +++---
 sys/dev/isa/wd.c        |  6 +++---
 sys/dev/isa/wds.c       |  6 +++---
 sys/dev/isa/wss.c       |  5 +++--
 sys/dev/isa/wt.c        |  6 +++---
 37 files changed, 175 insertions(+), 117 deletions(-)

diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 2b9101370aa8..bc139fcc2db1 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.147 1996/03/17 00:54:01 thorpej Exp $	*/
+/*	$NetBSD: wd.c,v 1.148 1996/04/11 22:30:31 cgd Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -256,8 +256,8 @@ wdcattach(parent, self, aux)
 
 	printf("\n");
 
-	wdc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, wdcintr,
-	    wdc);
+	wdc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_BIO, wdcintr, wdc);
 
 	for (wa.wa_drive = 0; wa.wa_drive < 2; wa.wa_drive++)
 		(void)config_found(self, (void *)&wa, wdprint);
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index 338730b2957c..abc9f67c731a 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic6360.c,v 1.43 1996/04/03 15:58:13 mycroft Exp $	*/
+/*	$NetBSD: aic6360.c,v 1.44 1996/04/11 22:28:08 cgd Exp $	*/
 
 #define	integrate	static inline
 
@@ -779,8 +779,8 @@ aicattach(parent, self, aux)
 #ifdef NEWCONFIG
 	isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, aicintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_BIO, aicintr, sc);
 
 	config_found(self, &sc->sc_link, aicprint);
 }
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 188eaf07ce2c..6dd28c25fd32 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com.c,v 1.77 1996/03/17 13:38:14 cgd Exp $	*/
+/*	$NetBSD: com.c,v 1.78 1996/04/11 22:28:31 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995, 1996
@@ -56,7 +56,11 @@
 #include <sys/types.h>
 #include <sys/device.h>
 
-#include <machine/cpu.h>
+#ifdef i386							/* XXX */
+#include <machine/cpu.h>					/* XXX */
+#else								/* XXX */
+#include <machine/intr.h>
+#endif								/* XXX */
 #include <machine/bus.h>
 
 #include <dev/isa/isavar.h>
@@ -460,9 +464,17 @@ comattach(parent, self, aux)
 	bus_io_write_1(bc, ioh, com_ier, 0);
 	bus_io_write_1(bc, ioh, com_mcr, 0);
 
-	if (irq != IRQUNK)
-		sc->sc_ih = isa_intr_establish(irq, IST_EDGE, IPL_TTY,
-		    comintr, sc);
+	if (irq != IRQUNK) {
+#if NCOM_ISA
+		if (!strcmp(parent->dv_cfdata->cf_driver->cd_name, "isa")) {
+			struct isa_attach_args *ia = aux;
+
+			sc->sc_ih = isa_intr_establish(ia->ia_ic, irq,
+			    IST_EDGE, IPL_TTY, comintr, sc);
+		} else
+#endif
+			panic("comattach: IRQ but can't have one");
+	}
 
 #ifdef KGDB
 	if (kgdb_dev == makedev(commajor, unit)) {
diff --git a/sys/dev/ic/lpt.c b/sys/dev/ic/lpt.c
index 46a7b66dade7..c2afa6b8459b 100644
--- a/sys/dev/ic/lpt.c
+++ b/sys/dev/ic/lpt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpt.c,v 1.36 1996/04/10 19:03:46 mycroft Exp $	*/
+/*	$NetBSD: lpt.c,v 1.37 1996/04/11 22:29:37 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -64,7 +64,11 @@
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <machine/cpu.h>
+#ifdef i386							/* XXX */
+#include <machine/cpu.h>					/* XXX */
+#else								/* XXX */
+#include <machine/intr.h>
+#endif								/* XXX */
 #include <machine/bus.h>
 
 #include <dev/isa/isavar.h>
@@ -268,8 +272,8 @@ lptattach(parent, self, aux)
 	bus_io_write_1(bc, ioh, lpt_control, LPC_NINIT);
 
 	if (ia->ia_irq != IRQUNK)
-		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY,
-		    lptintr, sc);
+		sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+		    IPL_TTY, lptintr, sc);
 }
 
 /*
diff --git a/sys/dev/ic/lptvar.h b/sys/dev/ic/lptvar.h
index 22914c0dc280..7867b5a2d3a4 100644
--- a/sys/dev/ic/lptvar.h
+++ b/sys/dev/ic/lptvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: lptvar.h,v 1.36 1996/04/10 19:03:46 mycroft Exp $	*/
+/*	$NetBSD: lptvar.h,v 1.37 1996/04/11 22:29:37 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -64,7 +64,11 @@
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <machine/cpu.h>
+#ifdef i386							/* XXX */
+#include <machine/cpu.h>					/* XXX */
+#else								/* XXX */
+#include <machine/intr.h>
+#endif								/* XXX */
 #include <machine/bus.h>
 
 #include <dev/isa/isavar.h>
@@ -268,8 +272,8 @@ lptattach(parent, self, aux)
 	bus_io_write_1(bc, ioh, lpt_control, LPC_NINIT);
 
 	if (ia->ia_irq != IRQUNK)
-		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY,
-		    lptintr, sc);
+		sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+		    IPL_TTY, lptintr, sc);
 }
 
 /*
diff --git a/sys/dev/ic/mb86960.c b/sys/dev/ic/mb86960.c
index 1b1c7a50069e..396e875c571a 100644
--- a/sys/dev/ic/mb86960.c
+++ b/sys/dev/ic/mb86960.c
@@ -1128,8 +1128,8 @@ feattach(parent, self, aux)
 	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, feintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_NET, feintr, sc);
 }
 
 /*
diff --git a/sys/dev/ic/mb86960var.h b/sys/dev/ic/mb86960var.h
index 1b1c7a50069e..396e875c571a 100644
--- a/sys/dev/ic/mb86960var.h
+++ b/sys/dev/ic/mb86960var.h
@@ -1128,8 +1128,8 @@ feattach(parent, self, aux)
 	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, feintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_NET, feintr, sc);
 }
 
 /*
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 153d422d06af..d8a95ec3f85d 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aha.c,v 1.6 1996/04/03 09:45:45 mycroft Exp $	*/
+/*	$NetBSD: aha.c,v 1.7 1996/04/11 22:27:59 cgd Exp $	*/
 
 #define AHADIAG
 #define integrate
@@ -378,8 +378,8 @@ ahaattach(parent, self, aux)
 #ifdef NEWCONFIG
 	isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
-	sc->sc_ih = isa_intr_establish(sc->sc_irq, IST_EDGE, IPL_BIO, ahaintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, sc->sc_irq, IST_EDGE,
+	    IPL_BIO, ahaintr, sc);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/aha284x.c b/sys/dev/isa/aha284x.c
index 5ec6d27325a9..50ba4f6cb435 100644
--- a/sys/dev/isa/aha284x.c
+++ b/sys/dev/isa/aha284x.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aha284x.c,v 1.3 1996/03/17 00:52:58 thorpej Exp $	*/
+/*	$NetBSD: aha284x.c,v 1.4 1996/04/11 22:28:04 cgd Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Graff.  All rights reserved.
@@ -178,8 +178,8 @@ ahe_attach(parent, self, aux)
 #ifdef NEWCONFIG
         isa_establish(&ahc->sc_id, &ahc->sc_dev);
 #endif
-        ahc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO,
-					ahcintr, ahc);
+        ahc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+            IPL_BIO, ahcintr, ahc);
 
 	/*
 	 * attach the devices on the bus
diff --git a/sys/dev/isa/aic6360.c b/sys/dev/isa/aic6360.c
index 338730b2957c..abc9f67c731a 100644
--- a/sys/dev/isa/aic6360.c
+++ b/sys/dev/isa/aic6360.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic6360.c,v 1.43 1996/04/03 15:58:13 mycroft Exp $	*/
+/*	$NetBSD: aic6360.c,v 1.44 1996/04/11 22:28:08 cgd Exp $	*/
 
 #define	integrate	static inline
 
@@ -779,8 +779,8 @@ aicattach(parent, self, aux)
 #ifdef NEWCONFIG
 	isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, aicintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_BIO, aicintr, sc);
 
 	config_found(self, &sc->sc_link, aicprint);
 }
diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c
index a60f78b221bc..5ccf25ecf63d 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ast.c,v 1.24 1996/04/04 07:08:10 cgd Exp $	*/
+/*	$NetBSD: ast.c,v 1.25 1996/04/11 22:28:18 cgd Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -36,6 +36,11 @@
 #include <sys/param.h>
 #include <sys/device.h>
 
+#ifdef i386							/* XXX */
+#include <machine/cpu.h>					/* XXX */
+#else								/* XXX */
+#include <machine/intr.h>
+#endif								/* XXX */
 #include <machine/bus.h>
 
 #include <dev/isa/isavar.h>
@@ -171,8 +176,8 @@ astattach(parent, self, aux)
 			sc->sc_alive |= 1 << i;
 	}
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY, astintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_TTY, astintr, sc);
 }
 
 int
diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c
index 1b0352ddf580..38fb3f6ed852 100644
--- a/sys/dev/isa/boca.c
+++ b/sys/dev/isa/boca.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: boca.c,v 1.11 1996/04/04 07:08:16 cgd Exp $	*/
+/*	$NetBSD: boca.c,v 1.12 1996/04/11 22:28:22 cgd Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -36,6 +36,11 @@
 #include <sys/param.h>
 #include <sys/device.h>
 
+#ifdef i386							/* XXX */
+#include <machine/cpu.h>					/* XXX */
+#else								/* XXX */
+#include <machine/intr.h>
+#endif								/* XXX */
 #include <machine/bus.h>
 
 #include <dev/isa/isavar.h>
@@ -166,8 +171,8 @@ bocaattach(parent, self, aux)
 			sc->sc_alive |= 1 << i;
 	}
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY, bocaintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_TTY, bocaintr, sc);
 }
 
 int
diff --git a/sys/dev/isa/bt.c b/sys/dev/isa/bt.c
index c17ad4063808..c41101900398 100644
--- a/sys/dev/isa/bt.c
+++ b/sys/dev/isa/bt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bt.c,v 1.6 1996/04/03 09:45:47 mycroft Exp $	*/
+/*	$NetBSD: bt.c,v 1.7 1996/04/11 22:28:25 cgd Exp $	*/
 
 #define BTDIAG
 #define integrate
@@ -378,8 +378,8 @@ btattach(parent, self, aux)
 #ifdef NEWCONFIG
 	isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
-	sc->sc_ih = isa_intr_establish(sc->sc_irq, IST_EDGE, IPL_BIO, btintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, sc->sc_irq, IST_EDGE,
+	    IPL_BIO, btintr, sc);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/com.c b/sys/dev/isa/com.c
index 188eaf07ce2c..6dd28c25fd32 100644
--- a/sys/dev/isa/com.c
+++ b/sys/dev/isa/com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com.c,v 1.77 1996/03/17 13:38:14 cgd Exp $	*/
+/*	$NetBSD: com.c,v 1.78 1996/04/11 22:28:31 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995, 1996
@@ -56,7 +56,11 @@
 #include <sys/types.h>
 #include <sys/device.h>
 
-#include <machine/cpu.h>
+#ifdef i386							/* XXX */
+#include <machine/cpu.h>					/* XXX */
+#else								/* XXX */
+#include <machine/intr.h>
+#endif								/* XXX */
 #include <machine/bus.h>
 
 #include <dev/isa/isavar.h>
@@ -460,9 +464,17 @@ comattach(parent, self, aux)
 	bus_io_write_1(bc, ioh, com_ier, 0);
 	bus_io_write_1(bc, ioh, com_mcr, 0);
 
-	if (irq != IRQUNK)
-		sc->sc_ih = isa_intr_establish(irq, IST_EDGE, IPL_TTY,
-		    comintr, sc);
+	if (irq != IRQUNK) {
+#if NCOM_ISA
+		if (!strcmp(parent->dv_cfdata->cf_driver->cd_name, "isa")) {
+			struct isa_attach_args *ia = aux;
+
+			sc->sc_ih = isa_intr_establish(ia->ia_ic, irq,
+			    IST_EDGE, IPL_TTY, comintr, sc);
+		} else
+#endif
+			panic("comattach: IRQ but can't have one");
+	}
 
 #ifdef KGDB
 	if (kgdb_dev == makedev(commajor, unit)) {
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index 39929334e8d3..c5fe987e81d3 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gus.c,v 1.12 1996/03/31 22:50:11 jtk Exp $	*/
+/*	$NetBSD: gus.c,v 1.13 1996/04/11 22:28:42 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -931,8 +931,8 @@ gusattach(parent, self, aux)
 	/* XXX we shouldn't have to use splgus == splclock, nor should
 	 * we use IPL_CLOCK.
 	 */
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO, gusintr,
-	    sc /* sc->sc_gusdsp */);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_AUDIO, gusintr, sc /* sc->sc_gusdsp */);
 
 	/*
 	 * Set some default values
diff --git a/sys/dev/isa/if_ate.c b/sys/dev/isa/if_ate.c
index 1b1c7a50069e..396e875c571a 100644
--- a/sys/dev/isa/if_ate.c
+++ b/sys/dev/isa/if_ate.c
@@ -1128,8 +1128,8 @@ feattach(parent, self, aux)
 	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, feintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_NET, feintr, sc);
 }
 
 /*
diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c
index cdb30508419a..c05d18660b22 100644
--- a/sys/dev/isa/if_ed.c
+++ b/sys/dev/isa/if_ed.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ed.c,v 1.92 1996/04/09 00:46:15 thorpej Exp $	*/
+/*	$NetBSD: if_ed.c,v 1.93 1996/04/11 22:28:55 cgd Exp $	*/
 
 /*
  * Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -1271,8 +1271,8 @@ edattach(parent, self, aux)
 	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, edintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_NET, edintr, sc);
 }
 
 /*
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index acadf895a496..dced93998201 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_eg.c,v 1.23 1996/03/17 00:53:22 thorpej Exp $	*/
+/*	$NetBSD: if_eg.c,v 1.24 1996/04/11 22:29:03 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993 Dean Huxley <dean@fsa.ca>
@@ -416,8 +416,8 @@ egattach(parent, self, aux)
 	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, egintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_NET, egintr, sc);
 }
 
 void
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 7d67d28b6642..80bfff7a269e 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_el.c,v 1.35 1996/03/17 00:53:24 thorpej Exp $	*/
+/*	$NetBSD: if_el.c,v 1.36 1996/04/11 22:29:07 cgd Exp $	*/
 
 /*
  * Copyright (c) 1994, Matthew E. Kimmel.  Permission is hereby granted
@@ -208,8 +208,8 @@ elattach(parent, self, aux)
 	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, elintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_NET, elintr, sc);
 
 	dprintf(("elattach() finished.\n"));
 }
diff --git a/sys/dev/isa/if_ep.c b/sys/dev/isa/if_ep.c
index 28f9489499c2..8754a6ffcd74 100644
--- a/sys/dev/isa/if_ep.c
+++ b/sys/dev/isa/if_ep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ep.c,v 1.89 1996/03/27 04:03:05 cgd Exp $	*/
+/*	$NetBSD: if_ep.c,v 1.90 1996/04/11 22:29:15 cgd Exp $	*/
 
 /*
  * Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
@@ -456,8 +456,8 @@ epattach(parent, self, aux)
 #endif
 	{
 		struct isa_attach_args *ia = aux;
-		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET,
-		    epintr, sc);
+		sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq,
+		    IST_EDGE, IPL_NET, epintr, sc);
 	}
 }
 
diff --git a/sys/dev/isa/if_fe.c b/sys/dev/isa/if_fe.c
index 1b1c7a50069e..396e875c571a 100644
--- a/sys/dev/isa/if_fe.c
+++ b/sys/dev/isa/if_fe.c
@@ -1128,8 +1128,8 @@ feattach(parent, self, aux)
 	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, feintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_NET, feintr, sc);
 }
 
 /*
diff --git a/sys/dev/isa/if_fmv.c b/sys/dev/isa/if_fmv.c
index 1b1c7a50069e..396e875c571a 100644
--- a/sys/dev/isa/if_fmv.c
+++ b/sys/dev/isa/if_fmv.c
@@ -1128,8 +1128,8 @@ feattach(parent, self, aux)
 	bpfattach(&ifp->if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, feintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_NET, feintr, sc);
 }
 
 /*
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index 0011014ab083..134dc676b76b 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ie.c,v 1.46 1996/03/17 00:53:34 thorpej Exp $	*/
+/*	$NetBSD: if_ie.c,v 1.47 1996/04/11 22:29:27 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles Hannum.
@@ -780,8 +780,8 @@ ieattach(parent, self, aux)
 	    sizeof(struct ether_header));
 #endif
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, ieintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_NET, ieintr, sc);
 }
 
 /*
diff --git a/sys/dev/isa/if_le.c b/sys/dev/isa/if_le.c
index 2080245c52b3..0052dae1b46b 100644
--- a/sys/dev/isa/if_le.c
+++ b/sys/dev/isa/if_le.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le.c,v 1.40 1996/03/27 04:03:10 cgd Exp $	*/
+/*	$NetBSD: if_le.c,v 1.41 1996/04/11 22:29:34 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
@@ -406,8 +406,8 @@ leattach(parent, self, aux)
 		if (ia->ia_drq != DRQUNK)
 			isa_dmacascade(ia->ia_drq);
 
-		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET,
-		    leintredge, sc);
+		sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+		    IPL_NET, leintredge, sc);
 	}
 #endif
 
diff --git a/sys/dev/isa/lpt.c b/sys/dev/isa/lpt.c
index 46a7b66dade7..c2afa6b8459b 100644
--- a/sys/dev/isa/lpt.c
+++ b/sys/dev/isa/lpt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpt.c,v 1.36 1996/04/10 19:03:46 mycroft Exp $	*/
+/*	$NetBSD: lpt.c,v 1.37 1996/04/11 22:29:37 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -64,7 +64,11 @@
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <machine/cpu.h>
+#ifdef i386							/* XXX */
+#include <machine/cpu.h>					/* XXX */
+#else								/* XXX */
+#include <machine/intr.h>
+#endif								/* XXX */
 #include <machine/bus.h>
 
 #include <dev/isa/isavar.h>
@@ -268,8 +272,8 @@ lptattach(parent, self, aux)
 	bus_io_write_1(bc, ioh, lpt_control, LPC_NINIT);
 
 	if (ia->ia_irq != IRQUNK)
-		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY,
-		    lptintr, sc);
+		sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+		    IPL_TTY, lptintr, sc);
 }
 
 /*
diff --git a/sys/dev/isa/lpt_isa.c b/sys/dev/isa/lpt_isa.c
index dc6a596a2f26..31246bce385c 100644
--- a/sys/dev/isa/lpt_isa.c
+++ b/sys/dev/isa/lpt_isa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpt_isa.c,v 1.36 1996/04/10 19:03:46 mycroft Exp $	*/
+/*	$NetBSD: lpt_isa.c,v 1.37 1996/04/11 22:29:37 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -64,7 +64,11 @@
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <machine/cpu.h>
+#ifdef i386							/* XXX */
+#include <machine/cpu.h>					/* XXX */
+#else								/* XXX */
+#include <machine/intr.h>
+#endif								/* XXX */
 #include <machine/bus.h>
 
 #include <dev/isa/isavar.h>
@@ -268,8 +272,8 @@ lptattach(parent, self, aux)
 	bus_io_write_1(bc, ioh, lpt_control, LPC_NINIT);
 
 	if (ia->ia_irq != IRQUNK)
-		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY,
-		    lptintr, sc);
+		sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+		    IPL_TTY, lptintr, sc);
 }
 
 /*
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index bf3fc9990626..b1a2c596aa9f 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mcd.c,v 1.46 1996/03/17 00:53:44 thorpej Exp $	*/
+/*	$NetBSD: mcd.c,v 1.47 1996/04/11 22:29:43 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -231,8 +231,8 @@ mcdattach(parent, self, aux)
 
 	mcd_soft_reset(sc);
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, mcdintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_BIO, mcdintr, sc);
 }
 
 /*
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index f8d19adbe37e..0489cd2d30e8 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pas.c,v 1.14 1996/03/17 00:53:47 thorpej Exp $	*/
+/*	$NetBSD: pas.c,v 1.15 1996/04/11 22:29:48 cgd Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -434,8 +434,8 @@ pasattach(parent, self, aux)
 	int err;
 	
 	sc->sc_iobase = iobase;
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO,
-				       sbdsp_intr, &sc->sc_sbdsp);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_AUDIO, sbdsp_intr, &sc->sc_sbdsp);
 
 	printf(" ProAudio Spectrum %s [rev %d] ", pasnames[sc->model], sc->rev);
 	
diff --git a/sys/dev/isa/pss.c b/sys/dev/isa/pss.c
index ae6575920687..6da2f78a8c2e 100644
--- a/sys/dev/isa/pss.c
+++ b/sys/dev/isa/pss.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pss.c,v 1.12 1996/03/17 00:53:49 thorpej Exp $	*/
+/*	$NetBSD: pss.c,v 1.13 1996/04/11 22:29:52 cgd Exp $	*/
 
 /*
  * Copyright (c) 1994 John Brezak
@@ -1020,13 +1020,13 @@ pssattach(parent, self, aux)
 #endif
 
     /* Setup interrupt handler for PSS */
-    sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO, pssintr,
-	sc);
+    sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE, IPL_AUDIO,
+	pssintr, sc);
 
     vers = (inw(sc->sc_iobase+PSS_ID_VERS)&0xff) - 1;
     printf(": ESC614%c\n", (vers > 0)?'A'+vers:' ');
     
-    (void)config_found(self, NULL, NULL);
+    (void)config_found(self, ia->ia_ic, NULL);		/* XXX */
 
     sc->out_port = PSS_MASTER_VOL;
 
@@ -1046,6 +1046,7 @@ spattach(parent, self, aux)
 {
     struct ad1848_softc *sc = (struct ad1848_softc *)self;
     struct cfdata *cf = (void *)sc->sc_dev.dv_cfdata;
+    isa_chipset_tag_t ic = aux;				/* XXX */
     int iobase = cf->cf_iobase;
 
     sc->sc_iobase = iobase;
@@ -1055,8 +1056,8 @@ spattach(parent, self, aux)
     isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
 
-    sc->sc_ih = isa_intr_establish(cf->cf_irq, IST_EDGE, IPL_AUDIO, ad1848_intr,
-	sc);
+    sc->sc_ih = isa_intr_establish(ic, cf->cf_irq, IST_EDGE, IPL_AUDIO,
+	ad1848_intr, sc);
 
     /* XXX might use pssprint func ?? */
     printf(" port 0x%x-0x%x irq %d drq %d",
@@ -1075,6 +1076,7 @@ mpuattach(parent, self, aux)
 {
     struct mpu_softc *sc = (struct mpu_softc *)self;
     struct cfdata *cf = (void *)sc->sc_dev.dv_cfdata;
+    isa_chipset_tag_t ic = aux;				/* XXX */
     int iobase = cf->cf_iobase;
 
     sc->sc_iobase = iobase;
@@ -1083,8 +1085,8 @@ mpuattach(parent, self, aux)
     isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
 
-    sc->sc_ih = isa_intr_establish(cf->cf_irq, IST_EDGE, IPL_AUDIO, mpuintr,
-	sc);
+    sc->sc_ih = isa_intr_establish(ic, cf->cf_irq, IST_EDGE, IPL_AUDIO,
+        mpuintr, sc);
 
     /* XXX might use pssprint func ?? */
     printf(" port 0x%x-0x%x irq %d\n",
diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c
index fd75d8678cbd..af9443e9773e 100644
--- a/sys/dev/isa/rtfps.c
+++ b/sys/dev/isa/rtfps.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtfps.c,v 1.19 1996/04/04 07:08:20 cgd Exp $	*/
+/*	$NetBSD: rtfps.c,v 1.20 1996/04/11 22:29:57 cgd Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -36,6 +36,11 @@
 #include <sys/param.h>
 #include <sys/device.h>
 
+#ifdef i386							/* XXX */
+#include <machine/cpu.h>					/* XXX */
+#else								/* XXX */
+#include <machine/intr.h>
+#endif								/* XXX */
 #include <machine/bus.h>
 
 #include <dev/isa/isavar.h>
@@ -183,8 +188,8 @@ rtfpsattach(parent, self, aux)
 			sc->sc_alive |= 1 << i;
 	}
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY, rtfpsintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_TTY, rtfpsintr, sc);
 }
 
 int
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index e3ada40b9a8b..fbba6714f04b 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sb.c,v 1.33 1996/03/17 00:53:52 thorpej Exp $	*/
+/*	$NetBSD: sb.c,v 1.34 1996/04/11 22:30:01 cgd Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -273,8 +273,8 @@ sbattach(parent, self, aux)
 	register int iobase = ia->ia_iobase;
 	int err;
 	
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO,
-				       sbdsp_intr, sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_AUDIO, sbdsp_intr, sc);
 
 	sbdsp_attach(sc);
 
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index 54c3a1f87ae5..eed4acb56d2f 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -442,8 +442,8 @@ seaattach(parent, self, aux)
 #ifdef NEWCONFIG
 	isa_establish(&sea->sc_id, &sea->sc_deV);
 #endif
-	sea->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, seaintr,
-	    sea);
+	sea->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_BIO, seaintr, sea);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/ultra14f.c b/sys/dev/isa/ultra14f.c
index 5981432b0f77..a481fb9b017a 100644
--- a/sys/dev/isa/ultra14f.c
+++ b/sys/dev/isa/ultra14f.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ultra14f.c,v 1.63 1996/03/17 00:53:58 thorpej Exp $	*/
+/*	$NetBSD: ultra14f.c,v 1.64 1996/04/11 22:30:20 cgd Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -610,8 +610,8 @@ uhaattach(parent, self, aux)
 #ifdef NEWCONFIG
 	isa_establish(&uha->sc_id, &uha->sc_dev);
 #endif
-	uha->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO,
-	    uha->intr, uha);
+	uha->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_BIO, uha->intr, uha);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c
index 2b9101370aa8..bc139fcc2db1 100644
--- a/sys/dev/isa/wd.c
+++ b/sys/dev/isa/wd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.147 1996/03/17 00:54:01 thorpej Exp $	*/
+/*	$NetBSD: wd.c,v 1.148 1996/04/11 22:30:31 cgd Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -256,8 +256,8 @@ wdcattach(parent, self, aux)
 
 	printf("\n");
 
-	wdc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, wdcintr,
-	    wdc);
+	wdc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_BIO, wdcintr, wdc);
 
 	for (wa.wa_drive = 0; wa.wa_drive < 2; wa.wa_drive++)
 		(void)config_found(self, (void *)&wa, wdprint);
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 093fd109df49..4f454764c43a 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wds.c,v 1.3 1996/04/10 23:01:13 cgd Exp $	*/
+/*	$NetBSD: wds.c,v 1.4 1996/04/11 22:30:38 cgd Exp $	*/
 
 #define	WDSDIAG
 #define	integrate
@@ -295,8 +295,8 @@ wdsattach(parent, self, aux)
 #ifdef NEWCONFIG
 	isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
-	sc->sc_ih = isa_intr_establish(sc->sc_irq, IST_EDGE, IPL_BIO, wdsintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, sc->sc_irq, IST_EDGE,
+	    IPL_BIO, wdsintr, sc);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/wss.c b/sys/dev/isa/wss.c
index 847efd1de2f0..161c23f11d2e 100644
--- a/sys/dev/isa/wss.c
+++ b/sys/dev/isa/wss.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wss.c,v 1.10 1996/03/17 00:54:03 thorpej Exp $	*/
+/*	$NetBSD: wss.c,v 1.11 1996/04/11 22:30:46 cgd Exp $	*/
 
 /*
  * Copyright (c) 1994 John Brezak
@@ -253,7 +253,8 @@ wssattach(parent, self, aux)
 #ifdef NEWCONFIG
     isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
-    sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO, ad1848_intr,	&sc->sc_ad1848);
+    sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE, IPL_AUDIO,
+        ad1848_intr, &sc->sc_ad1848);
 
     ad1848_attach(&sc->sc_ad1848);
     
diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c
index 250b5d7257be..8e0332ee685a 100644
--- a/sys/dev/isa/wt.c
+++ b/sys/dev/isa/wt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wt.c,v 1.30 1996/03/17 00:54:05 thorpej Exp $	*/
+/*	$NetBSD: wt.c,v 1.31 1996/04/11 22:30:49 cgd Exp $	*/
 
 /*
  * Streamer tape driver.
@@ -253,8 +253,8 @@ wtattach(parent, self, aux)
 	sc->flags = TPSTART;		/* tape is rewound */
 	sc->dens = -1;			/* unknown density */
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, wtintr,
-	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+	    IPL_BIO, wtintr, sc);
 }
 
 int