aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2016-02-04 19:56:07 -0500
committerTakashi Iwai <tiwai@suse.de>2016-02-05 06:46:15 -0500
commit61ebe499643703af517a8253662982f6f4764c92 (patch)
treecd00d701d878b2c39a5a673831d4a5beb3a89b3b
parent3e78e1518e129407fae75c867e48828262b3ea6d (diff)
ALSA: firewire-tascam: remove a flag for controller
Currently, 'struct snd_tscm_spec' has a member named as 'is_controller' to identify MIDI controller. This member was originally added to skip parse control and status messages in isochronous packets for non-controller model. As long as I investigate, FW-1804 (non-controller) also transfers the control and status message, thus it becomes meaningless. This commit removes it. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/firewire/tascam/tascam.c3
-rw-r--r--sound/firewire/tascam/tascam.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/sound/firewire/tascam/tascam.c b/sound/firewire/tascam/tascam.c
index dcb11c26c225..e281c338e562 100644
--- a/sound/firewire/tascam/tascam.c
+++ b/sound/firewire/tascam/tascam.c
@@ -21,7 +21,6 @@ static struct snd_tscm_spec model_specs[] = {
21 .pcm_playback_analog_channels = 8, 21 .pcm_playback_analog_channels = 8,
22 .midi_capture_ports = 4, 22 .midi_capture_ports = 4,
23 .midi_playback_ports = 4, 23 .midi_playback_ports = 4,
24 .is_controller = true,
25 }, 24 },
26 { 25 {
27 .name = "FW-1082", 26 .name = "FW-1082",
@@ -31,7 +30,6 @@ static struct snd_tscm_spec model_specs[] = {
31 .pcm_playback_analog_channels = 2, 30 .pcm_playback_analog_channels = 2,
32 .midi_capture_ports = 2, 31 .midi_capture_ports = 2,
33 .midi_playback_ports = 2, 32 .midi_playback_ports = 2,
34 .is_controller = true,
35 }, 33 },
36 { 34 {
37 .name = "FW-1804", 35 .name = "FW-1804",
@@ -41,7 +39,6 @@ static struct snd_tscm_spec model_specs[] = {
41 .pcm_playback_analog_channels = 2, 39 .pcm_playback_analog_channels = 2,
42 .midi_capture_ports = 2, 40 .midi_capture_ports = 2,
43 .midi_playback_ports = 4, 41 .midi_playback_ports = 4,
44 .is_controller = false,
45 }, 42 },
46}; 43};
47 44
diff --git a/sound/firewire/tascam/tascam.h b/sound/firewire/tascam/tascam.h
index 2d028d2bd3bd..66268600c357 100644
--- a/sound/firewire/tascam/tascam.h
+++ b/sound/firewire/tascam/tascam.h
@@ -39,7 +39,6 @@ struct snd_tscm_spec {
39 unsigned int pcm_playback_analog_channels; 39 unsigned int pcm_playback_analog_channels;
40 unsigned int midi_capture_ports; 40 unsigned int midi_capture_ports;
41 unsigned int midi_playback_ports; 41 unsigned int midi_playback_ports;
42 bool is_controller;
43}; 42};
44 43
45#define TSCM_MIDI_IN_PORT_MAX 4 44#define TSCM_MIDI_IN_PORT_MAX 4