Your average hp300 manual page overhaul for the release:

- clean/rewrite frame buffer manual page, with correct names, and add hyper.
- add missing manual pages, mostly from NetBSD
- harmonize texts, rebalance .Bl lists, sprinkle useful .Xr

25 files changed, 651 insertions, 534 deletions

diff --git a/share/man/man4/man4.hp300/Makefile b/share/man/man4/man4.hp300/Makefile
index c3d26433e35..9a1385826d6 100644
--- a/share/man/man4/man4.hp300/Makefile
+++ b/share/man/man4/man4.hp300/Makefile
@@ -1,9 +1,11 @@
-#	$OpenBSD: Makefile,v 1.7 2002/10/01 07:12:30 miod Exp $
+#	$OpenBSD: Makefile,v 1.8 2003/03/16 20:12:50 miod Exp $
 #	from: @(#)Makefile	5.1 (Berkeley) 6/29/90
 
-MAN=	apci.4 autoconf.4 cons.4 ct.4 dca.4 dcm.4 dv.4 gb.4 grf.4 \
-	hd.4 hil.4 intro.4 ite.4 le.4 mem.4 ppi.4 rb.4 sd.4 tc.4
+MAN=	apci.4 autoconf.4 cons.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 oscsi.4 \
+	ppi.4 rbox.4 sd.4 topcat.4
 MLINKS=	mem.4 kmem.4
+MLINKS+=nhpib.4 fhpib.4 nhpib.4 hpibbus.4
 MANSUBDIR=hp300
 
 .include <bsd.prog.mk>
diff --git a/share/man/man4/man4.hp300/apci.4 b/share/man/man4/man4.hp300/apci.4
index 50f26ece40b..9ed3b14cd78 100644
--- a/share/man/man4/man4.hp300/apci.4
+++ b/share/man/man4/man4.hp300/apci.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apci.4,v 1.4 2003/03/03 06:47:43 jmc Exp $
+.\"	$OpenBSD: apci.4,v 1.5 2003/03/16 20:12:50 miod Exp $
 .\
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -77,6 +77,7 @@ has overflowed and incoming data has been lost.
 .Sh SEE ALSO
 .Xr dca 4 ,
 .Xr dcm 4 ,
+.Xr frodo 4 ,
 .Xr intro 4 ,
 .Xr tty 4
 .Sh BUGS
diff --git a/share/man/man4/man4.hp300/cons.4 b/share/man/man4/man4.hp300/cons.4
index 714e6564726..10553a6a72b 100644
--- a/share/man/man4/man4.hp300/cons.4
+++ b/share/man/man4/man4.hp300/cons.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cons.4,v 1.5 2002/10/01 07:12:30 miod Exp $
+.\"	$OpenBSD: cons.4,v 1.6 2003/03/16 20:12:50 miod Exp $
 .\
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -62,9 +62,7 @@ acting as an
 .Dq Tn ITE ,
 a serial interface
 .Pq Xr apci 4 \ or Xr dca 4 ,
-or a
-.Xr null 4
-console, in that order.
+or a null console, in that order.
 .Sh FILES
 .Bl -tag -width /dev/console
 .It Pa /dev/console
diff --git a/share/man/man4/man4.hp300/ct.4 b/share/man/man4/man4.hp300/ct.4
index 02fde39b126..9845a5e50da 100644
--- a/share/man/man4/man4.hp300/ct.4
+++ b/share/man/man4/man4.hp300/ct.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ct.4,v 1.7 2002/10/01 07:12:30 miod Exp $
+.\"	$OpenBSD: ct.4,v 1.8 2003/03/16 20:12:50 miod Exp $
 .\
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -101,6 +101,7 @@ refer to streaming no-rewind interfaces.
 .Sh SEE ALSO
 .Xr mt 1 ,
 .Xr hd 4 ,
+.Xr hpibbus 4 ,
 .Xr intro 4 ,
 .Xr mtio 4 ,
 .Xr sd 4 ,
diff --git a/share/man/man4/man4.hp300/dca.4 b/share/man/man4/man4.hp300/dca.4
index acd76918e9f..6e5a5fd60bb 100644
--- a/share/man/man4/man4.hp300/dca.4
+++ b/share/man/man4/man4.hp300/dca.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dca.4,v 1.7 2003/03/03 06:47:43 jmc Exp $
+.\"	$OpenBSD: dca.4,v 1.8 2003/03/16 20:12:50 miod Exp $
 .\
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -82,6 +82,7 @@ has overflowed and incoming data has been lost.
 .Sh SEE ALSO
 .Xr apci 4 ,
 .Xr dcm 4 ,
+.Xr dio 4 ,
 .Xr intro 4 ,
 .Xr tty 4
 .Sh BUGS
diff --git a/share/man/man4/man4.hp300/dcm.4 b/share/man/man4/man4.hp300/dcm.4
index 8ff648c10c4..9091b9ced18 100644
--- a/share/man/man4/man4.hp300/dcm.4
+++ b/share/man/man4/man4.hp300/dcm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dcm.4,v 1.9 2003/03/03 06:47:43 jmc Exp $
+.\"	$OpenBSD: dcm.4,v 1.10 2003/03/16 20:12:50 miod Exp $
 .\
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -97,6 +97,7 @@ overflowed.
 .El
 .Sh SEE ALSO
 .Xr apci 4 ,
+.Xr dio 4 ,
 .Xr dca 4 ,
 .Xr intro 4 ,
 .Xr tty 4
