Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove pcvt tentacles.

Browse Source
This commit is contained in:
mycroft 2000-06-11 02:41:10 +00:00
parent 6e7ce465e9
commit 9884ae5ff6
23 changed files with 46 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/i386/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.16 1998/11/15 20:36:30 perry Exp $
# $NetBSD: Makefile,v 1.17 2000/06/11 02:41:47 mycroft Exp $
# Makefile for i386 tags file and boot blocks
@ -27,6 +27,6 @@ links:
(cd $$i && rm -f tags; ln -s ../tags tags); done
SUBDIR= include stand isa/pcvt
SUBDIR= include stand
.include <bsd.subdir.mk>

6
sys/arch/i386/conf/BIKINI
View File

@ -1,4 +1,4 @@
# $NetBSD: BIKINI,v 1.27 2000/04/19 08:44:32 haya Exp $
# $NetBSD: BIKINI,v 1.28 2000/06/11 02:41:10 mycroft Exp $
# From: GENERIC,v 1.260 1999/09/28 18:07:29 thorpej Exp
#
# BIKINI -- Mycroft's development machine
@ -228,9 +228,8 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
@ -639,7 +638,6 @@ midi* at sb? # SB1 MIDI port
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks

3
sys/arch/i386/conf/BOAT_ANCHOR
View File

@ -1,4 +1,4 @@
# $NetBSD: BOAT_ANCHOR,v 1.82 1999/07/29 10:37:17 augustss Exp $
# $NetBSD: BOAT_ANCHOR,v 1.83 2000/06/11 02:41:10 mycroft Exp $
#
# BOAT_ANCHOR -- kernel for the 386-20 the gang uses for testing
#
@ -51,7 +51,6 @@ isa0 at mainbus0
npx0 at isa? port 0xf0 irq 13 # math coprocessor
pc0 at isa? port 0x60 irq 1 # generic PC console device
#vt0 at isa? port 0x60 irq 1
com0 at isa? port 0x3f8 irq 4 # standard PC serial ports
ast0 at isa? port 0x1a0 irq 3 # AST 4-port serial cards

6
sys/arch/i386/conf/CARDBUS
View File

@ -1,4 +1,4 @@
# $NetBSD: CARDBUS,v 1.13 2000/04/13 11:21:18 joda Exp $
# $NetBSD: CARDBUS,v 1.14 2000/06/11 02:41:10 mycroft Exp $
#
# CARDBUS -- GENERIC + CardBus support
#
@ -230,9 +230,8 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
@ -615,7 +614,6 @@ olms1 at isa? port 0x238 irq 5
omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
omms1 at isa? port 0x238 irq 5
#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks

3
sys/arch/i386/conf/DISKLESS
View File

@ -1,4 +1,4 @@
# $NetBSD: DISKLESS,v 1.70 2000/03/22 00:58:20 cgd Exp $
# $NetBSD: DISKLESS,v 1.71 2000/06/11 02:41:10 mycroft Exp $
#
# DISKLESS -- Generic machine setup for diskless boot.
# This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
@ -120,7 +120,6 @@ isa* at mainbus0 # all other ISA
npx0 at isa? port 0xf0 irq 13 # math coprocessor
pc0 at isa? port 0x60 irq 1 # generic PC console device
#vt0 at isa? port 0x60 irq 1
#pcppi0 at isa?
#sysbeep0 at pcppi?

6
sys/arch/i386/conf/DR-EVIL
View File

@ -1,4 +1,4 @@
# $NetBSD: DR-EVIL,v 1.18 2000/06/05 23:18:51 gmcgarry Exp $
# $NetBSD: DR-EVIL,v 1.19 2000/06/11 02:41:10 mycroft Exp $
#
# DR-EVIL -- Dell Inspiron 3800 laptop used by thorpej@netbsd.org
#
@ -300,9 +300,8 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
@ -791,7 +790,6 @@ bktr* at pci? dev ? function ?
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks

11
sys/arch/i386/conf/GENERIC
View File

