diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2015-09-19 11:21:56 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-09-29 12:48:02 +0200 |
| commit | 51c29fd21389d9995a8a18a91eeb8dd1220a2119 (patch) | |
| tree | bc45c96ca22ad4eb7754da35d99a5394ed831a61 /sound/firewire/amdtp-stream.c | |
| parent | 5955815e71ff9c773b156680c781c87728e37bea (diff) | |
| download | linux-51c29fd21389d9995a8a18a91eeb8dd1220a2119.tar.gz linux-51c29fd21389d9995a8a18a91eeb8dd1220a2119.tar.bz2 linux-51c29fd21389d9995a8a18a91eeb8dd1220a2119.zip | |
ALSA: firewire-lib: rename parameter setting function for AM824 with FDF field
The value of FDF field in CIP header is protocol-dependent. Thus, it's
better to allow data block processing layer to decide the value in any
timing.
In AM824 data format, the value of FDF field in CIP header indicates
N-flag and Nominal Sampling Frequency Code (sfc). The N-flag is for
switching 'Clock-based rate control mode' and 'Command-based rate control
mode'. In our implementation, 'Clock-based rate control mode' is just
supported. Therefore, When sampling transfer frequency is decided, then
the FDF can be set.
This commit replaces 'amdtp_stream_set_parameters' with
'amdtp_am824_set_parameters' to set the FDF. This is the same timing
to decide the ration between the number of data blocks and the number of
PCM frames.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/amdtp-stream.c')
| -rw-r--r-- | sound/firewire/amdtp-stream.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index 2254eec4521b..53d84e9bf241 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -54,12 +54,8 @@ #define CIP_SYT_MASK 0x0000ffff #define CIP_SYT_NO_INFO 0xffff -/* - * Audio and Music transfer protocol specific parameters - * only "Clock-based rate control mode" is supported - */ +/* Audio and Music transfer protocol specific parameters */ #define CIP_FMT_AM 0x10 -#define AMDTP_FDF_AM824 0x00 #define AMDTP_FDF_NO_DATA 0xff /* TODO: make these configurable */ @@ -204,8 +200,7 @@ EXPORT_SYMBOL(amdtp_stream_add_pcm_hw_constraints); int amdtp_stream_set_parameters(struct amdtp_stream *s, unsigned int rate, unsigned int pcm_channels, - unsigned int midi_ports, - bool double_pcm_frames) + unsigned int midi_ports) { unsigned int i, sfc, midi_channels; @@ -228,18 +223,6 @@ int amdtp_stream_set_parameters(struct amdtp_stream *s, s->data_block_quadlets = s->pcm_channels + midi_channels; s->midi_ports = midi_ports; - s->fdf = AMDTP_FDF_AM824 | s->sfc; - - /* - * In IEC 61883-6, one data block represents one event. In ALSA, one - * event equals to one PCM frame. But Dice has a quirk at higher - * sampling rate to transfer two PCM frames in one data block. - */ - if (double_pcm_frames) - s->frame_multiplier = 2; - else - s->frame_multiplier = 1; - s->syt_interval = amdtp_syt_intervals[sfc]; /* default buffering in the device */ |