from netbsd:

The IST_* and IPL_* constants are not bus-specific; don't treat them as such.
Change splimp -> splnet in Ethernet, ARCnet, and FDDI drivers.

30 files changed, 94 insertions, 113 deletions

diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 50acf16c43a..285917c5ca5 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -602,8 +602,8 @@ ahaattach(parent, self, aux)
 #ifdef NEWCONFIG
 	isa_establish(&aha->sc_id, &aha->sc_dev);
 #endif
-	aha->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_BIO,
-	    ahaintr, aha);
+	aha->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, ahaintr,
+	    aha);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/aha1542.c b/sys/dev/isa/aha1542.c
index 50acf16c43a..285917c5ca5 100644
--- a/sys/dev/isa/aha1542.c
+++ b/sys/dev/isa/aha1542.c
@@ -602,8 +602,8 @@ ahaattach(parent, self, aux)
 #ifdef NEWCONFIG
 	isa_establish(&aha->sc_id, &aha->sc_dev);
 #endif
-	aha->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_BIO,
-	    ahaintr, aha);
+	aha->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, ahaintr,
+	    aha);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/aic6360.c b/sys/dev/isa/aic6360.c
index 41bb6650d98..e26f34f36e9 100644
--- a/sys/dev/isa/aic6360.c
+++ b/sys/dev/isa/aic6360.c
@@ -766,8 +766,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, ISA_IST_EDGE, ISA_IPL_BIO,
-	    aicintr, sc);
+	sc->sc_ih = isa_intr_establish(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 77abde08861..9676c79d298 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -139,8 +139,8 @@ astattach(parent, self, aux)
 		}
 	}
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_TTY,
-	    astintr, sc);
+	sc->sc_ih = isa_intr_establish(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 796fe0d3771..350bde475ca 100644
--- a/sys/dev/isa/boca.c
+++ b/sys/dev/isa/boca.c
@@ -134,8 +134,8 @@ bocaattach(parent, self, aux)
 		}
 	}
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_TTY,
-	    bocaintr, sc);
+	sc->sc_ih = isa_intr_establish(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 e179c176066..abb458924f4 100644
--- a/sys/dev/isa/bt.c
+++ b/sys/dev/isa/bt.c
@@ -612,8 +612,8 @@ btattach(parent, self, aux)
 #ifdef NEWCONFIG
 	isa_establish(&bt->sc_id, &bt->sc_dev);
 #endif
-	bt->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_BIO,
-	    btintr, bt);
+	bt->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, btintr,
+	    bt);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/bt742a.c b/sys/dev/isa/bt742a.c
index e179c176066..abb458924f4 100644
--- a/sys/dev/isa/bt742a.c
+++ b/sys/dev/isa/bt742a.c
@@ -612,8 +612,8 @@ btattach(parent, self, aux)
 #ifdef NEWCONFIG
 	isa_establish(&bt->sc_id, &bt->sc_dev);
 #endif
-	bt->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_BIO,
-	    btintr, bt);
+	bt->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, btintr,
+	    bt);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/com.c b/sys/dev/isa/com.c
index 52b8dfc06fb..da385681114 100644
--- a/sys/dev/isa/com.c
+++ b/sys/dev/isa/com.c
@@ -223,8 +223,8 @@ comattach(parent, self, aux)
 	outb(iobase + com_mcr, 0);
 
 	if (ia->ia_irq != IRQUNK)
