[ALSA] Change some timer ioctls due to confliction

Timer Midlevel,ALSA Core
Change values of some timer ioctls to avoid confliction with FIO* ioctls.
The protocol version is increased to indicate this change.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

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)
         return (err = snd_timer_continue(tu->timeri)) < 0 ? err : 0;
 }
 
+enum {
+        SNDRV_TIMER_IOCTL_START_OLD = _IO('T', 0x20),
+        SNDRV_TIMER_IOCTL_STOP_OLD = _IO('T', 0x21),
+        SNDRV_TIMER_IOCTL_CONTINUE_OLD = _IO('T', 0x22),
+        SNDRV_TIMER_IOCTL_PAUSE_OLD = _IO('T', 0x23),
+};
+
 static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         snd_timer_user_t *tu;
@@ -1734,12 +1741,16 @@ static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, unsigned l
         case SNDRV_TIMER_IOCTL_STATUS:
                 return snd_timer_user_status(file, argp);
         case SNDRV_TIMER_IOCTL_START:
+        case SNDRV_TIMER_IOCTL_START_OLD:
                 return snd_timer_user_start(file);
         case SNDRV_TIMER_IOCTL_STOP:
+        case SNDRV_TIMER_IOCTL_STOP_OLD:
                 return snd_timer_user_stop(file);
         case SNDRV_TIMER_IOCTL_CONTINUE:
+        case SNDRV_TIMER_IOCTL_CONTINUE_OLD:
                 return snd_timer_user_continue(file);
         case SNDRV_TIMER_IOCTL_PAUSE:
+        case SNDRV_TIMER_IOCTL_PAUSE_OLD:
                 return snd_timer_user_pause(file);
         }
         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
         case SNDRV_TIMER_IOCTL_SELECT:
         case SNDRV_TIMER_IOCTL_PARAMS:
         case SNDRV_TIMER_IOCTL_START:
+        case SNDRV_TIMER_IOCTL_START_OLD:
         case SNDRV_TIMER_IOCTL_STOP:
+        case SNDRV_TIMER_IOCTL_STOP_OLD:
         case SNDRV_TIMER_IOCTL_CONTINUE:
+        case SNDRV_TIMER_IOCTL_CONTINUE_OLD:
         case SNDRV_TIMER_IOCTL_PAUSE:
+        case SNDRV_TIMER_IOCTL_PAUSE_OLD:
         case SNDRV_TIMER_IOCTL_NEXT_DEVICE:
                 return snd_timer_user_ioctl(file, cmd, (unsigned long)argp);
         case SNDRV_TIMER_IOCTL_INFO32: