diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-07-10 03:50:19 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-07-10 10:58:15 -0400 |
| commit | 5646eda5851e6cfdfa22d41895e3f5daffa643d3 (patch) | |
| tree | 833064daee079d8c84874a4ec7cf1e7d025ac460 /sound/core | |
| parent | 0ac8a52d4541adc284a4f3e8a1f6847236de1d8a (diff) | |
ALSA: pcm: Add timestamp type to sw_params
For allowing adjusting the timestamp type on the fly, add it to
sw_params. The existing ioctl is still kept for compatibility.
Along with this, increment the PCM protocol version.
The extension was suggested by Clemens Ladisch.
Acked-by: Jaroslav Kysela <perex@perex.cz>
Reviewed-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_native.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 2372c49a8e84..81dedc381efd 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
| @@ -543,6 +543,8 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream, | |||
| 543 | 543 | ||
| 544 | if (params->tstamp_mode > SNDRV_PCM_TSTAMP_LAST) | 544 | if (params->tstamp_mode > SNDRV_PCM_TSTAMP_LAST) |
| 545 | return -EINVAL; | 545 | return -EINVAL; |
| 546 | if (params->tstamp_type > SNDRV_PCM_TSTAMP_TYPE_LAST) | ||
| 547 | return -EINVAL; | ||
| 546 | if (params->avail_min == 0) | 548 | if (params->avail_min == 0) |
| 547 | return -EINVAL; | 549 | return -EINVAL; |
| 548 | if (params->silence_size >= runtime->boundary) { | 550 | if (params->silence_size >= runtime->boundary) { |
| @@ -557,6 +559,7 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream, | |||
| 557 | err = 0; | 559 | err = 0; |
| 558 | snd_pcm_stream_lock_irq(substream); | 560 | snd_pcm_stream_lock_irq(substream); |
| 559 | runtime->tstamp_mode = params->tstamp_mode; | 561 | runtime->tstamp_mode = params->tstamp_mode; |
| 562 | runtime->tstamp_type = params->tstamp_type; | ||
| 560 | runtime->period_step = params->period_step; | 563 | runtime->period_step = params->period_step; |
| 561 | runtime->control->avail_min = params->avail_min; | 564 | runtime->control->avail_min = params->avail_min; |
| 562 | runtime->start_threshold = params->start_threshold; | 565 | runtime->start_threshold = params->start_threshold; |