diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2014-04-25 17:45:05 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-26 16:25:00 +0400 |
| commit | 697022391e46614184101c59e46c9671598026db (patch) | |
| tree | 184134a0b33f09ac49d8301f534dc9e83f61c2a8 /sound/firewire/fireworks | |
| parent | c8bdf49b9935cdeec917347df00a5434d58e9df0 (diff) | |
| download | linux-697022391e46614184101c59e46c9671598026db.tar.xz | |
ALSA: fireworks/firewire-lib: Add a quirk for wrong dbs in tx packets
One of Fireworks firmware, named as 'AudioFire9', seems to transmit
packets with wrong value of dbs. It's always 0x11 but actual size of
data block is different.
This commit adds a flag for this quirk and some codes to calculate
correct size.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/fireworks')
| -rw-r--r-- | sound/firewire/fireworks/fireworks.c | 2 | ||||
| -rw-r--r-- | sound/firewire/fireworks/fireworks.h | 3 | ||||
| -rw-r--r-- | sound/firewire/fireworks/fireworks_stream.c | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c index 307fb2f250da..02b3259059f0 100644 --- a/sound/firewire/fireworks/fireworks.c +++ b/sound/firewire/fireworks/fireworks.c @@ -205,6 +205,8 @@ efw_probe(struct fw_unit *unit, err = get_hardware_info(efw); if (err < 0) goto error; + if (entry->model_id == MODEL_ECHO_AUDIOFIRE_9) + efw->is_af9 = true; err = snd_efw_stream_init_duplex(efw); if (err < 0) diff --git a/sound/firewire/fireworks/fireworks.h b/sound/firewire/fireworks/fireworks.h index ce511be4611b..9534e93e3a36 100644 --- a/sound/firewire/fireworks/fireworks.h +++ b/sound/firewire/fireworks/fireworks.h @@ -61,6 +61,9 @@ struct snd_efw { u32 seqnum; bool resp_addr_changable; + /* for quirks */ + bool is_af9; + unsigned int midi_in_ports; unsigned int midi_out_ports; diff --git a/sound/firewire/fireworks/fireworks_stream.c b/sound/firewire/fireworks/fireworks_stream.c index d687b047446b..7447af72ae30 100644 --- a/sound/firewire/fireworks/fireworks_stream.c +++ b/sound/firewire/fireworks/fireworks_stream.c @@ -198,6 +198,9 @@ int snd_efw_stream_init_duplex(struct snd_efw *efw) efw->tx_stream.flags |= CIP_EMPTY_WITH_TAG0; /* Fireworks has its own meaning for dbc. */ efw->tx_stream.flags |= CIP_DBC_IS_END_EVENT; + /* AudioFire9 always reports wrong dbs. */ + if (efw->is_af9) + efw->tx_stream.flags |= CIP_WRONG_DBS; err = init_stream(efw, &efw->rx_stream); if (err < 0) { |