diff --git a/sys/arch/i386/isa/aha1542.c b/sys/arch/i386/isa/aha1542.c
index 6c91d0973caa..a8c4701c4d90 100644
--- a/sys/arch/i386/isa/aha1542.c
+++ b/sys/arch/i386/isa/aha1542.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aha1542.c,v 1.39 1994/12/28 19:43:42 mycroft Exp $	*/
+/*	$NetBSD: aha1542.c,v 1.40 1995/01/03 01:30:14 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -584,7 +584,7 @@ ahaattach(parent, self, aux)
 	aha->sc_ih.ih_fun = ahaintr;
 	aha->sc_ih.ih_arg = aha;
 	aha->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &aha->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &aha->sc_ih);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/arch/i386/isa/aic6360.c b/sys/arch/i386/isa/aic6360.c
index 2aec38761af7..b8afb0bef0dc 100644
--- a/sys/arch/i386/isa/aic6360.c
+++ b/sys/arch/i386/isa/aic6360.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic6360.c,v 1.22 1994/12/31 05:34:00 mycroft Exp $	*/
+/*	$NetBSD: aic6360.c,v 1.23 1995/01/03 01:30:18 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -752,7 +752,7 @@ aicattach(parent, self, aux)
 	aic->sc_ih.ih_fun = aicintr;
 	aic->sc_ih.ih_arg = aic;
 	aic->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &aic->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &aic->sc_ih);
 	
 	config_found(self, &aic->sc_link, aicprint);
 }
diff --git a/sys/arch/i386/isa/ast.c b/sys/arch/i386/isa/ast.c
index e0c77e895def..f93db36d2d87 100644
--- a/sys/arch/i386/isa/ast.c
+++ b/sys/arch/i386/isa/ast.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ast.c,v 1.13 1995/01/02 22:27:46 mycroft Exp $	*/
+/*	$NetBSD: ast.c,v 1.14 1995/01/03 01:30:20 mycroft Exp $	*/
 
 /*
  * Multi-port serial card interrupt demuxing support.
@@ -117,7 +117,7 @@ astattach(parent, self, aux)
 	sc->sc_ih.ih_fun = astintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_TTY;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 int
diff --git a/sys/arch/i386/isa/bt742a.c b/sys/arch/i386/isa/bt742a.c
index f259b53651f7..92540ff70ad0 100644
--- a/sys/arch/i386/isa/bt742a.c
+++ b/sys/arch/i386/isa/bt742a.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bt742a.c,v 1.36 1994/12/28 19:43:49 mycroft Exp $	*/
+/*	$NetBSD: bt742a.c,v 1.37 1995/01/03 01:30:24 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -611,7 +611,7 @@ btattach(parent, self, aux)
 	bt->sc_ih.ih_fun = btintr;
 	bt->sc_ih.ih_arg = bt;
 	bt->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &bt->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &bt->sc_ih);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index f725f8649b74..d0545301e189 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.28 1994/11/04 19:01:39 mycroft Exp $	*/
+/*	$NetBSD: clock.c,v 1.29 1995/01/03 01:30:26 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -280,7 +280,7 @@ cpu_initclocks()
 	clockhand.ih_fun = clockintr;
 	clockhand.ih_arg = 0;
 	clockhand.ih_level = IPL_CLOCK;
-	intr_establish(0, &clockhand);
+	intr_establish(0, IST_PULSE, &clockhand);
 }
 
 void
diff --git a/sys/arch/i386/isa/com.c b/sys/arch/i386/isa/com.c
index 13ca1ccda397..044e5237cc7f 100644
--- a/sys/arch/i386/isa/com.c
+++ b/sys/arch/i386/isa/com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com.c,v 1.42 1994/11/25 08:17:21 mycroft Exp $	*/
+/*	$NetBSD: com.c,v 1.43 1995/01/03 01:30:28 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -216,7 +216,7 @@ comattach(parent, self, aux)
 		sc->sc_ih.ih_fun = comintr;
 		sc->sc_ih.ih_arg = sc;
 		sc->sc_ih.ih_level = IPL_TTY;
-		intr_establish(ia->ia_irq, &sc->sc_ih);
+		intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 	}
 
 #ifdef KGDB
diff --git a/sys/arch/i386/isa/if_ed.c b/sys/arch/i386/isa/if_ed.c
index 29c03c8b4e06..90c9afa43b8d 100644
--- a/sys/arch/i386/isa/if_ed.c
+++ b/sys/arch/i386/isa/if_ed.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ed.c,v 1.65 1995/01/02 20:32:55 mycroft Exp $	*/
+/*	$NetBSD: if_ed.c,v 1.66 1995/01/03 01:30:32 mycroft Exp $	*/
 
 /*
  * Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -1091,7 +1091,7 @@ edattach(parent, self, aux)
 	sc->sc_ih.ih_fun = edintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NET;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
  
 /*
diff --git a/sys/arch/i386/isa/if_eg.c b/sys/arch/i386/isa/if_eg.c
index 63debbdf3395..39d1dbdacb74 100644
--- a/sys/arch/i386/isa/if_eg.c
+++ b/sys/arch/i386/isa/if_eg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_eg.c,v 1.8 1994/11/18 22:03:15 mycroft Exp $	*/
+/*	$NetBSD: if_eg.c,v 1.9 1995/01/03 01:30:35 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1993 Dean Huxley <dean@fsa.ca>
@@ -409,7 +409,7 @@ egattach(parent, self, aux)
 	sc->sc_ih.ih_fun = egintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NET;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 static void
diff --git a/sys/arch/i386/isa/if_el.c b/sys/arch/i386/isa/if_el.c
index 746b209b66ff..745c09a4ae5f 100644
--- a/sys/arch/i386/isa/if_el.c
+++ b/sys/arch/i386/isa/if_el.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_el.c,v 1.19 1994/12/10 05:55:26 mycroft Exp $	*/
+/*	$NetBSD: if_el.c,v 1.20 1995/01/03 01:30:37 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994, Matthew E. Kimmel.  Permission is hereby granted
@@ -210,7 +210,7 @@ elattach(parent, self, aux)
 	sc->sc_ih.ih_fun = elintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NET;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 
 	dprintf(("elattach() finished.\n"));
 }
diff --git a/sys/arch/i386/isa/if_ep.c b/sys/arch/i386/isa/if_ep.c
index 446b8cbdead4..1fe7f9231cbe 100644
--- a/sys/arch/i386/isa/if_ep.c
+++ b/sys/arch/i386/isa/if_ep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ep.c,v 1.64 1994/12/28 16:47:50 hpeyerl Exp $	*/
+/*	$NetBSD: if_ep.c,v 1.65 1995/01/03 01:30:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
@@ -342,7 +342,7 @@ epattach(parent, self, aux)
 	sc->sc_ih.ih_fun = epintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NET;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 /*
diff --git a/sys/arch/i386/isa/if_ie.c b/sys/arch/i386/isa/if_ie.c
index a46b2a61c10a..926a6b85e4ea 100644
--- a/sys/arch/i386/isa/if_ie.c
+++ b/sys/arch/i386/isa/if_ie.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ie.c,v 1.25 1995/01/02 22:01:05 mycroft Exp $	*/
+/*	$NetBSD: if_ie.c,v 1.26 1995/01/03 01:30:43 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -543,7 +543,7 @@ ieattach(parent, self, aux)
 	sc->sc_ih.ih_fun = ieintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NET;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 /*
diff --git a/sys/arch/i386/isa/if_le.c b/sys/arch/i386/isa/if_le.c
index 1ef546886137..9ec80e9b2b62 100644
--- a/sys/arch/i386/isa/if_le.c
+++ b/sys/arch/i386/isa/if_le.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le.c,v 1.21 1995/01/02 20:39:37 mycroft Exp $	*/
+/*	$NetBSD: if_le.c,v 1.22 1995/01/03 01:30:46 mycroft Exp $	*/
 
 /*
  * LANCE Ethernet driver
@@ -419,7 +419,7 @@ leattach(parent, self, aux)
 	sc->sc_ih.ih_fun = leintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NET;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 void
diff --git a/sys/arch/i386/isa/intr.c b/sys/arch/i386/isa/intr.c
index 569a6294a0d3..fa9ceb6a5af0 100644
--- a/sys/arch/i386/isa/intr.c
+++ b/sys/arch/i386/isa/intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.26 1994/11/18 22:22:40 mycroft Exp $	*/
+/*	$NetBSD: intr.c,v 1.27 1995/01/03 01:30:47 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -136,7 +136,7 @@ isa_strayintr(irq)
 }
 
 int fastvec;
-int intrmask[ICU_LEN], intrlevel[ICU_LEN];
+int intrtype[ICU_LEN], intrmask[ICU_LEN], intrlevel[ICU_LEN];
 struct intrhand *intrhand[ICU_LEN];
 
 /*
@@ -211,21 +211,38 @@ fakeintr(arg)
  * Set up an interrupt handler to start being called.
  */
 void
