Convert sparc console code from rcons and pseudo-devices to rasops and wscons.

For most framebuffers it is faster.

Other changes include:
o 24 bit support in tcx(4) for the S24 framebuffer
o accelerated cgsix(4) text console
o new cgtwelve(4) driver for the GS framebuffer
o improved serial driver code
o better keyboard support

The following framebuffers have not been tested but should work: cgfour,
cgeight and cgfourteen

These changes will require XF4 changes, to use Xwsfb instead of Xsun*, to be
commited later today.

Most of the work by me during the LSM and the week after, with code borrowed
from jason@, NetBSD (new serial code), and feedback from mickey@. Work on
pnozz(4) done by millert@

6 files changed, 151 insertions, 110 deletions

diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 69bc7b0f8d3..0a56ca02726 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.52 2001/07/21 20:47:54 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.53 2002/08/12 10:44:03 miod Exp $
 # 	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -20,7 +20,6 @@ option		SUN4M		# sun4m - SS10, SS20, Classic, etc.
 #option		KGDBRATE=38400	# baud rate
 
 # Options for SPARCstation hardware
-option		RASTERCONSOLE	# fast rasterop console
 option		COMPAT_SUNOS	# compatibility with SunOS binaries
 option		COMPAT_SVR4	# compatibility with SVR4 binaries
 
@@ -98,6 +97,10 @@ zs1	at obio0 addr 0xf0000000 level 12 flags 0x103	# sun4/200 and sun4/300
 zs1	at obio0 addr 0x00000000 level 12 flags 0x103	# sun4/100
 zs2	at obio0 addr 0xe0000000 level 12 flags 0x103	# sun4/300
 
+zstty* at zs? channel ?
+zskbd* at zs? channel ?
+wskbd* at zskbd? console ?
+
 # Magma serial/parallel port devices
 magma*	at sbus? slot ? offset ?			# magma serial cards
 mtty*	at magma?
@@ -219,48 +222,55 @@ si0	at vmes0 addr 0xff200000 level 3 vect 0x40
 sw0	at obio0 addr 0x0a000000 level 3
 
 # Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
-# systems.  If your sun4 system has a cgfour installed in the P4 slot,
-# the P4 entries for "bwtwo" will attach to the overlay plane of the
-# "cgfour".
+# systems.
 bwtwo0	at sbus0 slot ? offset ?		# sun4c on-board
 bwtwo*	at sbus? slot ? offset ?		# sun4c and sun4m
 bwtwo0	at obio0 addr 0xfd000000 level 4	# sun4/200
 bwtwo0	at obio0 addr 0xfb300000 level 4	# sun4/300 in P4 slot
 bwtwo0	at obio0 addr 0x0b300000 level 4	# sun4/100 in P4 slot
+wsdisplay* at bwtwo?
 
-# Sun "cgtwo" VME color framebuffer
+# Sun "cgtwo" VME color framebuffer.
 cgtwo0	at vmes0 addr 0xff400000 level 4 vect 0xa8
+wsdisplay* at cgtwo?
 
-# Sun "cgthree" Sbus color framebuffer
-cgthree0 at sbus? slot ? offset ?
+# Sun "cgthree" Sbus color framebuffer.
 cgthree* at sbus? slot ? offset ?
-#cgthree0 at obio? slot ? offset ?		# sun4m
-#cgthree* at obio? slot ? offset ?		# sun4m
+wsdisplay* at cgthree?
 
-# Sun "cgfour" color framebuffer with overlay plane.  See above comment
-# regarding overlay plane.
+# Sun "cgfour" color framebuffer.
 cgfour0	at obio0 addr 0xfb300000 level 4	# sun4/300 P4
 cgfour0	at obio0 addr 0x0b300000 level 4	# sun4/100 P4
+wsdisplay* at cgfour?
 
 # Sun "cgsix" accelerated color framebuffer.
 cgsix0	at sbus? slot ? offset ?
 cgsix*	at sbus? slot ? offset ?
 cgsix0	at obio0 addr 0xfb000000 level 4	# sun4/300 P4
 cgsix0	at obio0 addr 0x0b000000 level 4	# sun4/100 P4
+wsdisplay* at cgsix?
 
-# Sun "cgeight" 24-bit framebuffer
+# 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
+wsdisplay* at cgeight?
 
 # Sun "tcx" accelerated color framebuffer.
-tcx0	at sbus? slot ? offset ?
 tcx*	at sbus? slot ? offset ?
