diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:06 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:06 +0000 |
commit | 7d590e462315f40f821599bcc0b2b6b7f62142a8 (patch) | |
tree | c5168c68304fa6d739f81ff620ab96e2aac1f017 /include/sound/pcm.h | |
parent | 3223d9c62c536677aa826ff42e22fafa672bf266 (diff) | |
parent | 9c7da1a57bb5938f1d874c8cd5e50d2494830d08 (diff) | |
download | linux-7d590e462315f40f821599bcc0b2b6b7f62142a8.tar.gz linux-7d590e462315f40f821599bcc0b2b6b7f62142a8.tar.bz2 linux-7d590e462315f40f821599bcc0b2b6b7f62142a8.zip |
Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next
Diffstat (limited to 'include/sound/pcm.h')
-rw-r--r-- | include/sound/pcm.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index b429b73e875e..95d1c20fa659 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -275,6 +275,12 @@ struct snd_pcm_hw_constraint_list { unsigned int mask; }; +struct snd_pcm_hw_constraint_ranges { + unsigned int count; + const struct snd_interval *ranges; + unsigned int mask; +}; + struct snd_pcm_hwptr_log; struct snd_pcm_runtime { @@ -910,6 +916,8 @@ void snd_interval_mulkdiv(const struct snd_interval *a, unsigned int k, const struct snd_interval *b, struct snd_interval *c); int snd_interval_list(struct snd_interval *i, unsigned int count, const unsigned int *list, unsigned int mask); +int snd_interval_ranges(struct snd_interval *i, unsigned int count, + const struct snd_interval *list, unsigned int mask); int snd_interval_ratnum(struct snd_interval *i, unsigned int rats_count, struct snd_ratnum *rats, unsigned int *nump, unsigned int *denp); @@ -934,6 +942,10 @@ int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime, unsigned int cond, snd_pcm_hw_param_t var, const struct snd_pcm_hw_constraint_list *l); +int snd_pcm_hw_constraint_ranges(struct snd_pcm_runtime *runtime, + unsigned int cond, + snd_pcm_hw_param_t var, + const struct snd_pcm_hw_constraint_ranges *r); int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime, unsigned int cond, snd_pcm_hw_param_t var, |