Switch OpenBSD/hp300 to wscons, still using on-board ROM fonts for now.

Main features:
- MI hil drivers, allowing live plug/unplug of devices, and the keyboard
  does not need to be at id 1 anymore.
- SGC bus support on 4xx models. SGC frame buffers are supported too, but
  not as console, though you can use them as a regular glass terminal if
  you run a getty on ttyC0. Currently not compiled-in, awaiting for an sti(4)
  fix to be commited.
- HP-UX compatibility interfaces are removed. grfinfo and hilinfo are removed.

X11 support is currently broken by these changes; X.org X11R6 support will
be available very soon.

Tested on hyperion and 4 different flavours of catseye/topcat/kathmandu; other,
older frame buffers (davinci, gatorbox and renaissance) could not been tested
but should work; please report any regression.

13 files changed, 123 insertions, 407 deletions

diff --git a/share/man/man4/hil.4 b/share/man/man4/hil.4
index bf20e8adaf6..a19a0017470 100644
--- a/share/man/man4/hil.4
+++ b/share/man/man4/hil.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hil.4,v 1.6 2004/09/30 19:59:24 mickey Exp $
+.\"	$OpenBSD: hil.4,v 1.7 2005/01/14 22:39:19 miod Exp $
 .\"
 .\" Copyright (c) 2003 Miodrag Vallat.
 .\" All rights reserved.
@@ -24,14 +24,16 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd February 11, 2003
+.Dd January 12, 2005
 .Dt HIL 4
 .Os
 .Sh NAME
 .Nm hil
 .Nd HP-HIL driver
 .Sh SYNOPSIS
-.Cd "hil* at gsc? irq 1"
+.Cd "hil* at intio?                  " Pq hp300
+.Cd "hil* at gsc? irq 1              " Pq hppa
+.Pp
 .Cd "hilkbd* at hil?"
 .Cd "hilms* at hil?"
 .Cd "hilid* at hil?"
diff --git a/share/man/man4/man4.hp300/Makefile b/share/man/man4/man4.hp300/Makefile
index 432dee8dfee..eaf3807f2f0 100644
--- a/share/man/man4/man4.hp300/Makefile
+++ b/share/man/man4/man4.hp300/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.10 2005/01/08 19:47:38 miod Exp $
+#	$OpenBSD: Makefile,v 1.11 2005/01/14 22:39:21 miod Exp $
 #	from: @(#)Makefile	5.1 (Berkeley) 6/29/90
 
 MAN=	apci.4 autoconf.4 ct.4 dca.4 dcm.4 dio.4 dvbox.4 frodo.4 gbox.4 \
-	grf.4 hd.4 hil.4 hyper.4 intro.4 ite.4 le.4 mem.4 nhpib.4 \
-	ppi.4 rbox.4 spc.4 topcat.4
+	hd.4 hyper.4 intro.4 le.4 mem.4 nhpib.4 ppi.4 rbox.4 sgc.4 spc.4 \
+	topcat.4
 MLINKS=	mem.4 kmem.4
 MLINKS+=nhpib.4 fhpib.4 nhpib.4 hpibbus.4
 MANSUBDIR=hp300
diff --git a/share/man/man4/man4.hp300/dio.4 b/share/man/man4/man4.hp300/dio.4
index 045120005c4..435b9531759 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.4 2004/08/03 21:46:49 miod Exp $
+.\"	$OpenBSD: dio.4,v 1.5 2005/01/14 22:39:21 miod Exp $
 .\"     $NetBSD: dio.4,v 1.2 2002/01/15 01:31:30 wiz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -118,5 +118,6 @@ HP 98658 SCSI host adaptor
 .Xr intro 4 ,
 .Xr le 4 ,
 .Xr rbox 4 ,
+.Xr sgc 4 ,
 .Xr spc 4 ,
 .Xr topcat 4