diff --git a/share/man/man4/man4.hp300/dio.4 b/share/man/man4/man4.hp300/dio.4
new file mode 100644
index 00000000000..e788dcd78a6
--- /dev/null
+++ b/share/man/man4/man4.hp300/dio.4
@@ -0,0 +1,120 @@
+.\"	$OpenBSD: dio.4,v 1.1 2003/03/16 20:12:50 miod Exp $
+.\"     $NetBSD: dio.4,v 1.2 2002/01/15 01:31:30 wiz Exp $
+.\"
+.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Gregory McGarry.
+.\"
+.\" 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. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"        This product includes software developed by the NetBSD
+.\"        Foundation, Inc. and its contributors.
+.\" 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+.\"
+.Dd September 10, 2001
+.Dt DIO 4 hp300
+.Os
+.Sh NAME
+.Nm dio
+.Nd
+.Tn DIO/DIO-II bus
+.Sh SYNOPSIS
+.Cd "dio0 at mainbus0"
+.Sh DESCRIPTION
+This driver is for the DIO/DIO-II bus on HP 9000/3xx and 9000/4xx series
+workstations.
+.Sh SUPPORTED DEVICES
+The following
+.Tn DIO
+devices are supported:
+.Ss Framebuffers
+.Bl -tag -width XXXXXX_4_ -offset indent
+.It Xr dvbox 4
+.Tn HP98730
+.Dq DaVinci
+frame buffer
+.It Xr gbox 4
+.Tn HP98700
+.Dq Gatorbox
+frame buffer
+.It Xr hyper 4
+.Tn A1096A
+.Dq Hyperion
+frame buffer
+.It Xr rbox 4
+.Tn HP98720
+.Dq Renaissance
+frame buffer
+.It Xr topcat 4
+.Tn HP98544
+.Dq Topcat
+and
+.Tn HP98550
+.Dq Catseye
+frame buffers
+.El
+.Ss Serial interfaces
+.Bl -tag -width XXXXXX_4_ -offset indent
+.It Xr dca 4
+.Tn HP98644A
+serial communications interface
+.It Xr dcm 4
+.Tn HP98642A
+serial communications multiplexer
+.El
+.Ss Network interfaces
+.Bl -tag -width XXXXXX_4_ -offset indent
+.It Xr le 4
+.Tn HP98643
+built-in and add-on Ethernet boards
+.El
+.Ss HP-IB interfaces
+.Bl -tag -width XXXXXX_4_ -offset indent
+.It Xr fhpib 4
+.Dq fast
+HP-IB interface
+.It Xr nhpib 4
+.Dq normal
+HP-IB interface
+.El
+.Ss SCSI interfaces
+.Bl -tag -width XXXXXX_4_ -offset indent
+.It Xr oscsi 4
+Old HP300 SCSI driver
+.El
+.Sh SEE ALSO
+.Xr dca 4 ,
+.Xr dcm 4 ,
+.Xr dvbox 4 ,
+.Xr gbox 4 ,
+.Xr hpibbus 4 ,
+.Xr hyper 4 ,
+.Xr intro 4 ,
+.Xr le 4 ,
+.Xr oscsi 4 ,
+.Xr rbox 4 ,
+.Xr topcat 4
diff --git a/share/man/man4/man4.hp300/dv.4 b/share/man/man4/man4.hp300/dvbox.4
index cbf97d9dbfc..6cc660387b9 100644
--- a/share/man/man4/man4.hp300/dv.4
+++ b/share/man/man4/man4.hp300/dvbox.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dv.4,v 1.8 2003/03/03 06:47:43 jmc Exp $
+.\"	$OpenBSD: dvbox.4,v 1.1 2003/03/16 20:12:50 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -37,27 +37,37 @@
 .\"
 .\"     from: @(#)dv.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd June 9, 1993
-.Dt DV 4 hp300
+.Dd March 16, 2003
+.Dt DVBOX 4 hp300
 .Os
 .Sh NAME
-.Nm dv
+.Nm dvbox
 .Nd
 .Tn HP98730
-``DaVinci'' frame buffer
+.Dq DaVinci
+frame buffer
 .Sh SYNOPSIS
 .Cd "dvbox* at intio?"
 .Cd "dvbox* at dio? scode ?"
-.Cd "grf* at dvbox?"
+.Cd "grf*   at dvbox?"
 .Sh DESCRIPTION
-This driver is for the
+The
 .Tn HP98730
-and 98731 graphics device, also known as
-the DaVinci.
-This driver has not been tested with all possible combinations of frame
-buffer boards and scan boards installed in the device.
-The driver merely checks for the existence of the device and does minimal set
-up.
+and
+.Tn HP98731 
+are stackable 4-bit color frame buffers,
+also known as the DaVinci.
+By adding up to 7
+.Tn HP98732A
+frame buffer extensions, it is possible to add overlay planes.
+.Pp
+The
+.Nm
+driver provides a frame buffer abstraction to the
+.Xr grf 4
+driver, and the associated
+.Xr ite 4
+console framework.
 .Pp
 The DaVinci can be configured at either the ``internal'' address
 (frame buffer address 0x200000, control register space address 0x560000)
@@ -67,99 +77,14 @@ At the internal address it will be the ``preferred'' console device
 .Xr cons 4 ) .
 The hardware installation manual describes the procedure for
 setting these values.
