tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[ALSA] fix port type bits

Fix the port information about non-MIDI messages that had wrong values
for some OPL3 and EmuX ports.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

authored by

Clemens Ladisch and committed by
Jaroslav Kysela c97f3dd8 f4a747f1

+3 -5
+1 -2
sound/drivers/opl3/opl3_oss.c
··· 99 99 opl3->oss_chset->port = snd_seq_event_port_attach(opl3->seq_client, &callbacks, 100 100 SNDRV_SEQ_PORT_CAP_WRITE, 101 101 SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC | 102 - SNDRV_SEQ_PORT_TYPE_MIDI_GM | 103 - SNDRV_SEQ_PORT_TYPE_SYNTH, 102 + SNDRV_SEQ_PORT_TYPE_MIDI_GM, 104 103 voices, voices, 105 104 name); 106 105 if (opl3->oss_chset->port < 0) {
+1 -1
sound/drivers/opl3/opl3_seq.c
··· 203 203 SNDRV_SEQ_PORT_CAP_SUBS_WRITE, 204 204 SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC | 205 205 SNDRV_SEQ_PORT_TYPE_MIDI_GM | 206 - SNDRV_SEQ_PORT_TYPE_SYNTH, 206 + SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE, 207 207 16, voices, 208 208 name); 209 209 if (opl3->chset->port < 0) {
+1 -2
sound/synth/emux/emux_seq.c
··· 54 54 #define DEFAULT_MIDI_TYPE (SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |\ 55 55 SNDRV_SEQ_PORT_TYPE_MIDI_GM |\ 56 56 SNDRV_SEQ_PORT_TYPE_MIDI_GS |\ 57 - SNDRV_SEQ_PORT_TYPE_MIDI_XG |\ 58 - SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE) 57 + SNDRV_SEQ_PORT_TYPE_MIDI_XG) 59 58 60 59 /* 61 60 * Initialise the EMUX Synth by creating a client and registering