diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2015-12-22 01:15:46 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-12-22 11:51:32 +0100 |
| commit | de5126cc3c0b0f291d08fa591dcdf237bc595a56 (patch) | |
| tree | 3e9c53f80e0692a80ffb772ed487081dcf7c818d /sound/firewire | |
| parent | ALSA: oxfw: obsolete scs1x module (diff) | |
| download | linux-de5126cc3c0b0f291d08fa591dcdf237bc595a56.tar.xz linux-de5126cc3c0b0f291d08fa591dcdf237bc595a56.zip | |
ALSA: oxfw: add stream format quirk for SCS.1 models
As long as I investigate SCS.1m, this model reports to transfer/receive
PCM data channels/MIDI conformant data channels in tx/rx AMDTP packet.
There's a contradiction that this model actually has no analog/digital
capture port for PCM frames and no physical MIDI ports.
I guess that SCS.1d also has the contradiction. This model has no
analog/digital ports for PCM frames and no physical MIDI ports, thus it
requires no streaming functionality.
This commit adds some modification codes to handle the contradiction,
as much as possible. Unfortunately, this module adds one PCM playback
substream for SCS.1d so as SCS.1m.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/oxfw/oxfw.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c index e7f2698c4cb8..abedc2207261 100644 --- a/sound/firewire/oxfw/oxfw.c +++ b/sound/firewire/oxfw/oxfw.c @@ -164,8 +164,16 @@ static int detect_quirks(struct snd_oxfw *oxfw) * Stanton models supports asynchronous transactions for unique MIDI * messages. */ - if (oxfw->entry->vendor_id == OUI_STANTON) + if (oxfw->entry->vendor_id == OUI_STANTON) { + /* No physical MIDI ports. */ + oxfw->midi_input_ports = 0; + oxfw->midi_output_ports = 0; + + /* Output stream exists but no data channels are useful. */ + oxfw->has_output = false; + return snd_oxfw_scs1x_add(oxfw); + } /* * TASCAM FireOne has physical control and requires a pair of additional |