-.Pp
-A user process communicates to the device initially by means of
-.Xr ioctl 2
-calls.
-For the
-.Tn HP-UX
-.Xr ioctl 2
-calls supported, refer to
-.Tn HP-UX
-manuals.
-The
-.Ox
-calls supported are:
-.Bl -tag -width indent
-.It Dv GRFIOCGINFO
-Get Graphics Info
-.Pp
-Get info about device, setting the entries in the
-.Ar grfinfo
-structure, as defined in
-.Aq Pa machine/grfioctl.h .
-For the standard 98730, the number of planes should be 4.
-The number of colors would therefore be 15, excluding black.
-If one 98732A frame buffer board is installed, there will still be 4 planes, 
-with the 4 planes on the colormap board becoming overlay planes.
-With each additional 98732 frame buffer board 4 planes will be added up
-to a maximum of 32 planes total.
-.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 structure is accessible.
-The structure describing the 98730 is defined in
-.Aq Pa machine/grf_dvreg.h .
-.El
-.Sh FILES
-.Bl -tag -width /dev/XXXX -compact
-.It Pa /dev/grf?
-.Ox
-special file
-.El
-.Sh EXAMPLES
-This is a short segment of code showing how the device is opened and mapped
-into user process address space assuming that it is
-.Ql grf0 :
-.Bd -literal
-struct dvboxfb *dvbox;
-u_char *Addr, frame_buffer;
-struct grfinfo gi;
-int disp_fd;
-
-disp_fd = open("/dev/grf0", 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;
-}
-dvbox = (dvboxfb *)Addr;                  /* Control Registers   */
-frame_buffer = (u_char *)Addr + gi.gd_regsize; /* Frame buffer memory */
-.Ed
-.Sh DIAGNOSTICS
-None under
-.Ox .
-The
-.Tn HP-UX
-.Tn CE.utilities/Crtadjust
-programs must be used.
 .Sh SEE ALSO
 .Xr ioctl 2 ,
-.Xr gb 4 ,
+.Xr gbox 4 ,
 .Xr grf 4 ,
-.\" .Xr hyper 4 ,
+.Xr hyper 4 ,
 .Xr intro 4 ,
-.Xr rb 4 ,
-.Xr tc 4
+.Xr rbox 4 ,
+.Xr topcat 4
 .Sh BUGS
-Not tested for all configurations of scan board and frame buffer memory boards.
+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/frodo.4 b/share/man/man4/man4.hp300/frodo.4
new file mode 100644
index 00000000000..4697059d898
--- /dev/null
+++ b/share/man/man4/man4.hp300/frodo.4
@@ -0,0 +1,51 @@
+.\"	$OpenBSD: frodo.4,v 1.1 2003/03/16 20: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 March 16, 2003
+.Dt FRODO 4 hp300
+.Os
+.Sh NAME
+.Nm frodo
+.Nd HP 9000/4xx Frodo ASIC
+.Sh SYNOPSIS
+.Cd "frodo0 at intio?"
+.Cd "apci* at frodo? offset ?"
+.Sh DESCRIPTION
+The
+.Tn FRODO
+ASIC (or
+.Dq Apollo Utility chip )
+is found on HP 9000/4xx series workstations.
+It provides three
+.Xr apci 4
+serial ports, the first one being used to connect the
+Domain keyboard.
+.Sh SEE ALSO
+.Xr apci 4 ,
+.\" .Xr dnkbd 4 ,
+.Xr intro 4
+.Sh BUGS
+The Domain keyboard is currently only supported by the boot blocks.
diff --git a/share/man/man4/man4.hp300/gb.4 b/share/man/man4/man4.hp300/gbox.4
index 7755489f170..10c861ce129 100644
--- a/share/man/man4/man4.hp300/gb.4
+++ b/share/man/man4/man4.hp300/gbox.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gb.4,v 1.6 2002/10/01 07:12:30 miod Exp $
+.\"	$OpenBSD: gbox.4,v 1.1 2003/03/16 20:12:50 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -37,39 +37,53 @@
 .\"
 .\"     from: @(#)gb.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd June 9, 1993
-.Dt GB 4 hp300
+.Dd March 16, 2003
+.Dt GBOX 4 hp300
 .Os
 .Sh NAME
-.Nm gb
+.Nm gbox
 .Nd
 .Tn HP98700
-``Gatorbox'' frame buffer
+.Dq Gatorbox
+frame buffer
 .Sh SYNOPSIS
 .Cd "gbox* at intio?"
 .Cd "gbox* at dio? scode ?"
-.Cd "grf* at gbox?"
+.Cd "grf*  at gbox?"
 .Sh DESCRIPTION
-This driver is for the
+The
 .Tn HP98700
-and 98710 graphics devices, also known as
-the Gatorbox.
-The term ``Gator'' will often be used, and it is not to be
-confused with ``Gator'' used in reference to an
+and
+.Tn HP98710
+are 4- and 8-bit color frame buffers,
+also known as the Gatorbox.
+.Pp
+The term
+.Dq Gator
+will often be used, and it is not to be
+confused with
+.Dq Gator
+used in reference to an
 .Tn HP
 9837 or 200/237 machine.
-Also, the term Gatorbox is used for the 98700 alone, with the 98701 frame
+Also, the term
+.Dq Gatorbox
+is used for the 98700 alone, with the 98701 frame
 buffer memory or with the 98710 accelerator installed.
-This driver merely checks for the existence of the device and does minimal
-set up, as it is expected the applications will initialize the device to their
-requirements.
+.Pp
+The
+.Nm
+driver provides a frame buffer abstraction to the
+.Xr grf 4
+driver, and the associated
+.Xr ite 4
+console framework.
 .Pp
 The 98700 can be used as the only graphics device on a system, in which case
 it will be used as the system console.
 It can also be installed as a secondary display device.
 For the first case, the
-.Tn HP
-.Tn 98287A M.A.D.
+.Tn HP98287A M.A.D.
 interface card
 should be set to internal control space.
 This will put the frame buffer at the DIO address 0x200000 and the control
