Commit eabe3228 authored by Jaroslav Kysela's avatar Jaroslav Kysela
Browse files

[ALSA] Revert "alsa: add annotations to bitwise type snd_pcm_hw_param_t" 



This reverts commit 36b34d2437104f323e09d7c6af6451d3c0b9c0cd.

From: Al Viro <viro@ZenIV.linux.org.uk>

WIW, *all* this stuff is not bitwise at all.  For crying out loud, half
of these types are routinely used as array indices and loop variables...

If anything, we want a different set of allowed operations - subtraction
between elements of type (yielding integer), addition/subtraction of
integer types not bigger than ours (yielding our type), comparisons,
assignments (=, +=, -=, passing to function as argument, return from
function, initializers) and second/third arguments in ?:.  With 0 *not*
being allowed as a constant of such type.

It's not bitwise; we may use the same infrastructure in sparse, but it
should be a separate class of types (__attribute__((affine))).

dma_addr_t is another candidate for the same treatment, but there we'll
need helpers for conversions to hw-acceptable form (dma_to_le32(), etc.)
and gradual conversion of drivers.

ALSA ones and pm mess are absolutely straightforward cases, though.

Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent a1855d80

include/sound/asound.h

+4 −8
Original line number Diff line number Diff line
@@ -302,8 +302,6 @@ typedef int __bitwise snd_pcm_hw_param_t; 
#define	SNDRV_PCM_HW_PARAM_SUBFORMAT	((__force snd_pcm_hw_param_t) 2) /* Subformat */

#define	SNDRV_PCM_HW_PARAM_FIRST_MASK	SNDRV_PCM_HW_PARAM_ACCESS

#define	SNDRV_PCM_HW_PARAM_LAST_MASK	SNDRV_PCM_HW_PARAM_SUBFORMAT

#define SNDRV_PCM_HW_PARAM_MASK_INDEX(var)	\

	((__force int)(var) - (__force int)SNDRV_PCM_HW_PARAM_FIRST_MASK)



#define	SNDRV_PCM_HW_PARAM_SAMPLE_BITS	((__force snd_pcm_hw_param_t) 8) /* Bits per sample */

#define	SNDRV_PCM_HW_PARAM_FRAME_BITS	((__force snd_pcm_hw_param_t) 9) /* Bits per frame */
@@ -319,8 +317,6 @@ typedef int __bitwise snd_pcm_hw_param_t; 
#define	SNDRV_PCM_HW_PARAM_TICK_TIME	((__force snd_pcm_hw_param_t) 19) /* Approx tick duration in us */

#define	SNDRV_PCM_HW_PARAM_FIRST_INTERVAL	SNDRV_PCM_HW_PARAM_SAMPLE_BITS

#define	SNDRV_PCM_HW_PARAM_LAST_INTERVAL	SNDRV_PCM_HW_PARAM_TICK_TIME

#define SNDRV_PCM_HW_PARAM_INTERVAL_INDEX(var)	\

	((__force int)(var) - (__force int)SNDRV_PCM_HW_PARAM_FIRST_INTERVAL)



#define SNDRV_PCM_HW_PARAMS_NORESAMPLE		(1<<0)	/* avoid rate resampling */
@@ -340,11 +336,11 @@ struct snd_mask { 


struct snd_pcm_hw_params {

	unsigned int flags;

	struct snd_mask masks[

		SNDRV_PCM_HW_PARAM_MASK_INDEX(SNDRV_PCM_HW_PARAM_LAST_MASK) + 1];

	struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - 

			       SNDRV_PCM_HW_PARAM_FIRST_MASK + 1];

	struct snd_mask mres[5];	/* reserved masks */

	struct snd_interval intervals[

		SNDRV_PCM_HW_PARAM_INTERVAL_INDEX(SNDRV_PCM_HW_PARAM_LAST_INTERVAL) + 1];

	struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL -

				        SNDRV_PCM_HW_PARAM_FIRST_INTERVAL + 1];

	struct snd_interval ires[9];	/* reserved intervals */

	unsigned int rmask;		/* W: requested masks */

	unsigned int cmask;		/* R: changed masks */

include/sound/pcm.h

+16 −16
Original line number Diff line number Diff line
@@ -209,10 +209,10 @@ struct snd_pcm_hw_rule { 
};



struct snd_pcm_hw_constraints {

