ALSA: ump: Fill group names for legacy rawmidi substreams

To make it clearer which legacy substream corresponds to which UMP
group, fill the subname field of each substream object with the group
number and the endpoint name, e.g. "Group 1 (My Device)".

Ideally speaking, we should have some better link information to the
derived UMP, but it's another feature extension.

Fixes: 0b5288f5fe63 ("ALSA: ump: Add legacy raw MIDI support")
Link: https://lore.kernel.org/r/20230824075108.29958-3-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/core/ump.c b/sound/core/ump.c
index b72b6dc36e0bd68d5ef5e8b5adfdfa85a3ad3123..d5d72473d9992cc7e45852791697e1d2f3264789 100644 (file)
--- a/sound/core/ump.c
+++ b/sound/core/ump.c
@@ -1123,6 +1123,16 @@ static void process_legacy_input(struct snd_ump_endpoint *ump, const u32 *src,
        spin_unlock_irqrestore(&ump->legacy_locks[dir], flags);
 }
 
        spin_unlock_irqrestore(&ump->legacy_locks[dir], flags);
 }
 

+static void fill_substream_names(struct snd_ump_endpoint *ump,
+                                struct snd_rawmidi *rmidi, int dir)
+{
+       struct snd_rawmidi_substream *s;
+
+       list_for_each_entry(s, &rmidi->streams[dir].substreams, list)
+               snprintf(s->name, sizeof(s->name), "Group %d (%s)",
+                        s->number + 1, ump->info.name);
+}
+

 int snd_ump_attach_legacy_rawmidi(struct snd_ump_endpoint *ump,
                                  char *id, int device)
 {
 int snd_ump_attach_legacy_rawmidi(struct snd_ump_endpoint *ump,
                                  char *id, int device)
 {


@@ -1156,6 +1166,11 @@ int snd_ump_attach_legacy_rawmidi(struct snd_ump_endpoint *ump,
        rmidi->ops = &snd_ump_legacy_ops;
        rmidi->private_data = ump;
        ump->legacy_rmidi = rmidi;
        rmidi->ops = &snd_ump_legacy_ops;
        rmidi->private_data = ump;
        ump->legacy_rmidi = rmidi;

+       if (input)
+               fill_substream_names(ump, rmidi, SNDRV_RAWMIDI_STREAM_INPUT);
+       if (output)
+               fill_substream_names(ump, rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT);
+

        ump_dbg(ump, "Created a legacy rawmidi #%d (%s)\n", device, id);
        return 0;
 }
        ump_dbg(ump, "Created a legacy rawmidi #%d (%s)\n", device, id);
        return 0;
 }