diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-05-01 19:15:17 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-05-01 19:15:17 +0000 |
| commit | d2074c2c4aaf756bec8242b625074b0b949295b7 (patch) | |
| tree | d1121bb059c69ec33cdcf526bd9c0362d7397656 /sys/arch/i386 | |
| parent | 0254d19824aa7cc534d8980d783f15f57ec7dba4 (diff) | |
Remove PCVT cruft.
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 15 | ||||
| -rw-r--r-- | sys/arch/i386/i386/linux_machdep.c | 11 |
2 files changed, 10 insertions, 16 deletions
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index e2b626f5717..b1104b580eb 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.67 2001/03/14 06:18:47 millert Exp $ */ +/* $OpenBSD: conf.c,v 1.68 2001/05/01 19:15:16 aaron Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -149,7 +149,6 @@ cdev_decl(fd); cdev_decl(wt); cdev_decl(scd); #include "pc.h" -#include "vt.h" cdev_decl(pc); #include "ss.h" #include "lpt.h" @@ -219,9 +218,6 @@ cdev_decl(ucom); #if (NCOM > 0) && (NPCCOM > 0) #error com and pccom are mutually exclusive. Sorry. #endif -#if (NVT > 0) && (NPC > 0) -#error vt and pc are mutually exclusive. Sorry. -#endif #include "wsdisplay.h" #include "wskbd.h" @@ -247,11 +243,12 @@ struct cdevsw cdevsw[] = cdev_disk_init(NFD,fd), /* 9: floppy disk */ cdev_tape_init(NWT,wt), /* 10: QIC-02/QIC-36 tape */ cdev_disk_init(NSCD,scd), /* 11: Sony CD-ROM */ -#if 0 - cdev_pc_init(NPC + NVT,pc), /* 12: PC console */ -#endif +#if NPC > 0 + cdev_pc_init(NPC,pc), /* 12: PC console */ +#else cdev_wsdisplay_init(NWSDISPLAY, /* 12: frame buffers, etc. */ wsdisplay), +#endif cdev_disk_init(NSD,sd), /* 13: SCSI disk */ cdev_tape_init(NST,st), /* 14: SCSI tape */ cdev_disk_init(NCD,cd), /* 15: SCSI CD-ROM */ @@ -511,7 +508,7 @@ struct consdev constab[] = { #if NWSDISPLAY > 0 cons_init(ws), #endif -#if NPC + NVT > 0 +#if NPC > 0 cons_init(pc), #endif #if NCOM + NPCCOM > 0 diff --git a/sys/arch/i386/i386/linux_machdep.c b/sys/arch/i386/i386/linux_machdep.c index fd496dcfc94..fd946fcd964 100644 --- a/sys/arch/i386/i386/linux_machdep.c +++ b/sys/arch/i386/i386/linux_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_machdep.c,v 1.15 2001/04/07 21:31:24 tholo Exp $ */ +/* $OpenBSD: linux_machdep.c,v 1.16 2001/05/01 19:15:16 aaron Exp $ */ /* $NetBSD: linux_machdep.c,v 1.29 1996/05/03 19:42:11 christos Exp $ */ /* @@ -70,16 +70,13 @@ #include <machine/linux_machdep.h> /* - * To see whether pcvt is configured (for virtual console ioctl calls). + * To see whether wsdisplay is configured (for virtual console ioctl calls). */ #include "wsdisplay.h" -#include "vt.h" #if NWSDISPLAY > 0 && defined(WSDISPLAY_COMPAT_USL) #include <sys/ioctl.h> #include <dev/wscons/wsconsio.h> #include <dev/wscons/wsdisplay_usl_io.h> -#elif NVT > 0 -#include <arch/i386/isa/pcvt/pcvt_ioctl.h> #endif #ifdef USER_LDT @@ -450,7 +447,7 @@ linux_machdepioctl(p, v, retval) } */ *uap = v; struct sys_ioctl_args bia; u_long com; -#if (NWSDISPLAY > 0 && defined(WSDISPLAY_COMPAT_USL)) || NVT > 0 +#if (NWSDISPLAY > 0 && defined(WSDISPLAY_COMPAT_USL)) int error; struct vt_mode lvt; caddr_t bvtp, sg; @@ -461,7 +458,7 @@ linux_machdepioctl(p, v, retval) com = SCARG(uap, com); switch (com) { -#if (NWSDISPLAY > 0 && defined(WSDISPLAY_COMPAT_USL)) || NVT > 0 +#if (NWSDISPLAY > 0 && defined(WSDISPLAY_COMPAT_USL)) case LINUX_KDGKBMODE: com = KDGKBMODE; break; |