summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-02-13 14:50:35 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-02-13 14:50:35 +0000
commit7bf10440f3ca8d870b8ac24a4111db8de337a276 (patch)
tree581564b95a78f4a1e5ddf1e0803056b05f5e5678
parentdd5d4c5e1e3c646d561c0e65ee2dd12cd947bfac (diff)
default more wscons options
Diffstat
-rw-r--r--sys/arch/alpha/conf/GENERIC4
-rw-r--r--sys/arch/alpha/conf/RAMDISK4
-rw-r--r--sys/arch/alpha/conf/RAMDISKB4
-rw-r--r--sys/arch/alpha/conf/RAMDISKBIG4
-rw-r--r--sys/arch/i386/conf/GENERIC7
-rw-r--r--sys/arch/i386/conf/RAMDISK6
-rw-r--r--sys/arch/i386/conf/RAMDISKB6
-rw-r--r--sys/arch/i386/conf/RAMDISKC6
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD6
-rw-r--r--sys/arch/powerpc/conf/GENERIC3
-rw-r--r--sys/arch/powerpc/conf/RAMDISK3
-rw-r--r--sys/dev/wscons/files.wscons10
-rw-r--r--sys/dev/wscons/wsemulconf.c4
-rw-r--r--sys/dev/wscons/wsemulvar.h4
14 files changed, 20 insertions, 51 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 349d2a0726e..4d5a7829414 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.64 2001/01/27 21:17:06 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.65 2001/02/13 14:50:33 deraadt Exp $
# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
#
# Generic Alpha kernel. Enough to get booted, etc., but not much more.
@@ -38,8 +38,6 @@ option PCIVERBOSE # recognize "unknown" PCI devices
option TCVERBOSE # recognize "unknown" TC devices
#option USBVERBOSE
-option WSEMUL_VT100 # wscons VT100 emulation
-
config bsd swap generic
mainbus0 at root
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
index f774465443a..041076f93de 100644
--- a/sys/arch/alpha/conf/RAMDISK
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.38 2001/02/05 21:41:24 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.39 2001/02/13 14:50:33 deraadt Exp $
# $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
machine alpha # architecture, used by config; REQUIRED
@@ -36,8 +36,6 @@ option INET # Internet protocol suite
#option TCVERBOSE # recognize "unknown" TC devices
option SCSITERSE # less verbose scsi error messages
-option WSEMUL_VT100 # wscons VT100 emulation
-
option BOOT_CONFIG
config bsd swap generic
diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB
index 8045f598630..72edcc8b205 100644
--- a/sys/arch/alpha/conf/RAMDISKB
+++ b/sys/arch/alpha/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.2 2001/02/05 21:41:25 deraadt Exp $
+# $OpenBSD: RAMDISKB,v 1.3 2001/02/13 14:50:33 deraadt Exp $
# $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
machine alpha # architecture, used by config; REQUIRED
@@ -37,8 +37,6 @@ option INET # Internet protocol suite
#option TCVERBOSE # recognize "unknown" TC devices
option SCSITERSE # less verbose scsi error messages
-option WSEMUL_VT100 # wscons VT100 emulation
-
option BOOT_CONFIG
config bsd swap generic
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index 737490c0721..214009f6437 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKBIG,v 1.3 2001/02/09 14:48:54 art Exp $
+# $OpenBSD: RAMDISKBIG,v 1.4 2001/02/13 14:50:33 deraadt Exp $
# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
#
# Generic Alpha kernel. Enough to get booted, etc., but not much more.
@@ -42,8 +42,6 @@ option PCIVERBOSE # recognize "unknown" PCI devices
option TCVERBOSE # recognize "unknown" TC devices
#option USBVERBOSE
-option WSEMUL_VT100 # wscons VT100 emulation
-
config bsd swap generic
mainbus0 at root
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index a21a9336ff6..6e89e42bff5 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.236 2001/01/30 19:54:05 aaron Exp $
+# $OpenBSD: GENERIC,v 1.237 2001/02/13 14:50:33 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -119,11 +119,6 @@ npx0 at isa? port 0xf0 irq 13 # math coprocessor
isadma0 at isa?
isapnp0 at isa?
-option WSEMUL_VT100 # VT100 / VT220 emulation
-option WS_KERNEL_FG=WSCOL_WHITE
-option WS_KERNEL_BG=WSCOL_BLUE
-option WSDISPLAY_COMPAT_PCVT # emulate some ioctls
-option WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
option WSDISPLAY_COMPAT_USL # VT handling
option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
option WSDISPLAY_DEFAULTSCREENS=6
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 76583ea57f7..ef808ee1552 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.96 2001/01/30 00:01:21 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.97 2001/02/13 14:50:33 deraadt Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -81,10 +81,6 @@ npx0 at isa? port 0xf0 irq 13 # math coprocessor
isadma0 at isa?
isapnp0 at isa?
-option WSEMUL_VT100 # VT100 / VT220 emulation
-option WS_KERNEL_FG=WSCOL_WHITE
-option WS_KERNEL_BG=WSCOL_BLUE
-
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
wskbd* at pckbd? console ?
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index cf6f26ee06b..c1a4a7413bf 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.29 2001/01/30 00:01:21 deraadt Exp $
+# $OpenBSD: RAMDISKB,v 1.30 2001/02/13 14:50:33 deraadt Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -81,10 +81,6 @@ npx0 at isa? port 0xf0 irq 13 # math coprocessor
isadma0 at isa?
isapnp0 at isa?
-option WSEMUL_VT100 # VT100 / VT220 emulation
-option WS_KERNEL_FG=WSCOL_WHITE
-option WS_KERNEL_BG=WSCOL_BLUE
-
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
wskbd* at pckbd? console ?
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index 7c19d1dc070..52a2757841d 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKC,v 1.11 2001/01/30 00:01:22 deraadt Exp $
+# $OpenBSD: RAMDISKC,v 1.12 2001/02/13 14:50:33 deraadt Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -87,10 +87,6 @@ npx0 at isa? port 0xf0 irq 13 # math coprocessor
isadma0 at isa?
isapnp0 at isa?
-option WSEMUL_VT100 # VT100 / VT220 emulation
-option WS_KERNEL_FG=WSCOL_WHITE
-option WS_KERNEL_BG=WSCOL_BLUE
-
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
wskbd* at pckbd? console ?
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 16696459700..01a80d3a900 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.28 2001/01/30 00:01:22 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.29 2001/02/13 14:50:33 deraadt Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -87,10 +87,6 @@ npx0 at isa? port 0xf0 irq 13 # math coprocessor
isadma0 at isa?
isapnp0 at isa?
-option WSEMUL_VT100 # VT100 / VT220 emulation
-option WS_KERNEL_FG=WSCOL_WHITE
-option WS_KERNEL_BG=WSCOL_BLUE
-
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
wskbd* at pckbd? console ?
diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
index 5d8c2dc56a8..12d0e2eff58 100644
--- a/sys/arch/powerpc/conf/GENERIC
+++ b/sys/arch/powerpc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.23 2001/02/04 10:07:02 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.24 2001/02/13 14:50:33 deraadt Exp $
#
# PPC GENERIC config file
#
@@ -14,7 +14,6 @@ option SYS_TYPE=APPL
option FIREPOWERBUGS
option PPC_MPC106_BUG
option PCIVERBOSE
-option WSEMUL_VT100
option WSEMUL_NO_DUMB
include "../../../conf/GENERIC"
diff --git a/sys/arch/powerpc/conf/RAMDISK b/sys/arch/powerpc/conf/RAMDISK
index 380cd4ca481..fe602102501 100644
--- a/sys/arch/powerpc/conf/RAMDISK
+++ b/sys/arch/powerpc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.11 2000/12/07 18:19:31 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.12 2001/02/13 14:50:33 deraadt Exp $
#
# PPC GENERIC config file
#
@@ -14,7 +14,6 @@ option SYS_TYPE=APPL
option FIREPOWERBUGS
option PPC_MPC106_BUG
option PCIVERBOSE
-option WSEMUL_VT100
option WSEMUL_NO_DUMB
# include "../../../conf/GENERIC"
diff --git a/sys/dev/wscons/files.wscons b/sys/dev/wscons/files.wscons
index 85ef979df9c..ad594f30be3 100644
--- a/sys/dev/wscons/files.wscons
+++ b/sys/dev/wscons/files.wscons
@@ -1,4 +1,4 @@
-# $OpenBSD: files.wscons,v 1.3 2000/09/06 01:39:15 rahnds Exp $
+# $OpenBSD: files.wscons,v 1.4 2001/02/13 14:50:33 deraadt Exp $
# $NetBSD: files.wscons,v 1.19 1999/12/12 08:17:28 scottr Exp $
#
@@ -27,10 +27,10 @@ file dev/wscons/wsdisplay_compat_usl.c wsdisplay & wsdisplay_compat_usl
file dev/wscons/wsemulconf.c wsdisplay
file dev/wscons/wsemul_dumb.c wsdisplay & !wsemul_no_dumb
file dev/wscons/wsemul_sun.c wsdisplay & wsemul_sun
-file dev/wscons/wsemul_vt100.c wsdisplay & wsemul_vt100
-file dev/wscons/wsemul_vt100_subr.c wsdisplay & wsemul_vt100
-file dev/wscons/wsemul_vt100_chars.c wsdisplay & wsemul_vt100
-file dev/wscons/wsemul_vt100_keys.c wsdisplay & wsemul_vt100
+file dev/wscons/wsemul_vt100.c wsdisplay & !wsemul_no_vt100
+file dev/wscons/wsemul_vt100_subr.c wsdisplay & !wsemul_no_vt100
+file dev/wscons/wsemul_vt100_chars.c wsdisplay & !wsemul_no_vt100
+file dev/wscons/wsemul_vt100_keys.c wsdisplay & !wsemul_no_vt100
file dev/wscons/wsevent.c wskbd | wsmouse
file dev/wscons/wskbd.c wskbd needs-flag
file dev/wscons/wskbdutil.c wskbd needs-flag
diff --git a/sys/dev/wscons/wsemulconf.c b/sys/dev/wscons/wsemulconf.c
index 96d3767ab7c..e745cd2873e 100644
--- a/sys/dev/wscons/wsemulconf.c
+++ b/sys/dev/wscons/wsemulconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemulconf.c,v 1.1 2000/05/16 23:49:11 mickey Exp $ */
+/* $OpenBSD: wsemulconf.c,v 1.2 2001/02/13 14:50:34 deraadt Exp $ */
/* $NetBSD: wsemulconf.c,v 1.4 2000/01/05 11:19:37 drochner Exp $ */
/*
@@ -45,7 +45,7 @@ static const struct wsemul_ops *wsemul_conf[] = {
#ifdef WSEMUL_SUN
&wsemul_sun_ops,
#endif
-#ifdef WSEMUL_VT100
+#ifndef WSEMUL_NO_VT100
&wsemul_vt100_ops,
#endif
#ifndef WSEMUL_NO_DUMB
diff --git a/sys/dev/wscons/wsemulvar.h b/sys/dev/wscons/wsemulvar.h
index d08dac1b70a..255dae92d92 100644
--- a/sys/dev/wscons/wsemulvar.h
+++ b/sys/dev/wscons/wsemulvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemulvar.h,v 1.1 2000/05/16 23:49:11 mickey Exp $ */
+/* $OpenBSD: wsemulvar.h,v 1.2 2001/02/13 14:50:34 deraadt Exp $ */
/* $NetBSD: wsemulvar.h,v 1.6 1999/01/17 15:46:15 drochner Exp $ */
/*
@@ -60,7 +60,7 @@ extern const struct wsemul_ops wsemul_dumb_ops;
#ifdef WSEMUL_SUN
extern const struct wsemul_ops wsemul_sun_ops;
#endif
-#ifdef WSEMUL_VT100
+#ifndef WSEMUL_NO_VT100
extern const struct wsemul_ops wsemul_vt100_ops;
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 17:19:36 +0000