Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit c97f3dd85490e51ba48782dd0c063cdade352c0d

Authored by Clemens Ladisch
Committed by Jaroslav Kysela
1 parent f4a747f155
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[ALSA] fix port type bits 

Fix the port information about non-MIDI messages that had wrong values
for some OPL3 and EmuX ports.

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

Showing 3 changed files with 3 additions and 5 deletions Side-by-side Diff

sound/drivers/opl3/opl3_oss.c
Diff comments   View file @ c97f3dd
... ... @@ -99,8 +99,7 @@
99 99 opl3->oss_chset->port = snd_seq_event_port_attach(opl3->seq_client, &callbacks,
100 100 SNDRV_SEQ_PORT_CAP_WRITE,
101 101 SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
102   - SNDRV_SEQ_PORT_TYPE_MIDI_GM |
103   - SNDRV_SEQ_PORT_TYPE_SYNTH,
  102 + SNDRV_SEQ_PORT_TYPE_MIDI_GM,
104 103 voices, voices,
105 104 name);
106 105 if (opl3->oss_chset->port < 0) {
sound/drivers/opl3/opl3_seq.c
Diff comments   View file @ c97f3dd
... ... @@ -203,7 +203,7 @@
203 203 SNDRV_SEQ_PORT_CAP_SUBS_WRITE,
204 204 SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
205 205 SNDRV_SEQ_PORT_TYPE_MIDI_GM |
206   - SNDRV_SEQ_PORT_TYPE_SYNTH,
  206 + SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE,
207 207 16, voices,
208 208 name);
209 209 if (opl3->chset->port < 0) {
sound/synth/emux/emux_seq.c
Diff comments   View file @ c97f3dd
... ... @@ -54,8 +54,7 @@
54 54 #define DEFAULT_MIDI_TYPE (SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |\
55 55 SNDRV_SEQ_PORT_TYPE_MIDI_GM |\
56 56 SNDRV_SEQ_PORT_TYPE_MIDI_GS |\
57   - SNDRV_SEQ_PORT_TYPE_MIDI_XG |\
58   - SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE)
  57 + SNDRV_SEQ_PORT_TYPE_MIDI_XG)
59 58  
60 59 /*
61 60 * Initialise the EMUX Synth by creating a client and registering