+wsdisplay* at tcx?
 
 # Sun "cgfourteen" accelerated 24-bit framebuffer.
 cgfourteen0	at obio0			# sun4m
+wsdisplay* at cgfourteen?
+
+# Sun "cgtwelve" (GS) accelerated 24-bit framebuffer.
+cgtwelve*	at sbus? slot ? offset ?
+wsdisplay* at cgtwelve?
 
 # Weitek p9100 found on Tadpole 3GS/3GX
 pnozz0	at sbus? slot ? offset ?
+wsdisplay* at pnozz?
+
 # Microcontroller found on Tadpole
 tctrl0	at obio0
 
@@ -292,5 +302,4 @@ fd*	at fdc0					# the drive itself
 #fvme*	at fga0					# FORCE CPU-5V
 #daadio*	at fvme? addr 0x0 level 1 vect 0x1f	# Matrix MD-DAADIO board
 
-pseudo-device	kbd		# Sun keyboard
 #pseudo-device	strip	1	# radio clock
diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK
index 58660d71299..64e49c38842 100644
--- a/sys/arch/sparc/conf/RAMDISK
+++ b/sys/arch/sparc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# 	$OpenBSD: RAMDISK,v 1.30 2002/07/28 01:39:14 krw Exp $
+# 	$OpenBSD: RAMDISK,v 1.31 2002/08/12 10:44:03 miod Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -39,7 +39,6 @@ option		SUN4M		# sun4m - SS10, SS20, Classic, etc.
 #option		KGDBRATE=38400	# baud rate
 
 # Options for SPARCstation hardware
-option		RASTERCONSOLE	# fast rasterop console
 #option		COMPAT_SUNOS	# compatibility with SunOS binaries
 #option		COMPAT_SVR4	# compatibility with SVR4 binaries
 
@@ -108,6 +107,10 @@ zs1	at obio0 addr 0xf0000000 level 12 flags 0x103	# sun4/200 and sun4/300
 zs1	at obio0 addr 0x00000000 level 12 flags 0x103	# sun4/100
 zs2	at obio0 addr 0xe0000000 level 12 flags 0x103	# sun4/300
 
+zstty* at zs? channel ?
+zskbd* at zs? channel ?
+wskbd* at zskbd? console ?
+
 # SUNW,xbox SBus Expansion Subsystem
 xbox*	at sbus? slot ? offset ?			# SBus Expansion box
 sbus*	at xbox?
@@ -213,45 +216,50 @@ si0	at vmes0 addr 0xff200000 level 3 vect 0x40
 sw0	at obio0 addr 0x0a000000 level 3
 
 # Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
-# systems.  If your sun4 system has a cgfour installed in the P4 slot,
-# the P4 entries for "bwtwo" will attach to the overlay plane of the
-# "cgfour".
+# systems.
 bwtwo0	at sbus0 slot ? offset ?		# sun4c on-board
 bwtwo*	at sbus? slot ? offset ?		# sun4c and sun4m
 bwtwo0	at obio0 addr 0xfd000000 level 4	# sun4/200
 bwtwo0	at obio0 addr 0xfb300000 level 4	# sun4/300 in P4 slot
 bwtwo0	at obio0 addr 0x0b300000 level 4	# sun4/100 in P4 slot
+wsdisplay* at bwtwo?
 
-# Sun "cgtwo" VME color framebuffer
+# Sun "cgtwo" VME color framebuffer.
 cgtwo0	at vmes0 addr 0xff400000 level 4 vect 0xa8
+wsdisplay* at cgtwo?
 
-# Sun "cgthree" Sbus color framebuffer
-cgthree0 at sbus? slot ? offset ?
+# Sun "cgthree" Sbus color framebuffer.
 cgthree* at sbus? slot ? offset ?
-#cgthree0 at obio? slot ? offset ?		# sun4m
-#cgthree* at obio? slot ? offset ?		# sun4m
+wsdisplay* at cgthree?
 
-# Sun "cgfour" color framebuffer with overlay plane.  See above comment
-# regarding overlay plane.
+# Sun "cgfour" color framebuffer.
 cgfour0	at obio0 addr 0xfb300000 level 4	# sun4/300 P4
 cgfour0	at obio0 addr 0x0b300000 level 4	# sun4/100 P4
+wsdisplay* at cgfour?
 
 # Sun "cgsix" accelerated color framebuffer.
 cgsix0	at sbus? slot ? offset ?
 cgsix*	at sbus? slot ? offset ?
 cgsix0	at obio0 addr 0xfb000000 level 4	# sun4/300 P4
 cgsix0	at obio0 addr 0x0b000000 level 4	# sun4/100 P4
+wsdisplay* at cgsix?
 
-# Sun "cgeight" 24-bit framebuffer
+# 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
+wsdisplay* at cgeight?
 
 # Sun "tcx" accelerated color framebuffer.
-tcx0	at sbus? slot ? offset ?
 tcx*	at sbus? slot ? offset ?
+wsdisplay* at tcx?
 
 # Sun "cgfourteen" accelerated 24-bit framebuffer.
 cgfourteen0	at obio0			# sun4m
+wsdisplay* at cgfourteen?
+
+# Sun "cgtwelve" (GS) accelerated 24-bit framebuffer.
+cgtwelve*	at sbus? slot ? offset ?
+wsdisplay* at cgtwelve?
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
 # to the underlying hardware controller.
@@ -273,7 +281,6 @@ fdc0	at mainbus0				# sun4c controller
 fdc0	at obio0				# sun4m controller
 fd*	at fdc0					# the drive itself
 
-pseudo-device	kbd		# Sun keyboard
 pseudo-device	rd	2
 pseudo-device	loop	1	# network loopback
 pseudo-device	bpfilter 1	# packet filter
diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4
index ace9b151296..3bb86ff793f 100644
--- a/sys/arch/sparc/conf/SUN4
+++ b/sys/arch/sparc/conf/SUN4
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4,v 1.25 2001/07/21 20:47:55 deraadt Exp $
+#	$OpenBSD: SUN4,v 1.26 2002/08/12 10:44:03 miod Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -13,7 +13,6 @@ option		SUN4		# sun4/100, sun4/200, sun4/300
 #option		MMU_3L		# 3-level MMU on sun4/400
 
 # Options for SPARCstation hardware
-option		RASTERCONSOLE	# fast rasterop console
 option		COMPAT_SUNOS	# compatibility with SunOS binaries
 option		COMPAT_SVR4	# compatibility with SVR4 binaries
 
@@ -63,6 +62,10 @@ zs1	at obio0 addr 0xf0000000 level 12 flags 0x103	# sun4/200 and sun4/300
 zs1	at obio0 addr 0x00000000 level 12 flags 0x103	# sun4/100
 zs2	at obio0 addr 0xe0000000 level 12 flags 0x103	# sun4/300
 
+zstty* at zs? channel ?
+zskbd* at zs? channel ?
+wskbd* at zskbd? console ?
+
 #
 # Note the flags on the esp entries below, that work around
 # deficiencies in the current driver:
@@ -129,28 +132,30 @@ si0	at vmes0 addr 0xff200000 level 3 vect 0x40
 sw0	at obio0 addr 0x0a000000 level 3
 
 # Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
-# systems.  If your sun4 system has a cgfour installed in the P4 slot,
-# the P4 entries for "bwtwo" will attach to the overlay plane of the
-# "cgfour".
+# systems.
 bwtwo0	at obio0 addr 0xfd000000 level 4	# sun4/200
 bwtwo0	at obio0 addr 0xfb300000 level 4	# sun4/300 in P4 slot
 bwtwo0	at obio0 addr 0x0b300000 level 4	# sun4/100 in P4 slot
+wsdisplay* at bwtwo?
 
-# Sun "cgtwo" VME color framebuffer
+# Sun "cgtwo" VME color framebuffer.
 cgtwo0	at vmes0 addr 0xff400000 level 4 vect 0xa8
+wsdisplay* at cgtwo?
 
-# Sun "cgfour" color framebuffer with overlay plane.  See above comment
-# regarding overlay plane.
+# Sun "cgfour" color framebuffer.
 cgfour0	at obio0 addr 0xfb300000 level 4	# sun4/300 P4
 cgfour0	at obio0 addr 0x0b300000 level 4	# sun4/100 P4
+wsdisplay* at cgfour?
 
 # Sun "cgsix" accelerated color framebuffer.
 cgsix0	at obio0 addr 0xfb000000 level 4	# sun4/300 P4
 cgsix0	at obio0 addr 0x0b000000 level 4	# sun4/100 P4
+wsdisplay* at cgsix?
 
-# Sun "cgeight" 24-bit framebuffer
+# 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
+wsdisplay* at cgeight?
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
 # to the underlying hardware controller.
