Port the remaining two sbus framebuffer drivers to sparc64; tvtwo untested

due to lack of hardware.

13 files changed, 223 insertions, 13 deletions

diff --git a/share/man/man4/man4.sparc64/Makefile b/share/man/man4/man4.sparc64/Makefile
index dc14a1d0b5f..4741e8c45e7 100644
--- a/share/man/man4/man4.sparc64/Makefile
+++ b/share/man/man4/man4.sparc64/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.40 2004/09/28 19:30:11 jason Exp $
+#	$OpenBSD: Makefile,v 1.41 2004/11/29 18:12:50 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 \
 	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 upa.4 uperf.4 vgafb.4 zs.4 zx.4
+	timer.4 tvtwo.4 upa.4 uperf.4 vgafb.4 vigra.4 zs.4 zx.4
 MLINKS=	clock.4 rtc.4 \
 	le.4 lebuffer.4 le.4 ledma.4 \
 	mem.4 kmem.4 \
diff --git a/share/man/man4/man4.sparc64/agten.4 b/share/man/man4/man4.sparc64/agten.4
index d731b60d1e1..c2220c5e54d 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.3 2004/09/30 19:59:27 mickey Exp $
+.\"	$OpenBSD: agten.4,v 1.4 2004/11/29 18:12:50 miod Exp $
 .\" Copyright (c) 2003 Miodrag Vallat.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@ interface.
 .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
diff --git a/share/man/man4/man4.sparc64/bwtwo.4 b/share/man/man4/man4.sparc64/bwtwo.4
index a361830b254..0a9ec03d5bd 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.9 2004/09/30 19:59:28 mickey Exp $
+.\"	$OpenBSD: bwtwo.4,v 1.10 2004/11/29 18:12:50 miod Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -56,7 +56,9 @@ interface.
 .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
diff --git a/share/man/man4/man4.sparc64/cgsix.4 b/share/man/man4/man4.sparc64/cgsix.4
index 1eaa80c6b9f..bec7a269bb2 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.15 2004/09/30 19:59:28 mickey Exp $
+.\"	$OpenBSD: cgsix.4,v 1.16 2004/11/29 18:12:50 miod Exp $
 .\"
 .\" Copyright (c) 2001 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -150,7 +150,9 @@ on the GX+.
 .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 ,
diff --git a/share/man/man4/man4.sparc64/cgthree.4 b/share/man/man4/man4.sparc64/cgthree.4
index 8e5d8462664..d398670ce4b 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.15 2004/09/30 19:59:28 mickey Exp $
+.\"	$OpenBSD: cgthree.4,v 1.16 2004/11/29 18:12:50 miod Exp $
 .\"
 .\" Copyright (c) 2001 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -98,7 +98,9 @@ Note that not all models support settings other than their default setting.
 .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
diff --git a/share/man/man4/man4.sparc64/creator.4 b/share/man/man4/man4.sparc64/creator.4
index 2ef6e20993e..ce17d90463b 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.18 2004/06/21 04:43:41 miod Exp $
+.\"	$OpenBSD: creator.4,v 1.19 2004/11/29 18:12:50 miod Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -68,8 +68,10 @@ this acceleration can be disabled.
 .Xr intro 4 ,
 .Xr mgx 4 ,
 .Xr rfx 4 ,
+.Xr tvtwo 4 ,
 .Xr upa 4 ,
 .Xr vgafb 4 ,
+.Xr vigra 4 ,
 .Xr wscons 4 ,
 .Xr wsdisplay 4 ,
 .Xr zx 4 ,
diff --git a/share/man/man4/man4.sparc64/intro.4 b/share/man/man4/man4.sparc64/intro.4
index 72b682f9fe7..22aa36172ed 100644
--- a/share/man/man4/man4.sparc64/intro.4
+++ b/share/man/man4/man4.sparc64/intro.4
@@ -1,9 +1,9 @@
-.\"     $OpenBSD: intro.4,v 1.41 2004/11/29 15:03:16 miod Exp $
+.\"     $OpenBSD: intro.4,v 1.42 2004/11/29 18:12:50 miod Exp $
 .\"
 .\" Copyright (c) 2001-2002 The OpenBSD Project
 .\" All Rights Reserved.
 .\"
-.Dd October 4, 2001
+.Dd November 29, 2004
 .Dt INTRO 4 sparc64
 .Os
 .Sh NAME
@@ -174,6 +174,8 @@ bridge.
 Alteon Networks Tigon I and II Gigabit Ethernet driver.
 .It Xr timer 4
 Onboard system timer.
+.It Xr tvtwo 4
+Parallax XVideo and PowerVideo 24 bit SBus color frame buffer.
 .It Xr ubsec 4
 Bluesteelnet 5501/5601, Broadcom 5805/5820/5821 cryptography accelerators.
 .It Xr ukbd 4
@@ -184,6 +186,8 @@ USB mouse.
 Performance counters on SBUS/PCI machines.
 .It Xr vgafb 4
 PCI graphics frame buffer.
