Do not install manpages for hardware we do not support (yet).

Rename mace to macebus per consistency.

4 files changed, 81 insertions, 77 deletions

diff --git a/share/man/man4/man4.sgi/Makefile b/share/man/man4/man4.sgi/Makefile
index cb95289baaf..5ae7253101c 100644
--- a/share/man/man4/man4.sgi/Makefile
+++ b/share/man/man4/man4.sgi/Makefile
@@ -1,7 +1,9 @@
-#	$OpenBSD: Makefile,v 1.2 2004/08/10 08:17:09 mickey Exp $
+#	$OpenBSD: Makefile,v 1.3 2004/08/27 13:30:57 miod Exp $
 
-MAN=	crime.4 dpclock.4 dsclock.4 gio.4 haltwo.4 hpc.4 imc.4 intro.4 \
-	mace.4 mec.4 newport.4 pic.4 wdsc.4
+# Not applicable: crime.4 dpclock.4 dsclock.4 gio.4 haltwo.4 hpc.4
+#		  imc.4 newport.4 pic.4 wdsc.4
+MAN=	intro.4 macebus.4 mec.4
+MLINKS=	macebus.4 macepcibr.4
 MANSUBDIR=sgi
 
 .include <bsd.prog.mk>
diff --git a/share/man/man4/man4.sgi/intro.4 b/share/man/man4/man4.sgi/intro.4
index 46678f0942a..4498aa850c5 100644
--- a/share/man/man4/man4.sgi/intro.4
+++ b/share/man/man4/man4.sgi/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.2 2004/08/15 22:52:41 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.3 2004/08/27 13:30:57 miod Exp $
 .\"     $NetBSD: intro.4,v 1.8 2004/02/10 16:54:19 wiz Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -39,8 +39,9 @@
 .Nm intro
 .Nd introduction to special files and hardware support
 .Sh DESCRIPTION
-This section describes the special files, related driver functions,
-and networking support available in the system.
+The manual pages in section 4 describe the special files,
+related driver functions, and networking support
+available in the system.
 In this part of the manual, the
 .Tn SYNOPSIS
 section of each configurable device gives a sample specification
@@ -61,8 +62,7 @@ the system and network related information.
 The networking support is introduced in
 .Xr netintro 4 .
 .Sh DEVICE SUPPORT
-This section describes the hardware supported by
-.Ox Os /sgi .
+This section describes the hardware supported on the sgi platform.
 Software support for these devices comes in two forms.
 A hardware device may be supported with a character or block
 .Em device driver ,
@@ -91,22 +91,22 @@ A list of the supported devices is given below.
 .Sh HARDWARE
 The following systems are supported:
 .Pp
-.Bl -tag -width XXXXXXXXXX -offset indent -compact
+.Bl -tag -width 8n -offset indent -compact
 .It O2
 IP32
 .Pq Dq Moosehead
-.It Indy
-IP24
-.Pq Dq Guinness
-.It Indigo 2
-IP22
-.Pq Dq Fullhouse
-.It Indigo R4k
-IP20
-.Pq Dq Blackjack
-.It Indigo R3k
-IP12
-.Pq Dq Hollywood
+.\" .It Indy
+.\" IP24
+.\" .Pq Dq Guinness
+.\" .It Indigo 2
+.\" IP22
+.\" .Pq Dq Fullhouse
+.\" .It Indigo R4k
+.\" IP20
+.\" .Pq Dq Blackjack
+.\" .It Indigo R3k
+.\" IP12
+.\" .Pq Dq Hollywood
 .El
 .Sh LIST OF DEVICES
 The devices listed below are supported in this incarnation of the
@@ -114,56 +114,47 @@ system.
 Devices are indicated by their functional interface.
 Not all supported devices are listed.
 .Pp
-.Bl -tag -width macepci -offset indent -compact
-.It crime
-found on the O2
-.It dsclock
-real-time clock
-.It dpclock
-real-time clock
-.It gio
-PCI-like bus
-.It hpc
-High performance Peripheral Controller
-.It imc
-Indigo R4k/Indy/Indigo2 bus arbitrator
-.It mace
-found on the O2
-.\" .It macepci
+.Bl -tag -width 8n -offset indent -compact
+.\" .It crime
+.\" found on the O2
+.\" .It dsclock
+.\" real-time clock
+.\" .It dpclock
+.\" real-time clock
+.\" .It gio
+.\" PCI-like bus
+.\" .It hpc
+.\" High performance Peripheral Controller
+.\" .It imc
+.\" Indigo R4k/Indy/Indigo2 bus arbitrator
+.It macebus
+O2 main bus controller
 .It mec