-		sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE,
-		    ISA_IPL_TTY, comintr, sc);
+		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY,
+		    comintr, sc);
 
 #ifdef KGDB
 	if (kgdb_dev == makedev(commajor, unit)) {
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index 7f1c415f434..b43fd76c6dd 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -911,10 +911,10 @@ gusattach(parent, self, aux)
 	 */
 
 	/* XXX we shouldn't have to use splgus == splclock, nor should
-	 * we use ISA_IPL_CLOCK.
+	 * we use IPL_CLOCK.
 	 */
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_AUDIO,
-				       gusintr, sc /* sc->sc_gusdsp */);
+	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO, gusintr,
+	    sc /* sc->sc_gusdsp */);
 
 	/*
 	 * Set some default values
diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c
index 0c4fa0cd428..8b3db662650 100644
--- a/sys/dev/isa/if_ed.c
+++ b/sys/dev/isa/if_ed.c
@@ -1092,8 +1092,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, ISA_IST_EDGE, ISA_IPL_NET,
-	    edintr, sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, edintr,
+	    sc);
 }
 
 /*
@@ -1105,7 +1105,7 @@ edreset(sc)
 {
 	int s;
 
-	s = splimp();
+	s = splnet();
 	edstop(sc);
 	edinit(sc);
 	splx(s);
@@ -1329,7 +1329,7 @@ ed_xmit(sc)
 /*
  * Start output on interface.
  * We make two assumptions here:
- *  1) that the current priority is set to splimp _before_ this code
+ *  1) that the current priority is set to splnet _before_ this code
  *     is called *and* is returned to the appropriate priority after
  *     return
  *  2) that the IFF_OACTIVE flag is checked before this code is called
@@ -1766,7 +1766,7 @@ edioctl(ifp, cmd, data)
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
-	s = splimp();
+	s = splnet();
 
 	switch (cmd) {
 
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index 4f2e8402a2e..e62e7c0f218 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -409,8 +409,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, ISA_IST_EDGE, ISA_IPL_NET,
-	    egintr, sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, egintr,
+	    sc);
 }
 
 void
@@ -731,7 +731,7 @@ egioctl(ifp, cmd, data)
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
-	s = splimp();
+	s = splnet();
 
 	switch (cmd) {
 
@@ -813,7 +813,7 @@ egreset(sc)
 	int s;
 
 	dprintf(("egreset()\n"));
-	s = splimp();
+	s = splnet();
 	egstop(sc);
 	eginit(sc);
 	splx(s);
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 0a6d9d27fc3..d0064756bd2 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -205,8 +205,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, ISA_IST_EDGE, ISA_IPL_NET,
-	    elintr, sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, elintr,
+	    sc);
 
 	dprintf(("elattach() finished.\n"));
 }
@@ -221,7 +221,7 @@ elreset(sc)
 	int s;
 
 	dprintf(("elreset()\n"));
-	s = splimp();
+	s = splnet();
 	elstop(sc);
 	elinit(sc);
 	splx(s);
@@ -296,7 +296,7 @@ elinit(sc)
 
 /*
  * Start output on interface.  Get datagrams from the queue and output them,
- * giving the receiver a chance between datagrams.  Call only from splimp or
+ * giving the receiver a chance between datagrams.  Call only from splnet or
  * interrupt level!
  */
 void
@@ -309,7 +309,7 @@ elstart(ifp)
 	int s, i, off, retries;
 
 	dprintf(("elstart()...\n"));
-	s = splimp();
+	s = splnet();
 
 	/* Don't do anything if output is active. */
 	if ((ifp->if_flags & IFF_OACTIVE) != 0) {
@@ -392,7 +392,7 @@ elstart(ifp)
 		outb(iobase+EL_AC, EL_AC_IRQE | EL_AC_RX);
 		splx(s);
 		/* Interrupt here. */
-		s = splimp();
+		s = splnet();
 	}
 
 	(void)inb(iobase+EL_AS);
@@ -403,7 +403,7 @@ elstart(ifp)
 
 /*
  * This function actually attempts to transmit a datagram downloaded to the
- * board.  Call at splimp or interrupt, after downloading data!  Returns 0 on
+ * board.  Call at splnet or interrupt, after downloading data!  Returns 0 on
  * success, non-0 on failure.
  */
 static int
@@ -620,7 +620,7 @@ elioctl(ifp, cmd, data)
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
-	s = splimp();
+	s = splnet();
 
 	switch (cmd) {
 
diff --git a/sys/dev/isa/if_ep.c b/sys/dev/isa/if_ep.c
index f3edf1424b6..50c9a636677 100644
--- a/sys/dev/isa/if_ep.c
+++ b/sys/dev/isa/if_ep.c
@@ -428,7 +428,7 @@ epattach(parent, self, aux)
 					     PCI_COMMAND_STATUS_REG) |
 			       PCI_COMMAND_MASTER_ENABLE);
 