@ -1,11 +1,11 @@
# $NetBSD: GENERIC,v 1.351 2000/06/11 00:21:01 augustss Exp $
# $NetBSD: GENERIC,v 1.352 2000/06/11 02:41:10 mycroft Exp $
#
# GENERIC -- everything that's currently supported
#
include "arch/i386/conf/std.i386"
#ident "GENERIC-$Revision: 1.351 $"
#ident "GENERIC-$Revision: 1.352 $"
maxusers 32 # estimated number of users
@ -298,17 +298,15 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
#options FINNISH_KBD
#options GERMAN_KBD
#options NORWEGIAN_KBD
# pccons-specific option:
# pccons-specific options:
#options XSERVER_DDB # PF12 gets you into DDB when X is running
# pccons/pcvt -specific option:
#options XSERVER # X server support
@ -797,7 +795,6 @@ wsmouse* at mms? mux 0
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks

6
sys/arch/i386/conf/GENERIC_TINY
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC_TINY,v 1.15 2000/04/03 00:03:30 augustss Exp $
# $NetBSD: GENERIC_TINY,v 1.16 2000/06/11 02:41:10 mycroft Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, PCMCIA or SCSI.
@ -193,9 +193,8 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
#pcppi0 at isa?
#sysbeep0 at pcppi?
@ -478,7 +477,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq 10
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks

6
sys/arch/i386/conf/HOMEWORLD
View File

@ -1,4 +1,4 @@
# $NetBSD: HOMEWORLD,v 1.47 2000/03/22 00:58:20 cgd Exp $
# $NetBSD: HOMEWORLD,v 1.48 2000/06/11 02:41:10 mycroft Exp $
# From: GENERIC,v 1.212 1999/01/06 23:30:53 thorpej Exp
#
# HOMEWORLD - Mail, CVS, and GNATS server
@ -202,9 +202,8 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
@ -565,7 +564,6 @@ ne0 at isa? port 0x300 irq 9 # NE[12]000 ethernet cards
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks

6
sys/arch/i386/conf/INSTALL
View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL,v 1.146 2000/06/08 21:42:14 fvdl Exp $
# $NetBSD: INSTALL,v 1.147 2000/06/11 02:41:10 mycroft Exp $
#
# INSTALL - Installation kernel.
#
@ -212,9 +212,8 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
@ -614,7 +613,6 @@ ukphy* at mii? phy ? # generic unknown PHYs
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks

5
sys/arch/i386/conf/INSTALL_SMALL
View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL_SMALL,v 1.48 2000/06/07 19:29:45 thorpej Exp $
# $NetBSD: INSTALL_SMALL,v 1.49 2000/06/11 02:41:10 mycroft Exp $
#
# INSTALL_SMALL - Small Installation kernel.
#
@ -199,9 +199,8 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD

5
sys/arch/i386/conf/INSTALL_TINY
View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL_TINY,v 1.17 2000/03/22 00:58:20 cgd Exp $
# $NetBSD: INSTALL_TINY,v 1.18 2000/06/11 02:41:10 mycroft Exp $
#
# INSTALL_TINY - Tiny Installation kernel, suitable for 4M machines.
#
@ -204,9 +204,8 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
#pcppi0 at isa?
#sysbeep0 at pcppi?

6
sys/arch/i386/conf/MINBAR
View File

@ -1,4 +1,4 @@
# $NetBSD: MINBAR,v 1.16 2000/03/22 00:58:20 cgd Exp $
# $NetBSD: MINBAR,v 1.17 2000/06/11 02:41:10 mycroft Exp $
# From: GENERIC,v 1.212 1999/01/06 23:30:53 thorpej Exp
#
# MINBAR -- offshore CVS server
@ -202,9 +202,8 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
@ -565,7 +564,6 @@ uhub* at uhub? port ? configuration ? interface ?
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks

6
sys/arch/i386/conf/NBFTP
View File

@ -1,4 +1,4 @@
# $NetBSD: NBFTP,v 1.21 2000/03/22 00:58:20 cgd Exp $
# $NetBSD: NBFTP,v 1.22 2000/06/11 02:41:10 mycroft Exp $
# From: GENERIC,v 1.212 1999/01/06 23:30:53 thorpej Exp
#
# NBFTP -- ftp/sup.netbsd.org server machine
@ -219,9 +219,8 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
@ -590,7 +589,6 @@ ugen* at uhub? port ? configuration ? interface ?
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks

