ALSA: seq: Add UMP group number to snd_seq_port_info

Add yet more new filed "ump_group" to snd_seq_port_info for specifying
the associated UMP Group number for each sequencer port.  This will be
referred in the upcoming automatic UMP conversion in sequencer core.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20230523075358.9672-30-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/uapi/sound/asequencer.h b/include/uapi/sound/asequencer.h
index eae1e0b0bf370970e6cd3cc6c971ad315ee1b966..2470eaa5edc52960f734b7749ea9ebc463578f8a 100644 (file)
--- a/include/uapi/sound/asequencer.h
+++ b/include/uapi/sound/asequencer.h
@@ -478,7 +478,8 @@ struct snd_seq_port_info {
        unsigned int flags;             /* misc. conditioning */
        unsigned char time_queue;       /* queue # for timestamping */
        unsigned char direction;        /* port usage direction (r/w/bidir) */
-       char reserved[58];              /* for future use */
+       unsigned char ump_group;        /* 0 = UMP EP (no conversion), 1-16 = UMP group number */
+       char reserved[57];              /* for future use */
 };
 
 

diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c
index 5574341f49eb69b5d6917a90a35c79d327f1045c..9b80f8275026be9f7ace11ac14e1f8278a43a91c 100644 (file)
--- a/sound/core/seq/seq_ports.c
+++ b/sound/core/seq/seq_ports.c
@@ -356,8 +356,12 @@ int snd_seq_set_port_info(struct snd_seq_client_port * port,
        port->time_real = (info->flags & SNDRV_SEQ_PORT_FLG_TIME_REAL) ? 1 : 0;
        port->time_queue = info->time_queue;
 
-       /* direction */
+       /* UMP direction and group */
        port->direction = info->direction;
+       port->ump_group = info->ump_group;
+       if (port->ump_group > SNDRV_UMP_MAX_GROUPS)
+               port->ump_group = 0;
+
        /* fill default port direction */
        if (!port->direction) {
                if (info->capability & SNDRV_SEQ_PORT_CAP_READ)
@@ -403,8 +407,9 @@ int snd_seq_get_port_info(struct snd_seq_client_port * port,
                info->time_queue = port->time_queue;
        }
 
-       /* direction */
+       /* UMP direction and group */
        info->direction = port->direction;
+       info->ump_group = port->ump_group;
 
        return 0;
 }

diff --git a/sound/core/seq/seq_ports.h b/sound/core/seq/seq_ports.h
index dce733ab2398a0672a6f6fa539ed16b15f58ca46..c6c138edceabe1d0b9f7450246b7adb854e9c20b 100644 (file)
--- a/sound/core/seq/seq_ports.h
+++ b/sound/core/seq/seq_ports.h
@@ -72,8 +72,9 @@ struct snd_seq_client_port {
        int midi_voices;
        int synth_voices;
                
-       /* direction */
+       /* UMP direction and group */
        unsigned char direction;
+       unsigned char ump_group;
 };
 
 struct snd_seq_client;