-		sc->sc_ih = pci_map_int(pa->pa_tag, PCI_IPL_NET, epintr, sc);
+		sc->sc_ih = pci_map_int(pa->pa_tag, IPL_NET, epintr, sc);
 		if (sc->sc_ih == NULL) {
 			printf("%s: couldn't map interrupt\n",
 			       sc->sc_dev.dv_xname);
@@ -440,8 +440,8 @@ epattach(parent, self, aux)
 #endif
 	{
 		struct isa_attach_args *ia = aux;
-		sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE,
-					       ISA_IPL_NET, epintr, sc);
+		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET,
+		    epintr, sc);
 	}
 }
 
@@ -569,7 +569,7 @@ epsetlink(sc)
 
 /*
  * Start outputting on the interface.
- * Always called as splimp().
+ * Always called as splnet().
  */
 void
 epstart(ifp)
@@ -1064,7 +1064,7 @@ epioctl(ifp, cmd, data)
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
-	s = splimp();
+	s = splnet();
 
 	switch (cmd) {
 
@@ -1159,7 +1159,7 @@ epreset(sc)
 {
 	int s;
 
-	s = splimp();
+	s = splnet();
 	epstop(sc);
 	epinit(sc);
 	splx(s);
@@ -1263,7 +1263,7 @@ epmbuffill(sc)
 {
 	int s, i;
 
-	s = splimp();
+	s = splnet();
 	i = sc->last_mb;
 	do {
 		if (sc->mb[i] == NULL)
@@ -1285,7 +1285,7 @@ epmbufempty(sc)
 {
 	int s, i;
 
-	s = splimp();
+	s = splnet();
 	for (i = 0; i<MAX_MBS; i++) {
 		if (sc->mb[i]) {
 			m_freem(sc->mb[i]);
diff --git a/sys/dev/isa/if_fe.c b/sys/dev/isa/if_fe.c
index 4f10f48f143..2a853fe9d36 100644
--- a/sys/dev/isa/if_fe.c
+++ b/sys/dev/isa/if_fe.c
@@ -1124,8 +1124,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, ISA_IST_EDGE, ISA_IPL_NET,
-	    feintr, sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, feintr,
+	    sc);
 }
 
 /*
@@ -1137,7 +1137,7 @@ fe_reset(sc)
 {
 	int s;
 
-	s = splimp();
+	s = splnet();
 	fe_stop(sc);
 	fe_init(sc);
 	splx(s);
@@ -1410,7 +1410,7 @@ fe_xmit(sc)
 /*
  * Start output on interface.
  * We make two assumptions here:
- *  1) that the current priority is set to splimp _before_ this code
+ *  1) that the current priority is set to splnet _before_ this code
  *     is called *and* is returned to the appropriate priority after
  *     return
  *  2) that the IFF_OACTIVE flag is checked before this code is called
@@ -1928,7 +1928,7 @@ fe_ioctl(ifp, command, data)
 	log(LOG_INFO, "%s: ioctl(%x)\n", sc->sc_dev.dv_xname, command);
 #endif
 
-	s = splimp();
+	s = splnet();
 
 	switch (command) {
 
@@ -2427,7 +2427,7 @@ fe_setmode(sc)
 /*
  * Load a new multicast address filter into MARs.
  *
- * The caller must have splimp'ed befor fe_loadmar.
+ * The caller must have splnet'ed befor fe_loadmar.
  * This function starts the DLC upon return.  So it can be called only
  * when the chip is working, i.e., from the driver's point of view, when
  * a device is RUNNING.  (I mistook the point in previous versions.)
diff --git a/sys/dev/isa/if_hp.c b/sys/dev/isa/if_hp.c
index d0117ae2839..aeebb013df3 100644
--- a/sys/dev/isa/if_hp.c
+++ b/sys/dev/isa/if_hp.c
@@ -162,7 +162,7 @@ hpprobe(dvp)
 #endif
 
 	hpc = (ns->ns_port = dvp->id_iobase + 0x10);
-	s = splimp();
+	s = splnet();
 
 	ns->hp_irq = ffs(dvp->id_irq) - 1;
 
@@ -441,7 +441,7 @@ hpinit(unit)
 	if (ifp->if_flags & IFF_RUNNING)
 		return;
 
-	s = splimp();
+	s = splnet();
 
 #ifdef HP_DEBUG
 	printf("hpinit: hp%d at 0x%x irq %d\n", unit, hpc, (int) ns->hp_irq);
@@ -505,7 +505,7 @@ hpinit(unit)
  * Setup output on interface.
  * Get another datagram to send off of the interface queue,
  * and map it to the interface before starting the output.
- * called only at splimp or interrupt level.
+ * called only at splnet or interrupt level.
  */
 hpstart(ifp)
 	struct ifnet *ifp;
@@ -926,7 +926,7 @@ hpioctl(ifp, cmd, data)
 	register struct ifaddr *ifa = (struct ifaddr *) data;
 	struct hp_softc *ns = &hp_softc[ifp->if_unit];
 	struct ifreq *ifr = (struct ifreq *) data;
-	int     s = splimp(), error = 0;
+	int     s = splnet(), error = 0;
 
 
 	switch (cmd) {
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index b991ee87636..cb11e553270 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -87,7 +87,7 @@ that we must include this header in the transmit buffer as well.
 By convention, all transmit commands, and only transmit commands, shall have
 the I (IE_CMD_INTR) bit set in the command.  This way, when an interrupt
 arrives at ieintr(), it is immediately possible to tell what precisely caused
-it.  ANY OTHER command-sending routines should run at splimp(), and should
+it.  ANY OTHER command-sending routines should run at splnet(), and should
 post an acknowledgement to every interrupt they generate.
 
 The 82586 has a 24-bit address space internally, and the adaptor's memory is
@@ -776,8 +776,8 @@ ieattach(parent, self, aux)
 	    sizeof(struct ether_header));
 #endif
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_NET,
-	    ieintr, sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, ieintr,
+	    sc);
 }
 
 /*
@@ -1508,7 +1508,7 @@ check_ie_present(sc, where, size)
 	u_long realbase;
 	int s;
 
-	s = splimp();
+	s = splnet();
 
 	realbase = (u_long)where + size - (1 << 24);
 
@@ -1759,7 +1759,7 @@ void
 iereset(sc)
 	struct ie_softc *sc;
 {
-	int s = splimp();
+	int s = splnet();
 
 	iestop(sc);
 
@@ -1967,7 +1967,7 @@ iememinit(ptr, sc)
 
 /*
  * Run the multicast setup command.
- * Called at splimp().
+ * Called at splnet().
  */
 static int
 mc_setup(sc, ptr)
@@ -2001,7 +2001,7 @@ mc_setup(sc, ptr)
  * includes executing the CONFIGURE, IA-SETUP, and MC-SETUP commands, starting
  * the receiver unit, and clearing interrupts.
  *
- * THIS ROUTINE MUST BE CALLED AT splimp() OR HIGHER.
+ * THIS ROUTINE MUST BE CALLED AT splnet() OR HIGHER.
  */
 int
 ieinit(sc)
@@ -2115,7 +2115,7 @@ ieioctl(ifp, cmd, data)
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
-	s = splimp();
+	s = splnet();
 
 	switch (cmd) {
 
diff --git a/sys/dev/isa/if_le.c b/sys/dev/isa/if_le.c
index eb0f039c22a..1bb579ea1b3 100644
--- a/sys/dev/isa/if_le.c
+++ b/sys/dev/isa/if_le.c
@@ -397,8 +397,8 @@ leattach(parent, self, aux)
 		if (ia->ia_drq != DRQUNK)
 			isa_dmacascade(ia->ia_drq);
 
-		sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE,
-		    ISA_IPL_NET, leintredge, sc);
+		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET,
+		    leintredge, sc);
 	}
 #endif
 
@@ -410,7 +410,7 @@ leattach(parent, self, aux)
 		    pci_conf_read(pa->pa_tag, PCI_COMMAND_STATUS_REG) |
 		    PCI_COMMAND_MASTER_ENABLE);
 