diff --git a/share/man/man4/man4.hp300/dvbox.4 b/share/man/man4/man4.hp300/dvbox.4
index 0ae3ececea6..de6e4587261 100644
--- a/share/man/man4/man4.hp300/dvbox.4
+++ b/share/man/man4/man4.hp300/dvbox.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dvbox.4,v 1.6 2005/01/08 19:47:38 miod Exp $
+.\"	$OpenBSD: dvbox.4,v 1.7 2005/01/14 22:39:21 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     from: @(#)dv.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 16, 2003
+.Dd January 12, 2005
 .Dt DVBOX 4 hp300
 .Os
 .Sh NAME
@@ -42,9 +42,9 @@
 .Tn HP98730
 DaVinci frame buffer
 .Sh SYNOPSIS
-.Cd "dvbox* at intio?"
-.Cd "dvbox* at dio?"
-.Cd "grf*   at dvbox?"
+.Cd "dvbox*     at intio?"
+.Cd "dvbox*     at dio?"
+.Cd "wsdisplay* at dvbox?"
 .Sh DESCRIPTION
 The
 .Tn HP98730
@@ -59,9 +59,7 @@ frame buffer extensions, it is possible to add overlay planes.
 The
 .Nm
 driver provides a frame buffer abstraction to the
-.Xr grf 4
-driver, and the associated
-.Xr ite 4
+.Xr wscons 4
 console framework.
 .Pp
 The DaVinci can be configured at either the ``internal'' address
@@ -70,13 +68,14 @@ or at an external select code less than 32.
 The hardware installation manual describes the procedure for
 setting these values.
 .Sh SEE ALSO
-.Xr ioctl 2 ,
 .Xr gbox 4 ,
-.Xr grf 4 ,
 .Xr hyper 4 ,
 .Xr intro 4 ,
 .Xr rbox 4 ,
-.Xr topcat 4
+.Xr sti 4 ,
+.Xr topcat 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
 .Sh BUGS
 This driver has not been tested with all possible combinations of frame
 buffer boards and scan boards installed in the device.
diff --git a/share/man/man4/man4.hp300/gbox.4 b/share/man/man4/man4.hp300/gbox.4
index b360fb484f8..2a557ad20da 100644
--- a/share/man/man4/man4.hp300/gbox.4
+++ b/share/man/man4/man4.hp300/gbox.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gbox.4,v 1.6 2005/01/08 19:47:38 miod Exp $
+.\"	$OpenBSD: gbox.4,v 1.7 2005/01/14 22:39:21 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     from: @(#)gb.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 16, 2003
+.Dd January 12, 2005
 .Dt GBOX 4 hp300
 .Os
 .Sh NAME
@@ -42,9 +42,9 @@
 .Tn HP98700
 Gatorbox frame buffer
 .Sh SYNOPSIS
-.Cd "gbox* at intio?"
-.Cd "gbox* at dio?"
-.Cd "grf*  at gbox?"
+.Cd "gbox*      at intio?"
+.Cd "gbox*      at dio?"
+.Cd "wsdisplay* at gbox?"
 .Sh DESCRIPTION
 The
 .Tn HP98700
@@ -60,9 +60,7 @@ The 98710 also has some acceleration features.
 The
 .Nm
 driver provides a frame buffer abstraction to the
-.Xr grf 4
-driver, and the associated
-.Xr ite 4
+.Xr wscons 4
 console framework.
 .Pp
 The 98700 can be used as the only graphics device on a system, in which case
@@ -86,10 +84,11 @@ The
 .%T 98700H Installation Guide
 contains further configuration information.
 .Sh SEE ALSO
-.Xr ioctl 2 ,
 .Xr dvbox 4 ,
-.Xr grf 4 ,
 .Xr hyper 4 ,
 .Xr intro 4 ,
 .Xr rbox 4 ,