@@ -87,93 +101,11 @@ The 98700 should only be installed as a secondary device in a machine with a
 The
 .%T 98700H Installation Guide
 contains further configuration information.
-.Pp
-The
-.Xr ioctl 2
-calls supported by the
-.Ox
-system for the Gatorbox are:
-.Bl -tag -width indent
-.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 .
-For the standard 98700, the number of planes should be 4.
-The number of colors would therefore be 15, excluding black.
-With the 98701 option installed there will be another 4 planes for a total of 8,
-giving 255 colors.
-.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 structure is accessible.
-The frame buffer structure describing the 98700
-is given in
-.Aq Pa machine/grf_gbreg.h .
-.It Dv GRFIOCUNMAP
-Unmap Device
-.Pp
-Unmap control registers and frame buffer space.
-.Pp
-For further information about the use of ioctl see the man page.
-.El
-.Sh FILES
-.Bl -tag -width /dev/XXXX -compact
-.It Pa /dev/grf?
-.Ox
-special file
-.El
-.Sh EXAMPLES
-A small example of opening, mapping and using the device is given below.
-.Bd -literal
-struct gboxfb *gbox;
-u_char *Addr, frame_buffer;
-struct grfinfo gi;
-int disp_fd;
-
-disp_fd = open("/dev/grf0", 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;
-}
-gbox = (gboxfb *)Addr;                         /* Control Registers   */
-frame_buffer = (u_char *)Addr + gi.gd_regsize; /* Frame buffer memory */
-.Ed
-.Sh DIAGNOSTICS
-None under
-.Ox .
-The
-.Tn HP-UX
-.Tn CE.utilities/Crtadjust
-programs must be used.
 .Sh SEE ALSO
 .Xr ioctl 2 ,
-.Xr dv 4 ,
+.Xr dvbox 4 ,
 .Xr grf 4 ,
-.\" .Xr hyper 4 ,
+.Xr hyper 4 ,
 .Xr intro 4 ,
-.Xr rb 4 ,
-.Xr tc 4
+.Xr rbox 4 ,
+.Xr topcat 4
diff --git a/share/man/man4/man4.hp300/grf.4 b/share/man/man4/man4.hp300/grf.4
index b867ace28cc..08184959d21 100644
--- a/share/man/man4/man4.hp300/grf.4
+++ b/share/man/man4/man4.hp300/grf.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: grf.4,v 1.7 2002/10/01 07:12:30 miod Exp $
+.\"	$OpenBSD: grf.4,v 1.8 2003/03/16 20:12:50 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -51,22 +51,25 @@ graphics frame buffer device interface
 .Cd "grf* at hyper?"
 .Cd "grf* at rbox?"
 .Cd "grf* at topcat?"
