aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2007-12-17 03:02:22 -0500
committerJaroslav Kysela <perex@perex.cz>2008-01-31 11:29:36 -0500
commit28e9e47384d333239a8335b439a92a13d29f91d6 (patch)
tree8bc379720a63487640d275ef36fe92441926c424
parentf85bf29c9435baf927e1817e6b43c9429b84f822 (diff)
[ALSA] PCM - added back TSTAMP ioctl for PCM (for old alsa-lib binaries)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r--include/sound/asound.h1
-rw-r--r--sound/core/pcm_native.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 475eb71d65b..eda5c63ea54 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -443,6 +443,7 @@ enum {
443enum { 443enum {
444 SNDRV_PCM_IOCTL_PVERSION = _IOR('A', 0x00, int), 444 SNDRV_PCM_IOCTL_PVERSION = _IOR('A', 0x00, int),
445 SNDRV_PCM_IOCTL_INFO = _IOR('A', 0x01, struct snd_pcm_info), 445 SNDRV_PCM_IOCTL_INFO = _IOR('A', 0x01, struct snd_pcm_info),
446 SNDRV_PCM_IOCTL_TSTAMP = _IOW('A', 0x02, int),
446 SNDRV_PCM_IOCTL_TTSTAMP = _IOW('A', 0x03, int), 447 SNDRV_PCM_IOCTL_TTSTAMP = _IOW('A', 0x03, int),
447 SNDRV_PCM_IOCTL_HW_REFINE = _IOWR('A', 0x10, struct snd_pcm_hw_params), 448 SNDRV_PCM_IOCTL_HW_REFINE = _IOWR('A', 0x10, struct snd_pcm_hw_params),
448 SNDRV_PCM_IOCTL_HW_PARAMS = _IOWR('A', 0x11, struct snd_pcm_hw_params), 449 SNDRV_PCM_IOCTL_HW_PARAMS = _IOWR('A', 0x11, struct snd_pcm_hw_params),
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 7fb7c921b27..2e7b1e63db9 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -2546,6 +2546,8 @@ static int snd_pcm_common_ioctl1(struct file *file,
2546 return put_user(SNDRV_PCM_VERSION, (int __user *)arg) ? -EFAULT : 0; 2546 return put_user(SNDRV_PCM_VERSION, (int __user *)arg) ? -EFAULT : 0;
2547 case SNDRV_PCM_IOCTL_INFO: 2547 case SNDRV_PCM_IOCTL_INFO:
2548 return snd_pcm_info_user(substream, arg); 2548 return snd_pcm_info_user(substream, arg);
2549 case SNDRV_PCM_IOCTL_TSTAMP: /* just for compatibility */
2550 return 0;
2549 case SNDRV_PCM_IOCTL_TTSTAMP: 2551 case SNDRV_PCM_IOCTL_TTSTAMP:
2550 return snd_pcm_tstamp(substream, arg); 2552 return snd_pcm_tstamp(substream, arg);
2551 case SNDRV_PCM_IOCTL_HW_REFINE: 2553 case SNDRV_PCM_IOCTL_HW_REFINE: