summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-01-06 21:32:58 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-01-06 21:32:58 +0000
commitff2ac8cff1b4b445fa9b7c71dbffdd98f3454834 (patch)
treef20c42f045054aa76836caa045667d97882fe7a5
parentcc012865d714868333a1bb76a83f31d808866a49 (diff)
use wsmux more; miod ok
Diffstat
-rw-r--r--sys/arch/alpha/conf/GENERIC10
-rw-r--r--sys/arch/alpha/conf/RAMDISK5
-rw-r--r--sys/arch/alpha/conf/RAMDISKB5
-rw-r--r--sys/arch/alpha/conf/RAMDISKBIG8
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/RAMDISK4
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD4
-rw-r--r--sys/arch/cats/conf/GENERIC6
-rw-r--r--sys/arch/cats/conf/RAMDISK5
-rw-r--r--sys/arch/hppa/conf/RAMDISK7
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/RAMDISK5
-rw-r--r--sys/arch/i386/conf/RAMDISKB5
-rw-r--r--sys/arch/i386/conf/RAMDISKC4
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD4
15 files changed, 43 insertions, 37 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 48f6f4d53a5..9457db23256 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.138 2005/01/04 01:22:40 jsg Exp $
+# $OpenBSD: GENERIC,v 1.139 2005/01/06 21:32:56 deraadt Exp $
# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
machine alpha
@@ -340,9 +340,9 @@ audio* at uaudio?
#wsdisplay* at sfb?
wsdisplay* at vga?
wsdisplay* at tga?
-wskbd* at pckbd?
-wsmouse* at pms?
-wsmouse* at pmsi?
+wskbd* at pckbd? mux 1
+wsmouse* at pms? mux 0
+wsmouse* at pmsi? mux 0
# crypto support
hifn* at pci? # Hi/fn 7751 crypto card
@@ -353,4 +353,4 @@ hifn* at pci? # Hi/fn 7751 crypto card
pseudo-device crypto 1
pseudo-device sequencer 1
#pseudo-device hotplug 1 # devices hot plugging
-#pseudo-device wsmux 2
+pseudo-device wsmux 2 # mouse & keyboard multiplexor
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
index 3d7bc99bee7..a1edc817056 100644
--- a/sys/arch/alpha/conf/RAMDISK
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.62 2004/11/05 16:29:18 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.63 2005/01/06 21:32:56 deraadt Exp $
# $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
machine alpha # architecture, used by config; REQUIRED
@@ -143,8 +143,9 @@ sd* at scsibus? # SCSI disk drives
# Workstation Console attachments
wsdisplay* at vga?
wsdisplay* at tga?
-wskbd* at pckbd?
+wskbd* at pckbd? mux 1
#pseudo-device bpfilter 1
pseudo-device loop
pseudo-device rd 1
+pseudo-device wsmux 2 # mouse & keyboard multiplexor
diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB
index 33e5fad8c02..d5c2025388a 100644
--- a/sys/arch/alpha/conf/RAMDISKB
+++ b/sys/arch/alpha/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.25 2004/11/05 16:29:18 deraadt Exp $
+# $OpenBSD: RAMDISKB,v 1.26 2005/01/06 21:32:56 deraadt Exp $
# $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
machine alpha # architecture, used by config; REQUIRED
@@ -145,8 +145,9 @@ sd* at scsibus? # SCSI disk drives
# Workstation Console attachments
wsdisplay* at vga?
wsdisplay* at tga?
-wskbd* at pckbd?
+wskbd* at pckbd? mux 1
#pseudo-device bpfilter 1
pseudo-device loop
pseudo-device rd 1
+pseudo-device wsmux 2 # mouse & keyboard multiplexor
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index bbc31c186ce..ec5b65e41cd 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKBIG,v 1.48 2005/01/04 01:22:40 jsg Exp $
+# $OpenBSD: RAMDISKBIG,v 1.49 2005/01/06 21:32:56 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.
@@ -293,10 +293,10 @@ scsibus* at atapiscsi?
#wsdisplay* at sfb?
wsdisplay* at vga?
wsdisplay* at tga?
-wskbd* at pckbd?
-wsmouse* at pms?
+wskbd* at pckbd? mux 1
+wsmouse* at pms? mux 0
pseudo-device bpfilter 1
pseudo-device loop
pseudo-device rd 1
-#pseudo-device wsmux 2
+pseudo-device wsmux 2
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 4ae59997e89..2fcc4a9f040 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.48 2005/01/02 20:06:22 martin Exp $
+# $OpenBSD: GENERIC,v 1.49 2005/01/06 21:32:56 deraadt Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -164,7 +164,7 @@ pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse
vga0 at isa?
vga* at pci?
wsdisplay* at vga?
-wskbd* at pckbd?
+wskbd* at pckbd? mux 1
wsmouse* at pms? mux 0
wsmouse* at pmsi? mux 0
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index 021a6005527..def55722ad5 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.18 2005/01/03 23:43:42 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.19 2005/01/06 21:32:56 deraadt Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -97,7 +97,7 @@ wskbd* at ukbd? mux 1
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
-wskbd* at pckbd?
+wskbd* at pckbd? mux 1
vga0 at isa?
vga* at pci?
wsdisplay* at vga?
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 8facb996534..7bdf24aba2e 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.26 2005/01/03 17:29:17 henning Exp $
+# $OpenBSD: RAMDISK_CD,v 1.27 2005/01/06 21:32:56 deraadt Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -106,7 +106,7 @@ upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network'
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
-wskbd* at pckbd?
+wskbd* at pckbd? mux 1
vga0 at isa?
vga* at pci?
wsdisplay* at vga?
diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index aa340ecfb38..fb141d01c93 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.17 2004/12/19 16:09:17 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.18 2005/01/06 21:32:56 deraadt Exp $
#
# GENERIC machine description file
#
@@ -243,8 +243,8 @@ isa* at pcib? # ISA bus
pckbc0 at isa? # pc keyboard controller
pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
-wskbd* at pckbd?
-wsmouse* at pms?
+wskbd* at pckbd? mux 1
+wsmouse* at pms? mux 0
pcppi0 at isa?
sysbeep0 at pcppi?
diff --git a/sys/arch/cats/conf/RAMDISK b/sys/arch/cats/conf/RAMDISK
index d6b84c5694a..a8f2fcf0ce7 100644
--- a/sys/arch/cats/conf/RAMDISK
+++ b/sys/arch/cats/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.10 2005/01/04 21:01:53 miod Exp $
+# $OpenBSD: RAMDISK,v 1.11 2005/01/06 21:32:56 deraadt Exp $
machine cats arm
@@ -189,7 +189,7 @@ isa* at pcib? # ISA bus
# wscons
pckbc0 at isa? # pc keyboard controller
pckbd* at pckbc? # PC keyboard
-wskbd* at pckbd?
+wskbd* at pckbd? mux 1
#pcppi0 at isa?
#sysbeep0 at pcppi?
@@ -231,6 +231,7 @@ pseudo-device wsmux 2
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 1 # packet filter
pseudo-device rd 1 # ram disk
+pseudo-device wsmux 2
option BOOT_CONFIG # boot-time kernel config
diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK
index 0ac014de011..89108b7a012 100644
--- a/sys/arch/hppa/conf/RAMDISK
+++ b/sys/arch/hppa/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.44 2004/12/08 14:59:42 mickey Exp $
+# $OpenBSD: RAMDISK,v 1.45 2005/01/06 21:32:56 deraadt Exp $
#
# Diskless kernel config
#
@@ -269,8 +269,8 @@ ukphy* at mii? # generic unknown PHYs
# MI devices
#wsdisplay* at vgafb?
wsdisplay* at sti?
-wskbd* at gsckbd? # mux 1
-wskbd* at hilkbd? # mux 1
+wskbd* at gsckbd? mux 1
+wskbd* at hilkbd? mux 1
#wsmouse* at pms? mux 0
#wsmouse* at hilms? mux 0
@@ -303,3 +303,4 @@ pseudo-device bpfilter 1 # packet filter
pseudo-device pty 16 # pseudo-terminals
pseudo-device ksyms 1 # kernel symbols device
pseudo-device ccd 4 # concatenated disk devices
+pseudo-device wsmux 2
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 7fc25c93e72..94507911b51 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.395 2004/12/31 00:27:47 jsg Exp $
+# $OpenBSD: GENERIC,v 1.396 2005/01/06 21:32:56 deraadt Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -211,7 +211,7 @@ vga* at pci?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at vga?
wsdisplay* at pcdisplay?
-wskbd* at pckbd?
+wskbd* at pckbd? mux 1
wsmouse* at pms? mux 0
wsmouse* at pmsi? mux 0
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index ab0a0b09d05..36116f2d505 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.133 2004/11/25 22:02:08 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.134 2005/01/06 21:32:56 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -83,7 +83,7 @@ isapnp0 at isa?
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
-wskbd* at pckbd?
+wskbd* at pckbd? mux 1
vga0 at isa?
vga* at pci?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
@@ -274,3 +274,4 @@ pseudo-device loop 1 # network loopback
#pseudo-device ppp 1 # PPP
pseudo-device bpfilter 1 # packet filter
pseudo-device rd 1 # ramdisk
+pseudo-device wsmux 2
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 9df2f0f3e6d..a1557a0cb15 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.76 2004/11/25 22:02:08 deraadt Exp $
+# $OpenBSD: RAMDISKB,v 1.77 2005/01/06 21:32:57 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -83,7 +83,7 @@ isapnp0 at isa?
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
-wskbd* at pckbd?
+wskbd* at pckbd? mux 1
vga0 at isa?
vga* at pci?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
@@ -295,3 +295,4 @@ pseudo-device loop 1 # network loopback
#pseudo-device ppp 1 # PPP
pseudo-device bpfilter 1 # packet filter
pseudo-device rd 1 # ramdisk
+pseudo-device wsmux 2
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index abcbe4c9560..bad0a36a4af 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKC,v 1.45 2005/01/03 21:46:00 deraadt Exp $
+# $OpenBSD: RAMDISKC,v 1.46 2005/01/06 21:32:57 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -119,7 +119,7 @@ isapnp0 at isa?
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
-wskbd* at pckbd?
+wskbd* at pckbd? mux 1
vga0 at isa?
vga* at pci?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 79817020c4f..e175db6d3ee 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.85 2004/12/20 01:06:58 pvalchev Exp $
+# $OpenBSD: RAMDISK_CD,v 1.86 2005/01/06 21:32:57 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -137,7 +137,7 @@ isapnp0 at isa?
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
-wskbd* at pckbd?
+wskbd* at pckbd? mux 1
vga0 at isa?
vga* at pci?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 03:15:50 +0000