snd_mask_min
hi all,
i've got a problem using params_format():
it uses an inline function snd_mask_min, which is declared in sound/pcm_params.h, but this file is not included by sound/pcm.h, where it is defined. including it manually, causes a huge number of errors. it would be very helpful, if pcm.h would be self-contained.
cheers, tim
At Mon, 25 Jul 2011 19:33:29 +0200,
Quoted 9 lines · Tim Blechmann
hi all,
i've got a problem using
params_format():it uses an inline function
snd_mask_min, which is declared insound/pcm_params.h, but this file is not included bysound/pcm.h, where it is defined. including it manually, causes a huge number of errors. it would be very helpful, ifpcm.hwould be self-contained.
Well, pcm_params.h is just an additional header that aren't used by most drivers, so it doesn't make much sense to include such unconditionally from the common pcm.h.
Takashi
Quoted 8 lines
Quoted 4 lines
it uses an inline function
snd_mask_min, which is declared insound/pcm_params.h, but this file is not included bysound/pcm.h, where it is defined. including it manually, causes a huge number of errors. it would be very helpful, ifpcm.hwould be self-contained.Well,
pcm_params.his just an additional header that aren't used by most drivers, so it doesn't make much sense to include such unconditionally from the commonpcm.h.
then wouldn't it make sense to move those parts from pcm.h that depend on pcm_params.h to that header? especially the params_* family? at the moment pcm.h is not self-contained, which is not really what i expect from a header ...
tim
At Tue, 26 Jul 2011 09:16:31 +0200,
Quoted 6 lines · Tim Blechmann
Quoted 6 lines
Quoted 5 lines
it uses an inline function
snd_mask_min, which is declared insound/pcm_params.h, but this file is not included bysound/pcm.h, where it is defined. including it manually, causes a huge number of errors. it would be very helpful, ifpcm.hwould be self-contained.
Quoted 7 lines
Quoted 3 lines
Well,
pcm_params.his just an additional header that aren't used by most drivers, so it doesn't make much sense to include such unconditionally from the commonpcm.h.then wouldn't it make sense to move those parts from
pcm.hthat depend onpcm_params.hto that header? especially the params_* family? at the momentpcm.his not self-contained, which is not really what i expect from a header ...
Ah, I see you point. Yes, some macros should be moved to pcm_params.h indeed. I applied the patch below now.
thanks,
Takashi
---
From: Takashi Iwai <[email protected]>
Subject: [PATCH] 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.
--- include/sound/pcm.h | 23 ++++++++++++----------- include/sound/pcm_params.h | 16 +++++++++++++++- 2 files changed, 27 insertions(+), 12 deletions(-)
include/sound/pcm.h +12 -11
@@ -761,17 +761,18 @@ static inline const struct snd_interval *hw_param_interval_c(const struct snd_pcreturn ¶ms->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
@@ -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 */
Signature · 1 line
1.7.6