-.Pp
+.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 display cards (also known as
+Topcat graphics cards (also known as
 .Tn HP300H
 devices),
 the 98548, 98549 and 98550
-Catseye display cards,
+Catseye graphics cards,
 the 98700
 Gatorbox graphics box,
 the 98720
 Renaissance graphics box,
-and the 98730
-DaVinci graphics box.
+the 98730
+DaVinci graphics box,
+and the A1096A
+Hyperion graphics cards.
 .Pp
 The basic programming of the
 .Nm grf Ns ?
@@ -76,10 +79,11 @@ 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 indent
+.Bl -tag -width GRFIOCGINFO
 .It Dv GRFIOCGINFO
 Get Graphics Info
 .Pp
@@ -123,14 +127,13 @@ are not affected.
 Map Device to user space
 .Pp
 Map in control registers and frame buffer space.
-Once the device file is mapped, the frame buffer structure is accessible.
+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
-.Pp
-For further information about the use of ioctl see the man page.
 .Sh FILES
 .Bl -tag -width /dev/XXXX -compact
 .It Pa /dev/grf?
@@ -162,18 +165,22 @@ frame_buffer = (u_char *)Addr + gi.gd_regsize; /* Frame buffer mem */
 .Sh DIAGNOSTICS
 None under
 .Ox .
+.Pp
 .Tn HP-UX
 The
 .Tn CE.utilities/Crtadjust
-programs must be used for each specific device.
+programs, running in
+.Tn HP-UX
+compatibility mode,
+can be used for each specific device.
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr cons 4 ,
-.Xr dv 4 ,
-.Xr gb 4 ,
+.Xr dvbox 4 ,
+.Xr gbox 4 ,
 .Xr hil 4 ,
-.\" .Xr hyper 4 ,
+.Xr hyper 4 ,
 .Xr intro 4 ,
 .Xr ite 4 ,
-.Xr rb 4 ,
-.Xr tc 4
+.Xr rbox 4 ,
+.Xr topcat 4
diff --git a/share/man/man4/man4.hp300/hd.4 b/share/man/man4/man4.hp300/hd.4
index d5b6648e50e..a31e420af91 100644
--- a/share/man/man4/man4.hp300/hd.4
+++ b/share/man/man4/man4.hp300/hd.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hd.4,v 1.6 2003/03/09 22:20:35 miod Exp $
+.\"	$OpenBSD: hd.4,v 1.7 2003/03/16 20:12:50 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -293,6 +293,7 @@ specified block on the specified disk.
 .El
 .Sh SEE ALSO
 .Xr \&ct 4 ,
+.Xr hpibbus 4 ,
 .Xr intro 4 ,
 .Xr sd 4 ,
 .Xr st 4
diff --git a/share/man/man4/man4.hp300/hil.4 b/share/man/man4/man4.hp300/hil.4
index 922c14440b6..66d767aa2cd 100644
--- a/share/man/man4/man4.hp300/hil.4
+++ b/share/man/man4/man4.hp300/hil.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hil.4,v 1.9 2002/10/01 07:12:30 miod Exp $
+.\"	$OpenBSD: hil.4,v 1.10 2003/03/16 20:12:50 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -169,7 +169,7 @@ documentation for more
 complete descriptions of these ioctls.
 The second set of ioctls are specific to this implementation and are
 primarily related to the shared-queue interface.
-.Bl -tag -width HILIOCARO
+.Bl -tag -width HILIOCALLOCQ
 .It Dv HILIOCID
 Identify and Describe
 .Pp
diff --git a/share/man/man4/man4.hp300/hyper.4 b/share/man/man4/man4.hp300/hyper.4
new file mode 100644
index 00000000000..dfc15ef852b
--- /dev/null
+++ b/share/man/man4/man4.hp300/hyper.4
@@ -0,0 +1,58 @@
+.\"	$OpenBSD: hyper.4,v 1.1 2003/03/16 20:12:51 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 March 16, 2003
+.Dt HYPER 4 hp300
+.Os
+.Sh NAME
+.Nm hyper
+.Nd
+.Tn HP A1096A
+.Dq Hyperion
+frame buffer
+.Sh SYNOPSIS
+.Cd "hyper* at dio? scode ?"
+.Cd "grf*   at hyper?"
+.Sh DESCRIPTION
+The
+.Dq Hyperion
+is a monochrome frame buffer.
+.Pp
+The
+.Nm
+driver provides a frame buffer abstraction to the
+.Xr grf 4
+driver, and the associated
+.Xr ite 4
+console framework.
+.Sh SEE ALSO
+.Xr dvbox 4 ,
+.Xr gbox 4 ,
+.Xr grf 4 ,
+.Xr hyper 4 ,
+.Xr intro 4 ,
+.Xr ite 4 ,
+.Xr rbox 4
diff --git a/share/man/man4/man4.hp300/intro.4 b/share/man/man4/man4.hp300/intro.4
index 137333fa211..b7623451cb3 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.13 2003/03/09 22:20:35 miod Exp $
+.\"	$OpenBSD: intro.4,v 1.14 2003/03/16 20:12:51 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -108,7 +108,7 @@ for example, new
 .Tn CS/80
 drives.
 .Pp
-.Bl -tag -width hpib(4) -compact -offset indent
+.Bl -tag -width topcat_4_ -compact -offset indent
 .It Xr apci 4
 Apollo utility chip serial interface.
 .It Xr \&ct 4
@@ -117,38 +117,52 @@ Apollo utility chip serial interface.
 98644 built-in serial interface.
 .It Xr dcm 4
 HP 98642A communications multiplexer.
-.\" .It Xr dio 4
-.\" DIO/DIO-II bus.
-.It Xr dv 4
-HP98730 ``DaVinci'' frame buffer.
-.It Xr gb 4
-HP98700 ``Gatorbox'' frame buffer.
+.It Xr dio 4
+DIO/DIO-II bus.
+.It Xr dvbox 4
+.Tn HP98730
+.Dq DaVinci
+frame buffer.
+.It Xr gbox 4
+.Tn HP98700
+.Dq Gatorbox
+frame buffer.
 .It Xr grf 4
-Topcat/Gatorbox/Renaissance frame buffer.
+Generic frame buffer interface for
+.Xr ite 4 .
 .It Xr hd 4
 CS/80 disk interface.
 .It Xr hil 4
 HIL interface.
-.\" .It Xr hpib 4
-.\" Built-in and 98625 HP-IB interface.
-.\" .It Xr hyper 4
-.\" Hyperion frame buffer.
+.It Xr hpibbus 4
+Built-in and 98625 HP-IB interface.
+.It Xr hyper 4
+.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 oscsi
-.\" Old HP300 SCSI driver.
+.It Xr oscsi
+Old HP300 SCSI interface.
 .It Xr ppi 4
 HP-IB printer/plotter interface.
-.It Xr rb 4
-HP98720 ``Renaissance'' device interface.
+.It Xr rbox 4
+.Tn HP98720
+.Dq Renaissance
+frame buffer.
 .It Xr sd 4
 SCSI disk drives.
 .It Xr st 4
 CCS SCSI tape drives.
-.It Xr tc 4
-HP98544-98550 ``Topcat'' and ``Catseye'' device interface.
+.It Xr topcat 4
+.Tn HP98544
+.Dq Topcat
+and
+.Tn HP98550
+.Dq Catseye
+frame buffers.
 .El
 .Sh SEE ALSO
 .Xr autoconf 4 ,
diff --git a/share/man/man4/man4.hp300/ite.4 b/share/man/man4/man4.hp300/ite.4
index 13cb35b4ae3..e48d5d7e50f 100644
--- a/share/man/man4/man4.hp300/ite.4
+++ b/share/man/man4/man4.hp300/ite.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ite.4,v 1.6 2003/03/03 06:47:43 jmc Exp $
+.\"	$OpenBSD: ite.4,v 1.7 2003/03/16 20:12:51 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -149,10 +149,11 @@ will be reinitialized with the frame buffer cleared and the
 colormap installed.
 .Sh SEE ALSO
 .Xr cons 4 ,
-.Xr dv 4 ,
-.Xr gb 4 ,
+.Xr dvbox 4 ,
+.Xr gbox 4 ,
 .Xr grf 4 ,
 .Xr hil 4 ,
+.Xr hyper 4 ,
 .Xr intro 4 ,
-.Xr rb 4 ,
-.Xr tc 4
+.Xr rbox 4 ,
+.Xr topcat 4
diff --git a/share/man/man4/man4.hp300/mem.4 b/share/man/man4/man4.hp300/mem.4
index ed12402bda3..161ea97b5ac 100644
--- a/share/man/man4/man4.hp300/mem.4
+++ b/share/man/man4/man4.hp300/mem.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mem.4,v 1.5 2003/03/03 06:47:43 jmc Exp $
+.\"	$OpenBSD: mem.4,v 1.6 2003/03/16 20:12:51 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -68,9 +68,7 @@ with
 8Mb of memory, physical memory would start
 at
 .Li 0xFF800000 .
-On the
-.Tn HP300 ,
-kernel virtual memory runs from
+The kernel virtual memory runs from
 .Li 0
 to about
 .Li 0x2400000 .
diff --git a/share/man/man4/man4.hp300/nhpib.4 b/share/man/man4/man4.hp300/nhpib.4
new file mode 100644
index 00000000000..2555c971182
--- /dev/null
+++ b/share/man/man4/man4.hp300/nhpib.4
@@ -0,0 +1,64 @@
+.\"	$OpenBSD: nhpib.4,v 1.1 2003/03/16 20:12:51 miod Exp $
+.\"     $NetBSD: hpib.4,v 1.2 2002/01/15 01:35:44 wiz Exp $
+.\"
+.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Gregory McGarry.
+.\"
+.\" 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. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"        This product includes software developed by the NetBSD
+.\"        Foundation, Inc. and its contributors.
+.\" 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+.\"
+.Dd September 10, 2001
+.Dt HPIB 4 hp300
+.Os
+.Sh NAME
+.Nm hpib
+.Nd Built-in and 98625 HP-IB interfaces
+.Sh SYNOPSIS
+.Cd "nhpib*	at dio? scode ?"
+.Cd "hpibbus*	at nhpib?"
+.Cd "fhpib*	at dio? scode ?"
+.Cd "hpibbus*	at fhpib?"
+.Cd ""
+.Cd "hd*  at hpibbus? slave ? punit ?   " Pq "disks"
+.Cd "ct*  at hpibbus? slave ? punit ?   " Pq "cartridge tapes"
+.Cd "mt*  at hpibbus? slave ? punit ?   " Pq "9-track tapes"
+.Cd "ppi0 at hpibbus? slave 5 punit 0   " Pq "plotter"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the built-in and 98625 HP-IB interfaces.
+.Sh SEE ALSO
+.Xr ct 4 ,
+.Xr dio 4 ,
+.Xr hd 4 ,
+.Xr intro 4 ,
+.Xr mt 4 ,
+.Xr ppi 4
diff --git a/share/man/man4/man4.hp300/oscsi.4 b/share/man/man4/man4.hp300/oscsi.4
new file mode 100644
index 00000000000..540aeebbcf3
--- /dev/null
+++ b/share/man/man4/man4.hp300/oscsi.4
@@ -0,0 +1,63 @@
+.\"	$OpenBSD: oscsi.4,v 1.1 2003/03/16 20:12:51 miod Exp $
+.\"     $NetBSD: oscsi.4,v 1.2 2002/01/15 01:36:36 wiz Exp $
+.\"
+.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Gregory McGarry.
+.\"
+.\" 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. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"        This product includes software developed by the NetBSD
+.\"        Foundation, Inc. and its contributors.
+.\" 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+.\"
+.Dd September 11, 2001
+.Dt OSCSI 4 hp300
+.Os
+.Sh NAME
+.Nm oscsi
+.Nd
+.Tn old HP300 CCS SCSI interface
+.Sh SYNOPSIS
+.Cd "oscsi*  at dio? scode ?"
+.Cd "sd*     at oscsi? target ? lun ?"
+.Cd "st*     at oscsi? target ? lun ?"
+.Cd "ac*     at oscsi? target ? lun ?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the SCSI interface on HP 9000/3xx and 9000/4xx series
+workstations.
+.Sh SEE ALSO
+.\".Xr ac 4 ,
+.Xr dio 4 ,
+.Xr intro 4 ,
+.Xr sd 4 ,
+.Xr st 4
+.Sh BUGS
+The current interface should be replaced with the
+machine-independent SCSI subsystem.
diff --git a/share/man/man4/man4.hp300/ppi.4 b/share/man/man4/man4.hp300/ppi.4
index 8ebf53afea5..a2713024dd7 100644
--- a/share/man/man4/man4.hp300/ppi.4
+++ b/share/man/man4/man4.hp300/ppi.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ppi.4,v 1.4 2002/10/01 07:12:30 miod Exp $
+.\"	$OpenBSD: ppi.4,v 1.5 2003/03/16 20:12:51 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -68,7 +68,7 @@ fully qualified.
 .It Pa /dev/ppi[0-3]
 .El
 .Sh SEE ALSO
-.\" .Xr hpib 4 ,
+.Xr hpibbus 4 ,
 .Xr intro 4
 .Sh BUGS
 This driver is very primitive, it handshakes data out byte by byte.
diff --git a/share/man/man4/man4.hp300/rb.4 b/share/man/man4/man4.hp300/rbox.4
index 101c5ed8534..2483a628372 100644
--- a/share/man/man4/man4.hp300/rb.4
+++ b/share/man/man4/man4.hp300/rbox.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rb.4,v 1.6 2002/10/01 07:12:30 miod Exp $
+.\"	$OpenBSD: rbox.4,v 1.1 2003/03/16 20:12:51 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -37,23 +37,33 @@
 .\"
 .\"     from: @(#)rb.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd June 9, 1993
-.Dt RB 4 hp300
+.Dd March 16, 2003
+.Dt RBOX 4 hp300
 .Os
 .Sh NAME
-.Nm rb
+.Nm rbox
 .Nd
 .Tn HP98720
-``Renaissance'' frame buffer
+.Dq Renaissance
+frame buffer
 .Sh DESCRIPTION
-This driver is for the
+The
 .Tn HP98720
-and 98721 graphics device, also known as
-the Renaissance.
-This driver has not been tested with all possible
-combinations of frame buffer boards and scan boards installed in the device.
-The driver merely checks for the existence of the device and does minimal set
-up.
+and
+.Tn HP98721
+are stackable 4-bit color frame buffers,
+also known as the Renaissance.
+By adding up to 7
+.Tn HP98722A
+frame buffer extensions, it is possible to add overlay planes.
+.Pp
+The
+.Nm
+driver provides a frame buffer abstraction to the
+.Xr grf 4
+driver, and the associated
+.Xr ite 4
+console framework.
 .Pp
 The Renaissance can be configured at either the ``internal'' address
 (frame buffer address 0x200000, control register space address 0x560000)
@@ -63,98 +73,14 @@ At the internal address it will be the ``preferred'' console device
 .Xr cons 4 ) .
 The hardware installation manual describes the procedure for
 setting these values.
