same devices named the same

6 files changed, 29 insertions, 35 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 87b320421c4..8a20e6defd5 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.322 2002/11/28 22:37:20 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.323 2002/11/28 23:24:53 mickey Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -413,7 +413,7 @@ pas0	at isa? port 0x220 irq 7 drq 1		# ProAudio Spectrum
 gus0	at isa? disable port 0x220 irq 7 drq 1 drq2 6 # Gravis (drq2 is record drq)
 ym*	at isapnp?
 mpu*	at isapnp?
-ympu*	at isa? port 0x300 			# generic MPU, Yamaha SW60XG
+mpu*	at isa? port 0x300 			# generic MPU, Yamaha SW60XG
 #aria0	at isa? port 0x280 irq 10 drq 0 flags 0x1 # Prometheus Aria 16
 
 # OPL[23] FM syntheziers
@@ -430,7 +430,6 @@ midi*	at opl?			# OPL FM synth
 midi*	at ym?
 midi*	at mpu?
 midi*	at autri?
-midi*	at ympu?	
 
 # The spkr driver provides a simple tone interface to the built in speaker.
 #spkr0	at pcppi?		# PC speaker
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 53bb36f8cac..2cfec1889f6 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isa,v 1.80 2002/11/28 22:37:20 mickey Exp $
+#	$OpenBSD: files.isa,v 1.81 2002/11/28 23:24:53 mickey Exp $
 #	$NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
 #
 # Config file and device description for machine-independent ISA code.
@@ -267,9 +267,9 @@ define	mpu
 file	dev/isa/mpu401.c		mpu | midi
 
 # MPU401 generic MIDI UART for dump MPUs like Yamaha SW60XG
-device	ympu: midibus
-attach	ympu at isa with ympu_isa
-file	dev/isa/ympu_isa.c		ympu & midi
+device	mpu: midibus
+attach	mpu at isa with mpu_isa
+file	dev/isa/mpu_isa.c		mpu & midi
 
 # the SoundBlaster DSP, or close likenesses; used by other drivers
 define	sbdsp { }
diff --git a/sys/dev/isa/files.isapnp b/sys/dev/isa/files.isapnp
index 3030ce2425a..f2797823959 100644
--- a/sys/dev/isa/files.isapnp
+++ b/sys/dev/isa/files.isapnp
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isapnp,v 1.25 2002/09/03 16:30:55 mickey Exp $
+#	$OpenBSD: files.isapnp,v 1.26 2002/11/28 23:24:53 mickey Exp $
 #	$NetBSD: files.isapnp,v 1.7 1997/10/16 17:16:36 matt Exp $
 #
 # Config file and device description for machine-independent ISAPnP code.
@@ -17,7 +17,6 @@ file	dev/isa/isapnpres.c		isapnp
 # MI PnP devices go here...
 #
 
-device mpu: midibus
 attach	mpu at isapnp with mpu_isapnp
 file	dev/isa/mpu_isapnp.c		mpu & midi
 
