diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-07-29 17:13:14 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-12-14 21:59:48 +0300 |
| commit | 8ddb4126e6a443ecfcca991d6726a07b035a92e6 (patch) | |
| tree | 45eb9b239f31f84862d170455bc101a29af4b85e /include | |
| parent | d3e8e4d62c88febc0ca6399320d219d124aeacdc (diff) | |
| download | linux-8ddb4126e6a443ecfcca991d6726a07b035a92e6.tar.xz | |
ALSA: ump: Update substream name from assigned FB names
[ Upstream commit 0642a3c5cacc0321c755d45ae48f2c84475469a6 ]
We had a nice name scheme in ALSA sequencer UMP binding for each
sequencer port referring to each assigned Function Block name, while
the legacy rawmidi refers only to the UMP Endpoint name. It's better
to align both.
This patch moves the UMP Group attribute update functions into the
core UMP code from the sequencer binding code, and improve the
substream name of the legacy rawmidi.
Link: https://patch.msgid.link/20240729141315.18253-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Stable-dep-of: aaa55faa2495 ("ALSA: seq: ump: Fix seq port updates per FB info notify")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/ump.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/sound/ump.h b/include/sound/ump.h index 91238dabe307..7f68056acdff 100644 --- a/include/sound/ump.h +++ b/include/sound/ump.h @@ -13,6 +13,14 @@ struct snd_ump_ops; struct ump_cvt_to_ump; struct snd_seq_ump_ops; +struct snd_ump_group { + int group; /* group index (0-based) */ + unsigned int dir_bits; /* directions */ + bool active; /* activeness */ + bool valid; /* valid group (referred by blocks) */ + char name[64]; /* group name */ +}; + struct snd_ump_endpoint { struct snd_rawmidi core; /* raw UMP access */ @@ -41,6 +49,8 @@ struct snd_ump_endpoint { struct mutex open_mutex; + struct snd_ump_group groups[SNDRV_UMP_MAX_GROUPS]; /* table of groups */ + #if IS_ENABLED(CONFIG_SND_UMP_LEGACY_RAWMIDI) spinlock_t legacy_locks[2]; struct snd_rawmidi *legacy_rmidi; |