diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-07 07:22:34 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-07 07:22:34 +0000 |
| commit | 01374b354a584861150a3763813e6b1475682451 (patch) | |
| tree | 20cbd4e1e97837d654ec825dfb6937b5030f14ad /sys/arch/i386/isa/pcvt/pcvt_hdr.h | |
| parent | a67cb0ed502d0c21cf6ab116718b19d1cbeb39bc (diff) | |
sync with 0504; prototype changes
Diffstat (limited to 'sys/arch/i386/isa/pcvt/pcvt_hdr.h')
| -rw-r--r-- | sys/arch/i386/isa/pcvt/pcvt_hdr.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/sys/arch/i386/isa/pcvt/pcvt_hdr.h b/sys/arch/i386/isa/pcvt/pcvt_hdr.h index 222d09e839e..53590fe0ea9 100644 --- a/sys/arch/i386/isa/pcvt/pcvt_hdr.h +++ b/sys/arch/i386/isa/pcvt/pcvt_hdr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcvt_hdr.h,v 1.7 1996/04/21 22:17:09 deraadt Exp $ */ +/* $OpenBSD: pcvt_hdr.h,v 1.8 1996/05/07 07:22:27 deraadt Exp $ */ /* * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch. @@ -904,8 +904,12 @@ struct vt_softc { }; #endif /* PCVT_NETBSD > 101 */ -int pcprobe (); -void pcattach (); +#if PCVT_NETBSD > 100 +int pcprobe(struct device *, void *, void *); +#endif +#if PCVT_NETBSD > 9 +void pcattach(struct device *, struct device *, void *); +#endif #if PCVT_NETBSD > 110 struct cfattach vt_ca = { @@ -1400,12 +1404,12 @@ static __inline void vt_selattr(struct video_state *svsp) /* 0x84 to produce keyboard controller */ /* access delays */ #define PCVT_KBD_DELAY() \ - { u_char x = inb(0x84); } \ - { u_char x = inb(0x84); } \ - { u_char x = inb(0x84); } \ - { u_char x = inb(0x84); } \ - { u_char x = inb(0x84); } \ - { u_char x = inb(0x84); } + { volatile u_char x = inb(0x84); (void) &x;} \ + { volatile u_char x = inb(0x84); (void) &x;} \ + { volatile u_char x = inb(0x84); (void) &x;} \ + { volatile u_char x = inb(0x84); (void) &x;} \ + { volatile u_char x = inb(0x84); (void) &x;} \ + { volatile u_char x = inb(0x84); (void) &x;} #else /* PCVT_PORTIO_DELAY */ /* use system supplied delay function for */ |