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.

1 files changed, 3 insertions, 4 deletions

diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c
index 7bbdaeaa06c..4c93d966616 100644
--- a/sys/dev/ic/sti.c
+++ b/sys/dev/ic/sti.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sti.c,v 1.62 2011/04/07 15:30:16 miod Exp $	*/
+/*	$OpenBSD: sti.c,v 1.63 2011/08/18 20:02:58 miod Exp $	*/
 
 /*
  * Copyright (c) 2000-2003 Michael Shalayeff
@@ -1326,11 +1326,10 @@ sti_unpack_attr(void *v, long attr, int *fg, int *bg, int *ul)
 		*ul = 0;
 }
 
-#if NSTI_SGC > 0
+#if NSTI_DIO > 0 || NSTI_SGC > 0
 
 /*
- * Early console support.
- * Only used on hp300 with unique sti@sgc attachment.
+ * Early console support.  Only used on hp300.
  */
 
 int