From 7716c5370ad4c724650bb6def35750d561bc11d2 Mon Sep 17 00:00:00 2001 From: tanimura Date: Tue, 11 Jul 2000 11:49:33 +0000 Subject: Finally merge newmidi. (I had been busy for my own research activity until the last weekend) Supported devices: SB Midi Port (sbc + midi) SB OPL3 (sbc + midi) 16550 UART (midi, needs a trick in your hint) CS461x Midi Port (csa + midi) OSS-compatible sequencer (seq) Supported playing software: playmidi (We definitely need more) Notes: /dev/midistat now reports installed midi drivers. /dev/sndstat reports only pcm drivers. We need the new name(pcmstat?). EMU8000(SB AWE) does not sound yet but does get probed so that the OPL3 synth on an AWE card works. TODO: MSS/PCI bridge drivers Midi-tty interface to support general serial devices Modules --- sys/dev/sound/pci/csa.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'sys/dev/sound/pci/csa.c') diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index b474574..7d51311 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -59,11 +59,9 @@ struct csa_softc { device_t pcm; /* pcm device */ driver_intr_t* pcmintr; /* pcm intr */ void *pcmintr_arg; /* pcm intr arg */ -#if notyet device_t midi; /* midi device */ driver_intr_t* midiintr; /* midi intr */ void *midiintr_arg; /* midi intr arg */ -#endif /* notyet */ void *ih; /* cookie */ struct csa_bridgeinfo binfo; /* The state of this bridge. */ @@ -198,7 +196,6 @@ csa_attach(device_t dev) scp->pcm = device_add_child(dev, "pcm", -1); device_set_ivars(scp->pcm, func); -#if notyet /* Midi Interface */ func = malloc(sizeof(struct sndcard_func), M_DEVBUF, M_NOWAIT); if (func == NULL) @@ -208,7 +205,6 @@ csa_attach(device_t dev) func->func = SCF_MIDI; scp->midi = device_add_child(dev, "midi", -1); device_set_ivars(scp->midi, func); -#endif /* notyet */ bus_generic_attach(dev); @@ -292,12 +288,10 @@ csa_setup_intr(device_t bus, device_t child, scp->pcmintr_arg = arg; break; -#if notyet case SCF_MIDI: scp->midiintr = intr; scp->midiintr_arg = arg; break; -#endif /* notyet */ default: return (EINVAL); @@ -334,12 +328,10 @@ csa_teardown_intr(device_t bus, device_t child, scp->pcmintr_arg = NULL; break; -#if notyet case SCF_MIDI: scp->midiintr = NULL; scp->midiintr_arg = NULL; break; -#endif /* notyet */ default: return (EINVAL); @@ -375,10 +367,8 @@ csa_intr(void *arg) /* Invoke the handlers of the children. */ if ((hisr & (HISR_VC0 | HISR_VC1)) != 0 && scp->pcmintr != NULL) scp->pcmintr(scp->pcmintr_arg); -#if notyet if ((hisr & HISR_MIDI) != 0 && scp->midiintr != NULL) scp->midiintr(scp->midiintr_arg); -#endif /* notyet */ /* Throw an eoi. */ csa_writeio(resp, BA0_HICR, HICR_IEV | HICR_CHGM); -- cgit v1.1