diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-15 05:21:13 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-15 05:21:13 -0400 |
| commit | 45c27fc8c89d39956930abeff8433c33d07a8d5f (patch) | |
| tree | 712e9882d975b050662d9a399a63b36785642f0c /include | |
| parent | 0882e8dd3aad33eca41696d463bb896e6c8817eb (diff) | |
| parent | 2ec775e7053c82bc90858ede011b35aeb416995b (diff) | |
Merge branch 'master' of git://git.alsa-project.org/alsa-kernel into for-linus
* 'master' of git://git.alsa-project.org/alsa-kernel:
[ALSA] intel8x0: add one retry to the ac97_clock measurement routine
[ALSA] intel8x0: fix wrong conditions in ac97_clock measure routine
[ALSA] intel8x0: do not use zero value from PICB register
[ALSA] intel8x0: an attempt to make ac97_clock measurement more reliable
[ALSA] pcm-midlevel: Add more strict buffer position checks based on jiffies
[ALSA] hda_intel: fix unexpected ring buffer positions
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/pcm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 8904b1900d7f..c17296891617 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h | |||
| @@ -268,7 +268,8 @@ struct snd_pcm_runtime { | |||
| 268 | int overrange; | 268 | int overrange; |
| 269 | snd_pcm_uframes_t avail_max; | 269 | snd_pcm_uframes_t avail_max; |
| 270 | snd_pcm_uframes_t hw_ptr_base; /* Position at buffer restart */ | 270 | snd_pcm_uframes_t hw_ptr_base; /* Position at buffer restart */ |
| 271 | snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time*/ | 271 | snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time */ |
| 272 | unsigned long hw_ptr_jiffies; /* Time when hw_ptr is updated */ | ||
| 272 | 273 | ||
| 273 | /* -- HW params -- */ | 274 | /* -- HW params -- */ |
| 274 | snd_pcm_access_t access; /* access mode */ | 275 | snd_pcm_access_t access; /* access mode */ |