Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Make two wsmux pseudo devices and add mux locators.
details: https://anonhg.NetBSD.org/src/rev/a0b567368e20
branches: trunk
changeset: 475025:a0b567368e20
user: augustss <augustss%NetBSD.org@localhost>
date: Thu Jul 29 19:36:58 1999 +0000
description:
Make two wsmux pseudo devices and add mux locators.
diffstat:
sys/arch/alpha/conf/GENERIC | 11 ++++++-----
sys/arch/bebox/conf/GENERIC | 5 +++--
sys/arch/i386/conf/GENERIC | 17 ++++++++++-------
sys/arch/macppc/conf/GENERIC | 9 +++++----
sys/arch/next68k/conf/GENERIC | 3 ++-
5 files changed, 26 insertions(+), 19 deletions(-)
diffs (177 lines):
diff -r 6ef02121c90e -r a0b567368e20 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC Thu Jul 29 19:26:08 1999 +0000
+++ b/sys/arch/alpha/conf/GENERIC Thu Jul 29 19:36:58 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.123 1999/07/29 10:37:13 augustss Exp $
+# $NetBSD: GENERIC,v 1.124 1999/07/29 19:36:58 augustss Exp $
#
# Generic Alpha kernel. Enough to get booted, etc., but not much more.
@@ -297,11 +297,11 @@
# USB mice
ums* at uhub? port ?
-wsmouse* at ums?
+wsmouse* at ums? mux 0
# USB Keyboards
ukbd* at uhub? port ?
-wskbd* at ukbd? console ?
+wskbd* at ukbd? console ? mux 1
# USB Generic HID devices
uhid* at uhub? port ?
@@ -314,8 +314,8 @@
wsdisplay* at vga?
#wsdisplay* at sfb?
wsdisplay* at tga?
-wskbd* at pckbd?
-wsmouse* at pms?
+wskbd* at pckbd? mux 1
+wsmouse* at pms? mux 0
pseudo-device bpfilter 16
pseudo-device ccd 4
@@ -328,6 +328,7 @@
pseudo-device sl 4
pseudo-device vnd 4
#pseudo-device gre 2 # generic L3 over IP tunnel
+pseudo-device wsmux 2 # mouse & keyboard multiplexor
# rnd is EXPERIMENTAL
#pseudo-device rnd # /dev/random and in-kernel generator
diff -r 6ef02121c90e -r a0b567368e20 sys/arch/bebox/conf/GENERIC
--- a/sys/arch/bebox/conf/GENERIC Thu Jul 29 19:26:08 1999 +0000
+++ b/sys/arch/bebox/conf/GENERIC Thu Jul 29 19:36:58 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.18 1999/07/29 10:37:16 augustss Exp $
+# $NetBSD: GENERIC,v 1.19 1999/07/29 19:36:59 augustss Exp $
#
# First try for BEBOX config file
#
@@ -58,6 +58,7 @@
pseudo-device pty 64
#pseudo-device raid 4 # RAIDframe disk driver
#pseudo-device gre 2 # generic L3 over IP tunnel
+pseudo-device wsmux 2
#
# device
@@ -103,7 +104,7 @@
wsdisplay* at vga? console ?
wsdisplay* at pfb? console ?
wskbd* at pckbd? console ?
-#wsmouse* at pms?
+#wsmouse* at pms? mux 0
#ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers
#scsibus* at ncr?
diff -r 6ef02121c90e -r a0b567368e20 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Thu Jul 29 19:26:08 1999 +0000
+++ b/sys/arch/i386/conf/GENERIC Thu Jul 29 19:36:58 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.245 1999/07/29 10:37:17 augustss Exp $
+# $NetBSD: GENERIC,v 1.246 1999/07/29 19:36:59 augustss Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -247,8 +247,8 @@
wsdisplay* at vga? console ?
wsdisplay* at pcdisplay? console ?
wskbd* at pckbd? console ?
-wsmouse* at pms?
-wsmouse* at pmsi?
+wsmouse* at pms? mux 0
+wsmouse* at pmsi? mux 0
pcppi0 at isa?
sysbeep0 at pcppi?
@@ -512,11 +512,11 @@
# USB Mice
ums* at uhub? port ? configuration ? interface ?
-wsmouse* at ums?
+wsmouse* at ums? mux 0
# USB Keyboards
ukbd* at uhub? port ? configuration ? interface ?
-wskbd* at ukbd? console ?
+wskbd* at ukbd? console ? mux 1
# USB Generic HID devices
uhid* at uhub? port ? configuration ? interface ?
@@ -589,8 +589,8 @@
lms1 at isa? port 0x238 irq 5
mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
mms1 at isa? port 0x238 irq 5
-wsmouse* at lms?
-wsmouse* at mms?
+wsmouse* at lms? mux 0
+wsmouse* at mms? mux 0
# backwards compatible versions
#olms0 at isa? port 0x23c irq 5 # Logitech bus mouse
#olms1 at isa? port 0x238 irq 5
@@ -648,3 +648,6 @@
# a pseudo device needed for Coda # also needs CODA (above)
pseudo-device vcoda 4 # coda minicache <-> venus comm.
+
+# mouse & keyboard multiplexor pseudo-devices
+pseudo-device wsmux 2
diff -r 6ef02121c90e -r a0b567368e20 sys/arch/macppc/conf/GENERIC
--- a/sys/arch/macppc/conf/GENERIC Thu Jul 29 19:26:08 1999 +0000
+++ b/sys/arch/macppc/conf/GENERIC Thu Jul 29 19:36:58 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.31 1999/07/29 10:37:19 augustss Exp $
+# $NetBSD: GENERIC,v 1.32 1999/07/29 19:37:00 augustss Exp $
#
# POWERMAC config file
#
@@ -138,7 +138,7 @@
wsdisplay0 at ofb? console ?
wskbd0 at akbd? console ?
-wsmouse0 at ams?
+wsmouse0 at ams? mux 0
scsibus* at adv?
scsibus* at ahc?
@@ -176,11 +176,11 @@
# USB Mice
ums* at uhub? port ? configuration ? interface ?
-wsmouse* at ums?
+wsmouse* at ums? mux 0
# USB Keyboards
ukbd* at uhub? port ? configuration ? interface ?
-wskbd* at ukbd? console ?
+wskbd* at ukbd? console ? mux 1
# USB Generic HID devices
uhid* at uhub? port ? configuration ? interface ?
@@ -203,6 +203,7 @@
pseudo-device tun 4 # network tunneling over tty
#pseudo-device gre 2 # generic L3 over IP tunnel
pseudo-device pty 64 # pseudo-terminals
+pseudo-device wsmux 2 # mouse & keyboard multiplexor
# rnd is EXPERIMENTAL at this point.
#pseudo-device rnd # /dev/random and in-kernel generator
diff -r 6ef02121c90e -r a0b567368e20 sys/arch/next68k/conf/GENERIC
--- a/sys/arch/next68k/conf/GENERIC Thu Jul 29 19:26:08 1999 +0000
+++ b/sys/arch/next68k/conf/GENERIC Thu Jul 29 19:36:58 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.17 1999/07/29 10:37:20 augustss Exp $
+# $NetBSD: GENERIC,v 1.18 1999/07/29 19:37:00 augustss Exp $
#
# GENERIC next68k
#
@@ -182,6 +182,7 @@
pseudo-device ipfilter # ip filter
# rnd is EXPERIMENTAL
#pseudo-device rnd # /dev/random and in-kernel generator
+#pseudo-device wsmux 2 # mouse & keyboard multiplexor
pseudo-device pty 64 # pseudo-terminals
pseudo-device vnd 4 # paging to files
Home |
Main Index |
Thread Index |
Old Index