Sync with recent developments.

7 files changed, 28 insertions, 27 deletions

diff --git a/distrib/notes/sgi/hardware b/distrib/notes/sgi/hardware
index 7fbbd589aee..bfab5d38e7f 100644
--- a/distrib/notes/sgi/hardware
+++ b/distrib/notes/sgi/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.8 2009/10/10 19:20:28 miod Exp $
+dnl	$OpenBSD: hardware,v 1.9 2009/10/26 18:38:09 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following machines:
 	IP27 class machines:
 		Origin 200, Onyx 2
@@ -69,7 +69,7 @@ Supported devices {:-include-:}:
                 PS/2 keyboards (pckbd)
 	USB keyboard and mice (already listed above)
 - Miscellaneous Devices
-	``soft'' power button as available on SGI O2 (power)
+	``soft'' power button as available on SGI O2 and Octane (power)
 
 If your hardware is not listed above, there is currently no support for it
 in this release.
diff --git a/share/man/man4/man4.sgi/macebus.4 b/share/man/man4/man4.sgi/macebus.4
index 5c21b37f94a..222b352527d 100644
--- a/share/man/man4/man4.sgi/macebus.4
+++ b/share/man/man4/man4.sgi/macebus.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: macebus.4,v 1.9 2008/06/26 05:42:07 ray Exp $
+.\"	$OpenBSD: macebus.4,v 1.10 2009/10/26 18:38:09 miod Exp $
 .\"	$NetBSD: mace.4,v 1.4 2004/02/10 16:54:02 wiz Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -25,7 +25,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: October 26 2009 $
 .Dt MACEBUS 4 sgi
 .Os
 .Sh NAME
@@ -35,12 +35,12 @@
 .Cd "macebus0 at mainbus0"
 .Pp
 .Cd "clock0 at macebus0"
-.Cd "com0 at macebus0 base 0x00390000 irq 5"
-.Cd "com1 at macebus0 base 0x00398000 irq 5"
-.Cd "mavb0 at macebus0 base 0x00300000 irq 7"
-.Cd "mec0 at macebus0 base 0x00280000 irq 4"
-.Cd "mkbc0 at macebus0 base 0x00320000 irq 6"
-.Cd "power0 at macebus0 irq 6"
+.Cd "com0 at macebus0 base 0x00390000"
+.Cd "com1 at macebus0 base 0x00398000"
+.Cd "mavb0 at macebus0"
+.Cd "mec0 at macebus0"
+.Cd "mkbc0 at macebus0"
+.Cd "power0 at macebus0"
 .Pp
 .Cd "macepcibr0 at macebus0"
 .Cd "pci* at macepcbir?"
diff --git a/share/man/man4/man4.sgi/mavb.4 b/share/man/man4/man4.sgi/mavb.4
index 2ef5b93329b..a5b34bb7408 100644
--- a/share/man/man4/man4.sgi/mavb.4
+++ b/share/man/man4/man4.sgi/mavb.4
@@ -1,4 +1,4 @@
-.\"   $OpenBSD: mavb.4,v 1.5 2008/03/27 13:47:08 jsing Exp $
+.\"   $OpenBSD: mavb.4,v 1.6 2009/10/26 18:38:09 miod Exp $
 .\"
 .\" Copyright (c) 2005 Mark Kettenis
 .\"
@@ -14,14 +14,14 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 27 2008 $
+.Dd $Mdocdate: October 26 2009 $
 .Dt MAVB 4 sgi
 .Os
 .Sh NAME
 .Nm mavb
 .Nd Moosehead A/V Board audio device
 .Sh SYNOPSIS
-.Cd "mavb0 at macebus0 base 0x00300000 irq 7"
+.Cd "mavb0 at macebus0"
 .Cd "audio* at mavb?"
 .Sh DESCRIPTION
 The
diff --git a/share/man/man4/man4.sgi/mec.4 b/share/man/man4/man4.sgi/mec.4
index 4a34d552864..147e7111bee 100644
--- a/share/man/man4/man4.sgi/mec.4
+++ b/share/man/man4/man4.sgi/mec.4
@@ -1,15 +1,15 @@
-.\"	$OpenBSD: mec.4,v 1.7 2008/03/27 13:47:08 jsing Exp $
+.\"	$OpenBSD: mec.4,v 1.8 2009/10/26 18:38:09 miod Exp $
 .\"
 .\"	Written by Michael Shalayeff, 2004. Public Domain.
 .\"