-.Pp
-A user process communicates to the device initially by means of
-.Xr ioctl 2
-calls.
-For the
-.Tn HP-UX
-.Xr ioctl 2
-calls supported, refer to
-.Tn HP-UX
-manuals.
-The
-.Tn BSD
-calls supported are:
-.Bl -tag -width indent
-.It Dv GRFIOCGINFO
-Get Graphics Info
-.Pp
-Get info about device, setting the entries in the
-.Ar grfinfo
-structure, as defined in
-.Aq Pa machine/grfioctl.h .
-For the standard 98720, the number of planes should be 4.
-The number of colors would therefore be 15, excluding black.
-If one 98722A frame buffer board is installed, there will still
-be 4 planes, with the 4 planes on the colormap board becoming overlay planes.
-With each additional 98722 frame buffer board 4 planes will be added up to
-a maximum of 32 planes total.
-.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 structure is accessible.
-The structure describing the 98720 is defined in
-.Aq Pa machine/grf_rbreg.h .
-.El
-.Sh FILES
-.Bl -tag -width /dev/XXXX -compact
-.It Pa /dev/grf?
-.Ox
-special file
-.El
-.Sh EXAMPLES
-This is a short segment of code showing how the device is opened and mapped
-into user process address space assuming that it is grf0:
-.Bd -literal
-struct rboxfb *rbox;
-u_char *Addr, frame_buffer;
-struct grfinfo gi;
-int disp_fd;
-
-disp_fd = open("/dev/grf0", 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;
-}
-rbox = (rboxfb *)Addr;                         /* Control Registers   */
-frame_buffer = (u_char *)Addr + gi.gd_regsize; /* Frame buffer memory */
-.Ed
-.Sh DIAGNOSTICS
-None under
-.Ox .
-The
-.Tn HP-UX
-.Tn CE.utilities/Crtadjust
-programs must be used.
 .Sh SEE ALSO
 .Xr ioctl 2 ,
