Now that xbox sort-of works on sparc64, port the cgtwelve driver, since

the only way to connect it to a sparc64 machine is via an xbox device.

13 files changed, 103 insertions, 18 deletions

diff --git a/share/man/man4/man4.sparc64/Makefile b/share/man/man4/man4.sparc64/Makefile
index 21520f8c202..f8e38d80317 100644
--- a/share/man/man4/man4.sparc64/Makefile
+++ b/share/man/man4/man4.sparc64/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.42 2005/03/05 01:44:50 miod Exp $
+#	$OpenBSD: Makefile,v 1.43 2005/03/05 01:48:59 miod Exp $
 
 MAN=	agten.4 apio.4 asio.4 audioce.4 audiocs.4 autoconf.4 auxio.4 \
-	be.4 beeper.4 bwtwo.4 \
-	central.4 cgsix.4 cgthree.4 clkbrd.4 clock.4 comkbd.4 creator.4 \
+	be.4 beeper.4 bwtwo.4 central.4 cgsix.4 cgthree.4 cgtwelve.4 \
+	clkbrd.4 clock.4 comkbd.4 creator.4 \
 	ebus.4 esp.4 fhc.4 intro.4 le.4 magma.4 mem.4 mgx.4 openprom.4 \
 	pcons.4 psycho.4 qe.4 qec.4 rfx.4 sab.4 schizo.4 spif.4 \
 	timer.4 tvtwo.4 upa.4 uperf.4 vgafb.4 vigra.4 xbox.4 zs.4 zx.4
diff --git a/share/man/man4/man4.sparc64/agten.4 b/share/man/man4/man4.sparc64/agten.4
index c2220c5e54d..95eb0236a91 100644
--- a/share/man/man4/man4.sparc64/agten.4
+++ b/share/man/man4/man4.sparc64/agten.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: agten.4,v 1.4 2004/11/29 18:12:50 miod Exp $
+.\"	$OpenBSD: agten.4,v 1.5 2005/03/05 01:48:59 miod Exp $
 .\" Copyright (c) 2003 Miodrag Vallat.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -51,6 +51,7 @@ interface.
 .Xr bwtwo 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr creator 4 ,
 .Xr intro 4 ,
 .Xr mgx 4 ,
diff --git a/share/man/man4/man4.sparc64/bwtwo.4 b/share/man/man4/man4.sparc64/bwtwo.4
index 0a9ec03d5bd..b1d69d690d6 100644
--- a/share/man/man4/man4.sparc64/bwtwo.4
+++ b/share/man/man4/man4.sparc64/bwtwo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bwtwo.4,v 1.10 2004/11/29 18:12:50 miod Exp $
+.\"	$OpenBSD: bwtwo.4,v 1.11 2005/03/05 01:48:59 miod Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -51,6 +51,7 @@ interface.
 .Xr agten 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr creator 4 ,
 .Xr intro 4 ,
 .Xr mgx 4 ,
diff --git a/share/man/man4/man4.sparc64/cgsix.4 b/share/man/man4/man4.sparc64/cgsix.4
index bec7a269bb2..0aa638ba329 100644
--- a/share/man/man4/man4.sparc64/cgsix.4
+++ b/share/man/man4/man4.sparc64/cgsix.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgsix.4,v 1.16 2004/11/29 18:12:50 miod Exp $
+.\"	$OpenBSD: cgsix.4,v 1.17 2005/03/05 01:48:59 miod Exp $
 .\"
 .\" Copyright (c) 2001 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -145,6 +145,7 @@ on the GX+.
 .Xr agten 4 ,
 .Xr bwtwo 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr creator 4 ,
 .Xr intro 4 ,
 .Xr mgx 4 ,
diff --git a/share/man/man4/man4.sparc64/cgthree.4 b/share/man/man4/man4.sparc64/cgthree.4
index d398670ce4b..422f65c8b62 100644
--- a/share/man/man4/man4.sparc64/cgthree.4
+++ b/share/man/man4/man4.sparc64/cgthree.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgthree.4,v 1.16 2004/11/29 18:12:50 miod Exp $
+.\"	$OpenBSD: cgthree.4,v 1.17 2005/03/05 01:48:59 miod Exp $
 .\"
 .\" Copyright (c) 2001 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -93,6 +93,7 @@ Note that not all models support settings other than their default setting.
 .Xr agten 4 ,
 .Xr bwtwo 4 ,
 .Xr cgsix 4 ,
