Attempt to make these match the current state of the code.

2 files changed, 24 insertions, 20 deletions

diff --git a/share/man/man4/pciide.4 b/share/man/man4/pciide.4
index bb5d548d7fd..bee928bcee4 100644
--- a/share/man/man4/pciide.4
+++ b/share/man/man4/pciide.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pciide.4,v 1.22 2002/09/10 13:27:40 gluk Exp $
+.\"	$OpenBSD: pciide.4,v 1.23 2002/09/26 07:52:47 miod Exp $
 .\"	$NetBSD: pciide.4,v 1.8 1999/03/16 01:19:17 garbled Exp $
 .\"
 .\" Copyright (c) 1998 Manuel Bouyer.
@@ -39,7 +39,8 @@
 .Nd PCI IDE controller driver
 .Sh SYNOPSIS
 .Cd "pciide* at pci ? dev ? function ? flags 0x0000"
-.Cd "options PCIIDE_CMD064x_DISABLE"
+.Cd "option PCIIDE_CMD064x_DISABLE"
+.Cd "option PCIIDE_CMD0646U_ENABLEUDMA"
 .Sh DESCRIPTION
 The
 .Nm
@@ -96,11 +97,12 @@ cause a machine hang.
 .Sh SEE ALSO
 .Xr atapiscsi 4 ,
 .Xr intro 4 ,
+.Xr pci 4 ,
 .Xr scsi 4 ,
 .Xr wd 4 ,
 .Xr wdc 4
 .Sh BUGS
-There's no way to know reliably if a PCI064x controller is enabled or not.
+There's no way to know reliably if a CMD064x controller is enabled or not.
 If the driver finds a PCI064x, it will assume it is enabled unless
 .Dv PCIIDE_CMD064x_DISABLE
 is specified in the kernel config file.
@@ -108,6 +110,11 @@ This will be a problem only if the controller has been disabled in the BIOS
 and another controller has been installed which uses the ISA legacy I/O ports
 and interrupts.
 .Pp
+The CMD0646U is reportedly unable to operate properly in UDMA mode. UDMA
+will not be enabled on this controller unless
+.Dv PCIIDE_CMD0646U_ENABLEUDMA
+is specified in the kernel config file.
+.Pp
 The OPTi controller code is disabled by default because the driver
 does not yet work around all bugs in current chipsets.
 .Pp
diff --git a/share/man/man4/pckbc.4 b/share/man/man4/pckbc.4
index bf84ce97994..21688bf8ede 100644
--- a/share/man/man4/pckbc.4
+++ b/share/man/man4/pckbc.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pckbc.4,v 1.5 2002/02/18 18:13:31 jason Exp $
+.\" $OpenBSD: pckbc.4,v 1.6 2002/09/26 07:52:47 miod Exp $
 .\" $NetBSD: pckbc.4,v 1.2 2000/06/16 06:42:31 augustss Exp $
 .\"
 .Dd April 21, 1999
@@ -9,12 +9,10 @@
 .Nd PC (ISA) keyboard controller driver
 .Sh SYNOPSIS
 .Cd "pckbc* at isa?"
-.Cd "pckbc* at pnpbios? index ?"
 .Cd "pckbc* at ebus?"
-.Cd "pckbd* at pckbc? slot ?"
-.Cd "pms*   at pckbc? slot ?"
-.Cd "pmsi*  at pckbc? slot ?"
-.Cd "opms*  at pckbc? slot ?"
+.Cd "pckbd* at pckbc?"
+.Cd "pms*   at pckbc?"
+.Cd "pmsi*  at pckbc?"
 .Sh DESCRIPTION
 The
 .Nm
@@ -25,17 +23,16 @@ It provides two logical connections for child devices, the
 slot for a keyboard and the
 .Dq auxiliary
 slot for mice (the latter might be missing in older keyboard controllers).
-.Pp
-The optional
-.Dq slot
-locator argument can be used to force unusual connections of devices to
-logical slots.
-This feature is for experimentation only, it will not be
-useful in normal operation.
+.\" .Pp
+.\" The optional
+.\" .Dq slot
+.\" locator argument can be used to force unusual connections of devices to
+.\" logical slots.
+.\" This feature is for experimentation only, it will not be
+.\" useful in normal operation.
 .Sh SEE ALSO
+.Xr ebus 4 ,
 .Xr isa 4 ,
 .Xr pckbd 4
-.\" .Xr pms 4 ,
-.\" .Xr pmsi 4 ,
-.\" .Xr pnpbios 4 ,
-.\" .Xr opms 4 .
+.Xr pms 4 ,
+.Xr pmsi 4 ,