-.Xr dv 4 ,
-.Xr gb 4 ,
+.Xr dvbox 4 ,
+.Xr gbox 4 ,
 .Xr grf 4 ,
-.\" .Xr hyper 4 ,
+.Xr hyper 4 ,
 .Xr intro 4 ,
-.Xr tc 4
+.Xr topcat 4
 .Sh BUGS
-Not tested for all configurations of scan board and frame buffer memory boards.
+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/sd.4 b/share/man/man4/man4.hp300/sd.4
index 5ff0f2a51e9..3d7b937cd33 100644
--- a/share/man/man4/man4.hp300/sd.4
+++ b/share/man/man4/man4.hp300/sd.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sd.4,v 1.3 2003/03/09 22:20:35 miod Exp $
+.\"	$OpenBSD: sd.4,v 1.4 2003/03/16 20:12:51 miod Exp $
 .\"
 .\" Copyright (c) 1996
 .\"     Julian Elischer <julian@freebsd.org>.  All rights reserved.
@@ -150,7 +150,7 @@ partition
 .Xr \&ct 4 ,
 .Xr hd 4 ,
 .Xr intro 4 ,
-.\" .Xr oscsi 4 ,
+.Xr oscsi 4 ,
 .Xr st 4 ,
 .Xr disklabel 5 ,
 .Xr disklabel 8
diff --git a/share/man/man4/man4.hp300/st.4 b/share/man/man4/man4.hp300/st.4
index 26393108c30..d6cd571a5cb 100644
--- a/share/man/man4/man4.hp300/st.4
+++ b/share/man/man4/man4.hp300/st.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: st.4,v 1.11 2003/03/09 22:20:35 miod Exp $
+.\"	$OpenBSD: st.4,v 1.12 2003/03/16 20:12:51 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -157,6 +157,7 @@ nrst56	X	X	X	X
 .Xr hd 4 ,
 .Xr intro 4 ,
 .Xr mtio 4 ,
+.Xr oscsi 4 ,
 .Xr sd 4
 .Rs
 .%T EXB-8200 8MM Cartridge Tape Subsystem Interface User Manual
