Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b51beb75 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: Make pcm.h self-contained 



Move the macros depending on snd_mask_min() and co out of pcm.h into
pcm_params.h.  Otherwise using some params_*() macros will give comiple
errors without inclusion of pcm_params.h.

Also use hw_param_interval_c() and hw_param_mask_c() for const pointer.

Reported-by: default avatarTim Blechmann <tim@klingt.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4d7fbdbc

include/sound/pcm.h

+12 −11
Original line number Diff line number Diff line
@@ -761,17 +761,18 @@ static inline const struct snd_interval *hw_param_interval_c(const struct snd_pc 
	return &params->intervals[var - SNDRV_PCM_HW_PARAM_FIRST_INTERVAL];

}



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

#define params_format(p) ((__force snd_pcm_format_t)snd_mask_min(hw_param_mask((p), SNDRV_PCM_HW_PARAM_FORMAT)))

#define params_subformat(p) snd_mask_min(hw_param_mask((p), SNDRV_PCM_HW_PARAM_SUBFORMAT))

#define params_channels(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_CHANNELS)->min

#define params_rate(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_RATE)->min

#define params_period_size(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_PERIOD_SIZE)->min

#define params_period_bytes(p) ((params_period_size(p)*snd_pcm_format_physical_width(params_format(p))*params_channels(p))/8)

#define params_periods(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_PERIODS)->min

#define params_buffer_size(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_BUFFER_SIZE)->min

#define params_buffer_bytes(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_BUFFER_BYTES)->min



#define params_channels(p) \

	(hw_param_interval_c((p), SNDRV_PCM_HW_PARAM_CHANNELS)->min)

#define params_rate(p) \

	(hw_param_interval_c((p), SNDRV_PCM_HW_PARAM_RATE)->min)

#define params_period_size(p) \

	(hw_param_interval_c((p), SNDRV_PCM_HW_PARAM_PERIOD_SIZE)->min)

#define params_periods(p) \

	(hw_param_interval_c((p), SNDRV_PCM_HW_PARAM_PERIODS)->min)

#define params_buffer_size(p) \

	(hw_param_interval_c((p), SNDRV_PCM_HW_PARAM_BUFFER_SIZE)->min)

#define params_buffer_bytes(p) \

	(hw_param_interval_c((p), SNDRV_PCM_HW_PARAM_BUFFER_BYTES)->min)



int snd_interval_refine(struct snd_interval *i, const struct snd_interval *v);

void snd_interval_mul(const struct snd_interval *a, const struct snd_interval *b, struct snd_interval *c);

include/sound/pcm_params.h

+15 −1
Original line number Diff line number Diff line
@@ -337,5 +337,19 @@ static inline unsigned int sub(unsigned int a, unsigned int b) 
	return 0;

}



#endif /* __SOUND_PCM_PARAMS_H */

#define params_access(p) ((__force snd_pcm_access_t)\

		snd_mask_min(hw_param_mask_c((p), SNDRV_PCM_HW_PARAM_ACCESS)))

#define params_format(p) ((__force snd_pcm_format_t)\

		snd_mask_min(hw_param_mask_c((p), SNDRV_PCM_HW_PARAM_FORMAT)))

#define params_subformat(p) \

	snd_mask_min(hw_param_mask_c((p), SNDRV_PCM_HW_PARAM_SUBFORMAT))



static inline unsigned int

params_period_bytes(const struct snd_pcm_hw_params *p)

{

	return (params_period_size(p) *

		snd_pcm_format_physical_width(params_format(p)) *

		params_channels(p)) / 8;

}



#endif /* __SOUND_PCM_PARAMS_H */