@@ -167,6 +172,5 @@ ch*	at scsibus? target ? lun ?		# SCSI changer devices
 ss*	at scsibus? target ? lun ?		# SCSI scanners
 uk*	at scsibus? target ? lun ?		# unknown SCSI devices
 
-pseudo-device	kbd		# Sun keyboard
 #pseudo-device	strip	1	# radio clock
 
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index ab9bbddd589..212bd441713 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-# 	$OpenBSD: SUN4C,v 1.31 2001/06/27 05:46:27 art Exp $
+# 	$OpenBSD: SUN4C,v 1.32 2002/08/12 10:44:03 miod Exp $
 # 	$NetBSD: GENERIC,v 1.19 1995/10/08 11:45:39 pk Exp $
 
 machine		sparc
@@ -14,7 +14,6 @@ option		TIMEZONE=0, DST=0
 option		KTRACE			# system call tracing support
 #option		KGDB			# support for kernel gdb
 #option		KGDBDEV=0xc01, KGDBRATE=38400	# device & baud rate
-option		RASTERCONSOLE		# fast rasterop console
 option		SYSVMSG,SYSVSEM,SYSVSHM
 
 # Filesystem options
@@ -86,6 +85,10 @@ zs1	at mainbus0
 #zs1	at obio0 addr 0x00000000 level 12 flags 0x103	# 4/100
 #zs2	at obio0 addr 0xe0000000 level 12 flags 0x103
 
+zstty* at zs? channel ?
+zskbd* at zs? channel ?
+wskbd* at zskbd? console ?
+
 # Magma serial/parallel port devices
 magma*	at sbus? slot ? offset ?			# magma serial cards
 mtty*	at magma?
@@ -151,23 +154,20 @@ be*	at qec?
 #si1	at vmes0 addr 0xff204000 level 2 vect 0x41
 #sw0	at obio0 addr 0x0a000000 level 2
 
-bwtwo0	at sbus? slot ? offset ?
+bwtwo0	at sbus0 slot ? offset ?
 bwtwo*	at sbus? slot ? offset ?
 #bwtwo0	at obio0 addr 0xfd000000 level 4	# 4/260
 #bwtwo0	at obio0 addr 0xfb300000 level 4	# 4/{300/400} ??
 #cgtwo0	at vmes0 addr 0xff400000 level 4 vect 0xa8
 #cgnine0 at vmel0 addr 0x08000000 level 4
-cgthree0 at sbus? slot ? offset ?
 cgthree* at sbus? slot ? offset ?
-cgsix0 at sbus? slot ? offset ?
 cgsix* at sbus? slot ? offset ?
+cgtwelve* at sbus? slot ? offset ?
 
-#pfour0	at obio0 addr 0xfb000000
-#pfour0	at obio0 addr 0x0b000000                        # 4/100
-#bwtwo0	at pfour0
-#cgfour0 at pfour0
-#cgeight0 at pfour0
-#cgsix0	at pfour0
+wsdisplay* at bwtwo?
+wsdisplay* at cgthree?
+wsdisplay* at cgsix?
+wsdisplay* at cgtwelve?
 
 scsibus* at esp?
 #scsibus* at si?
@@ -186,7 +186,6 @@ fd*	at fdc0
 pseudo-device	loop
 pseudo-device	pty	32
 pseudo-device	sl	2
-pseudo-device	kbd
 pseudo-device	ppp	2
 pseudo-device	tun	4
 pseudo-device	vnd	3
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index 83a375c9f30..c2d507f3184 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4M,v 1.40 2001/07/21 20:47:55 deraadt Exp $
+#	$OpenBSD: SUN4M,v 1.41 2002/08/12 10:44:03 miod Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -16,7 +16,6 @@ option		SUN4M		# sun4m - SS10, SS20, Classic, etc.
 #option		KGDBRATE=38400	# baud rate
 
 # Options for SPARCstation hardware
-option		RASTERCONSOLE	# fast rasterop console
 option		COMPAT_SUNOS	# compatibility with SunOS binaries
 option		COMPAT_SVR4	# compatibility with SVR4 binaries
 
@@ -63,6 +62,10 @@ led0	at obio0				# sun4m
 zs0	at obio0					# sun4m
 zs1	at obio0					# sun4m
 
+zstty* at zs? channel ?
+zskbd* at zs? channel ?
+wskbd* at zskbd? console ?
+
 # Magma serial/parallel port devices
 magma*	at sbus? slot ? offset ?			# magma serial cards
 mtty*	at magma?