diff --git a/share/man/man4/man4.hp300/tc.4 b/share/man/man4/man4.hp300/tc.4
deleted file mode 100644
index 0a74076a082..00000000000
--- a/share/man/man4/man4.hp300/tc.4
+++ /dev/null
@@ -1,162 +0,0 @@
-.\"	$OpenBSD: tc.4,v 1.9 2003/03/16 12:42:22 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. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. 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: @(#)tc.4	8.1 (Berkeley) 6/9/93
-.\"
-.Dd June 9, 1993
-.Dt TC 4 hp300
-.Os
-.Sh NAME
-.Nm tc
-.Nd
-.Tn HP98544
-98550 ``Topcat'' and ``Catseye'' frame buffer
-.Sh DESCRIPTION
-This driver is for the
-.Tn HP98544 ,
-98545 and 98547 ``Topcat''
-and
-.Tn HP98548 ,
-98549, and 98550 ``Catseye'' display cards.
-This driver merely checks for the existence of the device
-and does minimal set up, as it is expected the applications will initialize
-the device to their requirements.
-The Topcat and Catseye are nearly identical in common usage and only the
-Topcat will be referred to from now on.
-.Pp
-The Topcat display cards are not user configurable.
-If one is present on a
-system, it will always have a frame buffer address of 0x200000 and a control
-register address of 0x560000.
-These are the
-.Tn HP
-series 300
-.Tn ITE
-(Internal
-Terminal Emulator) defaults.
-The device can also be used as a graphics output device.
-.Pp
-The
-.Xr ioctl 2
-calls supported by the
-.Ox
-system for the Topcat are:
-.Bl -tag -width GRFIOCGINFO
-.It Dv GRFIOCGINFO
-Get Graphics Info
-.Pp
-Get info about device, setting the entries in the
-.Ar grfinfo
-structure, as defined in
-.Aq Pa machine/grfioctl.h .
-For the 98544 or 98549,
-the number of planes should be 1, as they are monochrome devices.
-The number of planes for a 98545 is 4, translating to 15 colors,
-excluding black.
-The 98547 and 98548 cards have 6 planes, yielding 63 colors and black.
-The 98550 has 8 planes, yielding 255 colors and black.
-The displayed frame buffer size for the 98549 and 98550 is 1280 x 1024,
-for the others it is 1024 x 768.
-.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 structure is accessible.
-The frame buffer structure describing Topcat/Catseye devices is defined in
-.Aq Pa machine/grf_tcreg.h .
-.El
-.Pp
-For further information about the use of
-.Xr ioctl 2
-see the man page.
-.Sh FILES
-.Bl -tag -width /dev/XXXX -compact
-.It Pa /dev/grf?
-.Ox
-special file
-.El
-.Sh EXAMPLES
-A small example of opening, mapping and using the device is given below.
-.Bd -literal
-struct tcboxfb *tc;
-u_char *Addr, frame_buffer;
-struct grfinfo gi;
-int disp_fd;
-
-disp_fd = open("/dev/grf0", 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;
-}
-tc = (tcboxfb *)Addr;                          /* Control Registers   */
-frame_buffer = (u_char *)Addr + gi.gd_regsize; /* Frame buffer memory */
-.Ed
-.Sh DIAGNOSTICS
-None under
-.Ox .
-The
-.Tn HP-UX
-.Tn CE.utilities/Crtadjust
-programs must be used.
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr dv 4 ,
-.Xr gb 4 ,
-.Xr grf 4 ,
-.\" .Xr hyper 4 ,
-.Xr intro 4 ,
-.Xr rb 4
diff --git a/share/man/man4/man4.hp300/topcat.4 b/share/man/man4/man4.hp300/topcat.4
new file mode 100644
index 00000000000..fd2f5d6dc55
--- /dev/null
+++ b/share/man/man4/man4.hp300/topcat.4
@@ -0,0 +1,114 @@
+.\"	$OpenBSD: topcat.4,v 1.1 2003/03/16 20:12:51 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. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. 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: @(#)tc.4	8.1 (Berkeley) 6/9/93
+.\"
+.Dd March 16, 2003
+.Dt TOPCAT 4 hp300
+.Os
+.Sh NAME
+.Nm topcat
+.Nd
+.Tn HP98544
+.Dq Topcat
+and
+.Tn HP98550
+.Dq Catseye
+frame buffers
+.Sh DESCRIPTION
+The
+.Tn HP98544 ,
+.Tn HP98545
+and
+.Tn HP98547
+.Dq Topcat ,
+as well as the
+.Tn HP98548 ,
+.Tn HP98549
+and
+.Tn HP98550
+.Dq Catseye
+are accelerated frame buffers, with the following resolution and color depth:
+.Bl -tag -width 985XX -offset indent
+.It 98544
+1024x768 monochrome
+.Dq Topcat
+.It 98545
+1024x768 4-bit color
+.Dq Topcat
+.It 98547
+1024x768 6-bit color
+.Dq Topcat
+.It 98548
+1024x768 6-bit color
+.Dq Catseye
+.It 98549
+1280x1204 monochrome
+.Dq Catseye
+.It 98550
+1280x1204 8-bit color
+.Dq Catseye
+.El
+.Pp
+The
+.Nm
+driver provides a frame buffer abstraction to the
+.Xr grf 4
+driver, and the associated
+.Xr ite 4
+console framework.
+.Pp
+The Topcat and Catseye display cards are not user configurable.
+If one is present on a
+system, it will always have a frame buffer address of 0x200000 and a control
+register address of 0x560000.
+These are the
+.Tn HP
+series 300
+.Tn ITE
+(Internal
+Terminal Emulator) defaults.
+The device can also be used as a graphics output device.
+.Pp
+.Sh SEE ALSO
+.Xr ioctl 2 ,
+.Xr dvbox 4 ,
+.Xr gbox 4 ,
+.Xr grf 4 ,
+.Xr hyper 4 ,
+.Xr intro 4 ,
+.Xr rbox 4