3
sys/arch/i386/conf/SUN_LAMP
View File

@ -1,4 +1,4 @@
# $NetBSD: SUN_LAMP,v 1.106 1999/07/29 10:37:18 augustss Exp $
# $NetBSD: SUN_LAMP,v 1.107 2000/06/11 02:41:11 mycroft Exp $
#
# SUN_LAMP -- kernel for one of cgd's 486/50 EISA boxes...
#
@ -90,7 +90,6 @@ eisa0 at mainbus0
npx0 at isa? port 0xf0 irq 13 # math coprocessor
pc0 at isa? port 0x60 irq 1 # generic PC console device
#vt0 at isa? port 0x60 irq 1
#pcppi0 at isa?
#sysbeep0 at pcppi?

8
sys/arch/i386/conf/SWINGER
View File

@ -1,4 +1,4 @@
# $NetBSD: SWINGER,v 1.6 2000/06/05 23:18:51 gmcgarry Exp $
# $NetBSD: SWINGER,v 1.7 2000/06/11 02:41:11 mycroft Exp $
# from NetBSD: GENERIC,v 1.325 2000/04/14 14:53:32 augustss Exp
#
# SWINGER -- thorpej's Abit BP6+dual Celeron
@ -6,7 +6,7 @@
include "arch/i386/conf/std.i386"
#ident "SWINGER-$Revision: 1.6 $"
#ident "SWINGER-$Revision: 1.7 $"
maxusers 64 # estimated number of users
@ -271,9 +271,8 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
@ -770,7 +769,6 @@ midi* at sb? # SB1 MIDI port
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks

6
sys/arch/i386/conf/TRINITY
View File

@ -1,4 +1,4 @@
# $NetBSD: TRINITY,v 1.95 2000/04/19 08:44:33 haya Exp $
# $NetBSD: TRINITY,v 1.96 2000/06/11 02:41:11 mycroft Exp $
# From: GENERIC,v 1.260 1999/09/28 18:07:29 thorpej Exp
#
# TRINITY -- Mycroft's laptop
@ -230,9 +230,8 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
@ -639,7 +638,6 @@ midi* at pcppi? # MIDI interface to the PC speaker
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks

6
sys/arch/i386/conf/UNDERWORLD
View File

@ -1,4 +1,4 @@
# $NetBSD: UNDERWORLD,v 1.12 2000/03/22 00:58:20 cgd Exp $
# $NetBSD: UNDERWORLD,v 1.13 2000/06/11 02:41:11 mycroft Exp $
#
# UNDERWORLD - Convenient config for our ol' Pentium boxes (abs)
#
@ -218,9 +218,8 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
@ -589,7 +588,6 @@ olms1 at isa? port 0x238 irq 5
omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
omms1 at isa? port 0x238 irq 5
#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks

3
sys/arch/i386/conf/ZHADUM
View File

@ -1,4 +1,4 @@
# $NetBSD: ZHADUM,v 1.21 2000/03/22 00:58:20 cgd Exp $
# $NetBSD: ZHADUM,v 1.22 2000/06/11 02:41:11 mycroft Exp $
#
# ZHADUM -- zhadum.netbsd.org, the new CVS server
#
@ -467,7 +467,6 @@ de* at pci? dev ? function ? # DEC 21x4x-based Ethernet
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks

8
sys/arch/i386/conf/ZYGORTHIAN-SPACE-RAIDERS
View File

@ -1,4 +1,4 @@
# $NetBSD: ZYGORTHIAN-SPACE-RAIDERS,v 1.30 2000/06/05 23:18:51 gmcgarry Exp $
# $NetBSD: ZYGORTHIAN-SPACE-RAIDERS,v 1.31 2000/06/11 02:41:11 mycroft Exp $
# From: GENERIC,v 1.299 2000/02/03 20:31:42 dante Exp
#
# GENERIC -- everything that's currently supported
@ -6,7 +6,7 @@
include "arch/i386/conf/std.i386"
#ident "GENERIC-$Revision: 1.30 $"
#ident "GENERIC-$Revision: 1.31 $"
maxusers 32 # estimated number of users
@ -264,9 +264,8 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console. You can only configure one of these!
# ISA console
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#vt0 at isa? port 0x60 irq 1 # PCVT console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
@ -736,7 +735,6 @@ midi* at pcppi? # MIDI interface to the PC speaker
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
#opms0 at vt? irq 12 # PS/2 auxiliary port mouse
# Joysticks

