diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-26 12:13:04 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-26 12:13:04 -0500 |
| commit | d0d2c38e3963f4f86a9e62d74f45a371458f2787 (patch) | |
| tree | 8ab868d67fcd4151e9b7a8158edc0cb2e1a19f66 /include/sound | |
| parent | cf944ee55cc318bdb1d4b2f3f5cce3257f7c07b3 (diff) | |
| parent | e7636925789b042ff9d98c51d48392e8c5549480 (diff) | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/pcm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index ee16122a1886..8b611a561985 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h | |||
| @@ -271,6 +271,7 @@ struct snd_pcm_runtime { | |||
| 271 | int overrange; | 271 | int overrange; |
| 272 | snd_pcm_uframes_t avail_max; | 272 | snd_pcm_uframes_t avail_max; |
| 273 | snd_pcm_uframes_t hw_ptr_base; /* Position at buffer restart */ | 273 | snd_pcm_uframes_t hw_ptr_base; /* Position at buffer restart */ |
| 274 | snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time */ | ||
| 274 | unsigned long hw_ptr_jiffies; /* Time when hw_ptr is updated */ | 275 | unsigned long hw_ptr_jiffies; /* Time when hw_ptr is updated */ |
| 275 | snd_pcm_sframes_t delay; /* extra delay; typically FIFO size */ | 276 | snd_pcm_sframes_t delay; /* extra delay; typically FIFO size */ |
| 276 | 277 | ||