diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2015-09-19 04:21:55 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-09-29 12:47:45 +0200 |
| commit | 5955815e71ff9c773b156680c781c87728e37bea (patch) | |
| tree | b485d5b1624d03e10d27b080711c17163cfc58e2 /sound/firewire/dice | |
| parent | ALSA: firewire-lib: rename 'amdtp' to 'amdtp-stream' to prepare for functiona... (diff) | |
| download | linux-5955815e71ff9c773b156680c781c87728e37bea.tar.xz linux-5955815e71ff9c773b156680c781c87728e37bea.zip | |
ALSA: firewire-lib: add data block processing layer for AM824 format
This commit adds data block processing layer for AM824 format. The new
layer initializes streaming layer with its value for fmt field.
Currently, most implementation of data block processing still remains
streaming layer. In later commits, these codes will be moved to the layer.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/dice')
| -rw-r--r-- | sound/firewire/dice/dice-stream.c | 2 | ||||
| -rw-r--r-- | sound/firewire/dice/dice.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/firewire/dice/dice-stream.c b/sound/firewire/dice/dice-stream.c index e4c6c20d70a0..917860e88b66 100644 --- a/sound/firewire/dice/dice-stream.c +++ b/sound/firewire/dice/dice-stream.c @@ -305,7 +305,7 @@ static int init_stream(struct snd_dice *dice, struct amdtp_stream *stream) goto end; resources->channels_mask = 0x00000000ffffffffuLL; - err = amdtp_stream_init(stream, dice->unit, dir, CIP_BLOCKING); + err = amdtp_am824_init(stream, dice->unit, dir, CIP_BLOCKING); if (err < 0) { amdtp_stream_destroy(stream); fw_iso_resources_destroy(resources); diff --git a/sound/firewire/dice/dice.h b/sound/firewire/dice/dice.h index 29578c19e977..101550ac1a24 100644 --- a/sound/firewire/dice/dice.h +++ b/sound/firewire/dice/dice.h @@ -34,7 +34,7 @@ #include <sound/pcm_params.h> #include <sound/rawmidi.h> -#include "../amdtp-stream.h" +#include "../amdtp-am824.h" #include "../iso-resources.h" #include "../lib.h" #include "dice-interface.h" |