+.Xr cgtwelve 4 ,
 .Xr creator 4 ,
 .Xr intro 4 ,
 .Xr mgx 4 ,
diff --git a/share/man/man4/man4.sparc64/cgtwelve.4 b/share/man/man4/man4.sparc64/cgtwelve.4
new file mode 100644
index 00000000000..ba4b5af901f
--- /dev/null
+++ b/share/man/man4/man4.sparc64/cgtwelve.4
@@ -0,0 +1,73 @@
+.\"	$OpenBSD: cgtwelve.4,v 1.1 2005/03/05 01:48:59 miod Exp $
+.\"
+.\" Copyright (c) 2002 Miodrag Vallat.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+.\" DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd March 4, 2005
+.Dt CGTWELVE 4 sparc64
+.Os
+.Sh NAME
+.Nm cgtwelve
+.Nd accelerated 24-bit color frame buffer
+.Sh SYNOPSIS
+.Cd "cgtwelve* at sbus?"
+.Cd "wsdisplay* at cgtwelve?"
+.Sh DESCRIPTION
+The
+.Nm
+is a triple-slot SBus color frame buffer, with graphics acceleration
+and overlay capabilities.
+.Pp
+The
+.Nm
+driver interfaces the frame buffer with the
+.Xr wscons 4
+console framework.
+It does not provide direct device driver entry points
+but makes its functions available via the internal
+.Xr wsdisplay 4
+interface.
+.Sh SEE ALSO
+.Xr agten 4 ,
+.Xr bwtwo 4 ,
+.Xr cgsix 4 ,
+.Xr cgthree 4 ,
+.Xr creator 4 ,
+.Xr intro 4 ,
+.Xr mgx 4 ,
+.Xr rfx 4 ,
+.Xr sbus 4 ,
+.Xr tvtwo 4 ,
+.Xr vgafb 4 ,
+.Xr vigra 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4 ,
+.Xr zx 4
+.Sh CAVEATS
+The only way to connect a
+.Nm
+frame buffer to an UltraSPARC is with the help of an
+.Xr xbox 4
+SBus Expansion subsystem.
+.Pp
+This driver does not support any acceleration features.
diff --git a/share/man/man4/man4.sparc64/creator.4 b/share/man/man4/man4.sparc64/creator.4
index ce17d90463b..10213042522 100644
--- a/share/man/man4/man4.sparc64/creator.4
+++ b/share/man/man4/man4.sparc64/creator.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: creator.4,v 1.19 2004/11/29 18:12:50 miod Exp $
+.\"	$OpenBSD: creator.4,v 1.20 2005/03/05 01:48:59 miod Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -65,6 +65,7 @@ this acceleration can be disabled.
 .Xr bwtwo 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr intro 4 ,
 .Xr mgx 4 ,
 .Xr rfx 4 ,
diff --git a/share/man/man4/man4.sparc64/intro.4 b/share/man/man4/man4.sparc64/intro.4
index 961c3930b9b..c4ad49044cc 100644
--- a/share/man/man4/man4.sparc64/intro.4
+++ b/share/man/man4/man4.sparc64/intro.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: intro.4,v 1.43 2005/03/05 01:44:50 miod Exp $
+.\"     $OpenBSD: intro.4,v 1.44 2005/03/05 01:48:59 miod Exp $
 .\"
 .\" Copyright (c) 2001-2002 The OpenBSD Project
 .\" All Rights Reserved.
@@ -90,13 +90,15 @@ PCI Trident 4DWAVE DX/NX, SiS 7018, ALi M5451 audio.
 .It Xr beeper 4
 Simple speaker beeper.
 .It Xr bwtwo 4
-SBus monochrome graphics frame buffer.
+SBus monochrome frame buffer.
 .It Xr central 4
 Central bus controller.
 .It Xr cgsix 4
-8 bit SBus color graphics frame buffer.
+accelerated 8 bit SBus color frame buffer.
 .It Xr cgthree 4