-intr_establish(irq, ih)
-	int irq;
+intr_establish(irq, type, ih)
+	int irq, type;
 	struct intrhand *ih;
 {
 	int mask;
 	struct intrhand **p, *q;
 	static struct intrhand fakehand = {fakeintr};
+	static char *typename[] = {NULL, "pulsed", "edge-triggered",
+	    "level-triggered"};
 
 	mask = 1 << irq;
 
-	if (irq < 0 || irq > ICU_LEN)
+	if (irq < 0 || irq > ICU_LEN || type == IST_NONE)
 		panic("intr_establish: bogus irq");
 	if (fastvec & mask)
 		panic("intr_establish: irq is already fast vector");
 
+	switch (intrtype[irq]) {
+	case IST_NONE:
+		intrtype[irq] = type;
+		break;
+	case IST_EDGE:
+	case IST_LEVEL:
+		if (type == intrtype[irq])
+			break;
+	case IST_PULSE:
+		if (type != IST_NONE)
+			panic("intr_establish: can't share %s with %s",
+			    typename[intrtype[irq]], typename[type]);
+		break;
+	}
+
 	/*
 	 * Figure out where to put the handler.
 	 * This is O(N^2), but we want to preserve the order, and N is
@@ -282,4 +299,7 @@ intr_disestablish(irq, ih)
 		panic("intr_disestablish: handler not registered");
 
 	intr_calculatemasks();
+
+	if (intrhand[irq] == NULL)
+		intrtype[irq] = IST_NONE;
 }
diff --git a/sys/arch/i386/isa/lms.c b/sys/arch/i386/isa/lms.c
index 91e3f35538c0..e2ec584a72aa 100644
--- a/sys/arch/i386/isa/lms.c
+++ b/sys/arch/i386/isa/lms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lms.c,v 1.17 1994/11/18 22:03:26 mycroft Exp $	*/
+/*	$NetBSD: lms.c,v 1.18 1995/01/03 01:30:49 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -122,7 +122,7 @@ lmsattach(parent, self, aux)
 	sc->sc_ih.ih_fun = lmsintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NONE;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_PULSE, &sc->sc_ih);
 }
 
 int
diff --git a/sys/arch/i386/isa/lpt.c b/sys/arch/i386/isa/lpt.c
index 6b523527c6ff..c0bc53cef78e 100644
--- a/sys/arch/i386/isa/lpt.c
+++ b/sys/arch/i386/isa/lpt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpt.c,v 1.25 1994/11/18 22:03:28 mycroft Exp $	*/
+/*	$NetBSD: lpt.c,v 1.26 1995/01/03 01:30:50 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -252,7 +252,7 @@ lptattach(parent, self, aux)
 		sc->sc_ih.ih_fun = lptintr;
 		sc->sc_ih.ih_arg = sc;
 		sc->sc_ih.ih_level = IPL_NONE;
-		intr_establish(ia->ia_irq, &sc->sc_ih);
+		intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 	}
 }
 
diff --git a/sys/arch/i386/isa/mcd.c b/sys/arch/i386/isa/mcd.c
index 6814a21145d4..a96683facfed 100644
--- a/sys/arch/i386/isa/mcd.c
+++ b/sys/arch/i386/isa/mcd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mcd.c,v 1.25 1994/12/14 15:23:27 mycroft Exp $	*/
+/*	$NetBSD: mcd.c,v 1.26 1995/01/03 01:31:45 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -204,7 +204,7 @@ mcdattach(parent, self, aux)
 	sc->sc_ih.ih_fun = mcdintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 int
diff --git a/sys/arch/i386/isa/mms.c b/sys/arch/i386/isa/mms.c
index 889fa598095d..ad0cecb509f9 100644
--- a/sys/arch/i386/isa/mms.c
+++ b/sys/arch/i386/isa/mms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mms.c,v 1.16 1994/11/18 22:03:32 mycroft Exp $	*/
+/*	$NetBSD: mms.c,v 1.17 1995/01/03 01:30:51 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -112,7 +112,7 @@ mmsattach(parent, self, aux)
 	sc->sc_ih.ih_fun = mmsintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NONE;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_PULSE, &sc->sc_ih);
 }
 
 int
diff --git a/sys/arch/i386/isa/npx.c b/sys/arch/i386/isa/npx.c
index 91a9a7e95191..1e422fd70d69 100644
--- a/sys/arch/i386/isa/npx.c
+++ b/sys/arch/i386/isa/npx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: npx.c,v 1.31 1994/11/30 04:42:07 mycroft Exp $	*/
+/*	$NetBSD: npx.c,v 1.32 1995/01/03 01:30:53 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1994 Charles Hannum.
@@ -351,7 +351,7 @@ npxattach(parent, self, aux)
 		npxhand.ih_fun = npxintr;
 		npxhand.ih_arg = 0;
 		npxhand.ih_level = IPL_NONE;
-		intr_establish(ia->ia_irq, &npxhand);
+		intr_establish(ia->ia_irq, IST_EDGE, &npxhand);
 		break;
 	case NPX_EXCEPTION:
 		printf(": using exception 16\n");
diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index a0a7888292dc..373d89f6012b 100644
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pccons.c,v 1.78 1994/12/13 13:42:56 mycroft Exp $	*/
+/*	$NetBSD: pccons.c,v 1.79 1995/01/03 01:30:55 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -470,7 +470,7 @@ pcattach(parent, self, aux)
 	pchand.ih_fun = pcintr;
 	pchand.ih_arg = 0;
 	pchand.ih_level = IPL_TTY;
-	intr_establish(ia->ia_irq, &pchand);
+	intr_establish(ia->ia_irq, IST_EDGE, &pchand);
 }
 
 int
diff --git a/sys/arch/i386/isa/pms.c b/sys/arch/i386/isa/pms.c
index b4e33943ca7c..f5ec20024f98 100644
--- a/sys/arch/i386/isa/pms.c
+++ b/sys/arch/i386/isa/pms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pms.c,v 1.17 1994/11/18 22:03:35 mycroft Exp $	*/
+/*	$NetBSD: pms.c,v 1.18 1995/01/03 01:30:58 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1994 Charles Hannum.
@@ -197,7 +197,7 @@ pmsattach(parent, self, aux)
 	sc->sc_ih.ih_fun = pmsintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NONE;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 int
diff --git a/sys/arch/i386/isa/rtfps.c b/sys/arch/i386/isa/rtfps.c
index 10a4bec9b54f..683829ae5b46 100644
--- a/sys/arch/i386/isa/rtfps.c
+++ b/sys/arch/i386/isa/rtfps.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtfps.c,v 1.8 1995/01/02 22:27:47 mycroft Exp $	*/
+/*	$NetBSD: rtfps.c,v 1.9 1995/01/03 01:30:59 mycroft Exp $	*/
 
 /*
  * Multi-port serial card interrupt demuxing support.
@@ -125,7 +125,7 @@ rtfpsattach(parent, self, aux)
 	sc->sc_ih.ih_fun = rtfpsintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_TTY;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 int
diff --git a/sys/arch/i386/isa/sb.c b/sys/arch/i386/isa/sb.c
index 9d2208d5a4c6..0130ee8acb9f 100644
--- a/sys/arch/i386/isa/sb.c
+++ b/sys/arch/i386/isa/sb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sb.c,v 1.15 1994/12/17 18:45:11 mycroft Exp $	*/
+/*	$NetBSD: sb.c,v 1.16 1995/01/03 01:31:01 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -211,7 +211,7 @@ sbattach(parent, self, aux)
 	sc->sc_ih.ih_fun = sbintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 
 #ifdef NEWCONFIG
 	/*
diff --git a/sys/arch/i386/isa/seagate.c b/sys/arch/i386/isa/seagate.c
index 99238c2afee7..3167a73076e6 100644
--- a/sys/arch/i386/isa/seagate.c
+++ b/sys/arch/i386/isa/seagate.c
@@ -433,7 +433,7 @@ seaattach(parent, self, aux)
 	sea->sc_ih.ih_fun = seaintr;
 	sea->sc_ih.ih_arg = sea;
 	sea->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &sea->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sea->sc_ih);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/arch/i386/isa/ultra14f.c b/sys/arch/i386/isa/ultra14f.c
index c6c876fb0741..2f89f9673270 100644
--- a/sys/arch/i386/isa/ultra14f.c
+++ b/sys/arch/i386/isa/ultra14f.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ultra14f.c,v 1.44 1994/12/28 19:43:55 mycroft Exp $	*/
+/*	$NetBSD: ultra14f.c,v 1.45 1995/01/03 01:31:05 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -611,7 +611,7 @@ uhaattach(parent, self, aux)
 	uha->sc_ih.ih_fun = uha->intr;
 	uha->sc_ih.ih_arg = uha;
 	uha->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &uha->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &uha->sc_ih);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/arch/i386/isa/wd.c b/sys/arch/i386/isa/wd.c
index 0341f4703797..c38c6f7731d3 100644
--- a/sys/arch/i386/isa/wd.c
+++ b/sys/arch/i386/isa/wd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.122 1994/12/14 15:23:49 mycroft Exp $	*/
+/*	$NetBSD: wd.c,v 1.123 1995/01/03 01:31:10 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -278,7 +278,7 @@ wdcattach(parent, self, aux)
 	wdc->sc_ih.ih_fun = wdcintr;
 	wdc->sc_ih.ih_arg = wdc;
 	wdc->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &wdc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &wdc->sc_ih);
 
 	for (wa.wa_drive = 0; wa.wa_drive < 2; wa.wa_drive++)
 		(void)config_found(self, (void *)&wa, wdprint);
diff --git a/sys/arch/i386/isa/wt.c b/sys/arch/i386/isa/wt.c
index 5b511b92e63f..32add9da26d0 100644
--- a/sys/arch/i386/isa/wt.c
+++ b/sys/arch/i386/isa/wt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wt.c,v 1.21 1994/11/18 22:03:51 mycroft Exp $	*/
+/*	$NetBSD: wt.c,v 1.22 1995/01/03 01:31:14 mycroft Exp $	*/
 
 /*
  * Streamer tape driver.
@@ -252,7 +252,7 @@ wtattach(parent, self, aux)
 	sc->sc_ih.ih_fun = wtintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 int
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 0341f4703797..c38c6f7731d3 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.122 1994/12/14 15:23:49 mycroft Exp $	*/
+/*	$NetBSD: wd.c,v 1.123 1995/01/03 01:31:10 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -278,7 +278,7 @@ wdcattach(parent, self, aux)
 	wdc->sc_ih.ih_fun = wdcintr;
 	wdc->sc_ih.ih_arg = wdc;
 	wdc->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &wdc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &wdc->sc_ih);
 
 	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 2aec38761af7..b8afb0bef0dc 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic6360.c,v 1.22 1994/12/31 05:34:00 mycroft Exp $	*/
+/*	$NetBSD: aic6360.c,v 1.23 1995/01/03 01:30:18 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -752,7 +752,7 @@ aicattach(parent, self, aux)
 	aic->sc_ih.ih_fun = aicintr;
 	aic->sc_ih.ih_arg = aic;
 	aic->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &aic->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &aic->sc_ih);
 	
 	config_found(self, &aic->sc_link, aicprint);
 }
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 13ca1ccda397..044e5237cc7f 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com.c,v 1.42 1994/11/25 08:17:21 mycroft Exp $	*/
+/*	$NetBSD: com.c,v 1.43 1995/01/03 01:30:28 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -216,7 +216,7 @@ comattach(parent, self, aux)
 		sc->sc_ih.ih_fun = comintr;
 		sc->sc_ih.ih_arg = sc;
 		sc->sc_ih.ih_level = IPL_TTY;
-		intr_establish(ia->ia_irq, &sc->sc_ih);
+		intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 	}
 
 #ifdef KGDB
diff --git a/sys/dev/ic/lpt.c b/sys/dev/ic/lpt.c
index 6b523527c6ff..c0bc53cef78e 100644
--- a/sys/dev/ic/lpt.c
+++ b/sys/dev/ic/lpt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpt.c,v 1.25 1994/11/18 22:03:28 mycroft Exp $	*/
+/*	$NetBSD: lpt.c,v 1.26 1995/01/03 01:30:50 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -252,7 +252,7 @@ lptattach(parent, self, aux)
 		sc->sc_ih.ih_fun = lptintr;
 		sc->sc_ih.ih_arg = sc;
 		sc->sc_ih.ih_level = IPL_NONE;
-		intr_establish(ia->ia_irq, &sc->sc_ih);
+		intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 	}
 }
 
diff --git a/sys/dev/ic/lptvar.h b/sys/dev/ic/lptvar.h
index 6008173bc594..548a316f782d 100644
--- a/sys/dev/ic/lptvar.h
+++ b/sys/dev/ic/lptvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: lptvar.h,v 1.25 1994/11/18 22:03:28 mycroft Exp $	*/
+/*	$NetBSD: lptvar.h,v 1.26 1995/01/03 01:30:50 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -252,7 +252,7 @@ lptattach(parent, self, aux)
 		sc->sc_ih.ih_fun = lptintr;
 		sc->sc_ih.ih_arg = sc;
 		sc->sc_ih.ih_level = IPL_NONE;
-		intr_establish(ia->ia_irq, &sc->sc_ih);
+		intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 	}
 }
 
diff --git a/sys/dev/isa/aha1542.c b/sys/dev/isa/aha1542.c
index 6c91d0973caa..a8c4701c4d90 100644
--- a/sys/dev/isa/aha1542.c
+++ b/sys/dev/isa/aha1542.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aha1542.c,v 1.39 1994/12/28 19:43:42 mycroft Exp $	*/
+/*	$NetBSD: aha1542.c,v 1.40 1995/01/03 01:30:14 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -584,7 +584,7 @@ ahaattach(parent, self, aux)
 	aha->sc_ih.ih_fun = ahaintr;
 	aha->sc_ih.ih_arg = aha;
 	aha->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &aha->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &aha->sc_ih);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/aic6360.c b/sys/dev/isa/aic6360.c
index 2aec38761af7..b8afb0bef0dc 100644
--- a/sys/dev/isa/aic6360.c
+++ b/sys/dev/isa/aic6360.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic6360.c,v 1.22 1994/12/31 05:34:00 mycroft Exp $	*/
+/*	$NetBSD: aic6360.c,v 1.23 1995/01/03 01:30:18 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -752,7 +752,7 @@ aicattach(parent, self, aux)
 	aic->sc_ih.ih_fun = aicintr;
 	aic->sc_ih.ih_arg = aic;
 	aic->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &aic->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &aic->sc_ih);
 	
 	config_found(self, &aic->sc_link, aicprint);
 }
diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c
index e0c77e895def..f93db36d2d87 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ast.c,v 1.13 1995/01/02 22:27:46 mycroft Exp $	*/
+/*	$NetBSD: ast.c,v 1.14 1995/01/03 01:30:20 mycroft Exp $	*/
 
 /*
  * Multi-port serial card interrupt demuxing support.
@@ -117,7 +117,7 @@ astattach(parent, self, aux)
 	sc->sc_ih.ih_fun = astintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_TTY;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 int
diff --git a/sys/dev/isa/bt742a.c b/sys/dev/isa/bt742a.c
index f259b53651f7..92540ff70ad0 100644
--- a/sys/dev/isa/bt742a.c
+++ b/sys/dev/isa/bt742a.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bt742a.c,v 1.36 1994/12/28 19:43:49 mycroft Exp $	*/
+/*	$NetBSD: bt742a.c,v 1.37 1995/01/03 01:30:24 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -611,7 +611,7 @@ btattach(parent, self, aux)
 	bt->sc_ih.ih_fun = btintr;
 	bt->sc_ih.ih_arg = bt;
 	bt->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &bt->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &bt->sc_ih);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/com.c b/sys/dev/isa/com.c
index 13ca1ccda397..044e5237cc7f 100644
--- a/sys/dev/isa/com.c
+++ b/sys/dev/isa/com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com.c,v 1.42 1994/11/25 08:17:21 mycroft Exp $	*/
+/*	$NetBSD: com.c,v 1.43 1995/01/03 01:30:28 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -216,7 +216,7 @@ comattach(parent, self, aux)
 		sc->sc_ih.ih_fun = comintr;
 		sc->sc_ih.ih_arg = sc;
 		sc->sc_ih.ih_level = IPL_TTY;
-		intr_establish(ia->ia_irq, &sc->sc_ih);
+		intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 	}
 
 #ifdef KGDB
diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c
index 29c03c8b4e06..90c9afa43b8d 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.65 1995/01/02 20:32:55 mycroft Exp $	*/
+/*	$NetBSD: if_ed.c,v 1.66 1995/01/03 01:30:32 mycroft Exp $	*/
 
 /*
  * Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -1091,7 +1091,7 @@ edattach(parent, self, aux)
 	sc->sc_ih.ih_fun = edintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NET;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
  
 /*
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index 63debbdf3395..39d1dbdacb74 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.8 1994/11/18 22:03:15 mycroft Exp $	*/
+/*	$NetBSD: if_eg.c,v 1.9 1995/01/03 01:30:35 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1993 Dean Huxley <dean@fsa.ca>
@@ -409,7 +409,7 @@ egattach(parent, self, aux)
 	sc->sc_ih.ih_fun = egintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NET;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 static void
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 746b209b66ff..745c09a4ae5f 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.19 1994/12/10 05:55:26 mycroft Exp $	*/
+/*	$NetBSD: if_el.c,v 1.20 1995/01/03 01:30:37 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994, Matthew E. Kimmel.  Permission is hereby granted
@@ -210,7 +210,7 @@ elattach(parent, self, aux)
 	sc->sc_ih.ih_fun = elintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NET;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 
 	dprintf(("elattach() finished.\n"));
 }
diff --git a/sys/dev/isa/if_ep.c b/sys/dev/isa/if_ep.c
index 446b8cbdead4..1fe7f9231cbe 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.64 1994/12/28 16:47:50 hpeyerl Exp $	*/
+/*	$NetBSD: if_ep.c,v 1.65 1995/01/03 01:30:40 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
@@ -342,7 +342,7 @@ epattach(parent, self, aux)
 	sc->sc_ih.ih_fun = epintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NET;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 /*
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index a46b2a61c10a..926a6b85e4ea 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.25 1995/01/02 22:01:05 mycroft Exp $	*/
+/*	$NetBSD: if_ie.c,v 1.26 1995/01/03 01:30:43 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -543,7 +543,7 @@ ieattach(parent, self, aux)
 	sc->sc_ih.ih_fun = ieintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NET;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 /*
diff --git a/sys/dev/isa/if_le.c b/sys/dev/isa/if_le.c
index 1ef546886137..9ec80e9b2b62 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.21 1995/01/02 20:39:37 mycroft Exp $	*/
+/*	$NetBSD: if_le.c,v 1.22 1995/01/03 01:30:46 mycroft Exp $	*/
 
 /*
  * LANCE Ethernet driver
@@ -419,7 +419,7 @@ leattach(parent, self, aux)
 	sc->sc_ih.ih_fun = leintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_NET;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 void
diff --git a/sys/dev/isa/lpt.c b/sys/dev/isa/lpt.c
index 6b523527c6ff..c0bc53cef78e 100644
--- a/sys/dev/isa/lpt.c
+++ b/sys/dev/isa/lpt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpt.c,v 1.25 1994/11/18 22:03:28 mycroft Exp $	*/
+/*	$NetBSD: lpt.c,v 1.26 1995/01/03 01:30:50 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -252,7 +252,7 @@ lptattach(parent, self, aux)
 		sc->sc_ih.ih_fun = lptintr;
 		sc->sc_ih.ih_arg = sc;
 		sc->sc_ih.ih_level = IPL_NONE;
-		intr_establish(ia->ia_irq, &sc->sc_ih);
+		intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 	}
 }
 
diff --git a/sys/dev/isa/lpt_isa.c b/sys/dev/isa/lpt_isa.c
index 618486fc3670..0db5e53ce20a 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.25 1994/11/18 22:03:28 mycroft Exp $	*/
+/*	$NetBSD: lpt_isa.c,v 1.26 1995/01/03 01:30:50 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -252,7 +252,7 @@ lptattach(parent, self, aux)
 		sc->sc_ih.ih_fun = lptintr;
 		sc->sc_ih.ih_arg = sc;
 		sc->sc_ih.ih_level = IPL_NONE;
-		intr_establish(ia->ia_irq, &sc->sc_ih);
+		intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 	}
 }
 
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 6814a21145d4..a96683facfed 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mcd.c,v 1.25 1994/12/14 15:23:27 mycroft Exp $	*/
+/*	$NetBSD: mcd.c,v 1.26 1995/01/03 01:31:45 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -204,7 +204,7 @@ mcdattach(parent, self, aux)
 	sc->sc_ih.ih_fun = mcdintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 int
diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c
index 10a4bec9b54f..683829ae5b46 100644
--- a/sys/dev/isa/rtfps.c
+++ b/sys/dev/isa/rtfps.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtfps.c,v 1.8 1995/01/02 22:27:47 mycroft Exp $	*/
+/*	$NetBSD: rtfps.c,v 1.9 1995/01/03 01:30:59 mycroft Exp $	*/
 
 /*
  * Multi-port serial card interrupt demuxing support.
@@ -125,7 +125,7 @@ rtfpsattach(parent, self, aux)
 	sc->sc_ih.ih_fun = rtfpsintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_TTY;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 int
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index 9d2208d5a4c6..0130ee8acb9f 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sb.c,v 1.15 1994/12/17 18:45:11 mycroft Exp $	*/
+/*	$NetBSD: sb.c,v 1.16 1995/01/03 01:31:01 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -211,7 +211,7 @@ sbattach(parent, self, aux)
 	sc->sc_ih.ih_fun = sbintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 
 #ifdef NEWCONFIG
 	/*
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index 99238c2afee7..3167a73076e6 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -433,7 +433,7 @@ seaattach(parent, self, aux)
 	sea->sc_ih.ih_fun = seaintr;
 	sea->sc_ih.ih_arg = sea;
 	sea->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &sea->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sea->sc_ih);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/ultra14f.c b/sys/dev/isa/ultra14f.c
index c6c876fb0741..2f89f9673270 100644
--- a/sys/dev/isa/ultra14f.c
+++ b/sys/dev/isa/ultra14f.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ultra14f.c,v 1.44 1994/12/28 19:43:55 mycroft Exp $	*/
+/*	$NetBSD: ultra14f.c,v 1.45 1995/01/03 01:31:05 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -611,7 +611,7 @@ uhaattach(parent, self, aux)
 	uha->sc_ih.ih_fun = uha->intr;
 	uha->sc_ih.ih_arg = uha;
 	uha->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &uha->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &uha->sc_ih);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c
index 0341f4703797..c38c6f7731d3 100644
--- a/sys/dev/isa/wd.c
+++ b/sys/dev/isa/wd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.122 1994/12/14 15:23:49 mycroft Exp $	*/
+/*	$NetBSD: wd.c,v 1.123 1995/01/03 01:31:10 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -278,7 +278,7 @@ wdcattach(parent, self, aux)
 	wdc->sc_ih.ih_fun = wdcintr;
 	wdc->sc_ih.ih_arg = wdc;
 	wdc->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &wdc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &wdc->sc_ih);
 
 	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/wt.c b/sys/dev/isa/wt.c
index 5b511b92e63f..32add9da26d0 100644
--- a/sys/dev/isa/wt.c
+++ b/sys/dev/isa/wt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wt.c,v 1.21 1994/11/18 22:03:51 mycroft Exp $	*/
+/*	$NetBSD: wt.c,v 1.22 1995/01/03 01:31:14 mycroft Exp $	*/
 
 /*
  * Streamer tape driver.
@@ -252,7 +252,7 @@ wtattach(parent, self, aux)
 	sc->sc_ih.ih_fun = wtintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_level = IPL_BIO;
-	intr_establish(ia->ia_irq, &sc->sc_ih);
+	intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih);
 }
 
 int