---

yaml --- r: 1578 b: refs/heads/master c: 15790a6 h: refs/heads/master v: v3
git-mirror · May 29, 2005 · c00471b · c00471b
1 parent 8043956
commit c00471b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92bb010cd874e53e4c2e2a73510966e45cfa4525
+refs/heads/master: 15790a6be14852850ee7cbd791225fa51750d8af
diff --git a/trunk/sound/core/timer.c b/trunk/sound/core/timer.c
@@ -1680,6 +1680,16 @@ static int snd_timer_user_continue(struct file *file)
 	return (err = snd_timer_continue(tu->timeri)) < 0 ? err : 0;
 }
 
+static int snd_timer_user_pause(struct file *file)
+{
+	int err;
+	snd_timer_user_t *tu;
+
+	tu = file->private_data;
+	snd_assert(tu->timeri != NULL, return -ENXIO);
+	return (err = snd_timer_continue(tu->timeri)) < 0 ? err : 0;
+}
+
 static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
 	snd_timer_user_t *tu;
@@ -1729,6 +1739,8 @@ static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, unsigned l
 		return snd_timer_user_stop(file);
 	case SNDRV_TIMER_IOCTL_CONTINUE:
 		return snd_timer_user_continue(file);
+	case SNDRV_TIMER_IOCTL_PAUSE:
+		return snd_timer_user_pause(file);
 	}
 	return -ENOTTY;
 }

diff --git a/trunk/sound/core/timer_compat.c b/trunk/sound/core/timer_compat.c
@@ -108,6 +108,7 @@ static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, uns
 	case SNDRV_TIMER_IOCTL_START:
 	case SNDRV_TIMER_IOCTL_STOP:
 	case SNDRV_TIMER_IOCTL_CONTINUE:
+	case SNDRV_TIMER_IOCTL_PAUSE:
 	case SNDRV_TIMER_IOCTL_NEXT_DEVICE:
 		return snd_timer_user_ioctl(file, cmd, (unsigned long)argp);
 	case SNDRV_TIMER_IOCTL_INFO32: