Add a joystick attachment to the ESS Solo-1 driver.

sys/dev/pci/eso.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: eso.c,v 1.23 2001/11/13 07:48:42 lukem Exp $	*/
+/*	$NetBSD: eso.c,v 1.24 2002/04/25 00:52:21 kleink Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Klaus J. Klein
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.23 2001/11/13 07:48:42 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.24 2002/04/25 00:52:21 kleink Exp $");
 
 #include "mpu.h"
 
@@ -85,6 +85,7 @@ struct eso_dma {
 static int eso_match __P((struct device *, struct cfdata *, void *));
 static void eso_attach __P((struct device *, struct device *, void *));
 static void eso_defer __P((struct device *));
+static int eso_print __P((void *, const char *));
 
 struct cfattach eso_ca = {
 	sizeof (struct eso_softc), eso_match, eso_attach
@@ -375,6 +376,11 @@ eso_attach(parent, self, aux)
 		mvctl |= ESO_MIXREG_MVCTL_MPUIRQM;
 		eso_write_mixreg(sc, ESO_MIXREG_MVCTL, mvctl);
 	}
+
+	aa.type = AUDIODEV_TYPE_AUX;
+	aa.hwif = NULL;
+	aa.hdl = NULL;
+	(void)config_found(&sc->sc_dev, &aa, eso_print);
 }
 
 static void
@@ -413,6 +419,20 @@ eso_defer(self)
 	printf("can't map Audio 1 DMA into I/O space\n");
 }
 
+/* ARGSUSED */
+static int
+eso_print(aux, pnp)
+	void *aux;
+	const char *pnp;
+{
+
+	/* Only joys can attach via this; easy. */
+	if (pnp)
+		printf("joy at %s:", pnp);
+
+	return (UNCONF);
+}
+
 static void
 eso_write_cmd(sc, cmd)
 	struct eso_softc *sc;

sys/dev/pci/files.pci

@@ -1,4 +1,4 @@
-#	$NetBSD: files.pci,v 1.170 2002/04/22 21:05:20 ad Exp $
+#	$NetBSD: files.pci,v 1.171 2002/04/25 00:52:21 kleink Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -321,6 +321,9 @@ file	dev/pci/opl_eso.c		opl_eso
 attach	mpu at eso with mpu_eso
 file	dev/pci/mpu_eso.c		mpu_eso
 
+attach	joy at eso with joy_eso
+file	dev/pci/joy_eso.c		joy_eso
+
 # ESS Maestro-1/2/2e PCI AC97 Audio Accelerator
 device	esm: audiobus, auconv, mulaw, ac97
 attach	esm at pci

sys/dev/pci/joy_eso.c

@@ -0,0 +1,96 @@
+/*	$NetBSD: joy_eso.c,v 1.1 2002/04/25 00:52:21 kleink Exp $	*/
+
+/*
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Lennart Augustsson (augustss@netbsd.org).
+ *
+ * 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 the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/errno.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
+#include <sys/proc.h>
+#include <sys/conf.h>
+#include <sys/select.h>
+#include <sys/audioio.h>
+
+#include <machine/bus.h>
+
+#include <dev/audio_if.h>
+
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+
+#include <dev/pci/esovar.h>
+
+#include <dev/ic/joyvar.h>
+
+static int	joy_eso_match __P((struct device *, struct cfdata *, void *));
+static void	joy_eso_attach __P((struct device *, struct device *, void *));
+
+struct cfattach joy_eso_ca = {
+	sizeof (struct joy_softc), joy_eso_match, joy_eso_attach
+};
+
+static int
+joy_eso_match(parent, match, aux)
+	struct device *parent;
+	struct cfdata *match;
+	void *aux;
+{
+	struct audio_attach_args *aa = (struct audio_attach_args *)aux;
+
+	if (aa->type != AUDIODEV_TYPE_AUX)
+		return (0);
+	return (1);
+}
+
+static void
+joy_eso_attach(parent, self, aux)
+	struct device *parent;
+	struct device *self;
+	void *aux;
+{
+	struct eso_softc *esc = (struct eso_softc *)parent;
+	struct joy_softc *sc = (struct joy_softc *)self;
+
+	printf("\n");
+
+	sc->sc_ioh = esc->sc_game_ioh;
+	sc->sc_iot = esc->sc_game_iot;
+
+	joyattach(sc);
+}