+.It Xr vigra 4
+8 bit SBus color framebuffer with VGA-compatible modes and connector.
 .It Xr wi 4
 WaveLAN/IEEE, PRISM 2-3 and Spectrum24 802.11B wireless network adapters.
 .It Xr xl 4
diff --git a/share/man/man4/man4.sparc64/mgx.4 b/share/man/man4/man4.sparc64/mgx.4
index 22b8d410871..eea0ed2aadc 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.3 2004/09/30 19:59:28 mickey Exp $
+.\"	$OpenBSD: mgx.4,v 1.4 2004/11/29 18:12:50 miod Exp $
 .\" Copyright (c) 2003 Miodrag Vallat.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -56,7 +56,9 @@ interface.
 .Xr intro 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
diff --git a/share/man/man4/man4.sparc64/rfx.4 b/share/man/man4/man4.sparc64/rfx.4
index 12b9e9d8b4f..67424d6aa65 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.4 2004/09/30 19:59:28 mickey Exp $
+.\"	$OpenBSD: rfx.4,v 1.5 2004/11/29 18:12:50 miod Exp $
 .\"
 .\" Copyright (c) 2004, Miodrag Vallat.
 .\" All rights reserved.
@@ -112,7 +112,9 @@ If the jumper position is not specified, it means it has to be removed
 .Xr intro 4 ,
 .Xr mgx 4 ,
 .Xr sbus 4 ,
+.Xr tvtwo 4 ,
 .Xr vgafb 4 ,
+.Xr vigra 4 ,
 .Xr wscons 4 ,
 .Xr wsdisplay 4 ,
 .Xr zx 4
diff --git a/share/man/man4/man4.sparc64/tvtwo.4 b/share/man/man4/man4.sparc64/tvtwo.4
new file mode 100644
index 00000000000..69e1af47dfb
--- /dev/null
+++ b/share/man/man4/man4.sparc64/tvtwo.4
@@ -0,0 +1,66 @@
+.\"	$OpenBSD: tvtwo.4,v 1.1 2004/11/29 18:12:50 miod Exp $
+.\" Copyright (c) 2003 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 November 29, 2004
+.Dt TVTWO 4 sparc64
+.Os
+.Sh NAME
+.Nm tvtwo
+.Nd accelerated 24-bit color frame buffer
+.Sh SYNOPSIS
+.Cd "tvtwo* at sbus?"
+.Cd "wsdisplay* at tvtwo?"
+.Sh DESCRIPTION
+The
+.Nm
+is a memory based color frame buffer, with graphics acceleration
+and overlay capabilities, and hardware MPEG decoding.
+.Pp
+The
+.Nm
+driver interfaces the frame buffer to 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 vgafb 4 ,
+.Xr vigra 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4 ,
+.Xr zx 4
+.Sh CAVEATS
+This driver does not support any acceleration features at the moment.
+Thus, vertical scrolling in console mode is abysmally slow in 24 bit mode.
diff --git a/share/man/man4/man4.sparc64/vgafb.4 b/share/man/man4/man4.sparc64/vgafb.4
index d346a3da724..3d04667dc12 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.10 2004/09/30 19:59:28 mickey Exp $
+.\"	$OpenBSD: vgafb.4,v 1.11 2004/11/29 18:12:50 miod Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -56,6 +56,8 @@ accelerated access methods are provided to
 .Xr mgx 4 ,
 .Xr pci 4 ,
 .Xr rfx 4 ,
+.Xr tvtwo 4 ,
+.Xr vigra 4 ,
 .Xr wscons 4 ,
 .Xr wsdisplay 4 ,
 .Xr zx 4