-.Xr topcat 4
+.Xr sti 4 ,
+.Xr topcat 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
diff --git a/share/man/man4/man4.hp300/grf.4 b/share/man/man4/man4.hp300/grf.4
deleted file mode 100644
index f08641b4d3a..00000000000
--- a/share/man/man4/man4.hp300/grf.4
+++ /dev/null
@@ -1,183 +0,0 @@
-.\"	$OpenBSD: grf.4,v 1.14 2005/01/08 19:47:38 miod Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Systems Programming Group of the University of Utah Computer
-.\" Science Department.
-.\"
-.\" 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.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
-.\"
-.\"     from: @(#)grf.4	8.1 (Berkeley) 6/9/93
-.\"
-.Dd June 9, 1993
-.Dt GRF 4 hp300
-.Os
-.Sh NAME
-.Nm grf
-.Nd
-.Tn HP
-graphics frame buffer device interface
-.Sh SYNOPSIS
-.Cd "grf* at dvbox?"
-.Cd "grf* at gbox?"
-.Cd "grf* at hyper?"
-.Cd "grf* at rbox?"
-.Cd "grf* at topcat?"
-.Cd ""
-.Cd "ite* at grf?"
-.Sh DESCRIPTION
-This is a generic description of the frame buffer device interface.
-.Pp
-The devices to which this applies are the 98544, 98545 and 98547
-Topcat graphics cards (also known as
-.Tn HP300H
-devices),
-the 98548, 98549 and 98550
-Catseye graphics cards,
-the A1416A
-Kathmandu graphics cards,
-the 98700
-Gatorbox graphics box,
-the 98720
-Renaissance graphics box,
-the 98730
-DaVinci graphics box,
-and the A1096A
-Hyperion graphics cards.
-.Pp
-The basic programming of the
-.Nm grf Ns ?\&
-devices involves opening the device
-file, mapping the control registers and frame buffer addresses into user
-space, and then manipulating the device as the application requires.
-The address mapping is controlled by an
-.Xr ioctl 2
-call to map the device into user space, and an unmap call when finished.
-.Pp
-The ioctls supported by
-.Ox
-are:
-.Bl -tag -width GRFIOCGINFO
-.It Dv GRFIOCGINFO
-Get Graphics Info
-.Pp
-Get info about device, setting the entries in the
-.Em grfinfo
-structure, as defined in
-.Aq Pa machine/grfioctl.h :
-.Bd -literal
-struct	grfinfo {
-	int	gd_id;		/* HP-UX identifier */
-	caddr_t	gd_regaddr;	/* control registers physaddr */
-	int	gd_regsize;	/* control registers size */
-	caddr_t	gd_fbaddr;	/* frame buffer physaddr */
-	int	gd_fbsize;	/* frame buffer size */
-	short	gd_colors;	/* number of colors */
-	short	gd_planes;	/* number of planes */
-/* new stuff */
-	int	gd_fbwidth;	/* frame buffer width */
-	int	gd_fbheight;	/* frame buffer height */
-	int	gd_dwidth;	/* displayed part width */
-	int	gd_dheight;	/* displayed part height */
-	int	gd_pad[6];	/* for future expansion */
-};
-.Ed
-.It Dv GRFIOCON
-Graphics On
-.Pp
-Turn graphics on by enabling
-.Tn CRT
-output.
-The screen will come on, displaying whatever is in the frame buffer, using
-whatever colormap is in place.
-.It Dv GRFIOCOFF
-Graphics Off
-.Pp
-Turn graphics off by disabling output to the
-.Tn CRT .
-The frame buffer contents
-are not affected.
-.It Dv GRFIOCMAP
-Map Device to user space
-.Pp
-Map in control registers and frame buffer space.
-Once the device file is mapped, the frame buffer memory and registers
-are accessible.
-.It Dv GRFIOCUNMAP
-Unmap Device
-.Pp
-Unmap control registers and frame buffer space.
-.El
-.Sh FILES
-.Bl -tag -width /dev/XXXX -compact
-.It Pa /dev/grf?
-.Ox
-interface special files
-.El
-.Sh EXAMPLES
-This short code fragment is an example of opening some graphics device and
-mapping in the control and frame buffer space:
-.Bd -literal
-#define GRF_DEV <some_graphics_device>  /* /dev/grfN */
-
-struct fbstruct *regs;  /*  fbstruct = gboxfb, rboxfb, etc. */
-u_char *Addr, frame_buffer;
-struct grfinfo gi;
-int disp_fd;
-
-disp_fd = open(GRF_DEV, O_WRONLY);
-if (ioctl(disp_fd, GRFIOCGINFO, &gi) < 0) return -1;
-ioctl(disp_fd, GRFIOCON, 0);
-
-if (ioctl(disp_fd, GRFIOCMAP, &Addr) < 0) {
-	ioctl(disp_fd, GRFIOCOFF, 0);
-	return -1;
-}
-regs = (fbstruct *)Addr;               /* Control Registers   */
-frame_buffer = (u_char *)Addr + gi.gd_regsize; /* Frame buffer mem */
-.Ed
-.Sh DIAGNOSTICS
-None under
-.Ox .
-.Pp
-.Tn HP-UX
-The
-.Tn CE.utilities/Crtadjust
-programs, running in
-.Tn HP-UX
-compatibility mode,
-can be used for each specific device.
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr dvbox 4 ,
-.Xr gbox 4 ,
-.Xr hil 4 ,
-.Xr hyper 4 ,
-.Xr intro 4 ,
-.Xr ite 4 ,
-.Xr rbox 4 ,
-.Xr topcat 4
diff --git a/share/man/man4/man4.hp300/hyper.4 b/share/man/man4/man4.hp300/hyper.4
index 9db78e6907a..a9a074777ca 100644
--- a/share/man/man4/man4.hp300/hyper.4
+++ b/share/man/man4/man4.hp300/hyper.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hyper.4,v 1.6 2005/01/08 23:31:00 jmc Exp $
+.\"	$OpenBSD: hyper.4,v 1.7 2005/01/14 22:39:21 miod Exp $
 .\"
 .\" Copyright (c) 2003, Miodrag Vallat.
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 16, 2003
+.Dd January 12, 2005
 .Dt HYPER 4 hp300
 .Os
 .Sh NAME
