pcm: Fill sw_params proto field
PATCH v2 1/1 pcm: Fill sw_params proto field
Fill the new proto field introduced to sw_params with the current PCM protocol version. This makes tstamp_type evaluated properly in the kernel.
Signed-off-by Takashi Iwai <[email protected]>
---v1->v2: rearrange proto and tstamp_type fields
include/sound/asound.h | 4 ++-- src/pcm/pcm.c | 1 + src/pcm/pcm_params.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-)
include/sound/asound.h +2 -2
@@ -386,8 +386,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 */ };
src/pcm/pcm.c +1 -0
@@ -5610,6 +5610,7 @@ int snd_pcm_sw_params_current(snd_pcm_t *pcm, snd_pcm_sw_params_t *params)SNDMSG ("PCM not set up" );return -EIO ; } + params->proto =SNDRV_PCM_VERSION ; params->tstamp_mode = pcm->tstamp_mode; params->tstamp_type = pcm->tstamp_type; params->period_step = pcm->period_step;
src/pcm/pcm_params.c +1 -0
@@ -2257,6 +2257,7 @@ static int snd_pcm_sw_params_default(snd_pcm_t *pcm, snd_pcm_sw_params_t *params {assert (pcm && params);assert (pcm->setup); + params->proto =SNDRV_PCM_VERSION ; params->tstamp_mode =SND_PCM_TSTAMP_NONE ; params->tstamp_type = pcm->tstamp_type; params->period_step =1 ;
Signature · 1 line
2.0.1