diff --git a/sys/dev/isa/mpu401.c b/sys/dev/isa/mpu401.c
index 5c18301722d..96f251dc64e 100644
--- a/sys/dev/isa/mpu401.c
+++ b/sys/dev/isa/mpu401.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpu401.c,v 1.7 2002/11/28 22:37:20 mickey Exp $	*/
+/*	$OpenBSD: mpu401.c,v 1.8 2002/11/28 23:24:53 mickey Exp $	*/
 /*	$NetBSD: mpu401.c,v 1.3 1998/11/25 22:17:06 augustss Exp $	*/
 
 /*
@@ -77,6 +77,10 @@ int	mpu_reset(struct mpu_softc *);
 static	__inline int mpu_waitready(struct mpu_softc *);
 void	mpu_readinput(struct mpu_softc *);
 
+struct cfdriver mpu_cd = {
+	NULL, "mpu", DV_DULL
+};
+
 struct midi_hw_if mpu_midi_hw_if = {
 	mpu_open,
 	mpu_close,
diff --git a/sys/dev/isa/ympu_isa.c b/sys/dev/isa/mpu_isa.c
index 1848db40b3d..2982e0be40d 100644
--- a/sys/dev/isa/ympu_isa.c
+++ b/sys/dev/isa/mpu_isa.c
@@ -1,4 +1,4 @@
-/*	$Id: ympu_isa.c,v 1.1 2002/11/28 22:37:20 mickey Exp $	*/
+/*	$OpenBSD: mpu_isa.c,v 1.1 2002/11/28 23:24:53 mickey Exp $	*/
 
 /*
  * Copyright (c) 2002 Sergey Smitienko. All rights reserved.
@@ -46,35 +46,31 @@
 
 #include <dev/ic/mpuvar.h>
 
-int	ympu_isa_match(struct device *, void *, void *);
-void	ympu_isa_attach(struct device *, struct device *, void *);
-int	ympu_test(bus_space_tag_t, int);
+int	mpu_isa_match(struct device *, void *, void *);
+void	mpu_isa_attach(struct device *, struct device *, void *);
+int	mpu_test(bus_space_tag_t, int);
 
 #ifdef	AUDIO_DEBUG
-#define	DPRINTF(x)	if (ympu_debug) printf x
-int	ympu_debug = 0;
+#define	DPRINTF(x)	if (mpu_debug) printf x
+int	mpu_debug = 0;
 #else
 #define	DPRINTF(x)
 #endif
 
 #define MPU_GETSTATUS(iot, ioh) (bus_space_read_1(iot, ioh, MPU_STATUS))
 
-struct ympu_isa_softc {
+struct mpu_isa_softc {
 	struct device sc_dev;
 
 	struct mpu_softc sc_mpu;
 };
 
-struct	cfdriver ympu_cd = {
-	NULL, "ympu", DV_DULL
-};
-
-struct cfattach ympu_isa_ca = {
-	sizeof(struct ympu_isa_softc), ympu_isa_match, ympu_isa_attach
+struct cfattach mpu_isa_ca = {
+	sizeof(struct mpu_isa_softc), mpu_isa_match, mpu_isa_attach
 };
 
 int
-ympu_test (iot, iobase)
+mpu_test (iot, iobase)
 	bus_space_tag_t iot;
 	int iobase;	/* base port number to try */
 {
@@ -83,11 +79,11 @@ ympu_test (iot, iobase)
 
 	rc = 0;
 	if (bus_space_map(iot, iobase, MPU401_NPORT, 0, &ioh)) {
-		DPRINTF(("ympu_test: can`t map: %x/2\n", iobase));
+		DPRINTF(("mpu_test: can`t map: %x/2\n", iobase));
 		return (0);
 	}
 
-	DPRINTF(("ympu_test: trying: %x\n", iobase));
+	DPRINTF(("mpu_test: trying: %x\n", iobase));
 
 	/*
 	 * The following code is a shameless copy of mpu401.c
@@ -117,13 +113,13 @@ done:
 }
 
 int
-ympu_isa_match(parent, match, aux)
+mpu_isa_match(parent, match, aux)
 	struct device *parent;
 	void *match, *aux;
 {
 	struct isa_attach_args *ia = aux;
 
-        if (ympu_test(ia->ia_iot, ia->ia_iobase)) {
+        if (mpu_test(ia->ia_iot, ia->ia_iobase)) {
 		ia->ia_iosize = MPU401_NPORT;
 		return (1);
 	}
@@ -132,11 +128,11 @@ ympu_isa_match(parent, match, aux)
 }
 
 void
-ympu_isa_attach(parent, self, aux)
+mpu_isa_attach(parent, self, aux)
 	struct device *parent, *self;
 	void *aux;
 {
-	struct ympu_isa_softc *sc = (struct ympu_isa_softc *)self;
+	struct mpu_isa_softc *sc = (struct mpu_isa_softc *)self;
 	struct isa_attach_args *ia = aux;
 
 	sc->sc_mpu.iot = ia->ia_iot;
diff --git a/sys/dev/isa/mpu_isapnp.c b/sys/dev/isa/mpu_isapnp.c
index 40abd16938e..009ebfb91c3 100644
--- a/sys/dev/isa/mpu_isapnp.c
+++ b/sys/dev/isa/mpu_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpu_isapnp.c,v 1.5 2002/03/14 01:26:56 millert Exp $	*/
+/*	$OpenBSD: mpu_isapnp.c,v 1.6 2002/11/28 23:24:53 mickey Exp $	*/
 
 #include "midi.h"
 
@@ -32,10 +32,6 @@ struct mpu_isapnp_softc {
 	struct mpu_softc sc_mpu;
 };
 
-struct cfdriver mpu_cd = {
-	NULL, "mpu", DV_DULL
-};
-
 struct cfattach mpu_isapnp_ca = {
 	sizeof(struct mpu_isapnp_softc), mpu_isapnp_match, mpu_isapnp_attach
 };