Initialize isa_devtab entries for interrupt handlers in individual

device drivers, not in ioconf.c.  Use a different hack in isa_device.h
so that a new config(8) is not required yet.

pc98 parts approved by: kato

21 files changed, 88 insertions, 41 deletions

diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index adebd22..374aed9 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.21 1998/06/21 14:53:10 bde Exp $
+ * $Id: if_ar.c,v 1.22 1998/08/24 02:28:15 bde Exp $
  */
 
 /*
@@ -178,6 +178,7 @@ static int irqtable[16] = {
 
 struct isa_driver ardriver = {arprobe, arattach, "arc"};
 
+static ointhand2_t arintr;
 static void ar_xmit(struct ar_softc *sc);
 static void arstart(struct ifnet *ifp);
 static int arioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
@@ -296,6 +297,7 @@ arattach(struct isa_device *id)
 	int unit;
 	char *iface;
 
+	id->id_ointr = arintr;
 	switch(hc->interface) {
 	default: iface = "UNKNOWN"; break;
 	case AR_IFACE_EIA_232: iface = "EIA-232"; break;
@@ -378,7 +380,7 @@ arattach(struct isa_device *id)
  * See if there is other interrupts pending.
  * Repeat until there is no more interrupts.
  */
-void
+static void
 arintr(int unit)
 {
 	struct ar_hardc *hc = &ar_hardc[unit];
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index adebd22..374aed9 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.21 1998/06/21 14:53:10 bde Exp $
+ * $Id: if_ar.c,v 1.22 1998/08/24 02:28:15 bde Exp $
  */
 
 /*
@@ -178,6 +178,7 @@ static int irqtable[16] = {
 
 struct isa_driver ardriver = {arprobe, arattach, "arc"};
 
+static ointhand2_t arintr;
 static void ar_xmit(struct ar_softc *sc);
 static void arstart(struct ifnet *ifp);
 static int arioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
@@ -296,6 +297,7 @@ arattach(struct isa_device *id)
 	int unit;
 	char *iface;
 
+	id->id_ointr = arintr;
 	switch(hc->interface) {
 	default: iface = "UNKNOWN"; break;
 	case AR_IFACE_EIA_232: iface = "EIA-232"; break;
@@ -378,7 +380,7 @@ arattach(struct isa_device *id)
  * See if there is other interrupts pending.
  * Repeat until there is no more interrupts.
  */
-void
+static void
 arintr(int unit)
 {
 	struct ar_hardc *hc = &ar_hardc[unit];
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 1d044de..3b63f4d 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -27,7 +27,7 @@
  */
 
 /*
- * $Id: if_cs.c,v 1.4 1998/08/27 22:41:18 msmith Exp $
+ * $Id: if_cs.c,v 1.5 1998/10/04 02:11:15 msmith Exp $
  *
  * Device driver for Crystal Semiconductor CS8920 based ethernet
  *   adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
@@ -108,6 +108,7 @@ SYSCTL_INT(_machdep, OID_AUTO, cs_recv_delay, CTLFLAG_RW, &cs_recv_delay, 0, "")
 static int	cs_attach		__P((struct cs_softc *, int, int));
 static int	cs_attach_isa		__P((struct isa_device *));
 static void	cs_init			__P((void *));
+static ointhand2_t	csintr;
 static int	cs_ioctl		__P((struct ifnet *, u_long, caddr_t));
 static int	cs_probe		__P((struct isa_device *));
 static int	cs_cs89x0_probe		__P((struct cs_softc *,
@@ -633,6 +634,7 @@ cs_attach_isa(struct isa_device *dev)
         struct cs_softc *sc=&cs_softc[unit];
         int flags=dev->id_flags;
 
+	dev->id_ointr = csintr;
         return cs_attach(sc, unit, flags);
 }
 
@@ -871,7 +873,7 @@ csintr_sc(struct cs_softc *sc, int unit)
 /*
  * Handle interrupts
  */
-void
+static void
 csintr(int unit)
 {
 	struct cs_softc *sc = &cs_softc[unit];
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 3f76567..f6388b1 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.70 1998/08/20 05:21:50 bde Exp $
+ *	$Id: cy.c,v 1.71 1998/08/23 08:26:40 bde Exp $
  */
 
 #include "opt_compat.h"
@@ -335,6 +335,7 @@ struct com_s {
 
 /* PCI driver entry point. */
 int	cyattach_common		__P((cy_addr cy_iobase, int cy_align));
+ointhand2_t	siointr;
 
 static	int	cy_units	__P((cy_addr cy_iobase, int cy_align));
 static	int	sioattach	__P((struct isa_device *dev));
@@ -506,6 +507,7 @@ sioattach(isdp)
 		printf("cy%d: attached as cy%d\n", isdp->id_unit, adapter);
 		isdp->id_unit = adapter;	/* XXX */
 	}
+	isdp->id_ointr = siointr;
 	isdp->id_ri_flags |= RI_FAST;
 	return (1);
 }
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 3f76567..f6388b1 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.70 1998/08/20 05:21:50 bde Exp $
+ *	$Id: cy.c,v 1.71 1998/08/23 08:26:40 bde Exp $
  */
 
 #include "opt_compat.h"
@@ -335,6 +335,7 @@ struct com_s {
 
 /* PCI driver entry point. */
 int	cyattach_common		__P((cy_addr cy_iobase, int cy_align));
+ointhand2_t	siointr;
 
 static	int	cy_units	__P((cy_addr cy_iobase, int cy_align));
 static	int	sioattach	__P((struct isa_device *dev));
@@ -506,6 +507,7 @@ sioattach(isdp)
 		printf("cy%d: attached as cy%d\n", isdp->id_unit, adapter);
 		isdp->id_unit = adapter;	/* XXX */
 	}
+	isdp->id_ointr = siointr;
 	isdp->id_ri_flags |= RI_FAST;
 	return (1);
 }
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 0fed19a..5309327 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.144 1998/08/24 02:28:15 bde Exp $
+ *	$Id: if_ed.c,v 1.145 1998/09/13 22:15:44 eivind Exp $
  */
 
 /*
@@ -138,6 +138,7 @@ static int ed_attach		__P((struct ed_softc *, int, int));
 static int ed_attach_isa	__P((struct isa_device *));
 
 static void ed_init		__P((void *));
+static ointhand2_t edintr;
 static int ed_ioctl		__P((struct ifnet *, u_long, caddr_t));
 static int ed_probe		__P((struct isa_device *));
 static void ed_start		__P((struct ifnet *));
@@ -1739,6 +1740,7 @@ ed_attach_isa(isa_dev)
 	struct ed_softc *sc = &ed_softc[unit];
 	int flags = isa_dev->id_flags;
 
+	isa_dev->id_ointr = edintr;
 	return ed_attach(sc, unit, flags);
 }
 
@@ -2567,7 +2569,7 @@ edintr_sc(sc)
 	}
 }
 
-void 
+static void 
 edintr(unit)
 	int unit;
 {
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 80b8db4..8ca0272 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.75 1998/06/07 17:10:28 dfr Exp $
+ *  $Id: if_ep.c,v 1.76 1998/06/21 18:02:38 bde Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -118,6 +118,7 @@ static	int ep_isa_attach __P((struct isa_device *));
 static	int epioctl __P((struct ifnet * ifp, u_long, caddr_t));
 
 static	void epinit __P((struct ep_softc *));
+static	ointhand2_t epintr;
 static	void epread __P((struct ep_softc *));
 void	epreset __P((int));
 static	void epstart __P((struct ifnet *));
@@ -538,6 +539,7 @@ ep_isa_attach(is)
     u_short config;
     int irq;
 
+    is->id_ointr = epintr;
     sc->ep_connectors = 0;
     config = inw(IS_BASE + EP_W0_CONFIG_CTRL);
     if (config & IS_AUI) {
@@ -900,7 +902,7 @@ readcheck:
     goto startagain;
 }
 
-void
+static void
 epintr(unit)
     int unit;
 {
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index f64ef74..2508bd7 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ex.c,v 1.11 1998/03/28 13:24:06 bde Exp $
+ *	$Id: if_ex.c,v 1.12 1998/06/07 17:10:30 dfr Exp $
  */
 
 /*
@@ -119,6 +119,7 @@ static int ex_attach __P((struct isa_device *));
 static void ex_init __P((void *));
 static void ex_start __P((struct ifnet *));
 static void ex_stop __P((int));
+static ointhand2_t exintr;
 static int ex_ioctl __P((struct ifnet *, u_long, caddr_t));
 static void ex_reset __P((int));
 static void ex_watchdog __P((struct ifnet *));
@@ -254,6 +255,8 @@ int ex_attach(struct isa_device *dev)
 
 	DODEBUG(Start_End, printf("ex_attach%d: start\n", unit););
 
+	dev->id_ointr = exintr;
+
 	/*
 	 * Initialize the ifnet structure.
 	 */
@@ -565,7 +568,7 @@ void ex_stop(int unit)
 }
 
 