-8 bit SBus color graphics frame buffer.
+8 bit SBus color frame buffer.
+.It Xr cgtwelve 4
+accelerated 24 bit SBus color frame buffer.
 .It Xr clkbrd 4
 Main system clock for E4500.
 .It Xr clock 4
@@ -108,7 +110,7 @@ Sun serial keyboards on
 .Xr com 4
 ports.
 .It Xr creator 4
-UPA Creator/Creator 3D/Elite 3D color graphics frame buffer.
+UPA Creator/Creator 3D/Elite 3D color frame buffer.
 .It Xr dc 4
 Clones of the DEC Tulip Ethernet controller.
 .It Xr eap 4
diff --git a/share/man/man4/man4.sparc64/mgx.4 b/share/man/man4/man4.sparc64/mgx.4
index eea0ed2aadc..9bda31a4f04 100644
--- a/share/man/man4/man4.sparc64/mgx.4
+++ b/share/man/man4/man4.sparc64/mgx.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mgx.4,v 1.4 2004/11/29 18:12:50 miod Exp $
+.\"	$OpenBSD: mgx.4,v 1.5 2005/03/05 01:48:59 miod Exp $
 .\" Copyright (c) 2003 Miodrag Vallat.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,7 @@ interface.
 .Xr bwtwo 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr creator 4 ,
 .Xr intro 4 ,
 .Xr rfx 4 ,
diff --git a/share/man/man4/man4.sparc64/rfx.4 b/share/man/man4/man4.sparc64/rfx.4
index 67424d6aa65..52d2c0b626f 100644
--- a/share/man/man4/man4.sparc64/rfx.4
+++ b/share/man/man4/man4.sparc64/rfx.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rfx.4,v 1.5 2004/11/29 18:12:50 miod Exp $
+.\"	$OpenBSD: rfx.4,v 1.6 2005/03/05 01:48:59 miod Exp $
 .\"
 .\" Copyright (c) 2004, Miodrag Vallat.
 .\" All rights reserved.
@@ -108,6 +108,7 @@ If the jumper position is not specified, it means it has to be removed
 .Xr bwtwo 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr creator 4 ,
 .Xr intro 4 ,
 .Xr mgx 4 ,
diff --git a/share/man/man4/man4.sparc64/tvtwo.4 b/share/man/man4/man4.sparc64/tvtwo.4
index 6234382da29..4cf65989ee7 100644
--- a/share/man/man4/man4.sparc64/tvtwo.4
+++ b/share/man/man4/man4.sparc64/tvtwo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tvtwo.4,v 1.2 2004/11/29 23:31:33 jmc Exp $
+.\"	$OpenBSD: tvtwo.4,v 1.3 2005/03/05 01:48:59 miod Exp $
 .\" Copyright (c) 2003 Miodrag Vallat.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -51,6 +51,7 @@ interface.
 .Xr bwtwo 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr creator 4 ,
 .Xr intro 4 ,
 .Xr mgx 4 ,
diff --git a/share/man/man4/man4.sparc64/vgafb.4 b/share/man/man4/man4.sparc64/vgafb.4
index 3d04667dc12..8abcb2fa65c 100644
--- a/share/man/man4/man4.sparc64/vgafb.4
+++ b/share/man/man4/man4.sparc64/vgafb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vgafb.4,v 1.11 2004/11/29 18:12:50 miod Exp $
+.\"	$OpenBSD: vgafb.4,v 1.12 2005/03/05 01:48:59 miod Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -51,6 +51,7 @@ accelerated access methods are provided to
 .Xr bwtwo 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr creator 4 ,
 .Xr intro 4 ,
 .Xr mgx 4 ,
diff --git a/share/man/man4/man4.sparc64/zx.4 b/share/man/man4/man4.sparc64/zx.4
index 7b4e6f90a78..ee65ae36102 100644
--- a/share/man/man4/man4.sparc64/zx.4
+++ b/share/man/man4/man4.sparc64/zx.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: zx.4,v 1.8 2005/03/03 13:19:44 miod Exp $
+.\"	$OpenBSD: zx.4,v 1.9 2005/03/05 01:48:59 miod Exp $
 .\" Copyright (c) 2003 Miodrag Vallat.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -94,6 +94,7 @@ The selected resolutions are:
 .Xr bwtwo 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr creator 4 ,
 .Xr intro 4 ,
 .Xr mgx 4 ,