@@ -33,17 +33,15 @@
 .Tn HP A1096A
 Hyperion frame buffer
 .Sh SYNOPSIS
-.Cd "hyper* at dio?"
-.Cd "grf*   at hyper?"
+.Cd "hyper*     at dio?"
+.Cd "wsdisplay* at hyper?"
 .Sh DESCRIPTION
 The Hyperion is a monochrome, high-resolution frame buffer.
 .Pp
 The
 .Nm
 driver provides a frame buffer abstraction to the
-.Xr grf 4
-driver, and the associated
-.Xr ite 4
+.Xr wscons 4
 console framework.
 .Sh SELECT CODE
 The
@@ -66,8 +64,9 @@ Leaving a jumper open is equivalent to shorting pins 1 and 2.
 .Sh SEE ALSO
 .Xr dvbox 4 ,
 .Xr gbox 4 ,
-.Xr grf 4 ,
 .Xr intro 4 ,
-.Xr ite 4 ,
 .Xr rbox 4 ,
-.Xr topcat 4
+.Xr sti 4 ,
+.Xr topcat 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
diff --git a/share/man/man4/man4.hp300/intro.4 b/share/man/man4/man4.hp300/intro.4
index dde08fe2ffd..926e5066dce 100644
--- a/share/man/man4/man4.hp300/intro.4
+++ b/share/man/man4/man4.hp300/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.20 2004/08/03 21:46:49 miod Exp $
+.\"	$OpenBSD: intro.4,v 1.21 2005/01/14 22:39:21 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     from: @(#)intro.4	8.1 (Berkeley) 6/5/93
 .\"
-.Dd July 27, 2004
+.Dd January 12, 2005
 .Dt INTRO 4 hp300
 .Os
 .Sh NAME
@@ -64,7 +64,7 @@ The networking support is introduced in
 .Sh DEVICE SUPPORT
 This section describes the hardware supported on the
 .Tn HP
-9000/300 series.
+9000/300 and 9000/400 series.
 Software support for these devices comes in two forms.
 A hardware device may be supported with a character or block
 .Em device driver ,
@@ -123,9 +123,6 @@ frame buffer.
 .Tn HP98700
 .Dq Gatorbox
 frame buffer.
-.It Xr grf 4
-Generic frame buffer interface for
-.Xr ite 4 .
 .It Xr hd 4
 CS/80 disk interface.
 .It Xr hil 4
@@ -136,8 +133,6 @@ Built-in and 98625 HP-IB interface.
 .Tn A1096A
 .Dq Hyperion
 frame buffer.
-.It Xr ite 4
-HP Internal Terminal Emulator.
 .It Xr le 4
 98643 LANCE-based Ethernet interface.
 .It Xr ppi 4
@@ -146,8 +141,12 @@ HP-IB printer/plotter interface.
 .Tn HP98720
 .Dq Renaissance
 frame buffer.
+.It Xr sgc 4
+Standard Graphics Connection bus.
 .It Xr spc 4
 HP 98658 SCSI host adaptor.
+.It Xr sti 4
+SGC frame buffers.
 .It Xr topcat 4
 .Tn HP98544
 .Dq Topcat ,
diff --git a/share/man/man4/man4.hp300/ite.4 b/share/man/man4/man4.hp300/ite.4
deleted file mode 100644
index 8c862ab825d..00000000000
--- a/share/man/man4/man4.hp300/ite.4
+++ /dev/null
@@ -1,154 +0,0 @@
-.\"	$OpenBSD: ite.4,v 1.9 2005/01/08 19:47:38 miod Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Systems Programming Group of the University of Utah Computer
-.\" Science Department.
-.\"
-.\" 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.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
-.\"
-.\"     from: @(#)ite.4	8.1 (Berkeley) 6/9/93
-.\"
-.Dd June 9, 1993
-.Dt ITE 4 hp300
-.Os
-.Sh NAME
-.Nm ite
-.Nd
-.Tn HP
-Internal Terminal Emulator
-.Sh SYNOPSIS
-.Cd "ite* at grf?"
-.Sh DESCRIPTION
-.Tn TTY
-special files of the form
-.Pa /dev/ttye?
-are interfaces to the
-.Tn HP ITE
-for bit-mapped displays as implemented under
-.Ox .
-An
-.Tn ITE
-is the main system console on most
-.Tn HP300
-workstations and
-is the mechanism through which a user communicates with the machine.
-If more than one display exists on a system,
-any or all can be used as
-.Tn ITE Ns s
-with the limitation that only the first
-one opened will have a keyboard (since only one keyboard is supported).
-.Pp
-.Tn ITE
-devices use the
-.Tn HP-UX
-.Sq Li 300h
-.Xr termcap 5
-or
-.Xr terminfo 5
-entries.
-However, as currently implemented,
-the
-.Tn ITE
-does not support the full range of
-.Tn HP-UX
-capabilities for this device.
-Missing are multiple colors, underlining, blinking, softkeys,
-programmable tabs, scrolling memory and keyboard arrow keys.
-The keyboard does not have any of the international character
-support of
-.Tn HP Ns 's
-.Tn NLS
-system.
-It does use the left and right
-.Em extend char
-keys as meta keys, in that it will set the eighth bit of the character code.
-.Pp
-Upon booting, the kernel will first look for an
-.Tn ITE
-device
-to use as the system console
-.Pq Pa /dev/console .
-If a display exists at any hardware address, it will be the console.
-.Pp
-When activated as an
-.Tn ITE
-(special file opened),
-all displays go through a standard initialization sequence.
-The frame buffer is cleared,
-the
-.Tn ROM
-fonts are unpacked and loaded into off-screen storage and
-a cursor appears.
-The
-.Tn ITE
-initialization routine also sets the colormap entry used to white.
-Variable colors are not used, mainly for reasons of simplicity.
-The font pixels are all set to 0xff and the colormap entry corresponding
-to all planes is set to R=255, G=255 and B=255.
-The actual number of planes used to display the characters depends
-on the hardware installed.
-Finally, if the keyboard
-.Tn HIL
-device is not already assigned to another
-.Tn ITE
-device, it is placed in ``cooked'' mode and assigned to this
-.Tn ITE .
-.Pp
-On most systems,
-a display is used both as an
-.Tn ITE
-.Pf ( Pa /dev/ttye?
-aka
-.Pa /dev/console )
-and as a graphics device
-.Pq Pa /dev/grf? .
-In this environment,
-there is some interaction between the two uses that should be noted.
-For example, opening
-.Pa /dev/grf0
-will deactivate the
-.Tn ITE ,
-that is, write over whatever may be on the
-.Tn ITE
-display.
-When the graphics application is finished and
-.Pa /dev/grf0
-closed, the
-.Tn ITE
-will be reinitialized with the frame buffer cleared and the
-.Tn ITE
-colormap installed.
-.Sh SEE ALSO
-.Xr dvbox 4 ,
-.Xr gbox 4 ,
-.Xr grf 4 ,
-.Xr hil 4 ,
-.Xr hyper 4 ,
-.Xr intro 4 ,
-.Xr rbox 4 ,
-.Xr topcat 4
diff --git a/share/man/man4/man4.hp300/rbox.4 b/share/man/man4/man4.hp300/rbox.4
index c5eb52469c0..a6971e3a4d6 100644
--- a/share/man/man4/man4.hp300/rbox.4
+++ b/share/man/man4/man4.hp300/rbox.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rbox.4,v 1.5 2005/01/08 19:47:38 miod Exp $
+.\"	$OpenBSD: rbox.4,v 1.6 2005/01/14 22:39:21 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     from: @(#)rb.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 16, 2003
+.Dd January 12, 2005
 .Dt RBOX 4 hp300
 .Os
 .Sh NAME