-void exintr(int unit)
+static void exintr(int unit)
 {
   struct ex_softc *sc = &ex_sc[unit];
   struct ifnet *ifp = &sc->arpcom.ac_if;
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index d04f98a..d6a7659 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.122 1998/09/15 08:15:28 gibbs Exp $
+ *	$Id: fd.c,v 1.123 1998/09/15 22:07:24 gibbs Exp $
  *
  */
 
@@ -221,6 +221,7 @@ static int fd_in(fdcu_t, int *);
 static void fdstart(fdcu_t);
 static timeout_t fd_iotimeout;
 static timeout_t fd_pseudointr;
+static ointhand2_t fdintr;
 static int fdstate(fdcu_t, fdc_p);
 static int retrier(fdcu_t);
 static int fdformat(dev_t, struct fd_formb *, struct proc *);
@@ -540,6 +541,7 @@ fdattach(struct isa_device *dev)
 	int	typesize;
 #endif
 
+	dev->id_ointr = fdintr;
 	fdc->fdcu = fdcu;
 	fdc->flags |= FDC_ATTACHED;
 	fdc->dmachan = dev->id_drq;
@@ -1275,7 +1277,7 @@ fd_pseudointr(void *arg1)
 * keep calling the state machine until it returns a 0			*
 * ALWAYS called at SPLBIO 						*
 \***********************************************************************/
-void
+static void
 fdintr(fdcu_t fdcu)
 {
 	fdc_p fdc = fdc_data + fdcu;
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 85e948d..ae8613a 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.41 1998/06/07 17:10:31 dfr Exp $
+ * $Id: if_fe.c,v 1.42 1998/06/21 16:51:06 bde Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -236,6 +236,7 @@ static struct fe_softc {
 static int		fe_probe	( struct isa_device * );
 static int		fe_attach	( struct isa_device * );
 static void		fe_init		( int );
+static ointhand2_t	feintr;
 static int		fe_ioctl	( struct ifnet *, u_long, caddr_t );
 static void		fe_start	( struct ifnet * );
 static void		fe_reset	( int );
@@ -1447,6 +1448,8 @@ fe_attach ( DEVICE * dev )
 #endif
 	struct fe_softc *sc = &fe_softc[dev->id_unit];
 
+	dev->id_ointr = feintr;
+
 	/*
 	 * Initialize ifnet structure
 	 */
@@ -2365,7 +2368,7 @@ fe_rint ( struct fe_softc * sc, u_char rstat )
 /*
  * Ethernet interface interrupt processor
  */
-void
+static void
 feintr ( int unit )
 {
 	struct fe_softc *sc = &fe_softc[unit];
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index f894dc5..3f1ed13 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.55 1998/08/10 14:27:32 bde Exp $
+ *	$Id: if_ie.c,v 1.56 1998/08/10 17:21:48 bde Exp $
  */
 
 /*
@@ -176,6 +176,7 @@ static struct mbuf *last_not_for_us;
 
 static int	ieprobe(struct isa_device * dvp);
 static int	ieattach(struct isa_device * dvp);
+static ointhand2_t	ieintr;
 static int	sl_probe(struct isa_device * dvp);
 static int	el_probe(struct isa_device * dvp);
 static int	ni_probe(struct isa_device * dvp);
@@ -789,6 +790,8 @@ ieattach(struct isa_device *dvp)
 	struct ifnet *ifp = &ie->arpcom.ac_if;
 	size_t	allocsize;
 
+	dvp->id_ointr = ieintr;
+
 	/*
 	 * based on the amount of memory we have, allocate our tx and rx
 	 * resources.
@@ -851,7 +854,7 @@ ieattach(struct isa_device *dvp)
 /*
  * What to do upon receipt of an interrupt.
  */
-void
+static void
 ieintr(int unit)
 {
 	register struct ie_softc *ie = &ie_softc[unit];
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index e31c600..e5f6c73 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.c,v 1.45 1998/08/24 02:28:15 bde Exp $
+ * $Id: if_lnc.c,v 1.46 1998/09/17 13:09:16 jkh Exp $
  */
 
 /*
@@ -177,6 +177,7 @@ static int pcnet_probe __P((struct lnc_softc *sc));
 static int lnc_attach_sc __P((struct lnc_softc *sc, int unit));
 static int lnc_attach __P((struct isa_device *isa_dev));
 static void lnc_init __P((struct lnc_softc *sc));
+static ointhand2_t lncintr;
 static __inline int mbuf_to_buffer __P((struct mbuf *m, char *buffer));
 static __inline struct mbuf *chain_to_cluster __P((struct mbuf *m));
 static void lnc_start __P((struct ifnet *ifp));
@@ -1273,8 +1274,10 @@ lnc_attach(struct isa_device * isa_dev)
 {
 	int unit = isa_dev->id_unit;
 	struct lnc_softc *sc = &lnc_softc[unit];
+	int result;
 
-	int result = lnc_attach_sc (sc, unit);
+	isa_dev->id_ointr = lncintr;
+	result = lnc_attach_sc (sc, unit);
 	if (result == 0)
 		return (0);
 
@@ -1592,7 +1595,7 @@ lncintr_sc(struct lnc_softc *sc)
 	}
 }
 
-void
+static void
 lncintr(int unit)
 {
 	struct lnc_softc *sc = &lnc_softc[unit];
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 0e3bd17..a24a79f 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.99 1998/07/04 22:30:17 julian Exp $
+ *	$Id: mcd.c,v 1.100 1998/07/13 09:53:01 bde Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -178,6 +178,7 @@ static	int	mcd_send(int unit, int cmd,int nretrys);
 static	void	hsg2msf(int hsg, bcd_t *msf);
 static  int     msf2hsg(bcd_t *msf, int relative);
 static	int	mcd_volinfo(int unit);
+static	ointhand2_t	mcdintr;
 static	int	mcd_waitrdy(int port,int dly);
 static	timeout_t mcd_timeout;
 static 	void	mcd_doread(int state, struct mcd_mbx *mbxin);
@@ -249,6 +250,7 @@ int mcd_attach(struct isa_device *dev)
 	int	unit = dev->id_unit;
 	struct mcd_data *cd = mcd_data + unit;
 
+	dev->id_ointr = mcdintr;
 	cd->iobase = dev->id_iobase;
 	cd->flags |= MCDINIT;
 	mcd_soft_reset(unit);
@@ -977,7 +979,7 @@ mcd_volinfo(int unit)
 	return EINVAL;
 }
 
-void
+static void
 mcdintr(unit)
 	int unit;
 {
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index d907e4c..6579de2 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.37 1998/01/24 02:54:22 eivind Exp $
+ * $Id: mse.c,v 1.38 1998/06/07 17:10:47 dfr Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -87,6 +87,7 @@ static struct cdevsw mse_cdevsw =
 	  mseioctl,	nostop,		nullreset,	nodevtotty,/* mse */
 	  msepoll,	nommap,		NULL,	"mse",	NULL,	-1 };
 
+static ointhand2_t mseintr;
 
 /*
  * Software control structure for mouse. The sc_enablemouse(),
@@ -257,6 +258,7 @@ mseattach(idp)
 	int unit = idp->id_unit;
 	struct mse_softc *sc = &mse_sc[unit];
 
+	idp->id_ointr = mseintr;
 	sc->sc_port = idp->id_iobase;
 	sc->mode.accelfactor = (idp->id_flags & MSE_CONFIG_ACCEL) >> 4;
 #ifdef	DEVFS
@@ -546,7 +548,7 @@ msepoll(dev, events, p)
 /*
  * mseintr: update mouse status. sc_deltax and sc_deltay are accumulative.
  */
-void
+static void
 mseintr(unit)
 	int unit;
 {
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index 7b498d7..bee0e15 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pcf.c,v 1.1.1.17 1998/08/29 17:04:23 son Exp $
+ *	$Id: pcf.c,v 1.1 1998/09/03 21:01:22 nsouch Exp $
  *
  */
 #include <sys/param.h>
@@ -108,6 +108,7 @@ static int pcf_start(device_t, u_char);
 static int pcf_stop(device_t);
 static int pcf_write(device_t, char *, int, int *);
 static int pcf_read(device_t, char *, int, int *);
+static ointhand2_t pcfintr;
 static int pcf_rst_card(device_t, u_char);
 
 static device_method_t pcf_methods[] = {
@@ -179,6 +180,7 @@ error:
 static int
 pcfattach_isa(struct isa_device *isdp)
 {
+	isdp->id_ointr = pcfintr;
 	return (1);				/* ok */
 }
 
@@ -358,7 +360,7 @@ error:
 	return (error);
 }
 
-void
+static void
 pcfintr(unit)
 {
 	struct pcf_softc *pcf =
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index 4dc6a44..39f4b4e 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppc.c,v 1.8 1998/09/13 20:57:06 nsouch Exp $
+ *	$Id: ppc.c,v 1.9 1998/09/20 14:47:01 nsouch Exp $
  *
  */
 #include "ppc.h"
@@ -124,6 +124,7 @@ static void ppc_wfifo(int unit, char byte) { w_fifo(ppcdata[unit], byte); }
 
 static void ppc_reset_epp_timeout(int);
 static void ppc_ecp_sync(int);
+static ointhand2_t ppcintr;
 
 static int ppc_exec_microseq(int, struct ppb_microseq **);
 static int ppc_generic_setmode(int, int);
@@ -189,7 +190,7 @@ ppc_ecp_sync(int unit) {
 	return;
 }
 
-void
+static void
 ppcintr(int unit)
 {
 	/* call directly upper code */
@@ -1276,6 +1277,8 @@ ppcattach(struct isa_device *isdp)
 		ppc_modes[ppc->ppc_mode], (PPB_IS_EPP(ppc->ppc_mode)) ?
 			ppc_epp_protocol[ppc->ppc_epp] : "");
 
+	isdp->id_ointr = ppcintr;
+
 	/*
 	 * Prepare ppbus data area for upper level code.
 	 */
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index e946c58..ae1108a 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -172,6 +172,7 @@ static int rc_rcsrt[16] = {
 };
 
 /* Static prototypes */
+static ointhand2_t rcintr;
 static void rc_hwreset          __P((int, int, unsigned int));
 static int  rc_test             __P((int, int));
 static void rc_discard_output   __P((struct rc_chans *));
@@ -231,6 +232,8 @@ rcattach(dvp)
 	static int              rc_started = 0;
 	struct tty              *tp;
 
+	dvp->id_ointr = rcintr;
+
 	/* Thorooughly test the device */
 	if (rcb->rcb_probed != RC_PROBED)
 		return 0;
@@ -278,7 +281,8 @@ rcattach(dvp)
 }
 
 /* RC interrupt handling */
-void    rcintr(unit)
+static void
+rcintr(unit)
 	int             unit;
 {
 	register struct rc_softc        *rcb = &rc_softc[unit];
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 236bb42..85cbb70 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.14 1998/06/17 13:54:56 bde Exp $
+ * $Id: if_sr.c,v 1.15 1998/06/21 14:53:12 bde Exp $
  */
 
 /*
@@ -270,6 +270,7 @@ struct	sr_hardc *srattach_pci(int unit, vm_offset_t plx_vaddr,
 void	srintr_hc(struct sr_hardc *hc);
 
 static int	srattach(struct sr_hardc *hc);
+static ointhand2_t	srintr;
 static void	sr_xmit(struct sr_softc *sc);
 static void	srstart(struct ifnet *ifp);
 static int	srioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
@@ -864,7 +865,7 @@ srattach(struct sr_hardc *hc)
  * See if there is other interrupts pending.
  * Repeat until there no interrupts remain.
  */
-void
+static void
 srintr(int unit)
 {
 	struct sr_hardc *hc;
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 236bb42..85cbb70 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.14 1998/06/17 13:54:56 bde Exp $
+ * $Id: if_sr.c,v 1.15 1998/06/21 14:53:12 bde Exp $
  */
 
 /*
@@ -270,6 +270,7 @@ struct	sr_hardc *srattach_pci(int unit, vm_offset_t plx_vaddr,
 void	srintr_hc(struct sr_hardc *hc);
 
 static int	srattach(struct sr_hardc *hc);
+static ointhand2_t	srintr;
 static void	sr_xmit(struct sr_softc *sc);
 static void	srstart(struct ifnet *ifp);
 static int	srioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
@@ -864,7 +865,7 @@ srattach(struct sr_hardc *hc)
  * See if there is other interrupts pending.
  * Repeat until there no interrupts remain.
  */
-void
+static void
 srintr(int unit)
 {
 	struct sr_hardc *hc;
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index eba0d36..caf072a 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.c,v 1.283 1998/10/01 11:39:18 yokota Exp $
+ *	$Id: syscons.c,v 1.284 1998/10/01 21:04:52 ache Exp $
  */
 
 #include "sc.h"
@@ -239,6 +239,7 @@ static const int	nsccons = MAXCONS+2;
 
 /* prototypes */
 static int scattach(struct isa_device *dev);
+static ointhand2_t scintr;
 static int scparam(struct tty *tp, struct termios *t);
 static int scprobe(struct isa_device *dev);
 static int scvidprobe(int unit, int flags);
@@ -645,6 +646,7 @@ scattach(struct isa_device *dev)
     int vc;
 #endif
 
+    dev->id_ointr = scintr;
     scinit();
     sc_flags = dev->id_flags;
     if (!ISFONTAVAIL(adp_flags))
@@ -851,7 +853,7 @@ scwrite(dev_t dev, struct uio *uio, int flag)
     return((*linesw[tp->t_line].l_write)(tp, uio, flag));
 }
 
-void
+static void
 scintr(int unit)
 {
     static struct tty *cur_tty;
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 66dbffd..31f7c31 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.14 1998/08/20 05:49:59 msmith Exp $ */
+/* $Id: if_wl.c,v 1.15 1998/08/24 02:28:15 bde Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -81,7 +81,7 @@
  *
  * sample config:
  *
- * device wl0 at isa? port 0x300 net irq ? vector wlintr
+ * device wl0 at isa? port 0x300 net irq ?
  *
  * Ifdefs:
  * 1. WLDEBUG. (off) - if turned on enables IFF_DEBUG set via ifconfig debug
@@ -302,6 +302,7 @@ static void	wlstart(struct ifnet *ifp);
 static void	wlinit(void *xsc);
 static int	wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
 static timeout_t wlwatchdog;
+static ointhand2_t wlintr;
 static void	wlxmt(int unt, struct mbuf *m);
 static int	wldiag(int unt); 
 static int	wlconfig(int unit); 
@@ -443,6 +444,7 @@ wlattach(struct isa_device *id)
 #ifdef WLDEBUG
     printf("wlattach: base %x, unit %d\n", base, unit);
 #endif
+    id->id_ointr = wlintr;
     sc->base = base;
     sc->unit = unit;
     sc->flags = 0;
@@ -1472,7 +1474,7 @@ wlwatchdog(void *vsc)
  * output	: either a packet is received, or a packet is transfered
  *
  */
-void
+static void
 wlintr(unit)
 int unit;
 {