diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 05:14:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 05:14:25 -0400 |
| commit | a9053d0494d3c92807701c0f47df61d50c971581 (patch) | |
| tree | 28cfb17d88d6491c5efd51e00e6937d57b1e81da /include/sound/asound.h | |
| parent | 4dd9e909e3b834b66fd48d6eac50c6557cc50275 (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
| download | kernel-crypto-a9053d0494d3c92807701c0f47df61d50c971581.tar.gz kernel-crypto-a9053d0494d3c92807701c0f47df61d50c971581.tar.xz kernel-crypto-a9053d0494d3c92807701c0f47df61d50c971581.zip | |
/spare/repo/libata-dev branch 'master'
Diffstat (limited to 'include/sound/asound.h')
| -rw-r--r-- | include/sound/asound.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/sound/asound.h b/include/sound/asound.h index 9974f83cca4..8e552d627fa 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h @@ -560,7 +560,7 @@ enum { * Timer section - /dev/snd/timer */ -#define SNDRV_TIMER_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 4) +#define SNDRV_TIMER_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 5) enum sndrv_timer_class { SNDRV_TIMER_CLASS_NONE = -1, @@ -693,11 +693,15 @@ enum sndrv_timer_event { SNDRV_TIMER_EVENT_CONTINUE, /* val = resolution in ns */ SNDRV_TIMER_EVENT_PAUSE, /* val = 0 */ SNDRV_TIMER_EVENT_EARLY, /* val = 0, early event */ + SNDRV_TIMER_EVENT_SUSPEND, /* val = 0 */ + SNDRV_TIMER_EVENT_RESUME, /* val = resolution in ns */ /* master timer events for slave timer instances */ SNDRV_TIMER_EVENT_MSTART = SNDRV_TIMER_EVENT_START + 10, SNDRV_TIMER_EVENT_MSTOP = SNDRV_TIMER_EVENT_STOP + 10, SNDRV_TIMER_EVENT_MCONTINUE = SNDRV_TIMER_EVENT_CONTINUE + 10, SNDRV_TIMER_EVENT_MPAUSE = SNDRV_TIMER_EVENT_PAUSE + 10, + SNDRV_TIMER_EVENT_MSUSPEND = SNDRV_TIMER_EVENT_SUSPEND + 10, + SNDRV_TIMER_EVENT_MRESUME = SNDRV_TIMER_EVENT_RESUME + 10, }; struct sndrv_timer_tread { |