@@ -42,9 +42,9 @@
 .Tn HP98720
 Renaissance frame buffer
 .Sh SYNOPSIS
-.Cd "rbox* at intio?"
-.Cd "rbox* at dio?"
-.Cd "grf*  at rbox?"
+.Cd "rbox*      at intio?"
+.Cd "rbox*      at dio?"
+.Cd "wsdisplay* at rbox?"
 .Sh DESCRIPTION
 The
 .Tn HP98720
@@ -59,9 +59,7 @@ frame buffer extensions, it is possible to add overlay planes.
 The
 .Nm
 driver provides a frame buffer abstraction to the
-.Xr grf 4
-driver, and the associated
-.Xr ite 4
+.Xr wscons 4
 console framework.
 .Pp
 The Renaissance can be configured at either the ``internal'' address
@@ -70,13 +68,14 @@ or at an external select code less than 32.
 The hardware installation manual describes the procedure for
 setting these values.
 .Sh SEE ALSO
-.Xr ioctl 2 ,
 .Xr dvbox 4 ,
 .Xr gbox 4 ,
-.Xr grf 4 ,
 .Xr hyper 4 ,
 .Xr intro 4 ,
-.Xr topcat 4
+.Xr sti 4 ,
+.Xr topcat 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
 .Sh BUGS
 This driver has not been tested with all possible
 combinations of frame buffer boards and scan boards installed in the device.
