Module Name: src
Committed By: bouyer
Date: Sun Jan 12 12:08:36 UTC 2014
Modified Files:
src/sys/arch/luna68k/conf [netbsd-6]: GENERIC
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1000):
sys/arch/luna68k/conf/GENERIC: revision 1.106
sys/arch/luna68k/conf/GENERIC: revision 1.109
sys/arch/luna68k/conf/GENERIC: revision 1.110
Enable cd at scsibus, just works on LUNA-II.
Add and enable wsmux(4) in GENERIC (for mlterm-fb demonstration).
Enable file-system CD9660 to make cd(4) actually usable.
To generate a diff of this commit:
cvs rdiff -u -r1.97.2.1 -r1.97.2.2 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.97.2.1 src/sys/arch/luna68k/conf/GENERIC:1.97.2.2
--- src/sys/arch/luna68k/conf/GENERIC:1.97.2.1 Wed Jul 25 21:30:34 2012
+++ src/sys/arch/luna68k/conf/GENERIC Sun Jan 12 12:08:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.97.2.1 2012/07/25 21:30:34 martin Exp $
+# $NetBSD: GENERIC,v 1.97.2.2 2014/01/12 12:08:36 bouyer 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.97.2.1 $"
+#ident "GENERIC-$Revision: 1.97.2.2 $"
maxusers 8
@@ -79,7 +79,7 @@ file-system FFS # ufs file system
#file-system LFS # log-structured file system
file-system NFS # nfs client support
file-system MFS
-#file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system CD9660 # ISO 9660 + Rock Ridge file system
#file-system MSDOSFS # MS-DOS FAT file system
file-system KERNFS # /kern
file-system PROCFS # /proc
@@ -160,8 +160,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?
@@ -169,7 +169,7 @@ scsibus* at spc?
# SCSI devices
sd* at scsibus? target ? lun ? # SCSI disks
st* at scsibus? target ? lun ? # SCSI tapes
-#cd* at scsibus? target ? lun ? # SCSI CD-ROMs
+cd* at scsibus? target ? lun ? # SCSI CD-ROMs
#ch* at scsibus? target ? lun ? # SCSI changer devices
#ss* at scsibus? target ? lun ? # SCSI scanners
#uk* at scsibus? target ? lun ? # unknown SCSI devices
@@ -206,6 +206,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
