Commit 9bb22e21 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Clean up ugly hacks in pcm_params.h 



Clean up ugly hacks for sync with alsa-lib in pcm_params.h.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9ac25594

include/sound/pcm_params.h

+42 −63
Original line number Diff line number Diff line
@@ -35,16 +35,12 @@ extern int _snd_pcm_hw_param_setinteger(struct snd_pcm_hw_params *params, 
extern int _snd_pcm_hw_param_set(struct snd_pcm_hw_params *params,

				 snd_pcm_hw_param_t var, unsigned int val, int dir);



/* To share the same code we have  alsa-lib */

#define INLINE static inline

#define assert(a) (void)(a)



#define SNDRV_MASK_BITS	64	/* we use so far 64bits only */

#define SNDRV_MASK_SIZE	(SNDRV_MASK_BITS / 32)

#define MASK_OFS(i)	((i) >> 5)

#define MASK_BIT(i)	(1U << ((i) & 31))



INLINE unsigned int ld2(u_int32_t v)

static inline unsigned int ld2(u_int32_t v)

{

        unsigned r = 0;
@@ -69,22 +65,22 @@ INLINE unsigned int ld2(u_int32_t v) 
        return r;

}



INLINE size_t snd_mask_sizeof(void)

static inline size_t snd_mask_sizeof(void)

{

	return sizeof(struct snd_mask);

}



INLINE void snd_mask_none(struct snd_mask *mask)

static inline void snd_mask_none(struct snd_mask *mask)

{

	memset(mask, 0, sizeof(*mask));

}



INLINE void snd_mask_any(struct snd_mask *mask)

static inline void snd_mask_any(struct snd_mask *mask)

{

	memset(mask, 0xff, SNDRV_MASK_SIZE * sizeof(u_int32_t));

}



INLINE int snd_mask_empty(const struct snd_mask *mask)

static inline int snd_mask_empty(const struct snd_mask *mask)

{

	int i;

	for (i = 0; i < SNDRV_MASK_SIZE; i++)
@@ -93,10 +89,9 @@ INLINE int snd_mask_empty(const struct snd_mask *mask) 
	return 1;

}



INLINE unsigned int snd_mask_min(const struct snd_mask *mask)

static inline unsigned int snd_mask_min(const struct snd_mask *mask)

{

	int i;

	assert(!snd_mask_empty(mask));

	for (i = 0; i < SNDRV_MASK_SIZE; i++) {

		if (mask->bits[i])

			return ffs(mask->bits[i]) - 1 + (i << 5);
@@ -104,10 +99,9 @@ INLINE unsigned int snd_mask_min(const struct snd_mask *mask) 
	return 0;

}



INLINE unsigned int snd_mask_max(const struct snd_mask *mask)

static inline unsigned int snd_mask_max(const struct snd_mask *mask)

{

	int i;

	assert(!snd_mask_empty(mask));

	for (i = SNDRV_MASK_SIZE - 1; i >= 0; i--) {

		if (mask->bits[i])

			return ld2(mask->bits[i]) + (i << 5);
@@ -115,70 +109,68 @@ INLINE unsigned int snd_mask_max(const struct snd_mask *mask) 
	return 0;

}



INLINE void snd_mask_set(struct snd_mask *mask, unsigned int val)

static inline void snd_mask_set(struct snd_mask *mask, unsigned int val)

{

	assert(val <= SNDRV_MASK_BITS);

	mask->bits[MASK_OFS(val)] |= MASK_BIT(val);

}



INLINE void snd_mask_reset(struct snd_mask *mask, unsigned int val)

static inline void snd_mask_reset(struct snd_mask *mask, unsigned int val)

{

	assert(val <= SNDRV_MASK_BITS);

	mask->bits[MASK_OFS(val)] &= ~MASK_BIT(val);

}



INLINE void snd_mask_set_range(struct snd_mask *mask, unsigned int from, unsigned int to)

static inline void snd_mask_set_range(struct snd_mask *mask,

				      unsigned int from, unsigned int to)

{

	unsigned int i;

	assert(to <= SNDRV_MASK_BITS && from <= to);

	for (i = from; i <= to; i++)

		mask->bits[MASK_OFS(i)] |= MASK_BIT(i);

}



INLINE void snd_mask_reset_range(struct snd_mask *mask, unsigned int from, unsigned int to)

static inline void snd_mask_reset_range(struct snd_mask *mask,

					unsigned int from, unsigned int to)

{

	unsigned int i;

	assert(to <= SNDRV_MASK_BITS && from <= to);

	for (i = from; i <= to; i++)

		mask->bits[MASK_OFS(i)] &= ~MASK_BIT(i);

}



INLINE void snd_mask_leave(struct snd_mask *mask, unsigned int val)

static inline void snd_mask_leave(struct snd_mask *mask, unsigned int val)

{

	unsigned int v;

	assert(val <= SNDRV_MASK_BITS);

	v = mask->bits[MASK_OFS(val)] & MASK_BIT(val);

	snd_mask_none(mask);

	mask->bits[MASK_OFS(val)] = v;

}



INLINE void snd_mask_intersect(struct snd_mask *mask, const struct snd_mask *v)

static inline void snd_mask_intersect(struct snd_mask *mask,

				      const struct snd_mask *v)

{

	int i;

	for (i = 0; i < SNDRV_MASK_SIZE; i++)

		mask->bits[i] &= v->bits[i];

}



INLINE int snd_mask_eq(const struct snd_mask *mask, const struct snd_mask *v)

static inline int snd_mask_eq(const struct snd_mask *mask,

			      const struct snd_mask *v)

{

	return ! memcmp(mask, v, SNDRV_MASK_SIZE * sizeof(u_int32_t));

}



INLINE void snd_mask_copy(struct snd_mask *mask, const struct snd_mask *v)

static inline void snd_mask_copy(struct snd_mask *mask,

				 const struct snd_mask *v)

{

	*mask = *v;

}



INLINE int snd_mask_test(const struct snd_mask *mask, unsigned int val)

static inline int snd_mask_test(const struct snd_mask *mask, unsigned int val)

{

	assert(val <= SNDRV_MASK_BITS);

	return mask->bits[MASK_OFS(val)] & MASK_BIT(val);

}



INLINE int snd_mask_single(const struct snd_mask *mask)

static inline int snd_mask_single(const struct snd_mask *mask)

{

	int i, c = 0;

	assert(!snd_mask_empty(mask));

	for (i = 0; i < SNDRV_MASK_SIZE; i++) {

		if (! mask->bits[i])

			continue;
@@ -191,10 +183,10 @@ INLINE int snd_mask_single(const struct snd_mask *mask) 
	return 1;

}



INLINE int snd_mask_refine(struct snd_mask *mask, const struct snd_mask *v)

static inline int snd_mask_refine(struct snd_mask *mask,

				  const struct snd_mask *v)

{

	struct snd_mask old;

	assert(!snd_mask_empty(mask));

	snd_mask_copy(&old, mask);

	snd_mask_intersect(mask, v);

	if (snd_mask_empty(mask))
@@ -202,27 +194,24 @@ INLINE int snd_mask_refine(struct snd_mask *mask, const struct snd_mask *v) 
	return !snd_mask_eq(mask, &old);

}



INLINE int snd_mask_refine_first(struct snd_mask *mask)

static inline int snd_mask_refine_first(struct snd_mask *mask)

{

	assert(!snd_mask_empty(mask));

	if (snd_mask_single(mask))

		return 0;

	snd_mask_leave(mask, snd_mask_min(mask));

	return 1;

}



INLINE int snd_mask_refine_last(struct snd_mask *mask)

static inline int snd_mask_refine_last(struct snd_mask *mask)

{

	assert(!snd_mask_empty(mask));

	if (snd_mask_single(mask))

		return 0;

	snd_mask_leave(mask, snd_mask_max(mask));

	return 1;

}



INLINE int snd_mask_refine_min(struct snd_mask *mask, unsigned int val)

static inline int snd_mask_refine_min(struct snd_mask *mask, unsigned int val)

{

	assert(!snd_mask_empty(mask));

	if (snd_mask_min(mask) >= val)

		return 0;

	snd_mask_reset_range(mask, 0, val - 1);
@@ -231,9 +220,8 @@ INLINE int snd_mask_refine_min(struct snd_mask *mask, unsigned int val) 
	return 1;

}



INLINE int snd_mask_refine_max(struct snd_mask *mask, unsigned int val)

static inline int snd_mask_refine_max(struct snd_mask *mask, unsigned int val)

{

	assert(!snd_mask_empty(mask));

	if (snd_mask_max(mask) <= val)

		return 0;

	snd_mask_reset_range(mask, val + 1, SNDRV_MASK_BITS);
@@ -242,10 +230,9 @@ INLINE int snd_mask_refine_max(struct snd_mask *mask, unsigned int val) 
	return 1;

}



INLINE int snd_mask_refine_set(struct snd_mask *mask, unsigned int val)

static inline int snd_mask_refine_set(struct snd_mask *mask, unsigned int val)

{

	int changed;

	assert(!snd_mask_empty(mask));

	changed = !snd_mask_single(mask);

	snd_mask_leave(mask, val);

	if (snd_mask_empty(mask))
@@ -253,13 +240,12 @@ INLINE int snd_mask_refine_set(struct snd_mask *mask, unsigned int val) 
	return changed;

}



INLINE int snd_mask_value(const struct snd_mask *mask)

static inline int snd_mask_value(const struct snd_mask *mask)

{

	assert(!snd_mask_empty(mask));

	return snd_mask_min(mask);

}



INLINE void snd_interval_any(struct snd_interval *i)

static inline void snd_interval_any(struct snd_interval *i)

{

	i->min = 0;

	i->openmin = 0;
@@ -269,63 +255,59 @@ INLINE void snd_interval_any(struct snd_interval *i) 
	i->empty = 0;

}



INLINE void snd_interval_none(struct snd_interval *i)

static inline void snd_interval_none(struct snd_interval *i)

{

	i->empty = 1;

}



INLINE int snd_interval_checkempty(const struct snd_interval *i)

static inline int snd_interval_checkempty(const struct snd_interval *i)

{

	return (i->min > i->max ||

		(i->min == i->max && (i->openmin || i->openmax)));

}



INLINE int snd_interval_empty(const struct snd_interval *i)

static inline int snd_interval_empty(const struct snd_interval *i)

{

	return i->empty;

}



INLINE int snd_interval_single(const struct snd_interval *i)

static inline int snd_interval_single(const struct snd_interval *i)

{

	assert(!snd_interval_empty(i));

	return (i->min == i->max || 

		(i->min + 1 == i->max && i->openmax));

}



INLINE int snd_interval_value(const struct snd_interval *i)

static inline int snd_interval_value(const struct snd_interval *i)

{

	assert(snd_interval_single(i));

	return i->min;

}



INLINE int snd_interval_min(const struct snd_interval *i)

static inline int snd_interval_min(const struct snd_interval *i)

{

	assert(!snd_interval_empty(i));

	return i->min;

}



INLINE int snd_interval_max(const struct snd_interval *i)

static inline int snd_interval_max(const struct snd_interval *i)

{

	unsigned int v;

	assert(!snd_interval_empty(i));

	v = i->max;

	if (i->openmax)

		v--;

	return v;

}



INLINE int snd_interval_test(const struct snd_interval *i, unsigned int val)

static inline int snd_interval_test(const struct snd_interval *i, unsigned int val)

{

	return !((i->min > val || (i->min == val && i->openmin) ||

		  i->max < val || (i->max == val && i->openmax)));

}



INLINE void snd_interval_copy(struct snd_interval *d, const struct snd_interval *s)

static inline void snd_interval_copy(struct snd_interval *d, const struct snd_interval *s)

{

	*d = *s;

}



INLINE int snd_interval_setinteger(struct snd_interval *i)

static inline int snd_interval_setinteger(struct snd_interval *i)

{

	if (i->integer)

		return 0;
@@ -335,7 +317,7 @@ INLINE int snd_interval_setinteger(struct snd_interval *i) 
	return 1;

}



INLINE int snd_interval_eq(const struct snd_interval *i1, const struct snd_interval *i2)

static inline int snd_interval_eq(const struct snd_interval *i1, const struct snd_interval *i2)

{

	if (i1->empty)

		return i2->empty;
@@ -359,8 +341,5 @@ static inline unsigned int sub(unsigned int a, unsigned int b) 
	return 0;

}



#undef INLINE

#undef assert



#endif /* __SOUND_PCM_PARAMS_H */