diff options
author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2016-02-05 01:56:06 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-02-05 12:46:07 +0100 |
commit | 3e78e1518e129407fae75c867e48828262b3ea6d (patch) | |
tree | 2a5d8accc03f33b9f8ae0bf104a67c3ca483861d /sound/firewire | |
parent | ALSA: firewire-tascam: fix NULL pointer dereference when model identification... (diff) | |
download | linux-3e78e1518e129407fae75c867e48828262b3ea6d.tar.xz linux-3e78e1518e129407fae75c867e48828262b3ea6d.zip |
ALSA: firewire-tascam: add support for FW-1804
This model supports:
* maximum 12 PCM channels for PCM playback
* maximum 18 PCM channels for PCM capture
* 4 ports for MIDI playback
* 4 ports for MIDI capture
* control and status messages in tx isochronous packets
* up to 96.0 kHz
This commit adds support for the model. As the other supported models,
all of available PCM channels are always enabled.
As I described in commit c0949b278515da94, Ilya Zimnovich had investigated
TASCAM FireWire series in 2011 with his FW-1804. In his report, this model
has internal multiplexer and any software implementation can control it.
Following to the design of ALSA firewire stack, this commit won't
implement it. It should be in userspace via Linux fw character device.
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/tascam/tascam.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/firewire/tascam/tascam.c b/sound/firewire/tascam/tascam.c index ee0bc1839508..dcb11c26c225 100644 --- a/sound/firewire/tascam/tascam.c +++ b/sound/firewire/tascam/tascam.c @@ -33,7 +33,16 @@ static struct snd_tscm_spec model_specs[] = { .midi_playback_ports = 2, .is_controller = true, }, - /* FW-1804 may be supported. */ + { + .name = "FW-1804", + .has_adat = true, + .has_spdif = true, + .pcm_capture_analog_channels = 8, + .pcm_playback_analog_channels = 2, + .midi_capture_ports = 2, + .midi_playback_ports = 4, + .is_controller = false, + }, }; static int identify_model(struct snd_tscm *tscm) |