Skip to contentSkip to conversation

ALSA: ump: Fix evaluation of MIDI 1.0 FB info

PATCH New Takashi Iwai 1 participant 1 message Nov 27, 2024 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: ump: Fix evaluation of MIDI 1.0 FB info

The m1.0 field of UMP Function Block info specifies whether the given FB is a MIDI 1.0 port or not. When implementing the UMP support on Linux, I somehow interpreted as if it were bit flags, but the field is actually an enumeration from 0 to 2, where 2 means MIDI 1.0 *and* low speed.

This patch corrects the interpretation and sets the right bit flags depending on the m1.0 field of FB Info. This effectively fixes the missing detection of MIDI 1.0 FB when m1.0 is 2.

Fixes 37e0e14128e0 ("ALSA: ump: Support UMP Endpoint and Function Block parsing")
---
 sound/core/ump.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
sound/core/ump.c +4 -1
index 5d4dd207e5ab..6d0aac6c763f 100644
@@ -788,7 +788,10 @@ static void fill_fb_info(struct snd_ump_endpoint *ump,
 	info->ui_hint = buf->fb_info.ui_hint;
 	info->first_group = buf->fb_info.first_group;
 	info->num_groups = buf->fb_info.num_groups;
-	info->flags = buf->fb_info.midi_10;
+	if (buf->fb_info.midi_10 < 2)
+		info->flags = buf->fb_info.midi_10;
+	else
+		info->flags = SNDRV_UMP_BLOCK_IS_MIDI1 | SNDRV_UMP_BLOCK_IS_LOWSPEED;
 	info->active = buf->fb_info.active;
 	info->midi_ci_version = buf->fb_info.midi_ci_version;
 	info->sysex8_streams = buf->fb_info.sysex8_streams;
Signature · 1 line
2.43.0