diff --git a/share/man/man4/man4.sparc64/vigra.4 b/share/man/man4/man4.sparc64/vigra.4
new file mode 100644
index 00000000000..3b7c706f926
--- /dev/null
+++ b/share/man/man4/man4.sparc64/vigra.4
@@ -0,0 +1,121 @@
+.\"	$OpenBSD: vigra.4,v 1.1 2004/11/29 18:12:50 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 November 29, 2004
+.Dt VIGRA 4 sparc64
+.Os
+.Sh NAME
+.Nm vigra
+.Nd 8-bit SBus color frame buffer with VGA-compatible modes
+.Sh SYNOPSIS
+.Cd "vigra* at sbus?"
+.Cd "wsdisplay* at vigra?"
+.Sh DESCRIPTION
+The
+.Tn "Vigra VS10, VS11 and VS12"
+are 8 bit color frame buffers with user-selectable video modes, and a
+VGA-compatible connector.
+.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.
+.Pp
+The video resolution and signal synchronization modes are
+selected with four dip switches on the back of the card.
+.Ss VS10 and VS12 Switch Settings:
+The VS10 and VS12 support the following basic modes:
+.Bl -column "Switches" "Resolution" "Refresh"
+.It Li Switches Ta Resolution Ta Refresh Ta Description
+.It Li "1 2 3 4" Ta "" Ta "Rate"
+.It " "
+.It Li "D D D D" Ta 640x480 Ta 60Hz Ta "Standard VGA, negative separate sync"
+.It Li "U D D D" Ta 800x600 Ta 56Hz Ta "Super VGA, negative separate sync"
+.It Li "D U D D" Ta 800x600 Ta 56Hz Ta "Super VGA, positive separate sync"
+.It Li "U U D D" Ta 1024x768 Ta 60Hz Ta "Super VGA, negative separate sync"
+.It Li "D D U D" Ta 1024x768 Ta 60Hz Ta "Super VGA, composite sync"
+.It Li "U D U D" Ta 1024x768 Ta 60Hz Ta "Super VGA, sync-on-green"
+.It Li "D U U D" Ta 1024x768 Ta 66Hz Ta "Sun 386i, composite sync"
+.It Li "U U U D" Ta 1152x900 Ta 76Hz Ta "Sun SPARCstation, composite sync"
+.It Li "D D D U" Ta 1152x900 Ta 61.5Hz Ta "NEC 4D, composite sync"
+.It Li "U D D U" Ta 1152x900 Ta 66Hz Ta "Sun SPARCstation, composite sync"
+.It Li "D U D U" Ta 800x600 Ta 60Hz Ta "VESA, negative separate sync"
+.It Li "U U D U" Ta 800x600 Ta 72Hz Ta "VESA, negative separate sync"
+.El
+.Ss VS12-only Switch Settings:
+The VS12 supports all of the previously listed modes, as well as a few high
+resolution settings.
+.Bl -column "Switches" "Resolution" "Refresh"
+.It Li Switches Ta Resolution Ta Refresh Ta Description
+.It Li "1 2 3 4" Ta "" Ta "Rate"
+.It " "
+.It Li "D D U U" Ta 1280x1024 Ta 60Hz Ta "NEC xD, negative separate sync"
+.It Li "U D U U" Ta 1280x1024 Ta 60Hz Ta "NEC xD, composite sync"
+.It Li "D U U U" Ta 1280x1024 Ta 60Hz Ta "NEC xD, sync-on-green"
+.It Li "U U U U" Ta 1280x1024 Ta 67Hz Ta "Sun SPARCstation, composite sync"
+.El
+.Ss VS11 Switch Settings:
+The VS11 supports a similar set of modes as the VS12, but with higher refresh
+rates.
+.Bl -column "Switches" "Resolution" "Refresh"
+.It Li Switches Ta Resolution Ta Refresh Ta Description
+.It Li "1 2 3 4" Ta "" Ta "Rate"
+.It " "
+.It Li "D D D D" Ta 640x480 Ta 60Hz Ta "Standard VGA, negative separate sync"
+.It Li "U D D D" Ta 800x600 Ta 72Hz Ta "VESA, negative separate sync"
+.It Li "D U D D" Ta 1024x768 Ta 60Hz Ta "VESA, negative separate sync"
+.It Li "U U D D" Ta 1024x768 Ta 60Hz Ta "VESA, composite sync"
+.It Li "D D U D" Ta 1024x768 Ta 60Hz Ta "VESA, sync-on-green"
+.It Li "U D U D" Ta 1024x768 Ta 66Hz Ta "Sun 386i, composite sync"
+.It Li "D U U D" Ta 1152x900 Ta 66Hz Ta "Sun SPARCstation, composite sync"
+.It Li "U U U D" Ta 1152x900 Ta 76Hz Ta "Sun SPARCstation, composite sync"
+.It Li "D D D U" Ta 1280x1024 Ta 67Hz Ta "Sun SPARCstation, composite sync"
+.It Li "U D D U" Ta 1280x1024 Ta 60Hz Ta "NEC xFG, negative separate sync"
+.It Li "D U D U" Ta 1280x1024 Ta 60Hz Ta "NEC xFG, composite sync"
+.It Li "U U D U" Ta 1280x1024 Ta 60Hz Ta "NEC xFG, sync-on-green"
+.It Li "D D U U" Ta 1280x1024 Ta 74Hz Ta "NEC xFG, composite sync"
+.It Li "U D U U" Ta 1280x1024 Ta 74Hz Ta "NEC xFG, sync-on-green"
+.It Li "D U U U" Ta 1280x1024 Ta 72Hz Ta "HP A1097, composite sync"
+.It Li "U U U U" Ta 1280x1024 Ta 72Hz Ta "Special, composite sync"
+.El
+.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 wscons 4 ,
+.Xr wsdisplay 4 ,
+.Xr zx 4
diff --git a/share/man/man4/man4.sparc64/zx.4 b/share/man/man4/man4.sparc64/zx.4
index 834d46c18f1..851af45f49e 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.6 2004/11/29 15:03:58 miod Exp $
+.\"	$OpenBSD: zx.4,v 1.7 2004/11/29 18:12:50 miod Exp $
 .\" Copyright (c) 2003 Miodrag Vallat.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -99,7 +99,9 @@ The selected resolutions are:
 .Xr mgx 4 ,
 .Xr rfx 4 ,
 .Xr sbus 4 ,
+.Xr tvtwo 4 ,
 .Xr vgafb 4 ,
+.Xr vigra 4 ,
 .Xr wscons 4 ,
 .Xr wsdisplay 4
 .Sh CAVEATS