-		sc->sc_ih = pci_map_int(pa->pa_tag, PCI_IPL_NET, leintr, sc);
+		sc->sc_ih = pci_map_int(pa->pa_tag, IPL_NET, leintr, sc);
 	}
 #endif
 
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c
index 799bf2fb2f9..70af397240f 100644
--- a/sys/dev/isa/isa.c
+++ b/sys/dev/isa/isa.c
@@ -88,17 +88,17 @@ isascan(parent, match)
 
 char *
 isa_intr_typename(type)
-	isa_intrtype type;
+	int type;
 {
 
 	switch (type) {
-        case ISA_IST_NONE :
+        case IST_NONE :
 		return ("none");
-        case ISA_IST_PULSE:
+        case IST_PULSE:
 		return ("pulsed");
-        case ISA_IST_EDGE:
+        case IST_EDGE:
 		return ("edge-triggered");
-        case ISA_IST_LEVEL:
+        case IST_LEVEL:
 		return ("level-triggered");
 	default:
 		panic("isa_intr_typename: invalid type %d", type);
diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h
index 96fc2455992..05b6b317c9a 100644
--- a/sys/dev/isa/isavar.h
+++ b/sys/dev/isa/isavar.h
@@ -102,27 +102,11 @@ struct isa_softc {
  */
 
 /* ISA interrupt sharing types */
-typedef enum {
-	ISA_IST_NONE = 0,	/* not yet assigned */
-	ISA_IST_PULSE,		/* pulsed */
-	ISA_IST_EDGE,		/* edge-triggered */
-	ISA_IST_LEVEL		/* level-triggered */
-} isa_intrtype;
-
-/* ISA interrupt levels; system interrupt levels for ISA bus use */
-typedef enum {
-	ISA_IPL_NONE,		/* block only the interrupt's IRQ*/
-	ISA_IPL_BIO,		/* block I/O interrupts */
-	ISA_IPL_NET,		/* network */
-	ISA_IPL_TTY,		/* terminal */
-	ISA_IPL_CLOCK,		/* clock */
-} isa_intrlevel;
-
 void	isascan __P((struct device *parent, void *match));
-void	*isa_intr_establish __P((int intr, isa_intrtype type,
-	    isa_intrlevel level, int (*ih_fun)(void *), void *ih_arg));
+void	*isa_intr_establish __P((int intr, int type, int level,
+	    int (*ih_fun)(void *), void *ih_arg));
 void	isa_intr_disestablish __P((void *handler));
-char	*isa_intr_typename __P((isa_intrtype type));
+char	*isa_intr_typename __P((int type));
 
 #ifdef NEWCONFIG
 /*
diff --git a/sys/dev/isa/lpt.c b/sys/dev/isa/lpt.c
index aee3a5be153..ffe91a14127 100644
--- a/sys/dev/isa/lpt.c
+++ b/sys/dev/isa/lpt.c
@@ -238,8 +238,8 @@ lptattach(parent, self, aux)
 	outb(iobase + lpt_control, LPC_NINIT);
 
 	if (ia->ia_irq != IRQUNK)
-		sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE,
-		    ISA_IPL_NONE, lptintr, sc);
+		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NONE,
+		    lptintr, sc);
 }
 
 /*
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 35941a8bfa1..615d6b0af4c 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -222,8 +222,8 @@ mcdattach(parent, self, aux)
 
 	sc->sc_dk.dk_driver = &mcddkdriver;
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_BIO,
-	    mcdintr, sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, mcdintr,
+	    sc);
 }
 
 /*
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index 417b2325e5a..b2e95400597 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -431,7 +431,7 @@ pasattach(parent, self, aux)
 	int err;
 	
 	sc->sc_iobase = iobase;
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_AUDIO,
+	sc->sc_ih = isa_intr_establish(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 a5b4f0d5876..0e90c4677fe 100644
--- a/sys/dev/isa/pss.c
+++ b/sys/dev/isa/pss.c
@@ -1004,8 +1004,8 @@ pssattach(parent, self, aux)
 #endif
 
     /* Setup interrupt handler for PSS */
-    sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_AUDIO,
-				   pssintr, sc);
+    sc->sc_ih = isa_intr_establish(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:' ');
@@ -1039,8 +1039,8 @@ spattach(parent, self, aux)
     isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
 
-    sc->sc_ih = isa_intr_establish(cf->cf_irq, ISA_IST_EDGE, ISA_IPL_AUDIO,
-	ad1848_intr, sc);
+    sc->sc_ih = isa_intr_establish(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",
@@ -1067,8 +1067,8 @@ mpuattach(parent, self, aux)
     isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
 
-    sc->sc_ih = isa_intr_establish(cf->cf_irq, ISA_IST_EDGE, ISA_IPL_AUDIO,
-	mpuintr, sc);
+    sc->sc_ih = isa_intr_establish(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 cff8651d628..adfbe3579b5 100644
--- a/sys/dev/isa/rtfps.c
+++ b/sys/dev/isa/rtfps.c
@@ -147,8 +147,7 @@ rtfpsattach(parent, self, aux)
 		}
 	}
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_TTY,
-	    rtfpsintr, sc);
+	sc->sc_ih = isa_intr_establish(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 43d4aab1c15..11ca1a4b9ed 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -273,7 +273,7 @@ sbattach(parent, self, aux)
 	register int iobase = ia->ia_iobase;
 	int err;
 	
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_AUDIO,
+	sc->sc_ih = isa_intr_establish(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 2319e2ef55f..4e2ef8990cc 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -438,8 +438,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, ISA_IST_EDGE, ISA_IPL_BIO,
-	    seaintr, sea);
+	sea->sc_ih = isa_intr_establish(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 ba1a727f688..078dc9a34c2 100644
--- a/sys/dev/isa/ultra14f.c
+++ b/sys/dev/isa/ultra14f.c
@@ -608,7 +608,7 @@ uhaattach(parent, self, aux)
 #ifdef NEWCONFIG
 	isa_establish(&uha->sc_id, &uha->sc_dev);
 #endif
-	uha->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_BIO,
+	uha->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO,
 	    uha->intr, uha);
 
 	/*
diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c
index c9d169560f2..85d53bc69ad 100644
--- a/sys/dev/isa/wd.c
+++ b/sys/dev/isa/wd.c
@@ -55,7 +55,6 @@
 #include <machine/pio.h>
 
 #include <dev/isa/isavar.h>
-#include <dev/isa/isadmavar.h>
 #include <dev/isa/wdreg.h>
 
 #define	WAITTIME	(4 * hz)	/* time to wait for a completion */
@@ -250,8 +249,8 @@ wdcattach(parent, self, aux)
 
 	printf("\n");
 
-	wdc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_BIO,
-	    wdcintr, wdc);
+	wdc->sc_ih = isa_intr_establish(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/wss.c b/sys/dev/isa/wss.c
index 802fe505284..2d5010e8769 100644
--- a/sys/dev/isa/wss.c
+++ b/sys/dev/isa/wss.c
@@ -249,8 +249,7 @@ wssattach(parent, self, aux)
 #ifdef NEWCONFIG
     isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
-    sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_AUDIO,
-				   ad1848_intr, &sc->sc_ad1848);
+    sc->sc_ih = isa_intr_establish(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 e770b00661e..6db4ec6f893 100644
--- a/sys/dev/isa/wt.c
+++ b/sys/dev/isa/wt.c
@@ -249,8 +249,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, ISA_IST_EDGE, ISA_IPL_BIO,
-	    wtintr, sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, wtintr,
+	    sc);
 }
 
 int