diff options
Diffstat (limited to 'sound/core/pcm_native.c')
| -rw-r--r-- | sound/core/pcm_native.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index bf5d0f2acfb9..b98b3ccde4f0 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -39,6 +39,9 @@ #include "pcm_local.h" +#define CREATE_TRACE_POINTS +#include "pcm_param_trace.h" + /* * Compatibility */ @@ -279,6 +282,9 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, unsigned int stamp = 2; int changed, again; + struct snd_mask __maybe_unused old_mask; + struct snd_interval __maybe_unused old_interval; + params->info = 0; params->fifo_size = 0; if (params->rmask & (1 << SNDRV_PCM_HW_PARAM_SAMPLE_BITS)) @@ -294,6 +300,9 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, return -EINVAL; if (!(params->rmask & (1 << k))) continue; + + if (trace_hw_mask_param_enabled()) + old_mask = *m; #ifdef RULES_DEBUG pr_debug("%s = ", snd_pcm_hw_param_names[k]); pr_cont("%04x%04x%04x%04x -> ", m->bits[3], m->bits[2], m->bits[1], m->bits[0]); @@ -302,6 +311,8 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, #ifdef RULES_DEBUG pr_cont("%04x%04x%04x%04x\n", m->bits[3], m->bits[2], m->bits[1], m->bits[0]); #endif + trace_hw_mask_param(substream, k, 0, &old_mask, m); + if (changed) params->cmask |= 1 << k; if (changed < 0) @@ -314,6 +325,9 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, return -EINVAL; if (!(params->rmask & (1 << k))) continue; + + if (trace_hw_interval_param_enabled()) + old_interval = *i; #ifdef RULES_DEBUG pr_debug("%s = ", snd_pcm_hw_param_names[k]); if (i->empty) @@ -333,6 +347,8 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, i->openmin ? '(' : '[', i->min, i->max, i->openmax ? ')' : ']'); #endif + trace_hw_interval_param(substream, k, 0, &old_interval, i); + if (changed) params->cmask |= 1 << k; if (changed < 0) @@ -359,6 +375,15 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, } if (!doit) continue; + + if (trace_hw_mask_param_enabled()) { + if (hw_is_mask(r->var)) + old_mask = *hw_param_mask(params, r->var); + } + if (trace_hw_interval_param_enabled()) { + if (hw_is_interval(r->var)) + old_interval = *hw_param_interval(params, r->var); + } #ifdef RULES_DEBUG pr_debug("Rule %d [%p]: ", k, r->func); if (r->var >= 0) { @@ -394,6 +419,14 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, } pr_cont("\n"); #endif + if (hw_is_mask(r->var)) { + trace_hw_mask_param(substream, r->var, k + 1, + &old_mask, hw_param_mask(params, r->var)); + } + if (hw_is_interval(r->var)) { + trace_hw_interval_param(substream, r->var, k + 1, + &old_interval, hw_param_interval(params, r->var)); + } rstamps[k] = stamp; if (changed && r->var >= 0) { params->cmask |= (1 << r->var); |