diff --git a/share/man/man4/man4.hp300/sgc.4 b/share/man/man4/man4.hp300/sgc.4
new file mode 100644
index 00000000000..02d49bd2b65
--- /dev/null
+++ b/share/man/man4/man4.hp300/sgc.4
@@ -0,0 +1,52 @@
+.\"	$OpenBSD: sgc.4,v 1.1 2005/01/14 22:39:21 miod Exp $
+.\"
+.\" Copyright (c) 2005, Miodrag Vallat
+.\"
+.\" 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 January 12, 2005
+.Dt SGC 4 hp300
+.Os
+.Sh NAME
+.Nm sgc
+.Nd Standard Graphics Connection bus
+.Sh SYNOPSIS
+.Cd "sgc0 at mainbus0"
+.Sh DESCRIPTION
+The SGC bus was designed by
+.Tn HP
+as a standard interface to connect graphics products to workstations.
+The
+.Nm
+driver provides support for the SGC bus found on some HP 9000/4xx series
+workstations.
+.Sh SUPPORTED DEVICES
+The following SGC devices are supported:
+.Ss Framebuffers
+.Bl -tag -width xxxxxx -offset indent -compact
+.It Xr sti 4
+HP Standard Text Interface compatible frame buffers
+.El
+.Sh SEE ALSO
+.Xr dio 4 ,
+.Xr intro 4 ,
+.Xr sti 4
diff --git a/share/man/man4/man4.hp300/topcat.4 b/share/man/man4/man4.hp300/topcat.4
index a96c6f1ade4..25edefdbe84 100644
--- a/share/man/man4/man4.hp300/topcat.4
+++ b/share/man/man4/man4.hp300/topcat.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: topcat.4,v 1.9 2005/01/11 22:34:13 miod Exp $
+.\"	$OpenBSD: topcat.4,v 1.10 2005/01/14 22:39:21 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     from: @(#)tc.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd January 11, 2005
+.Dd January 12, 2005
 .Dt TOPCAT 4 hp300
 .Os
 .Sh NAME
@@ -45,9 +45,9 @@ and
 Kathmandu
 frame buffers
 .Sh SYNOPSIS
-.Cd "topcat* at intio?"
-.Cd "topcat* at dio?"
-.Cd "grf*    at topcat?"
+.Cd "topcat*    at intio?"
+.Cd "topcat*    at dio?"
+.Cd "wsdisplay* at topcat?"
 .Sh DESCRIPTION
 The
 HP98543, HP98544, HP98545A and HP98547A Topcat,
@@ -79,9 +79,7 @@ are accelerated frame buffers, with the following resolution and color depth:
 The
 .Nm
 driver provides a frame buffer abstraction to the
-.Xr grf 4
-driver, and the associated
-.Xr ite 4
+.Xr wscons 4
 console framework.
 .Pp
 The Topcat display cards are not user configurable.
@@ -94,10 +92,12 @@ switches selector to define the
 .Dq select code .
 A select code of 1 will use the same settings as the Topcat cards.
 .Sh SEE ALSO
-.Xr ioctl 2 ,
 .Xr dvbox 4 ,
 .Xr gbox 4 ,
 .Xr grf 4 ,
 .Xr hyper 4 ,
 .Xr intro 4 ,
-.Xr rbox 4
+.Xr rbox 4 ,
+.Xr sti 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
diff --git a/share/man/man4/sti.4 b/share/man/man4/sti.4
index 586f00c6f7e..7913682ab46 100644
--- a/share/man/man4/sti.4
+++ b/share/man/man4/sti.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sti.4,v 1.15 2004/09/30 19:59:25 mickey Exp $
+.\"	$OpenBSD: sti.4,v 1.16 2005/01/14 22:39:19 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 May 11, 2001
+.Dd January 12, 2005
 .Dt STI 4
 .Os
 .Sh NAME
@@ -33,6 +33,7 @@
 .Sh SYNOPSIS
 .Cd "sti*	at mainbus0"
 .Cd "sti*	at phantomas0"
+.Cd "sti*	at sgc?"
 .\" .Cd "sti*	at pci?"
 .Cd "wsdisplay*	at sti?"
 .Sh DESCRIPTION
@@ -45,6 +46,7 @@ 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 "EVRX" Ta "8" Ta "2" Ta "" Ta "HP9000/425e"
 .\" .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"
@@ -247,6 +249,7 @@ Colour frame buffer support.
 .El
 .Sh SEE ALSO
 .Xr intro 4 ,
+.Xr sgc 4 ,
 .Xr phantomas 4 ,
 .Xr wsdisplay 4
 .Pp