[ALSA] add more sequencer port type information bits

Add four new information flags SNDRV_SEQ_PORT_TYPE_HARDWARE, _SOFTWARE,
_SYNTHESIZER, _PORT for sequencer ports.  This makes it easier for apps
like Rosegarden to make policy decisions based on the port type.

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

10 files changed, 31 insertions, 9 deletions

diff --git a/include/sound/asequencer.h b/include/sound/asequencer.h
index 6691e4aa4ea7..3f2f4042a20d 100644
--- a/include/sound/asequencer.h
+++ b/include/sound/asequencer.h
@@ -605,6 +605,10 @@ struct snd_seq_remove_events {
 #define SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE (1<<11)       /* Sampling device (support sample download) */
 #define SNDRV_SEQ_PORT_TYPE_SAMPLE      (1<<12) /* Sampling device (sample can be downloaded at any time) */
 /*...*/
+#define SNDRV_SEQ_PORT_TYPE_HARDWARE    (1<<16) /* driver for a hardware device */
+#define SNDRV_SEQ_PORT_TYPE_SOFTWARE    (1<<17) /* implemented in software */
+#define SNDRV_SEQ_PORT_TYPE_SYNTHESIZER (1<<18) /* generates sound */
+#define SNDRV_SEQ_PORT_TYPE_PORT        (1<<19) /* connects to other device(s) */
 #define SNDRV_SEQ_PORT_TYPE_APPLICATION (1<<20) /* application (sequencer/editor) */
 
 /* misc. conditioning flags */
diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c
index 2a283a59ea4d..9eb1c744f77b 100644
--- a/sound/core/seq/seq_dummy.c
+++ b/sound/core/seq/seq_dummy.c
@@ -171,7 +171,9 @@ create_port(int idx, int type)
         pinfo.capability |= SNDRV_SEQ_PORT_CAP_WRITE | SNDRV_SEQ_PORT_CAP_SUBS_WRITE;
         if (duplex)
                 pinfo.capability |= SNDRV_SEQ_PORT_CAP_DUPLEX;
-        pinfo.type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC;
+        pinfo.type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC
+                | SNDRV_SEQ_PORT_TYPE_SOFTWARE
+                | SNDRV_SEQ_PORT_TYPE_PORT;
         memset(&pcb, 0, sizeof(pcb));
         pcb.owner = THIS_MODULE;
         pcb.unuse = dummy_unuse;
diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
index 3b316da25eff..f873742c6532 100644
--- a/sound/core/seq/seq_midi.c
+++ b/sound/core/seq/seq_midi.c
@@ -376,7 +376,9 @@ snd_seq_midisynth_register_port(struct snd_seq_device *dev)
                 if ((port->capability & (SNDRV_SEQ_PORT_CAP_WRITE|SNDRV_SEQ_PORT_CAP_READ)) == (SNDRV_SEQ_PORT_CAP_WRITE|SNDRV_SEQ_PORT_CAP_READ) &&
                     info->flags & SNDRV_RAWMIDI_INFO_DUPLEX)
                         port->capability |= SNDRV_SEQ_PORT_CAP_DUPLEX;
-                port->type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC;
+                port->type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC
+                        | SNDRV_SEQ_PORT_TYPE_HARDWARE
+                        | SNDRV_SEQ_PORT_TYPE_PORT;
                 port->midi_channels = 16;
                 memset(&pcallbacks, 0, sizeof(pcallbacks));
                 pcallbacks.owner = THIS_MODULE;
diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c
index f4edec603b8f..0cfa06c6b81f 100644
--- a/sound/core/seq/seq_virmidi.c
+++ b/sound/core/seq/seq_virmidi.c
@@ -390,7 +390,9 @@ static int snd_virmidi_dev_attach_seq(struct snd_virmidi_dev *rdev)
         pinfo->capability |= SNDRV_SEQ_PORT_CAP_WRITE | SNDRV_SEQ_PORT_CAP_SYNC_WRITE | SNDRV_SEQ_PORT_CAP_SUBS_WRITE;
         pinfo->capability |= SNDRV_SEQ_PORT_CAP_READ | SNDRV_SEQ_PORT_CAP_SYNC_READ | SNDRV_SEQ_PORT_CAP_SUBS_READ;
         pinfo->capability |= SNDRV_SEQ_PORT_CAP_DUPLEX;
-        pinfo->type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC;
+        pinfo->type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC
+                | SNDRV_SEQ_PORT_TYPE_SOFTWARE
+                | SNDRV_SEQ_PORT_TYPE_PORT;
         pinfo->midi_channels = 16;
         memset(&pcallbacks, 0, sizeof(pcallbacks));
         pcallbacks.owner = THIS_MODULE;
diff --git a/sound/drivers/opl3/opl3_oss.c b/sound/drivers/opl3/opl3_oss.c
index d48f8dee2d98..5fd3a4c95626 100644
--- a/sound/drivers/opl3/opl3_oss.c
+++ b/sound/drivers/opl3/opl3_oss.c
@@ -99,7 +99,9 @@ static int snd_opl3_oss_create_port(struct snd_opl3 * opl3)
         opl3->oss_chset->port = snd_seq_event_port_attach(opl3->seq_client, &callbacks,
                                                           SNDRV_SEQ_PORT_CAP_WRITE,
                                                           SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
-                                                          SNDRV_SEQ_PORT_TYPE_MIDI_GM,
+                                                          SNDRV_SEQ_PORT_TYPE_MIDI_GM |
+                                                          SNDRV_SEQ_PORT_TYPE_HARDWARE |
+                                                          SNDRV_SEQ_PORT_TYPE_SYNTHESIZER,
                                                           voices, voices,
                                                           name);
         if (opl3->oss_chset->port < 0) {
diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c
index 2aece1b18660..96762c9d4855 100644
--- a/sound/drivers/opl3/opl3_seq.c
+++ b/sound/drivers/opl3/opl3_seq.c
@@ -203,7 +203,9 @@ static int snd_opl3_synth_create_port(struct snd_opl3 * opl3)
                                                       SNDRV_SEQ_PORT_CAP_SUBS_WRITE,
                                                       SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
                                                       SNDRV_SEQ_PORT_TYPE_MIDI_GM |
-                                                      SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE,
+                                                      SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE |
+                                                      SNDRV_SEQ_PORT_TYPE_HARDWARE |
+                                                      SNDRV_SEQ_PORT_TYPE_SYNTHESIZER,
                                                       16, voices,
                                                       name);
         if (opl3->chset->port < 0) {
diff --git a/sound/drivers/opl4/opl4_seq.c b/sound/drivers/opl4/opl4_seq.c
index dc0dcdc6c313..43d8a2bdd280 100644
--- a/sound/drivers/opl4/opl4_seq.c
+++ b/sound/drivers/opl4/opl4_seq.c
@@ -164,7 +164,9 @@ static int snd_opl4_seq_new_device(struct snd_seq_device *dev)
                                                       SNDRV_SEQ_PORT_CAP_WRITE |
                                                       SNDRV_SEQ_PORT_CAP_SUBS_WRITE,
                                                       SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
-                                                      SNDRV_SEQ_PORT_TYPE_MIDI_GM,
+                                                      SNDRV_SEQ_PORT_TYPE_MIDI_GM |
+                                                      SNDRV_SEQ_PORT_TYPE_HARDWARE |
+                                                      SNDRV_SEQ_PORT_TYPE_SYNTHESIZER,
                                                       16, 24,
                                                       "OPL4 Wavetable Port");
         if (opl4->chset->port < 0) {
diff --git a/sound/isa/gus/gus_synth.c b/sound/isa/gus/gus_synth.c
index 2767cc187ae3..3e4d4d6edd8b 100644
--- a/sound/isa/gus/gus_synth.c
+++ b/sound/isa/gus/gus_synth.c
@@ -194,7 +194,9 @@ static int snd_gus_synth_create_port(struct snd_gus_card * gus, int idx)
                                                    &callbacks,
                                                    SNDRV_SEQ_PORT_CAP_WRITE | SNDRV_SEQ_PORT_CAP_SUBS_WRITE,
                                                    SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE |
-                                                   SNDRV_SEQ_PORT_TYPE_SYNTH,
+                                                   SNDRV_SEQ_PORT_TYPE_SYNTH |
+                                                   SNDRV_SEQ_PORT_TYPE_HARDWARE |
+                                                   SNDRV_SEQ_PORT_TYPE_SYNTHESIZER,
                                                    16, 0,
                                                    name);
         if (p->chset->port < 0) {
diff --git a/sound/pci/trident/trident_synth.c b/sound/pci/trident/trident_synth.c
index cc7af8bc55a0..9b7dee84743b 100644
--- a/sound/pci/trident/trident_synth.c
+++ b/sound/pci/trident/trident_synth.c
@@ -914,7 +914,9 @@ static int snd_trident_synth_create_port(struct snd_trident * trident, int idx)
                                                    &callbacks,
                                                    SNDRV_SEQ_PORT_CAP_WRITE | SNDRV_SEQ_PORT_CAP_SUBS_WRITE,
                                                    SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE |
-                                                   SNDRV_SEQ_PORT_TYPE_SYNTH,
+                                                   SNDRV_SEQ_PORT_TYPE_SYNTH |
+                                                   SNDRV_SEQ_PORT_TYPE_HARDWARE |
+                                                   SNDRV_SEQ_PORT_TYPE_SYNTHESIZER,
                                                    16, 0,
                                                    name);
         if (p->chset->port < 0) {
diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
index 58838f7c95f0..d176cc01742d 100644
--- a/sound/synth/emux/emux_seq.c
+++ b/sound/synth/emux/emux_seq.c
@@ -54,7 +54,9 @@ static struct snd_midi_op emux_ops = {
 #define DEFAULT_MIDI_TYPE       (SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |\
                                  SNDRV_SEQ_PORT_TYPE_MIDI_GM |\
                                  SNDRV_SEQ_PORT_TYPE_MIDI_GS |\
-                                 SNDRV_SEQ_PORT_TYPE_MIDI_XG)
+                                 SNDRV_SEQ_PORT_TYPE_MIDI_XG |\
+                                 SNDRV_SEQ_PORT_TYPE_HARDWARE |\
+                                 SNDRV_SEQ_PORT_TYPE_SYNTHESIZER)
 
 /*
  * Initialise the EMUX Synth by creating a client and registering