So, it turns out that models 362 and 382 built-in frame buffer only shows up

in DIO-II space, as a fat device spanning four select codes (i.e. 16MB of
memory). This is way too much for an at-most 2 Mpixel 8bit frame buffer, and
it turns out that this is because the device provides both a regular DIO-II
frame buffer (spanning two select codes) and a regular STI frame buffer
(spanning the other two select codes).
This commit introduces a straightforward sti@dio attachment to get a working
sti(4) and wsdisplay(4) in a ridiculously small number of lines; however
the console code needs some changes to avoid duplicating globals.

While there, add sti@dio support for the bootblocks, and I couldn't help
myself but clean the most rotten parts of them, and try to have them reuse
various files in sys/arch/hp300/dev instead of rolling their outdated ones.

Tested on a real 382 with the low-resolution frame buffer:
sti0 at dio0 scode 132: rev 8.02;129, ID 0x27134CB440A00499
sti0: 382V, 2048x512 frame buffer, 640x480x8 display
sti0: 8x16 font type 1, 16 bpc, charset 0-255
wsdisplay0 at sti0 mux 1: console (std, vt100 emulation)

Boot blocks updates tested on DIO-II 425t (serial/glass console), SGC 425e
(serial/glass console) and 382 (serial/glass console). And will be tested
on SGC 425t soon as well.

2 files changed, 20 insertions, 6 deletions

diff --git a/share/man/man4/man4.hp300/dio.4 b/share/man/man4/man4.hp300/dio.4
index 9fb42735b33..dce0e8cb616 100644
--- a/share/man/man4/man4.hp300/dio.4
+++ b/share/man/man4/man4.hp300/dio.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dio.4,v 1.9 2008/06/26 05:42:07 ray Exp $
+.\"	$OpenBSD: dio.4,v 1.10 2011/08/18 20:02:57 miod Exp $
 .\"     $NetBSD: dio.4,v 1.2 2002/01/15 01:31:30 wiz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 26 2008 $
+.Dd $Mdocdate: August 18 2011 $
 .Dt DIO 4 hp300
 .Os
 .Sh NAME
@@ -62,6 +62,8 @@ frame buffer
 .Tn HP98720
 .Dq Renaissance
 frame buffer
+.It Xr sti 4
+HP Standard Text Interface
 .It Xr topcat 4
 .Tn HP98544
 .Dq Topcat ,
diff --git a/share/man/man4/sti.4 b/share/man/man4/sti.4
index 197c9133f82..d011a5e8081 100644
--- a/share/man/man4/sti.4
+++ b/share/man/man4/sti.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sti.4,v 1.19 2007/05/31 19:19:52 jmc Exp $
+.\"	$OpenBSD: sti.4,v 1.20 2011/08/18 20:02:55 miod Exp $
 .\"
 .\" Copyright (c) 2001 Michael Shalayeff
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: August 18 2011 $
 .Dt STI 4
 .Os
 .Sh NAME
@@ -32,9 +32,10 @@
 .Nd HP Standard Text Interface
 .Sh SYNOPSIS
 .Cd "sti*	at mainbus0"
+.Cd "sti*	at dio?"
+.Cd "sti*	at pci?"
 .Cd "sti*	at phantomas0"
 .Cd "sti*	at sgc?"
-.Cd "sti*	at pci?"
 .Cd "wsdisplay*	at sti?"
 .Sh DESCRIPTION
 The
@@ -46,8 +47,9 @@ The following models are supported
 (though not all features or frame buffer depths may be available):
 .Bl -column "Visualize FX10pro" "Bits" "Mem" "3D" "machines" -offset left
 .It "Model" Ta "Bits" Ta "Mem" Ta "3D" Ta "Machines/Cards"
+.It "VRX" Ta 8 Ta "2" Ta "" Ta "HP9000/362/382"
 .It "EVRX" Ta "8" Ta "2" Ta "" Ta "HP9000/425e"
-.\" .It "Timber" Ta "8" Ta "2" Ta "" Ta "HP9000/705/710"
+.It "Timber" Ta "8" Ta "2" Ta "" Ta "HP9000/705/710"
 .It "GRX" Ta "8g" Ta "2" Ta "" Ta "SGC"
 .It "CRX" Ta "8" Ta "2" Ta "" Ta "SGC"
 .It "Tomcat" Ta "8" Ta "2" Ta "" Ta "SGC"
@@ -248,7 +250,9 @@ function added (flashing under HP-UX and other sideband traffic).
 Colour frame buffer support.
 .El
 .Sh SEE ALSO
+.Xr dio 4 ,
 .Xr intro 4 ,
+.Xr pci 4 ,
 .Xr phantomas 4 ,
 .Xr sgc 4 ,
 .Xr wsdisplay 4
@@ -267,6 +271,14 @@ driver was written by
 for HPPA
 port for
 .Ox 2.7 .
+.\" .Pp
+.\" .Xr dio 4 ,
+.\" .Xr pci 4
+.\" and
+.\" .Xr sgc 4
+.\" attachment code was written by
+.\" .An Miod Vallat .
+.Xr 
 .Sh BUGS
 Currently, neither scroll back nor screen blanking functions
 are implemented.