	struct snd_mask masks[

		SNDRV_PCM_HW_PARAM_MASK_INDEX(SNDRV_PCM_HW_PARAM_LAST_MASK) + 1];

	struct snd_interval intervals[

		SNDRV_PCM_HW_PARAM_INTERVAL_INDEX(SNDRV_PCM_HW_PARAM_LAST_INTERVAL) + 1];

	struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - 

			 SNDRV_PCM_HW_PARAM_FIRST_MASK + 1];

	struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL -

			     SNDRV_PCM_HW_PARAM_FIRST_INTERVAL + 1];

	unsigned int rules_num;

	unsigned int rules_all;

	struct snd_pcm_hw_rule *rules;
@@ -221,13 +221,13 @@ struct snd_pcm_hw_constraints { 
static inline struct snd_mask *constrs_mask(struct snd_pcm_hw_constraints *constrs,

					    snd_pcm_hw_param_t var)

{

	return &constrs->masks[SNDRV_PCM_HW_PARAM_MASK_INDEX(var)];

	return &constrs->masks[var - SNDRV_PCM_HW_PARAM_FIRST_MASK];

}



static inline struct snd_interval *constrs_interval(struct snd_pcm_hw_constraints *constrs,

						    snd_pcm_hw_param_t var)

{

	return &constrs->intervals[SNDRV_PCM_HW_PARAM_INTERVAL_INDEX(var)];

	return &constrs->intervals[var - SNDRV_PCM_HW_PARAM_FIRST_INTERVAL];

}



struct snd_ratnum {
@@ -761,40 +761,40 @@ static inline void snd_pcm_trigger_done(struct snd_pcm_substream *substream, 
	substream->runtime->trigger_master = master;

}



static inline int hw_is_mask(snd_pcm_hw_param_t var)

static inline int hw_is_mask(int var)

{

	return (__force int)var >= (__force int)SNDRV_PCM_HW_PARAM_FIRST_MASK &&

		(__force int)var <= (__force int)SNDRV_PCM_HW_PARAM_LAST_MASK;

	return var >= SNDRV_PCM_HW_PARAM_FIRST_MASK &&

		var <= SNDRV_PCM_HW_PARAM_LAST_MASK;

}



static inline int hw_is_interval(snd_pcm_hw_param_t var)

static inline int hw_is_interval(int var)

{

	return (__force int)var >= (__force int)SNDRV_PCM_HW_PARAM_FIRST_INTERVAL &&

		(__force int)var <= (__force int)SNDRV_PCM_HW_PARAM_LAST_INTERVAL;

	return var >= SNDRV_PCM_HW_PARAM_FIRST_INTERVAL &&

		var <= SNDRV_PCM_HW_PARAM_LAST_INTERVAL;

}



static inline struct snd_mask *hw_param_mask(struct snd_pcm_hw_params *params,

				     snd_pcm_hw_param_t var)

{

	return &params->masks[SNDRV_PCM_HW_PARAM_MASK_INDEX(var)];

	return &params->masks[var - SNDRV_PCM_HW_PARAM_FIRST_MASK];

}



static inline struct snd_interval *hw_param_interval(struct snd_pcm_hw_params *params,

					     snd_pcm_hw_param_t var)

{

	return &params->intervals[SNDRV_PCM_HW_PARAM_INTERVAL_INDEX(var)];

	return &params->intervals[var - SNDRV_PCM_HW_PARAM_FIRST_INTERVAL];

}



static inline const struct snd_mask *hw_param_mask_c(const struct snd_pcm_hw_params *params,

					     snd_pcm_hw_param_t var)

{

	return &params->masks[SNDRV_PCM_HW_PARAM_MASK_INDEX(var)];

	return &params->masks[var - SNDRV_PCM_HW_PARAM_FIRST_MASK];

}



static inline const struct snd_interval *hw_param_interval_c(const struct snd_pcm_hw_params *params,

						     snd_pcm_hw_param_t var)

{

	return &params->intervals[SNDRV_PCM_HW_PARAM_INTERVAL_INDEX(var)];

	return &params->intervals[var - SNDRV_PCM_HW_PARAM_FIRST_INTERVAL];

}



#define params_access(p) snd_mask_min(hw_param_mask((p), SNDRV_PCM_HW_PARAM_ACCESS))

CRA Git | Maintained and supported by SUSTech CRA and CCSE