diff options
Diffstat (limited to 'sys/arch/i386/isa')
| -rw-r--r-- | sys/arch/i386/isa/isa_machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/isa/pccom.c | 10 | ||||
| -rw-r--r-- | sys/arch/i386/isa/pcvt/pcvt_drv.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/isa/pcvt/pcvt_kbd.h | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c index c907f63e7d5..fd641539bb1 100644 --- a/sys/arch/i386/isa/isa_machdep.c +++ b/sys/arch/i386/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.27 1998/01/20 18:40:20 niklas Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.28 1998/02/22 21:35:30 niklas Exp $ */ /* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */ #define ISA_DMA_STATS @@ -151,7 +151,7 @@ extern vm_offset_t avail_end; #define IDTVEC(name) __CONCAT(X,name) /* default interrupt vector table entries */ -typedef (*vector) __P((void)); +typedef int (*vector) __P((void)); extern vector IDTVEC(intr)[], IDTVEC(fast)[]; void isa_strayintr __P((int)); void intr_calculatemasks __P((void)); diff --git a/sys/arch/i386/isa/pccom.c b/sys/arch/i386/isa/pccom.c index c315ad126aa..16ca8bd7b61 100644 --- a/sys/arch/i386/isa/pccom.c +++ b/sys/arch/i386/isa/pccom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccom.c,v 1.20 1998/02/05 16:48:28 deraadt Exp $ */ +/* $OpenBSD: pccom.c,v 1.21 1998/02/22 21:35:31 niklas Exp $ */ /* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */ /*- @@ -651,15 +651,15 @@ comattach(parent, self, aux) FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_TRIGGER_14); delay(100); if (ISSET(bus_space_read_1(iot, ioh, com_iir), IIR_FIFO_MASK) == - IIR_FIFO_MASK) - if (ISSET(bus_space_read_1(iot, ioh, com_fifo), FIFO_TRIGGER_14) == - FIFO_TRIGGER_14) { + IIR_FIFO_MASK) { + if (ISSET(bus_space_read_1(iot, ioh, com_fifo), + FIFO_TRIGGER_14) == FIFO_TRIGGER_14) { SET(sc->sc_hwflags, COM_HW_FIFO); printf(": ns16550a, working fifo\n"); sc->sc_fifolen = 16; } else printf(": ns16550, broken fifo\n"); - else + } else printf(": ns8250 or ns16450, no fifo\n"); bus_space_write_1(iot, ioh, com_fifo, 0); #ifdef COM_HAYESP diff --git a/sys/arch/i386/isa/pcvt/pcvt_drv.c b/sys/arch/i386/isa/pcvt/pcvt_drv.c index 2aa1cf54640..2f76c9c6d5a 100644 --- a/sys/arch/i386/isa/pcvt/pcvt_drv.c +++ b/sys/arch/i386/isa/pcvt/pcvt_drv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcvt_drv.c,v 1.18 1998/01/04 12:11:37 deraadt Exp $ */ +/* $OpenBSD: pcvt_drv.c,v 1.19 1998/02/22 21:35:33 niklas Exp $ */ /* * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch. @@ -631,7 +631,7 @@ pctty(Dev_t dev) int pcioctl(Dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) { - register error; + register int error; register struct tty *tp; if((tp = get_pccons(dev)) == NULL) diff --git a/sys/arch/i386/isa/pcvt/pcvt_kbd.h b/sys/arch/i386/isa/pcvt/pcvt_kbd.h index c95375e8fa0..cd552a4d225 100644 --- a/sys/arch/i386/isa/pcvt/pcvt_kbd.h +++ b/sys/arch/i386/isa/pcvt/pcvt_kbd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcvt_kbd.h,v 1.4 1996/08/01 23:23:27 deraadt Exp $ */ +/* $OpenBSD: pcvt_kbd.h,v 1.5 1998/02/22 21:35:34 niklas Exp $ */ /* * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch. @@ -110,7 +110,7 @@ typedef struct static Ovl_tbl *ovltbl; /* the table itself */ -static ovlinitflag = 0; /* the init flag for the table */ +static int ovlinitflag = 0; /* the init flag for the table */ /* * key codes >= 128 denote "virtual" shift/control |