12
sys/arch/i386/conf/files.i386
View File

@ -1,4 +1,4 @@
# $NetBSD: files.i386,v 1.161 2000/06/04 22:36:28 gmcgarry Exp $
# $NetBSD: files.i386,v 1.162 2000/06/11 02:41:11 mycroft Exp $
#
# new style config file for i386 architecture
#
@ -194,16 +194,6 @@ device pcconskbd
attach pcconskbd at pckbc
file arch/i386/isa/pccons.c pc | pcconskbd needs-flag
# PC console support a la "pcvt"
device vt: tty, pckbcport
attach vt at isa
file arch/i386/isa/pcvt/pcvt_drv.c vt needs-flag
file arch/i386/isa/pcvt/pcvt_ext.c vt needs-flag
file arch/i386/isa/pcvt/pcvt_kbd.c vt needs-flag
file arch/i386/isa/pcvt/pcvt_out.c vt needs-flag
file arch/i386/isa/pcvt/pcvt_sup.c vt needs-flag
file arch/i386/isa/pcvt/pcvt_vtf.c vt needs-flag
# PC Mice; Logitech-style, Microsoft-style, and PS/2-style
device olms
attach olms at isa

5
sys/arch/i386/i386/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.126 2000/05/22 16:58:20 thorpej Exp $ */
/* $NetBSD: conf.c,v 1.127 2000/06/11 02:46:29 mycroft Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -168,7 +168,6 @@ cdev_decl(fd);
cdev_decl(wt);
cdev_decl(scd);
#include "pc.h"
#include "vt.h"
cdev_decl(pc);
cdev_decl(sd);
cdev_decl(st);
@ -323,7 +322,7 @@ struct cdevsw cdevsw[] =
cdev_disk_init(NFDC,fd), /* 9: floppy disk */
cdev_tape_init(NWT,wt), /* 10: QIC-02/QIC-36 tape */
cdev_disk_init(NSCD,scd), /* 11: Sony CD-ROM */
cdev_pc_init(NPC + NVT,pc), /* 12: PC console */
cdev_pc_init(NPC,pc), /* 12: PC console */
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 */

11
sys/arch/i386/i386/consinit.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: consinit.c,v 1.3 2000/06/09 04:58:34 soda Exp $ */
/* $NetBSD: consinit.c,v 1.4 2000/06/11 02:46:29 mycroft Exp $ */
/*
* Copyright (c) 1998
@ -63,11 +63,6 @@
#include <machine/pccons.h>
#endif
#include "vt.h"
#if (NVT > 0)
#include <i386/isa/pcvt/pcvt_cons.h>
#endif
#include "com.h"
#if (NCOM > 0)
#include <sys/termios.h>
@ -147,7 +142,7 @@ consinit()
#endif
consinfo = &default_consinfo;
#if (NPC > 0) || (NVT > 0) || (NVGA > 0) || (NEGA > 0) || (NPCDISPLAY > 0)
#if (NPC > 0) || (NVGA > 0) || (NEGA > 0) || (NPCDISPLAY > 0)
if (!strcmp(consinfo->devname, "pc")) {
#if (NVGA > 0)
if (!vga_cnattach(I386_BUS_SPACE_IO, I386_BUS_SPACE_MEM,
@ -162,7 +157,7 @@ consinit()
if (!pcdisplay_cnattach(I386_BUS_SPACE_IO, I386_BUS_SPACE_MEM))
goto dokbd;
#endif
#if (NPC > 0) || (NVT > 0)
#if (NPC > 0)
pccnattach();
#endif
if (0) goto dokbd; /* XXX stupid gcc */