sound/pci: Enable MIDI code in emu10kx.

NOTE: this depends on pull requests freebsd#1905 and freebsd#1892.

MIDI code in emu10kx driver was disabled due to possible locking problems
in MIDI core, which should have been corrected by freebsd#1905.

Here, we also fixed that the card interrupts were enabled too early and
disabled too late.

This was tested under FreeBSD 15.0 using a SoundBlaster Audigy
(chipset CA0100, I will also try one Audigy2).

Signed-off-by: Nicolas Provost <dev@nicolas-provost.fr>

Author: n-p-soft

sys/dev/sound/pci/emu10kx-midi.c

@@ -173,37 +173,34 @@ emu_midi_attach(device_t dev)
 
 	if (scp->is_emu10k1) {
 		/* SB Live! - only one MIDI device here */
-		inte_val = 0;
-		/* inte_val |= EMU_INTE_MIDITXENABLE;*/
+		inte_val = EMU_INTE_MIDITXENABLE;
 		inte_val |= EMU_INTE_MIDIRXENABLE;
 		ipr_val = EMU_IPR_MIDITRANSBUFE;
 		ipr_val |= EMU_IPR_MIDIRECVBUFE;
 	} else {
 		if (scp->port == EMU_A_MUDATA1) {
 			/* EXTERNAL MIDI (AudigyDrive) */
-			inte_val = 0;
-			/* inte_val |= A_EMU_INTE_MIDITXENABLE1;*/
+			inte_val = EMU_INTE_MIDITXENABLE;
 			inte_val |= EMU_INTE_MIDIRXENABLE;
 			ipr_val = EMU_IPR_MIDITRANSBUFE;
 			ipr_val |= EMU_IPR_MIDIRECVBUFE;
 		} else {
 			/* MIDI hw config port 2 */
-			inte_val = 0;
-			/* inte_val |= A_EMU_INTE_MIDITXENABLE2;*/
+			inte_val = EMU_INTE_A_MIDITXENABLE2;
 			inte_val |= EMU_INTE_A_MIDIRXENABLE2;
 			ipr_val = EMU_IPR_A_MIDITRANSBUFE2;
 			ipr_val |= EMU_IPR_A_MIDIRECBUFE2;
 		}
 	}
 
-	scp->ihandle = emu_intr_register(scp->card, inte_val, ipr_val, &emu_midi_card_intr, scp);
 	/* Init the interface. */
 	scp->mpu = mpu401_init(&emu_mpu_class, scp, emu_midi_intr, &scp->mpu_intr);
 	if (scp->mpu == NULL) {
 		emu_intr_unregister(scp->card, scp->ihandle);
 		mtx_destroy(&scp->mtx);
 		return (ENOMEM);
 	}
+	scp->ihandle = emu_intr_register(scp->card, inte_val, ipr_val, &emu_midi_card_intr, scp);
 	/*
 	 * XXX I don't know how to check for Live!Drive / AudigyDrive
 	 * presence. Let's hope that IR enabling code will not harm if
@@ -225,8 +222,8 @@ emu_midi_detach(device_t dev)
 	struct emu_midi_softc *scp;
 
 	scp = device_get_softc(dev);
-	mpu401_uninit(scp->mpu);
 	emu_intr_unregister(scp->card, scp->ihandle);
+	mpu401_uninit(scp->mpu);
 	mtx_destroy(&scp->mtx);
 	return (0);
 }

sys/dev/sound/pci/emu10kx.c

@@ -3007,9 +3007,8 @@ emu_pci_attach(device_t dev)
 	struct sndcard_func *func;
 	struct emu_sc_info *sc;
 	struct emu_pcminfo *pcminfo;
-#if 0
 	struct emu_midiinfo *midiinfo;
-#endif
+
 	int i;
 	int device_flags;
 	char status[255];
@@ -3283,8 +3282,6 @@ emu_pci_attach(device_t dev)
 	for (i = 0; i < 2; i++)
 		sc->midi[i] = NULL;
 
-	/* MIDI has some memory mangament and (possible) locking problems */
-#if 0
 	/* Midi Interface 1: Live!, Audigy, Audigy 2 */
 	if ((sc->is_emu10k1) || (sc->is_emu10k2) || (sc->is_ca0102)) {
 		func = malloc(sizeof(struct sndcard_func), M_DEVBUF, M_WAITOK | M_ZERO);
@@ -3295,7 +3292,7 @@ emu_pci_attach(device_t dev)
 			midiinfo->portnr = 1;
 		}
 		if (sc->is_emu10k1) {
-			midiinfo->port = MUDATA;
+			midiinfo->port = EMU_MUDATA;
 			midiinfo->portnr = 1;
 		}
 		func->func = SCF_MIDI;
@@ -3317,7 +3314,6 @@ emu_pci_attach(device_t dev)
 		sc->midi[1] = device_add_child(dev, "midi", DEVICE_UNIT_ANY);
 		device_set_ivars(sc->midi[1], func);
 	}
-#endif
 	bus_attach_children(dev);
 	return (0);