ALSA: pcm: Introduce protocol version field to sw_params
PATCH v2 1/2 ALSA: pcm: Introduce protocol version field to sw_params
For controlling the new fields more strictly, add sw_params.proto field indicating the protocol version of the user-space. User-space should fill the SNDRV_PCM_VERSION value it's built with, then kernel can know whether the new fields should be evaluated or not.
And now tstamp_type field is evaluated only when the valid value is set there. This avoids the wrong override of tstamp_type to zero, which is SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY.
---v1->v2: rearrange the order of proto and tstamp_type fields
include/uapi/sound/asound.h | 4 ++-- sound/core/pcm_native.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-)
include/uapi/sound/asound.h +2 -2
@@ -391,8 +391,8 @@ struct snd_pcm_sw_params {snd_pcm_uframes_t silence_threshold;/* min distance from noise for silence filling */ snd_pcm_uframes_t silence_size;/* silence block size */ snd_pcm_uframes_t boundary;/* pointers wrap point */ -unsigned int tstamp_type;/* timestamp type */ -int pads;/* alignment, reserved */ +unsigned int proto;/* protocol version */ +unsigned int tstamp_type;/* timestamp type (req. proto >= 2.0.12) */ unsigned char reserved[56 ];/* reserved for future */ };
sound/core/pcm_native.c +4 -2
@@ -543,7 +543,8 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream,if (params->tstamp_mode >SNDRV_PCM_TSTAMP_LAST )return -EINVAL ; -if (params->tstamp_type >SNDRV_PCM_TSTAMP_TYPE_LAST ) +if (params->proto >=SNDRV_PROTOCOL_VERSION (2 ,0 ,12 ) && + params->tstamp_type >SNDRV_PCM_TSTAMP_TYPE_LAST )return -EINVAL ;if (params->avail_min ==0 )return -EINVAL ;
@@ -559,7 +560,8 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream, err =0 ;snd_pcm_stream_lock_irq (substream); runtime->tstamp_mode = params->tstamp_mode; - runtime->tstamp_type = params->tstamp_type; +if (params->proto >=SNDRV_PROTOCOL_VERSION (2 ,0 ,12 )) + runtime->tstamp_type = params->tstamp_type; runtime->period_step = params->period_step; runtime->control->avail_min = params->avail_min; runtime->start_threshold = params->start_threshold;
Signature · 1 line
2.0.1
PATCH v2 2/2 ALSA: pcm: Add tstamp_type and proto to sw_params compat layer
I forgot to add the new fields in sw_params to 32bit compat layer.
---v1->v2: rearrange the order of proto and tstamp_type fields
sound/core/pcm_compat.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
sound/core/pcm_compat.c +6 -2
@@ -101,7 +101,9 @@ struct snd_pcm_sw_params32 {u32 silence_threshold;u32 silence_size;u32 boundary; -unsigned char reserved[64 ]; +u32 proto; +u32 tstamp_type; +unsigned char reserved[56 ]; };/* recalcuate the boundary within 32bit */
@@ -133,7 +135,9 @@ static int snd_pcm_ioctl_sw_params_compat(struct snd_pcm_substream *substream,get_user (params.start_threshold, &src->start_threshold) ||get_user (params.stop_threshold, &src->stop_threshold) ||get_user (params.silence_threshold, &src->silence_threshold) || - get_user(params.silence_size, &src->silence_size)) +get_user (params.silence_size, &src->silence_size) || +get_user (params.tstamp_type, &src->tstamp_type) || + get_user(params.proto, &src->proto)) return -EFAULT;/* * Check silent_size parameter. Since we have 64bit boundary,
Signature · 1 line
2.0.1