[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>

1 files changed, 6 insertions, 5 deletions

diff --git a/include/sound/asound.h b/include/sound/asound.h
index 4321e92a7f8b..9974f83cca44 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, 3)
+#define SNDRV_TIMER_VERSION             SNDRV_PROTOCOL_VERSION(2, 0, 4)
 
 enum sndrv_timer_class {
         SNDRV_TIMER_CLASS_NONE = -1,
@@ -673,10 +673,11 @@ enum {
         SNDRV_TIMER_IOCTL_INFO = _IOR('T', 0x11, struct sndrv_timer_info),
         SNDRV_TIMER_IOCTL_PARAMS = _IOW('T', 0x12, struct sndrv_timer_params),
         SNDRV_TIMER_IOCTL_STATUS = _IOR('T', 0x14, struct sndrv_timer_status),
-        SNDRV_TIMER_IOCTL_START = _IO('T', 0x20),
-        SNDRV_TIMER_IOCTL_STOP = _IO('T', 0x21),
-        SNDRV_TIMER_IOCTL_CONTINUE = _IO('T', 0x22),
-        SNDRV_TIMER_IOCTL_PAUSE = _IO('T', 0x23),
+        /* The following four ioctls are changed since 1.0.9 due to confliction */
+        SNDRV_TIMER_IOCTL_START = _IO('T', 0xa0),
+        SNDRV_TIMER_IOCTL_STOP = _IO('T', 0xa1),
+        SNDRV_TIMER_IOCTL_CONTINUE = _IO('T', 0xa2),
+        SNDRV_TIMER_IOCTL_PAUSE = _IO('T', 0xa3),
 };
 
 struct sndrv_timer_read {