@@ -124,30 +127,34 @@ qe*	at qec?
 be*	at qec?
 
 # Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
-# systems.  If your sun4 system has a cgfour installed in the P4 slot,
-# the P4 entries for "bwtwo" will attach to the overlay plane of the
-# "cgfour".
+# systems.
 bwtwo*	at sbus? slot ? offset ?		# sun4c and sun4m
+wsdisplay* at bwtwo?
 
-# Sun "cgthree" Sbus color framebuffer
-cgthree0 at sbus? slot ? offset ?
+# Sun "cgthree" Sbus color framebuffer.
 cgthree* at sbus? slot ? offset ?
-#cgthree0 at obio? slot ? offset ?		# sun4m
-#cgthree* at obio? slot ? offset ?		# sun4m
+wsdisplay* at cgthree?
 
 # Sun "cgsix" accelerated color framebuffer.
-cgsix0	at sbus? slot ? offset ?
 cgsix*	at sbus? slot ? offset ?
+wsdisplay* at cgsix?
 
 # Sun "tcx" accelerated color framebuffer.
-tcx0	at sbus? slot ? offset ?
 tcx*	at sbus? slot ? offset ?
+wsdisplay* at tcx?
 
 # Sun "cgfourteen" accelerated 24-bit framebuffer.
 cgfourteen0	at obio0			# sun4m
+wsdisplay* at cgfourteen?
+
+# Sun "cgtwelve" (GS) accelerated 24-bit framebuffer.
+cgtwelve*	at sbus? slot ? offset ?
+wsdisplay* at cgtwelve?
 
 # Weitek p9100 found on Tadpole 3GS/3GX
 pnozz0	at sbus? slot ? offset ?
+wsdisplay* at pnozz?
+
 # Microcontroller found on Tadpole
 tctrl0  at obio0
 
@@ -169,5 +176,4 @@ uk*	at scsibus? target ? lun ?		# unknown SCSI devices
 fdc0	at obio0				# sun4m controller
 fd*	at fdc0					# the drive itself
 
-pseudo-device	kbd		# Sun keyboard
 #pseudo-device	strip	1	# radio clock
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index 996867421eb..c7ad155000d 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.42 2002/07/09 15:27:59 jason Exp $
+#	$OpenBSD: files.sparc,v 1.43 2002/08/12 10:44:03 miod Exp $
 #	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
@@ -61,9 +61,10 @@ device memreg
 attach memreg at mainbus, obio
 file	arch/sparc/sparc/memreg.c
 
-device zs
+device zs { channel = -1 }
 attach zs at mainbus, obio
-file	arch/sparc/dev/zs.c			zs needs-count
+file	arch/sparc/dev/zs.c			zs needs-flag
+file	arch/sparc/dev/z8530sc.c		zs
 
 device fdc {}
 attach fdc at mainbus, obio
@@ -78,6 +79,22 @@ attach sbus at mainbus, iommu, sbus, xbox
 file	arch/sparc/dev/sbus.c			sbus
 
 #
+# Console (zs) related stuff
+#
+
+device zstty: tty
+attach zstty at zs
+file	arch/sparc/dev/z8530tty.c		zstty needs-flag
+file	arch/sparc/dev/zs_kgdb.c		kgdb
+
+define sunkbd
+file	dev/sun/sunkbd.c			sunkbd
+
+device zskbd: tty, wskbddev, sunkbd
+attach zskbd at zs
+file	arch/sparc/dev/z8530kbd.c		zskbd needs-flag
+
+#
 # Media Independent Interface (mii)
 #
 include "../../../dev/mii/files.mii"
@@ -130,47 +147,57 @@ device audiocs: audio, auconv
 attach audiocs at sbus
 file	arch/sparc/dev/cs4231.c		audiocs
 
-# Brooktree DAC attribute
-define bt_dac
+# Framebuffers
 
-device bwtwo
-attach bwtwo at sbus, obio, vmes, vmel
-file	arch/sparc/dev/bwtwo.c		bwtwo needs-flag
+file	arch/sparc/dev/fb.c
 
-device cgtwo
-attach cgtwo at sbus, obio, vmes
-file	arch/sparc/dev/cgtwo.c		cgtwo needs-flag
+include "dev/wscons/files.wscons"
+include "dev/rasops/files.rasops"
+include "dev/wsfont/files.wsfont"
 
