Import of the new lms(4) and mms(4) manpages for wsmouse compatible lms and mms

drivers. Old lms(4) and mms(4) become olms(4) and omms(4). aaron@ ok.

6 files changed, 148 insertions, 151 deletions

diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index e50f0d0a352..1ea2629a888 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,9 +1,10 @@
-#	$OpenBSD: Makefile,v 1.34 2000/08/17 20:20:46 mickey Exp $
+#	$OpenBSD: Makefile,v 1.35 2001/02/20 21:55:43 jbm Exp $
 #	from: @(#)Makefile	5.1 (Berkeley) 2/12/91
 #	Id: Makefile,v 1.4 1995/12/14 05:41:38 deraadt Exp $
 
 MAN=	apm.4 autoconf.4 bktr.4 gus.4 ie.4 intro.4 iy.4 joy.4 le.4 lms.4 \
-	lpt.4 mcd.4 mem.4 mms.4 mtrr.4 npx.4 pcibios.4 pctr.4 pms.4 pss.4 sb.4 \
+	lpt.4 mcd.4 mem.4 mms.4 mtrr.4 npx.4 olms.4 omms.4 opms.4 pcibios.4 \
+	pctr.4 pss.4 sb.4 \
 	scd.4 sea.4 speaker.4 uha.4 wdt.4 wss.4 wt.4 xf86.4
 
 MLINKS+= speaker.4 spkr.4
diff --git a/share/man/man4/man4.i386/lms.4 b/share/man/man4/man4.i386/lms.4
index 31fa71f5819..4f0809cf02c 100644
--- a/share/man/man4/man4.i386/lms.4
+++ b/share/man/man4/man4.i386/lms.4
@@ -1,8 +1,9 @@
-.\"	$OpenBSD: lms.4,v 1.4 2000/07/05 13:46:53 aaron Exp $
+.\"	$OpenBSD: lms.4,v 1.5 2001/02/20 21:55:43 jbm Exp $
+.\" $NetBSD: lms.4,v 1.13 2000/07/05 16:13:48 msaitoh Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
-.\"
+.\" 
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -13,10 +14,12 @@
 .\"    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 Christopher G. Demetriou.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
+.\"          This product includes software developed for the
+.\"          NetBSD Project.  See http://www.netbsd.org/ for
+.\"          information about NetBSD.
+.\" 4. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\" 
 .\" 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.
@@ -27,25 +30,26 @@
 .\" 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.
+.\" 
+.\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
 .\"
-.Dd August 6, 1993
+.Dd March 12, 1997
 .Dt LMS 4 i386
 .Os
 .Sh NAME
 .Nm lms
-.Nd
-Logitech-style bus mouse driver
+.Nd Logitech-style bus mouse driver
 .Sh SYNOPSIS
-.\" XXX this is awful hackery to get it to work right... -- cgd
-.Cd "lms0 at isa? port" \&"IO_BMS1\&" irq 5
-.Cd "lms0 at isa? port" \&"IO_BMS2\&" irq 5
+.Cd lms0 at isa? port 0x23c irq 5
+.Cd lms1 at isa? port 0x238 irq 5
+.Cd wsmouse* at lms?
 .Sh DESCRIPTION
 This driver provides an interface to a Logitech-style bus mouse.
-.Sh FILES
-.Bl -tag -width /dev/lms0 -compact
-.It Pa /dev/lms0
-first Logitech-style bus mouse
-.El
+Mouse related data are accessed by
+.Xr wsmouse 4
+devices.
 .Sh SEE ALSO
+.Xr wsmouse 4 ,
 .Xr mms 4 ,
