Module Name: src
Committed By: bouyer
Date: Sun Oct 18 14:01:50 UTC 2009
Modified Files:
src/sys/arch/sparc/conf [netbsd-5]: MRCOFFEE
Log Message:
Pull up following revision(s) (requested by macallan in ticket #990):
sys/arch/sparc/conf/MRCOFFEE: revision 1.29
add the missing wscons bits so this kernel builds again
needs testing on actual hardware which I don't have.
To generate a diff of this commit:
cvs rdiff -u -r1.23.20.1 -r1.23.20.2 src/sys/arch/sparc/conf/MRCOFFEE
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/sparc/conf/MRCOFFEE
diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.1 src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.2
--- src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.1 Fri Oct 16 06:30:02 2009
+++ src/sys/arch/sparc/conf/MRCOFFEE Sun Oct 18 14:01:49 2009
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.23.20.1 2009/10/16 06:30:02 snj Exp $
+# $NetBSD: MRCOFFEE,v 1.23.20.2 2009/10/18 14:01:49 bouyer Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MRCOFFEE-$Revision: 1.23.20.1 $"
+#ident "MRCOFFEE-$Revision: 1.23.20.2 $"
maxusers 32
@@ -29,16 +29,21 @@
# Blink the power LED on some machines to indicate the system load.
#options BLINK
-# XXX: uwe: TCX driver doesn't support RASTERCONSOLE, so don't bother
-## Use a faster console than the PROM's slow drawing routines. Not needed
-## for headless (no framebuffer) machines.
-#options RASTERCONSOLE # fast rasterop console
-#options FONT_GALLANT12x22 # the console font
-#options FONT_BOLD8x16 # a somewhat smaller font
-## default console colors: black-on-white; this can be changed
-## using the following two options.
-#options RASTERCONSOLE_FGCOL=WSCOL_BLACK
-#options RASTERCONSOLE_BGCOL=WSCOL_WHITE
+# builtin terminal emulations
+options WSEMUL_SUN # sun terminal emulation
+options WSEMUL_VT100 # VT100 / VT220 emulation
+options WSEMUL_DEFAULT="\"vt100\""
+
+# customization of console and kernel output - see dev/wscons/wsdisplayvar.h
+options WSDISPLAY_COMPAT_RAWKBD
+options WSDISPLAY_CUSTOM_OUTPUT
+options WS_DEFAULT_FG=WSCOL_BLACK
+options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
+options WS_KERNEL_FG=WSCOL_GREEN
+options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
+options WSDISPLAY_SCROLLSUPPORT
+options FONT_GALLANT12x22 # the console font
+
#### System options that are the same for all ports
@@ -250,9 +255,14 @@
#### Keyboard and mouse
pckbc0 at obio0
-kbd0 at pckbc0
-ms0 at pckbc0
-
+#kbd0 at pckbc0
+#ms0 at pckbc0
+#wskbd* at kbd? console ?
+#wsmouse* at ms? mux 0
+pckbd* at pckbc? # PC keyboard
+pms* at pckbc? # PS/2 mouse for wsmouse
+wskbd* at pckbd? console ?
+wsmouse* at pms? mux 0
#### Disk controllers and disks
@@ -316,7 +326,7 @@
## Sun "tcx" accelerated color framebuffer.
tcx0 at sbus? slot ? offset ?
-
+wsdisplay0 at tcx0
#### Other device configuration
@@ -334,3 +344,6 @@
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
+
+pseudo-device wsmux # mouse and keyboard multiplexor
+pseudo-device wsfont
