aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/timer.c11
-rw-r--r--sound/core/timer_compat.c4
2 files changed, 15 insertions, 0 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 48aebdf6550b..305e39d74092 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1690,6 +1690,13 @@ static int snd_timer_user_pause(struct file *file)
1690 return (err = snd_timer_continue(tu->timeri)) < 0 ? err : 0; 1690 return (err = snd_timer_continue(tu->timeri)) < 0 ? err : 0;
1691} 1691}
1692 1692
1693enum {
1694 SNDRV_TIMER_IOCTL_START_OLD = _IO('T', 0x20),
1695 SNDRV_TIMER_IOCTL_STOP_OLD = _IO('T', 0x21),
1696 SNDRV_TIMER_IOCTL_CONTINUE_OLD = _IO('T', 0x22),
1697 SNDRV_TIMER_IOCTL_PAUSE_OLD = _IO('T', 0x23),
1698};
1699
1693static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 1700static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
1694{ 1701{
1695 snd_timer_user_t *tu; 1702 snd_timer_user_t *tu;
@@ -1734,12 +1741,16 @@ static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, unsigned l
1734 case SNDRV_TIMER_IOCTL_STATUS: 1741 case SNDRV_TIMER_IOCTL_STATUS:
1735 return snd_timer_user_status(file, argp); 1742 return snd_timer_user_status(file, argp);
1736 case SNDRV_TIMER_IOCTL_START: 1743 case SNDRV_TIMER_IOCTL_START:
1744 case SNDRV_TIMER_IOCTL_START_OLD:
1737 return snd_timer_user_start(file); 1745 return snd_timer_user_start(file);
1738 case SNDRV_TIMER_IOCTL_STOP: 1746 case SNDRV_TIMER_IOCTL_STOP:
1747 case SNDRV_TIMER_IOCTL_STOP_OLD:
1739 return snd_timer_user_stop(file); 1748 return snd_timer_user_stop(file);
1740 case SNDRV_TIMER_IOCTL_CONTINUE: 1749 case SNDRV_TIMER_IOCTL_CONTINUE:
1750 case SNDRV_TIMER_IOCTL_CONTINUE_OLD:
1741 return snd_timer_user_continue(file); 1751 return snd_timer_user_continue(file);
1742 case SNDRV_TIMER_IOCTL_PAUSE: 1752 case SNDRV_TIMER_IOCTL_PAUSE:
1753 case SNDRV_TIMER_IOCTL_PAUSE_OLD:
1743 return snd_timer_user_pause(file); 1754 return snd_timer_user_pause(file);
1744 } 1755 }
1745 return -ENOTTY; 1756 return -ENOTTY;
diff --git a/sound/core/timer_compat.c b/sound/core/timer_compat.c
index 420817d10b7c..3de552dfe80f 100644
--- a/sound/core/timer_compat.c
+++ b/sound/core/timer_compat.c
@@ -106,9 +106,13 @@ static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, uns
106 case SNDRV_TIMER_IOCTL_SELECT: 106 case SNDRV_TIMER_IOCTL_SELECT:
107 case SNDRV_TIMER_IOCTL_PARAMS: 107 case SNDRV_TIMER_IOCTL_PARAMS:
108 case SNDRV_TIMER_IOCTL_START: 108 case SNDRV_TIMER_IOCTL_START:
109 case SNDRV_TIMER_IOCTL_START_OLD:
109 case SNDRV_TIMER_IOCTL_STOP: 110 case SNDRV_TIMER_IOCTL_STOP:
111 case SNDRV_TIMER_IOCTL_STOP_OLD:
110 case SNDRV_TIMER_IOCTL_CONTINUE: 112 case SNDRV_TIMER_IOCTL_CONTINUE:
113 case SNDRV_TIMER_IOCTL_CONTINUE_OLD:
111 case SNDRV_TIMER_IOCTL_PAUSE: 114 case SNDRV_TIMER_IOCTL_PAUSE:
115 case SNDRV_TIMER_IOCTL_PAUSE_OLD:
112 case SNDRV_TIMER_IOCTL_NEXT_DEVICE: 116 case SNDRV_TIMER_IOCTL_NEXT_DEVICE:
113 return snd_timer_user_ioctl(file, cmd, (unsigned long)argp); 117 return snd_timer_user_ioctl(file, cmd, (unsigned long)argp);
114 case SNDRV_TIMER_IOCTL_INFO32: 118 case SNDRV_TIMER_IOCTL_INFO32: