Loose ends for amiga joy device:

MAKEDEV entry and manpage.

3 files changed, 79 insertions, 5 deletions

diff --git a/etc/etc.amiga/MAKEDEV b/etc/etc.amiga/MAKEDEV
index 7b19ff425b4..11c39932dcf 100644
--- a/etc/etc.amiga/MAKEDEV
+++ b/etc/etc.amiga/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.44 2000/03/22 07:34:27 niklas Exp $
+#	$OpenBSD: MAKEDEV,v 1.45 2000/09/03 14:46:45 espie Exp $
 #	$NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -91,6 +91,7 @@
 #	uk*	SCSI Unknown device
 #	*random	inkernal random data source
 #	audio*	one unit of the audio device. Unit 0 is custom chip audio.
+#	joy*	amiga joysticks
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
 this=$0
@@ -160,7 +161,7 @@ unit=`unt $i`
 case $i in
 all)
 	sh $this std fd st0 st1 ttye0 ttye1 ttye2 ttye3 ttye4 ttye5 ttye6
-	sh $this mouse0 mouse1 tty00 ttyA0 ttyA1
+	sh $this mouse0 mouse1 joy0 joy1 tty00 ttyA0 ttyA1
 	sh $this ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 ttyB6 ttyB7 ttyB8 ttyB9
 	sh $this grf0 grf1 grf2 grf3 grf4 grf5 grf6
 	sh $this kbd sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
@@ -501,6 +502,18 @@ mouse*)
 	esac
 	;;
 
+joy*)
+	unit=`expr $i : 'joy\(.*\)'`
+	rm -f joy${unit}
+	case $unit in
+	0|1)
+		mknod joy${unit} c 43 ${unit}; chmod 666 mouse${unit}
+		;;
+	*)
+		echo bad unit for joy in: $i
+		;;
+	esac
+	;;
 kbd)
 	rm -f kbd
 	mknod kbd c 14 0
diff --git a/share/man/man4/man4.amiga/Makefile b/share/man/man4/man4.amiga/Makefile
index 023831f9e31..2d12af4edad 100644
--- a/share/man/man4/man4.amiga/Makefile
+++ b/share/man/man4/man4.amiga/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.2 2000/03/02 14:46:43 todd Exp $
+#	$OpenBSD: Makefile,v 1.3 2000/09/03 14:46:46 espie Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 2/16/94
 
 MAN=	ae.4 afsc.4 ahsc.4 atzsc.4 autoconf.4 console.4 bah.4 ed.4 es.4 gtsc.4 \
-	intro.4 ite.4 le.4 mem.4 mfcs.4 mgnsc.4 qn.4 ser.4 wesc.4 zssc.4
+	intro.4 ite.4 joy.4 le.4 mem.4 mfcs.4 mgnsc.4 qn.4 ser.4 wesc.4 zssc.4
 MLINKS=	mem.4 kmem.4
-MANSUBDIR=/amiga
+MANSUBDIR=amiga
 
 .include <bsd.prog.mk>
diff --git a/share/man/man4/man4.amiga/joy.4 b/share/man/man4/man4.amiga/joy.4
new file mode 100644
index 00000000000..41e3a54de75
--- /dev/null
+++ b/share/man/man4/man4.amiga/joy.4
@@ -0,0 +1,61 @@
+.\"	$OpenBSD: joy.4,v 1.1 2000/09/03 14:46:46 espie Exp $
+.\"
+.\" Copyright (c) 2000 Marc Espie
+.\" 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.
+.\"
+.\" 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 September 2, 2000
+.Dt JOY 4 amiga
+.Os
+.Sh NAME
+.Nm joy
+.Nd
+.Tn amiga
+joystick driver
+.Sh SYNOPSIS
+.Cd "joy0 at mainbus0"
+.Sh DESCRIPTION
+This driver provides access to
+.Tn amiga
+joysticks.
+The lower bit in the minor device number selects the joystick: 0 is the first
+joystick and 1 is the second.
+.Pp
+The joystick connectors also accept mouses. There is no simple way to
+find out whether a mouse or a joystick is currently plugged in.
+.Pp
+The joystick is a digital device. Each
+.Fn read
+on the file descriptor does return
+one byte representing the current state of the joystick,
+as a set of ORed values as listed in
+.Aq Pa machine/joystick.h .
+.Sh FILES
+.Bl -tag -width /dev/joy0 -compact
+.It Pa /dev/joy0
+first joystick
+.It Pa /dev/joy1
+second joystick
+.El
+.Sh AUTHORS
+This very simple driver was written by Marc Espie on
+.Ox .