sync with netbsd 960418

3 files changed, 152 insertions, 10 deletions

diff --git a/share/man/man4/man4.i386/joy.4 b/share/man/man4/man4.i386/joy.4
index 5b0b4cd53d1..c1caa8a9abb 100644
--- a/share/man/man4/man4.i386/joy.4
+++ b/share/man/man4/man4.i386/joy.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: joy.4,v 1.2 1996/04/22 01:28:06 deraadt Exp $
 .\"
 .\" Copyright (c) 1996 Matthieu Herrb
 .\" All rights reserved.
@@ -27,7 +28,139 @@
 .\" (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: joy.4,v 1.1 1996/01/16 08:24:49 deraadt Exp $
+.\"     $NetBSD: joy.4,v 1.2 1996/03/31 00:17:43 perry Exp $
+.\"
+.Dd January 7, 1996
+.Dt JOY 4 i386
+.Os "NetBSD 1.1A"
+.Sh NAME
+.Nm joy
+.Nd
+Games adapter driver
+.Sh SYNOPSIS
+.Cd "joy0 at isa? port 0x201"
+.Sh DESCRIPTION
+This driver provides access to the games adapter. The lower bit in the
+minor device number selects the joystick: 0 is the first joystick and
+1 is the second.
+.Pp
+The game control adapter allows up to two joysticks to be attached to
+the system. The adapter plus the driver convert the present resistive
+value to a relative joystick position. On receipt of an output signal,
+four timing circuits are started. By determining the time required for
+the circuit to time-out (a function of the resistance), the paddle
+position can be determined. The adapter could be used as a general
+purpose I/O card with four analog (resistive) inputs plus four digital
+input points.
+.Pp
+Applications may call ioctl() on a game adapter driver file descriptor
+to set and get the offsets of the two potentiometers and the maximum
+time-out value for the circuit. The
+ioctl() commands are listed in
+.Pa Aq machine/joystick.h
+and currently are:
+.Pp
+.Bl -tag -width JOY_GET_X_OFFSET -compact
+.It JOY_SETTIMEOUT
+Sets the maximum time-out for the adapter.
+.It JOY_GETTIMEOUT
+Returns the current maximum time-out.
+.It JOY_SET_X_OFFSET
+Sets an offset on X value.
+.It JOY_GET_X_OFFSET
+Returns the current X offset.
+.It JOY_SET_Y_OFFSET
+Sets an offset on Y value.
+.It JOY_GET_Y_OFFSET
+Returns the current Y offset.
+.El
+.Pp
+All this commands take an integer parameter.
+.Pp
+Read() on the file descriptor returns a 
+.Fa joystick 
+structure:
+.Bd -literal -offset indent
+struct joystick {
+	int x;
+	int y;
+	int b1;
+	int b2;
+};
+.Ed
+.Pp
+The fields have the following functions:
+.Bl -tag -width b1
+.It Fa x
+The current X coordinate of the joystick (or position of paddle 1)
+.It Fa y
+The current Y coordinate of the joystick (or position of paddle 2)
+.It Fa b1
+The current state of button 1
+.It Fa b2
+The current state of button 2
+.El
+.Pp
+The b1 and b2 fields in struct joystick are set to 1 if the
+corresponding button is down, 0 otherwise.
+.Pp
+The x and y coordinates are supposed to be between 0 and 255 for a
+good joystick and a good adapter. Unfortunately, because of the
+hardware hack that is used to measure the position (by measuring the
+time needed to discharge an RC circuit made from the joystick's
+potentiometer and a capacitor on the adapter), calibration
+is needed to determine exactly what values are returned for a specific
+joystick/adapter combination. Incorrect hardware can yield negative or
+> 255 values.
+.Pp
+A typical calibration procedure uses the values returned at lower
+left, center and upper right positions of the joystick to compute the
+relative position.
+.Pp
+This calibration is not part of the driver.
+.Sh FILES
+.Bl -tag -width Pa -compact
+.It Pa /dev/joy0
+first joystick
+.br
+.It Pa /dev/joy1
+second joystick
+.El
+.Sh AUTHORS
+.Pp
+Jean-Marc Zucconi wrote the FreeBSD driver. Matthieu Herrb ported it
+to NetBSD and wrote this manual page.
+
+.\"
+.\" Copyright (c) 1996 Matthieu Herrb
+.\" 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.
+.\"
+.\"     $Id: joy.4,v 1.2 1996/04/22 01:28:06 deraadt Exp $
 .\"
 .Dd January 7, 1996
 .Dt JOY 4 i386
diff --git a/share/man/man4/man4.i386/sb.4 b/share/man/man4/man4.i386/sb.4
index 3892ee33b19..bb24d2da1c1 100644
--- a/share/man/man4/man4.i386/sb.4
+++ b/share/man/man4/man4.i386/sb.4
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: sb.4,v 1.3 1996/03/29 10:16:12 niklas Exp $
-.\"	$NetBSD: sb.4,v 1.3 1996/02/27 22:39:42 jtc Exp $
+.\"	$OpenBSD: sb.4,v 1.4 1996/04/22 01:28:07 deraadt Exp $
+.\"	$NetBSD: sb.4,v 1.4 1996/03/16 17:21:58 jtk Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -43,12 +43,12 @@
 .Nd
 SoundBlaster family (and compatibles) audio device driver
 .Sh SYNOPSIS
-.Cd "sb0 at isa? port 0xPPP irq X drq Y"
+.Cd "sb0 at isa? port 0xPPP irq X drq Y flags Z"
 .Sh DESCRIPTION
 The
 .Nm sb
 driver provides support for the SoundBlaster, SoundBlaster Pro,
-SoundBlaster 16, and hardware register-level compatible audio cards.
+SoundBlaster 16, Jazz 16, and hardware register-level compatible audio cards.
 .Pp
 The SoundBlaster series are half-duplex cards, capable of 8- and 16-bit
 audio sample recording and playback at rates up to 44.1kHz (depending on
@@ -63,6 +63,12 @@ jumper-selected.  For the SoundBlaster 16, the IRQ and DRQ channels are
 set by this driver to the values specified in the config file.  The IRQ
 must be selected from the set {5,7,9,10}.
 .Pp
+The configuration file must use a nonzero 
+.Cm flags
+specification to enable the Jazz16 support.  This is to avoid potential
+conflicts with other devices when probing the Jazz 16 because it requires
+use of extra I/O ports not in the base port range.
+.Pp
 .Sh BUGS
 The driver has not been extensively tested on original SoundBlaster,
 SoundBlaster 16, or newer cards.
diff --git a/share/man/man4/man4.i386/speaker.4 b/share/man/man4/man4.i386/speaker.4
index dce825750ed..63a51a968b3 100644
--- a/share/man/man4/man4.i386/speaker.4
+++ b/share/man/man4/man4.i386/speaker.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: speaker.4,v 1.2 1996/04/22 01:28:08 deraadt Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
@@ -27,15 +28,15 @@
 .\" (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: speaker.4,v 1.1 1995/10/18 08:44:30 deraadt Exp $
-.\"
 .Dd August 6, 1993
 .Dt SPEAKER 4 i386
 .Os NetBSD 0.8a
 .Sh NAME
 speaker \- console speaker device driver
 .Sh SYNOPSIS
-.Cd "pseudo-device speaker"
+.Cd "spkr0	at pckbd? port 0x61"
+.Fd #include <machine/spkr.h>
+.Pa /dev/speaker
 .Sh DESCRIPTION
 The speaker device driver allows applications to control the PC console
 speaker on an IBM-PC-compatible machine running UNIX.
@@ -53,7 +54,7 @@ tones. Other processes may emit beeps while the driver is running.
 .Pp
 Applications may call ioctl() on a speaker file descriptor to control the
 speaker driver directly; definitions for the ioctl() interface are in
-machine/spkr.h. The tone_t structure used in these calls has two fields,
+<machine/spkr.h>. The tone_t structure used in these calls has two fields,
 specifying a frequency (in hz) and a duration (in 1/100ths of a second).
 A frequency of zero is interpreted as a rest.
 .Pp
@@ -139,7 +140,9 @@ melody sections.
 .Sh BUGS
 Due to roundoff in the pitch tables and slop in the tone-generation and timer
 hardware (neither of which was designed for precision), neither pitch accuracy
-nor timings will be mathematically exact. There is no volume control.
+nor timings will be mathematically exact.
+.Pp
+There is no volume control.
 .Pp
 In play strings which are very long (longer than your system's physical I/O
 blocks) note suffixes or numbers may occasionally be parsed incorrectly due