diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-04 15:57:06 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-04 15:57:06 -0500 |
commit | 7d590e462315f40f821599bcc0b2b6b7f62142a8 (patch) | |
tree | c5168c68304fa6d739f81ff620ab96e2aac1f017 /include/sound | |
parent | 3223d9c62c536677aa826ff42e22fafa672bf266 (diff) | |
parent | 9c7da1a57bb5938f1d874c8cd5e50d2494830d08 (diff) |
Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next
Diffstat (limited to 'include/sound')
-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 { | |||
275 | unsigned int mask; | 275 | unsigned int mask; |
276 | }; | 276 | }; |
277 | 277 | ||
278 | struct snd_pcm_hw_constraint_ranges { | ||
279 | unsigned int count; | ||
280 | const struct snd_interval *ranges; | ||
281 | unsigned int mask; | ||
282 | }; | ||
283 | |||
278 | struct snd_pcm_hwptr_log; | 284 | struct snd_pcm_hwptr_log; |
279 | 285 | ||
280 | struct snd_pcm_runtime { | 286 | struct snd_pcm_runtime { |
@@ -910,6 +916,8 @@ void snd_interval_mulkdiv(const struct snd_interval *a, unsigned int k, | |||
910 | const struct snd_interval *b, struct snd_interval *c); | 916 | const struct snd_interval *b, struct snd_interval *c); |
911 | int snd_interval_list(struct snd_interval *i, unsigned int count, | 917 | int snd_interval_list(struct snd_interval *i, unsigned int count, |
912 | const unsigned int *list, unsigned int mask); | 918 | const unsigned int *list, unsigned int mask); |
919 | int snd_interval_ranges(struct snd_interval *i, unsigned int count, | ||
920 | const struct snd_interval *list, unsigned int mask); | ||
913 | int snd_interval_ratnum(struct snd_interval *i, | 921 | int snd_interval_ratnum(struct snd_interval *i, |
914 | unsigned int rats_count, struct snd_ratnum *rats, | 922 | unsigned int rats_count, struct snd_ratnum *rats, |
915 | unsigned int *nump, unsigned int *denp); | 923 | unsigned int *nump, unsigned int *denp); |
@@ -934,6 +942,10 @@ int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime, | |||
934 | unsigned int cond, | 942 | unsigned int cond, |
935 | snd_pcm_hw_param_t var, | 943 | snd_pcm_hw_param_t var, |
936 | const struct snd_pcm_hw_constraint_list *l); | 944 | const struct snd_pcm_hw_constraint_list *l); |
945 | int snd_pcm_hw_constraint_ranges(struct snd_pcm_runtime *runtime, | ||
946 | unsigned int cond, | ||
947 | snd_pcm_hw_param_t var, | ||
948 | const struct snd_pcm_hw_constraint_ranges *r); | ||
937 | int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime, | 949 | int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime, |
938 | unsigned int cond, | 950 | unsigned int cond, |
939 | snd_pcm_hw_param_t var, | 951 | snd_pcm_hw_param_t var, |