Module Name: src
Committed By: bouyer
Date: Sun Oct 18 13:33:29 UTC 2009
Modified Files:
src/sys/arch/sparc/conf [netbsd-5]: GENERIC
Log Message:
Pull up following revision(s) (requested by macallan in ticket #965):
sys/arch/sparc/conf/GENERIC: revision 1.208
wscons here we come!
(finally)
To generate a diff of this commit:
cvs rdiff -u -r1.205.4.1 -r1.205.4.2 src/sys/arch/sparc/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/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.205.4.1 src/sys/arch/sparc/conf/GENERIC:1.205.4.2
--- src/sys/arch/sparc/conf/GENERIC:1.205.4.1 Fri Oct 16 06:30:01 2009
+++ src/sys/arch/sparc/conf/GENERIC Sun Oct 18 13:33:29 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.205.4.1 2009/10/16 06:30:01 snj Exp $
+# $NetBSD: GENERIC,v 1.205.4.2 2009/10/18 13:33:29 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.205.4.1 $"
+#ident "GENERIC-$Revision: 1.205.4.2 $"
maxusers 32
@@ -45,14 +45,30 @@
## 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.
+## These is obsolete for wscons kernels
+#options RASTERCONSOLE # fast rasterop console
#options RASTERCONSOLE_FGCOL=WSCOL_BLACK
#options RASTERCONSOLE_BGCOL=WSCOL_WHITE
+# wscons stuff
+options WSEMUL_SUN
+#options WSEMUL_VT100
+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_COMPAT_PCVT
+options WSDISPLAY_COMPAT_SYSCONS
+options WSDISPLAY_COMPAT_USL
+
+options WSDISPLAY_SCROLLSUPPORT
+
+# generic options vlid for both wscons and RASTERCONSOLE
+options FONT_GALLANT12x22 # the console font
+#options FONT_BOLD8x16 # a somewhat smaller font
+
#### System options that are the same for all ports
## Root device configuration: change the ?'s if you are going to use a
@@ -316,16 +332,23 @@
zs0 at obio0 addr 0xf1000000 level 12 # sun4/200 and sun4/300
zs0 at obio0 addr 0x01000000 level 12 # sun4/100
zs0 at bootbus0 # sun4d
-zstty0 at zs0 channel 0 # ttya
-zstty1 at zs0 channel 1 # ttyb
zs1 at mainbus0 # sun4c
zs1 at obio0 # sun4m
zs1 at obio0 addr 0xf0000000 level 12 # sun4/200 and sun4/300
zs1 at obio0 addr 0x00000000 level 12 # sun4/100
zs1 at bootbus0 # sun4d
-kbd0 at zs1 channel 0 # keyboard
-ms0 at zs1 channel 1 # mouse
+
+# old kbd and mouse attachments
+#kbd0 at zs1 channel 0 # keyboard
+#ms0 at zs1 channel 1 # mouse
+zstty* at zs?
+
+# these are for wscons
+kbd0 at zstty?
+ms0 at zstty?
+wskbd* at wskbddev?
+wsmouse* at wsmousedev?
zs2 at obio0 addr 0xe0000000 level 12 # sun4/300
zstty2 at zs2 channel 0 # ttyc
@@ -637,7 +660,8 @@
bwtwo0 at obio0 addr 0x0b300000 level 4 # sun4/100 in P4 slot
## Sun "cgtwo" VME color framebuffer
-cgtwo0 at vme0 addr 0x400000 irq ? vect 0xa8
+# XXX no wsdisplay support
+#cgtwo0 at vme0 addr 0x400000 irq ? vect 0xa8
## Sun "cgthree" Sbus color framebuffer
cgthree0 at sbus? slot ? offset ?
@@ -646,8 +670,9 @@
## Sun "cgfour" color framebuffer with overlay plane. See above comment
## regarding overlay plane.
-cgfour0 at obio0 addr 0xfb300000 level 4 # sun4/300 P4
-cgfour0 at obio0 addr 0x0b300000 level 4 # sun4/100 P4
+# XXX no wsdisplay support
+#cgfour0 at obio0 addr 0xfb300000 level 4 # sun4/300 P4
+#cgfour0 at obio0 addr 0x0b300000 level 4 # sun4/100 P4
## Sun "cgsix" accelerated color framebuffer.
cgsix0 at sbus? slot ? offset ?
@@ -656,21 +681,31 @@
cgsix0 at obio0 addr 0x0b000000 level 4 # sun4/100 P4
## Sun "cgeight" 24-bit framebuffer
-cgeight0 at obio0 addr 0xfb300000 level 4 # sun4/300 P4
-cgeight0 at obio0 addr 0x0b300000 level 4 # sun4/100 P4
+# XXX no wsdisplay support
+#cgeight0 at obio0 addr 0xfb300000 level 4 # sun4/300 P4
+#cgeight0 at obio0 addr 0x0b300000 level 4 # sun4/100 P4
## Sun "tcx" accelerated color framebuffer.
-tcx0 at sbus? slot ? offset ?
-tcx* at sbus? slot ? offset ?
+# XXX no wsdisplay support
+#tcx0 at sbus? slot ? offset ?
+#tcx* at sbus? slot ? offset ?
# Sun "cgfourteen" accelerated 24-bit framebuffer.
-cgfourteen0 at obio0 # sun4m
+cgfourteen* at obio0 # sun4m
# P9100-based display on Tadpole SPARCbook 3.
pnozz0 at sbus? slot ? offset ?
# Sun ZX/Leo 24-bit framebuffer
-zx* at sbus? slot ? offset ?
+# XXX no wsdisplay support
+#zx* at sbus? slot ? offset ?
+
+# Fujitsu AG-10e accelerated graphics 8/24-bit board
+agten* at sbus? slot ? offset ?
+
+# make sure wsdisplay0 is the console
+wsdisplay0 at wsemuldisplaydev? console 1
+wsdisplay* at wsemuldisplaydev?
#### Other device configuration
@@ -694,6 +729,8 @@
#pseudo-device pf # PF packet filter
#pseudo-device pflog # PF log if
pseudo-device fss 4 # file system snapshot device
+pseudo-device wsmux # mouse and keyboard multiplexor
+pseudo-device wsfont
#options FILEASSOC # fileassoc(9)