-device cgthree: bt_dac
-attach cgthree at sbus
-file	arch/sparc/dev/cgthree.c	cgthree needs-flag
+define	bt_dac
+file	arch/sparc/dev/bt_subr.c	bt_dac
 
-device cgfour: bt_dac
-attach cgfour at obio
-file	arch/sparc/dev/cgfour.c		cgfour needs-flag
+device	bwtwo: wsemuldisplaydev, rasops1, wsemul_sun
+attach	bwtwo at sbus, obio, vmes, vmel
+file	arch/sparc/dev/bwtwo.c		bwtwo
 
-device cgsix: bt_dac
-attach cgsix at sbus, obio
-file	arch/sparc/dev/cgsix.c		cgsix needs-flag
+device	cgtwo: wsemuldisplaydev, rasops8, wsemul_sun
+attach	cgtwo at sbus, obio, vmes
+file	arch/sparc/dev/cgtwo.c		cgtwo
 
-device cgeight: bt_dac
-attach cgeight at obio
-file	arch/sparc/dev/cgeight.c	cgeight needs-flag
+device	cgthree: wsemuldisplaydev, rasops8, wsemul_sun, bt_dac
+attach	cgthree at sbus
+file	arch/sparc/dev/cgthree.c	cgthree
 
-device tcx: bt_dac
-attach tcx at sbus
-file	arch/sparc/dev/tcx.c		tcx needs-flag
+device	cgfour: wsemuldisplaydev, rasops8, wsemul_sun, bt_dac
+attach	cgfour at obio
+file	arch/sparc/dev/cgfour.c		cgfour
 
-device cgfourteen
-attach cgfourteen at obio
-file	arch/sparc/dev/cgfourteen.c	cgfourteen needs-flag
+device	cgsix: wsemuldisplaydev, rasops8, wsemul_sun, bt_dac
+attach	cgsix at sbus, obio
+file	arch/sparc/dev/cgsix.c		cgsix
 
-file	arch/sparc/dev/bt_subr.c	bt_dac
+device	cgeight: wsemuldisplaydev, rasops24, wsemul_sun, bt_dac
+attach	cgeight at obio
+file	arch/sparc/dev/cgeight.c	cgeight
+
+device	cgfourteen: wsemuldisplaydev, rasops8, rasops32, wsemul_sun
+attach	cgfourteen at obio
+file	arch/sparc/dev/cgfourteen.c	cgfourteen
+
+device	cgtwelve: wsemuldisplaydev, rasops32, wsemul_sun
+attach	cgtwelve at sbus
+file	arch/sparc/dev/cgtwelve.c	cgtwelve
 
 # Onboard Weitek p9100 found on Tadpole 3GS/3GX
-device pnozz
-attach pnozz at sbus: bt_dac
-file	arch/sparc/dev/p9100.c		pnozz needs-flag
+device	pnozz: wsemuldisplaydev, rasops8, rasops16, rasops24, rasops32, wsemul_sun, bt_dac
+attach	pnozz at sbus
+file	arch/sparc/dev/p9100.c		pnozz
+
+device	tcx: wsemuldisplaydev, rasops8, rasops32, wsemul_sun, bt_dac
+attach	tcx at sbus
+file	arch/sparc/dev/tcx.c		tcx
 
 # device definition in sys/conf/files
 attach le at sbus, ledma, lebuffer, obio
@@ -209,17 +236,11 @@ file	arch/sparc/dev/si.c		si | sw
 attach	isp at sbus with isp_sbus
 file	arch/sparc/dev/isp_sbus.c	isp_sbus
 
-pseudo-device	kbd
-
 #
-# Generic Sun stuff
+# Generic Sparc stuff
 #
-include "../../../dev/sun/files.sun"
 
-file	arch/sparc/dev/cons.c
-file	arch/sparc/dev/fb.c
-file	arch/sparc/dev/ms.c
-file	arch/sparc/dev/kbd.c		kbd	needs-flag
+file	dev/cons.c
 
 file	arch/sparc/fpu/fpu.c
 file	arch/sparc/fpu/fpu_add.c
@@ -263,11 +284,6 @@ file	arch/sparc/sparc/db_trace.c	ddb
 file	arch/sparc/sparc/db_disasm.c	ddb
 
 #
-# Raster Console
-#
-include "../../../dev/rcons/files.rcons"
-
-#
 # Compatibility modules
 #