-O2 MAC110 Ethernet
-.It newport
-entry framebuffer on Indy and Indigo2
-.It pic
-Personal Iris 4D/3x and Indigo R3k bus arbitrator
-.It sbic
-WD33C93 SCSI interface
-.It sq
-SEEQ 8003/80C03 Ethernet
-.It wdsc
-WD33C93 SCSI interface
+O2 on-board MAC110 Ethernet
+.\" .It newport
+.\" entry framebuffer on Indy and Indigo2
+.\" .It pic
+.\" Personal Iris 4D/3x and Indigo R3k bus arbitrator
+.\" .It sbic
+.\" WD33C93 SCSI interface
+.\" .It sq
+.\" SEEQ 8003/80C03 Ethernet
+.\" .It wdsc
+.\" WD33C93 SCSI interface
 .El
 .Pp
 PCI devices are supported through the
 .Xr pci 4
 bus and associated device drivers.
 .Pp
-.\" .Sh UNSUPPORTED DEVICES
-.\" The following devices are not supported, due to unavailability of
-.\" either documentation or sample hardware:
-.\" .Pp
-.\" .Bl -tag -width XXXXX -offset indent -compact
-.\" .It not yet
-.\" .El
-.\" .Pp
 .Sh SEE ALSO
 .Xr autoconf 4 ,
-.Xr crime 4 ,
-.Xr gio 4 ,
-.Xr hpc 4 ,
-.Xr imc 4 ,
-.Xr mace 4 ,
-.Xr pic 4 ,
+.\" .Xr crime 4 ,
+.\" .Xr gio 4 ,
+.\" .Xr hpc 4 ,
+.\" .Xr imc 4 ,
+.Xr macebus 4 ,
+.\" .Xr pic 4 ,
 .Xr config 8
 .Sh HISTORY
 This
diff --git a/share/man/man4/man4.sgi/mace.4 b/share/man/man4/man4.sgi/macebus.4
index 6e52769c06a..507659e3e1f 100644
--- a/share/man/man4/man4.sgi/mace.4
+++ b/share/man/man4/man4.sgi/macebus.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mace.4,v 1.2 2004/08/17 23:49:21 jaredy Exp $
+.\"	$OpenBSD: macebus.4,v 1.1 2004/08/27 13:30:57 miod Exp $
 .\"	$NetBSD: mace.4,v 1.4 2004/02/10 16:54:02 wiz Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -33,27 +33,38 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd December 23, 2002
-.Dt MACE 4 sgi
+.Dt MACEBUS 4 sgi
 .Os
 .Sh NAME
-.Nm mace
+.Nm macebus
 .Nd Multimedia, Audio and Communications Engine I/O ASIC
 .Sh SYNOPSIS
-.Cd "mace0 at mainbus0 addr 0x1f000000"
+.Cd "macebus0 at mainbus0"
+.Pp
+.Cd "clock0 at macebus0"
+.Cd "com0 at macebus0 sys 0x18 base 0x00390000 irq 5"
+.Cd "com1 at macebus0 sys 0x18 base 0x00398000 irq 5"
+.Cd "mec0 at macebus0 sys 0x18 base 0x00280000 irq 4"
+.Pp
+.Cd "macepcibr0 at macebus0"
+.Cd "pci* at macepcbir?"
 .Sh DESCRIPTION
 The
 .Nm
-I/O ASIC takes care of all the basic I/O functions.
-Examples of interfaces provided by it are the keyboard and mouse,
-Fast Ethernet, video, audio, the PCI bus, and parallel and serial
-connectors.
-It is connected to the host bus through the
-.Xr crime 4
-controller.
+driver provides access to the MACE I/O ASIC, which manages all
+the on-board devices on the O2.
+.\" It is connected to the host bus through the
+.\" .Xr crime 4
+.\" controller.
+The
 .Nm
-is typically found on O2 machines.
+also provides a
+.Tn PCI
+bridge.
 .Sh SEE ALSO
-.Xr crime 4 ,
+.Xr com 4 ,
+.Xr intro 4 ,
+.Xr mec 4 ,
 .Xr pci 4
 .Sh HISTORY
 The
diff --git a/share/man/man4/man4.sgi/mec.4 b/share/man/man4/man4.sgi/mec.4
index f52b4fd10f8..299140d0927 100644
--- a/share/man/man4/man4.sgi/mec.4
+++ b/share/man/man4/man4.sgi/mec.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mec.4,v 1.2 2004/08/15 22:54:56 jmc Exp $
+.\"	$OpenBSD: mec.4,v 1.3 2004/08/27 13:30:57 miod Exp $
 .\"
 .\"	Written by Michael Shalayeff, 2004. Public Domain.
 .\"
@@ -20,7 +20,7 @@ machines.
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr intro 4 ,
-.Xr mace 4 ,
+.Xr macebus 4 ,
 .Xr netintro 4 ,
 .Xr ifconfig 8
 .Sh HISTORY