diff options
| -rw-r--r-- | sys/dev/audio.c | 19 | ||||
| -rw-r--r-- | sys/dev/midi.c | 16 |
2 files changed, 16 insertions, 19 deletions
diff --git a/sys/dev/audio.c b/sys/dev/audio.c index 4a6a06a88b5..70ea6d8949c 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: audio.c,v 1.19 1999/12/05 18:35:33 espie Exp $ */ +/* $OpenBSD: audio.c,v 1.20 2000/01/03 19:38:12 fgsch Exp $ */ /* $NetBSD: audio.c,v 1.105 1998/09/27 16:43:56 christos Exp $ */ /* @@ -405,17 +405,7 @@ audio_attach_mi(ahwp, hdlp, dev) } } -#include "midi.h" - -#if NAUDIO == 0 && (NMIDI > 0 || NMIDIBUS > 0) -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/device.h> -#include <sys/audioio.h> -#include <dev/audio_if.h> -#endif - -#if NAUDIO > 0 || (NMIDI > 0 || NMIDIBUS > 0) +#if NAUDIO > 0 int audioprint(aux, pnp) void *aux; @@ -429,9 +419,6 @@ audioprint(aux, pnp) case AUDIODEV_TYPE_AUDIO: type = "audio"; break; - case AUDIODEV_TYPE_MIDI: - type = "midi"; - break; case AUDIODEV_TYPE_OPL: type = "opl"; break; @@ -446,7 +433,7 @@ audioprint(aux, pnp) return (UNCONF); } -#endif /* NAUDIO > 0 || (NMIDI > 0 || NMIDIBUS > 0) */ +#endif /* NAUDIO > 0 */ #ifdef AUDIO_DEBUG void audio_printsc __P((struct audio_softc *)); diff --git a/sys/dev/midi.c b/sys/dev/midi.c index e5987066e7c..c1fdc511dc6 100644 --- a/sys/dev/midi.c +++ b/sys/dev/midi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: midi.c,v 1.2 1999/01/02 00:59:08 niklas Exp $ */ +/* $OpenBSD: midi.c,v 1.3 2000/01/03 19:38:13 fgsch Exp $ */ /* $NetBSD: midi.c,v 1.10 1998/12/20 14:26:44 drochner Exp $ */ /* @@ -744,7 +744,7 @@ midi_getinfo(dev, mi) #if NMIDI > 0 || NMIDIBUS > 0 -int audioprint __P((void *, const char *)); +int midiprint __P((void *, const char *)); void midi_attach_mi(mhwp, hdlp, dev) @@ -763,7 +763,17 @@ midi_attach_mi(mhwp, hdlp, dev) arg.type = AUDIODEV_TYPE_MIDI; arg.hwif = mhwp; arg.hdl = hdlp; - (void)config_found(dev, &arg, audioprint); + (void)config_found(dev, &arg, midiprint); +} + +int +midiprint(aux, pnp) + void *aux; + const char *pnp; +{ + if (pnp) + printf("midi at %s", pnp); + return (UNCONF); } #endif /* NMIDI > 0 || NMIDIBUS > 0 */ |