-.Dd $Mdocdate: March 27 2008 $
+.Dd $Mdocdate: October 26 2009 $
 .Dt MEC 4 sgi
 .Os
 .Sh NAME
 .Nm mec
 .Nd MAC-110 10/100 Ethernet device
 .Sh SYNOPSIS
-.Cd "mec0 at macebus0 base 0x00280000 irq 4"
+.Cd "mec0 at macebus0"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.sgi/mkbc.4 b/share/man/man4/man4.sgi/mkbc.4
index b501944e55a..9390ce8e048 100644
--- a/share/man/man4/man4.sgi/mkbc.4
+++ b/share/man/man4/man4.sgi/mkbc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mkbc.4,v 1.3 2008/03/27 13:47:08 jsing Exp $
+.\"	$OpenBSD: mkbc.4,v 1.4 2009/10/26 18:38:09 miod Exp $
 .\"
 .\" Copyright (c) 2007 Joel Sing
 .\"
@@ -14,14 +14,14 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 27 2008 $
+.Dd $Mdocdate: October 26 2009 $
 .Dt MKBC 4 sgi
 .Os
 .Sh NAME
 .Nm mkbc
 .Nd Moosehead PS/2 Controller
 .Sh SYNOPSIS
-.Cd "mkbc0 at macebus0 base 0x00320000 irq 6"
+.Cd "mkbc0 at macebus0"
 .Cd "pckbd* at mkbc?"
 .Cd "pms* at mkbc?"
 .Sh DESCRIPTION
diff --git a/share/man/man4/man4.sgi/power.4 b/share/man/man4/man4.sgi/power.4
index 5c301a4852b..d56f6b78abc 100644
--- a/share/man/man4/man4.sgi/power.4
+++ b/share/man/man4/man4.sgi/power.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: power.4,v 1.2 2008/03/24 14:34:27 jsing Exp $
+.\"     $OpenBSD: power.4,v 1.3 2009/10/26 18:38:09 miod Exp $
 .\"
 .\" Copyright (c) 2007 Jasper Lievisse Adriaanse <jasper@openbsd.org>
 .\" All rights reserved.
@@ -15,17 +15,18 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 24 2008 $
+.Dd $Mdocdate: October 26 2009 $
 .Dt POWER 4 sgi
 .Os
 .Sh NAME
 .Nm power
 .Nd power button
 .Sh SYNOPSIS
-.Cd "power0 at macebus0 irq 6"
+.Cd "power0 at macebus0" Pq "O2"
+.Cd "power0 at mainbus0" Pq "Octane"
 .Sh DESCRIPTION
-The SGI O2 machines generate an interrupt when the power button on the front
-panel is pressed.
+The SGI O2 and Octane machines generate an interrupt when the power button
+on the front panel is pressed.
 The
 .Nm
 driver catches that interrupt.
diff --git a/share/man/man4/man4.sgi/xbridge.4 b/share/man/man4/man4.sgi/xbridge.4
index 6eda80acafd..e05cf214a87 100644
--- a/share/man/man4/man4.sgi/xbridge.4
+++ b/share/man/man4/man4.sgi/xbridge.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xbridge.4,v 1.4 2009/10/22 19:55:43 miod Exp $
+.\"	$OpenBSD: xbridge.4,v 1.5 2009/10/26 18:38:09 miod Exp $
 .\"
 .\" Copyright (c) 2009 Miodrag Vallat.
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 22 2009 $
+.Dd $Mdocdate: October 26 2009 $
 .Dt XBRIDGE 4 sgi
 .Os
 .Sh NAME
@@ -22,7 +22,7 @@
 .Nd XIO-PCI bridge
 .Sh SYNOPSIS
 .Cd "xbridge* at xbow?"
-.Cd "xppci* at xbridge?"
+.Cd "xbpci* at xbridge?"
 .Cd "pci* at xbpci?"
 .Sh DESCRIPTION
 The