From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760787AbbA1VfR (ORCPT ); Wed, 28 Jan 2015 16:35:17 -0500 Received: from cantor2.suse.de ([195.135.220.15]:59696 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761551AbbA1UoE (ORCPT ); Wed, 28 Jan 2015 15:44:04 -0500 Date: Wed, 28 Jan 2015 18:19:00 +0100 Message-ID: From: Takashi Iwai To: Peter Rosin Cc: alsa-devel@alsa-project.org, Peter Rosin , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Jaroslav Kysela , Liam Girdwood , Mark Brown , Clemens Ladisch , Lars-Peter Clausen , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 1/7] ALSA: pcm: Add snd_interval_ranges() and snd_pcm_hw_constraint_ranges() In-Reply-To: <1422454572-7847-2-git-send-email-peda@lysator.liu.se> References: <1422454572-7847-1-git-send-email-peda@lysator.liu.se> <1422454572-7847-2-git-send-email-peda@lysator.liu.se> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.4 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Wed, 28 Jan 2015 15:16:06 +0100, Peter Rosin wrote: > > From: Peter Rosin > > Add helper functions to allow drivers to specify several disjoint > ranges for a variable. In particular, there is a codec (PCM512x) that > has a hole in its supported range of rates, due to PLL and divider > restrictions. > > This is like snd_pcm_hw_constraint_list(), but for ranges instead of > points. > > Signed-off-by: Peter Rosin > Reviewed-by: Lars-Peter Clausen Mark, feel free to take my ack if you carry this with other patches through your tree. Reviewed-by: Takashi Iwai thanks, Takashi > --- > include/sound/pcm.h | 12 +++++++ > sound/core/pcm_lib.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 97 insertions(+) > > diff --git a/include/sound/pcm.h b/include/sound/pcm.h > index 1e7f74acc2ec..04fc037e0555 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, > diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c > index ec9e7866177f..446c00bd908b 100644 > --- a/sound/core/pcm_lib.c > +++ b/sound/core/pcm_lib.c > @@ -1015,6 +1015,60 @@ int snd_interval_list(struct snd_interval *i, unsigned int count, > > EXPORT_SYMBOL(snd_interval_list); > > +/** > + * snd_interval_ranges - refine the interval value from the list of ranges > + * @i: the interval value to refine > + * @count: the number of elements in the list of ranges > + * @ranges: the ranges list > + * @mask: the bit-mask to evaluate > + * > + * Refines the interval value from the list of ranges. > + * When mask is non-zero, only the elements corresponding to bit 1 are > + * evaluated. > + * > + * Return: Positive if the value is changed, zero if it's not changed, or a > + * negative error code. > + */ > +int snd_interval_ranges(struct snd_interval *i, unsigned int count, > + const struct snd_interval *ranges, unsigned int mask) > +{ > + unsigned int k; > + struct snd_interval range_union; > + struct snd_interval range; > + > + if (!count) { > + snd_interval_none(i); > + return -EINVAL; > + } > + snd_interval_any(&range_union); > + range_union.min = UINT_MAX; > + range_union.max = 0; > + for (k = 0; k < count; k++) { > + if (mask && !(mask & (1 << k))) > + continue; > + snd_interval_copy(&range, &ranges[k]); > + if (snd_interval_refine(&range, i) < 0) > + continue; > + if (snd_interval_empty(&range)) > + continue; > + > + if (range.min < range_union.min) { > + range_union.min = range.min; > + range_union.openmin = 1; > + } > + if (range.min == range_union.min && !range.openmin) > + range_union.openmin = 0; > + if (range.max > range_union.max) { > + range_union.max = range.max; > + range_union.openmax = 1; > + } > + if (range.max == range_union.max && !range.openmax) > + range_union.openmax = 0; > + } > + return snd_interval_refine(i, &range_union); > +} > +EXPORT_SYMBOL(snd_interval_ranges); > + > static int snd_interval_step(struct snd_interval *i, unsigned int step) > { > unsigned int n; > @@ -1221,6 +1275,37 @@ int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime, > > EXPORT_SYMBOL(snd_pcm_hw_constraint_list); > > +static int snd_pcm_hw_rule_ranges(struct snd_pcm_hw_params *params, > + struct snd_pcm_hw_rule *rule) > +{ > + struct snd_pcm_hw_constraint_ranges *r = rule->private; > + return snd_interval_ranges(hw_param_interval(params, rule->var), > + r->count, r->ranges, r->mask); > +} > + > + > +/** > + * snd_pcm_hw_constraint_ranges - apply list of range constraints to a parameter > + * @runtime: PCM runtime instance > + * @cond: condition bits > + * @var: hw_params variable to apply the list of range constraints > + * @r: ranges > + * > + * Apply the list of range constraints to an interval parameter. > + * > + * Return: Zero if successful, or a negative error code on failure. > + */ > +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) > +{ > + return snd_pcm_hw_rule_add(runtime, cond, var, > + snd_pcm_hw_rule_ranges, (void *)r, > + var, -1); > +} > +EXPORT_SYMBOL(snd_pcm_hw_constraint_ranges); > + > static int snd_pcm_hw_rule_ratnums(struct snd_pcm_hw_params *params, > struct snd_pcm_hw_rule *rule) > { > -- > 1.7.10.4 >