diff options
| -rw-r--r-- | sys/i386/isa/sio.c | 4 | ||||
| -rw-r--r-- | sys/i386/isa/wd.c | 7 | ||||
| -rw-r--r-- | sys/i386/isa/wdreg.h | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index 90049d04b5aab..f0511eec65547 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.221 1999/01/07 14:14:23 yokota Exp $ + * $Id: sio.c,v 1.222 1999/01/08 19:17:49 bde Exp $ */ #include "opt_comconsole.h" @@ -2829,7 +2829,7 @@ siopnp_attach(u_long csn, u_long vend_id, char *name, struct isa_device *dev) dev->id_iobase = d.port[0]; dev->id_irq = (1 << d.irq[0]); - dev->id_intr = siointr; + dev->id_ointr = siointr; dev->id_ri_flags = RI_FAST; dev->id_drq = -1; diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index 775b8aa59ddc6..578ce6ab549bb 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.182 1998/12/24 06:30:21 foxfair Exp $ + * $Id: wd.c,v 1.183 1999/01/11 22:14:22 julian Exp $ */ /* TODO: @@ -437,7 +437,7 @@ wdattach(struct isa_device *dvp) struct disk *du; struct wdparams *wp; - dvp->id_ointr = wdintr; + dvp->id_intr = wdintr; if (dvp->id_unit >= NWDC) return (0); @@ -1047,11 +1047,12 @@ wdstart(int ctrlr) */ void -wdintr(int unit) +wdintr(void *unitnum) { register struct disk *du; register struct buf *bp; int dmastat = 0; /* Shut up GCC */ + int unit = (int)unitnum; #ifdef CMD640 int ctrlr_atapi; diff --git a/sys/i386/isa/wdreg.h b/sys/i386/isa/wdreg.h index 31b4027df0119..0c06aa92a163c 100644 --- a/sys/i386/isa/wdreg.h +++ b/sys/i386/isa/wdreg.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wdreg.h 7.1 (Berkeley) 5/9/91 - * $Id: wdreg.h,v 1.22 1998/04/08 20:04:39 sos Exp $ + * $Id: wdreg.h,v 1.23 1998/10/22 05:58:41 bde Exp $ */ /* @@ -312,6 +312,6 @@ struct wddma { extern struct wddma wddma[]; -void wdintr __P((int unit)); +void wdintr __P((void *unit)); #endif /* KERNEL */ |