Module Name: src
Committed By: tsutsui
Date: Sat Dec 21 17:12:36 UTC 2013
Modified Files:
src/sys/arch/luna68k/conf: GENERIC
Log Message:
Add and enable wsmux(4) in GENERIC (for mlterm-fb demonstration).
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/luna68k/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/conf/GENERIC
diff -u src/sys/arch/luna68k/conf/GENERIC:1.108 src/sys/arch/luna68k/conf/GENERIC:1.109
--- src/sys/arch/luna68k/conf/GENERIC:1.108 Sun Jun 30 21:38:57 2013
+++ src/sys/arch/luna68k/conf/GENERIC Sat Dec 21 17:12:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.108 2013/06/30 21:38:57 rmind Exp $
+# $NetBSD: GENERIC,v 1.109 2013/12/21 17:12:36 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/luna68k/conf/std.luna68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.108 $"
+#ident "GENERIC-$Revision: 1.109 $"
maxusers 8
@@ -156,8 +156,8 @@ fb0 at mainbus0 # 16 or 256 pseudo colo
# Workstation Console attachments
wsdisplay* at fb?
-wskbd* at ws? console ?
-wsmouse* at ws?
+wskbd* at ws? console ? mux 1
+wsmouse* at ws? mux 0
# SCSI bus support
scsibus* at spc?
@@ -202,6 +202,8 @@ pseudo-device ksyms # /dev/ksyms
#pseudo-device pf # PF packet filter
#pseudo-device pflog # PF log if
+pseudo-device wsmux # mouse & keyboard multiplexsor
+
# Veriexec
#
# a pseudo device needed for veriexec