-.Xr pms 4
+.Xr pms 4 ,
+.Xr ums 4
diff --git a/share/man/man4/man4.i386/mms.4 b/share/man/man4/man4.i386/mms.4
index 4e916c70fe5..dcec6521583 100644
--- a/share/man/man4/man4.i386/mms.4
+++ b/share/man/man4/man4.i386/mms.4
@@ -1,8 +1,9 @@
-.\"	$OpenBSD: mms.4,v 1.3 1998/07/12 09:55:28 downsj Exp $
+.\"	$OpenBSD: mms.4,v 1.4 2001/02/20 21:55:43 jbm Exp $
+.\" $NetBSD: mms.4,v 1.13 2000/07/05 16:13:49 msaitoh Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
-.\"
+.\" 
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -13,10 +14,12 @@
 .\"    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 Christopher G. Demetriou.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
+.\"          This product includes software developed for the
+.\"          NetBSD Project.  See http://www.netbsd.org/ for
+.\"          information about NetBSD.
+.\" 4. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\" 
 .\" 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.
@@ -27,24 +30,26 @@
 .\" 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.
+.\" 
+.\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
 .\"
-.Dd August 6, 1993
+.Dd March 12, 1997
 .Dt MMS 4 i386
 .Os
 .Sh NAME
 .Nm mms
-.Nd
-Microsoft-style bus mouse driver
+.Nd Microsoft-style bus mouse driver
 .Sh SYNOPSIS
-.\" XXX this is awful hackery to get it to work right... -- cgd
-.Cd "mms0 at isa? port" \&"IO_BMS1\&" irq 5
+.Cd mms0 at isa? port 0x23c irq 5
+.Cd mms1 at isa? port 0x238 irq 5
+.Cd wsmouse* at mms?
 .Sh DESCRIPTION
 This driver provides an interface to a Microsoft-style bus mouse.
-.Sh FILES
-.Bl -tag -width Pa -compact
-.It Pa /dev/mms0
-first Microsoft-style bus mouse
-.El
+Mouse related data are accessed by
+.Xr wsmouse 4
+devices.
 .Sh SEE ALSO
+.Xr wsmouse 4 ,
 .Xr lms 4 ,
-.Xr pms 4
+.Xr pms 4 ,
+.Xr ums 4
diff --git a/share/man/man4/man4.i386/olms.4 b/share/man/man4/man4.i386/olms.4
new file mode 100644
index 00000000000..b1edac832c1
--- /dev/null
+++ b/share/man/man4/man4.i386/olms.4
@@ -0,0 +1,51 @@
+.\"	$OpenBSD: olms.4,v 1.1 2001/02/20 21:55:43 jbm Exp $
+.\"
+.\" Copyright (c) 1993 Christopher G. Demetriou
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"      This product includes software developed by Christopher G. Demetriou.
+.\" 3. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission
+.\"
+.\" 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 August 6, 1993
+.Dt OLMS 4 i386
+.Os
+.Sh NAME
+.Nm olms
+.Nd
+Logitech-style bus mouse driver
+.Sh SYNOPSIS
+.\" XXX this is awful hackery to get it to work right... -- cgd
+.Cd "olms0 at isa? port" \&"IO_BMS1\&" irq 5
+.Cd "olms0 at isa? port" \&"IO_BMS2\&" irq 5
+.Sh DESCRIPTION
+This driver provides an interface to a Logitech-style bus mouse.
+.Sh FILES
+.Bl -tag -width /dev/lms0 -compact
+.It Pa /dev/lms0
+first Logitech-style bus mouse
+.El
+.Sh SEE ALSO
+.Xr omms 4 ,
+.Xr opms 4
diff --git a/share/man/man4/man4.i386/omms.4 b/share/man/man4/man4.i386/omms.4
new file mode 100644
index 00000000000..aec0c1a87bc
--- /dev/null
+++ b/share/man/man4/man4.i386/omms.4
@@ -0,0 +1,50 @@
+.\"	$OpenBSD: omms.4,v 1.1 2001/02/20 21:55:43 jbm Exp $
+.\"
+.\" Copyright (c) 1993 Christopher G. Demetriou
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"      This product includes software developed by Christopher G. Demetriou.
+.\" 3. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission
+.\"
+.\" 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 August 6, 1993
+.Dt OMMS 4 i386
+.Os
+.Sh NAME
+.Nm omms
+.Nd
+Microsoft-style bus mouse driver
+.Sh SYNOPSIS
+.\" XXX this is awful hackery to get it to work right... -- cgd
+.Cd "omms0 at isa? port" \&"IO_BMS1\&" irq 5
+.Sh DESCRIPTION
+This driver provides an interface to a Microsoft-style bus mouse.
+.Sh FILES
+.Bl -tag -width Pa -compact
+.It Pa /dev/mms0
+first Microsoft-style bus mouse
+.El
+.Sh SEE ALSO
+.Xr olms 4 ,
+.Xr opms 4
diff --git a/share/man/man4/man4.i386/pms.4 b/share/man/man4/man4.i386/pms.4
deleted file mode 100644
index 756b830e95a..00000000000
--- a/share/man/man4/man4.i386/pms.4
+++ /dev/null
@@ -1,114 +0,0 @@
-.\"
-.\"	$OpenBSD: pms.4,v 1.8 2000/04/03 21:19:38 aaron Exp $
-.\"
-.\" Copyright (c) 1996, Jason Downs.
-.\" Copyright (c) 1993 Christopher G. Demetriou
-.\" 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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed by Christopher G. Demetriou.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" 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 October 10, 1999
-.Dt PMS 4 i386
-.Os
-.Sh NAME
-.Nm pms
-.Nd
-PS/2 auxiliary port mouse driver
-.Sh SYNOPSIS
-.\" XXX this is awful hackery to get it to work right... -- cgd
-.\".Cd "pms0 at isa? port" \&"IO_KBD\&" irq 12
-.Cd "pms0 at pckbd? irq 12"
-.Sh DESCRIPTION
-This driver provides an interface to a PS/2 auxiliary port mice.  The driver
-offers two modes of operation, both a raw and the old style translated
-input stream.  The translating portion of the driver provides BusMouse
-codes; in raw mode no translations are performed.
-The
-.Nm
-driver provides three
-.Em ioctls
-for getting mouse status and changing modes.  They are defined in the
-following include:
-.Bd -literal -offset indent
-#include <machine/mouse.h>
-.Ed
-
-The
-.Dv MOUSEIOCREAD
-.Em ioctl
-is used to read the current mouse stats, and takes the
-.Dv "struct mouseinfo"
-as an argument to store the data in.
-
-The
-.Dv MOUSEIOCSRAW
-.Em ioctl
-puts the device into raw mode, if it is not already, and the
-.Dv MOUSEIOCSCOOKED
-.Em ioctl
-puts it into translated (or cooked) mode.  If the mode of the
-.Nm
-device driver changes, all pending but not yet read input is flushed.
-.Pp
-In translated mode, the
-.Nm
-driver also supports
-.Dq Intellimouse
-devices, with the wheel acting as a third button.  The kernel must currently
-be compiled with
-.Pp
-.Cd option INTELLIMOUSE
-.Pp
-specified in the config file, and the X server can be configured to use
-the translated mode of the driver.  (The output of the translated mode is
-.Em Busmouse
-compatible.)  Otherwise, the mouse works as a normal, two button, PS/2
-device.
-.Pp
-.Sh NOTES
-The translated mode of this driver is being deprecated. The raw device
-.Pa /dev/psm0
-should be used in
-.Pa /etc/XF86Config
-with the
-.Em PS/2
-protocol, or one of its variants
-.Pf ( Em IMPS/2
-for MS Intellimouse,
-.Em ThinkingMousePS/2
-for Kensington Thinking Mouse).
-.Pp
-.Sh FILES
-.Bl -tag -width /dev/pms0 -compact
-.It Pa /dev/psm0
-PS/2 mouse device file, defaulting to raw mode
-.It Pa /dev/pms0
-PS/2 mouse device file, defaulting to translating mode
-.El
-.Sh SEE ALSO
-.Xr lms 4 ,
-.Xr mms 4 ,
-.Xr XF86Config 4