patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / sound / core / timer.c

diff --git a/sound/core/timer.c b/sound/core/timer.c
index 35c5d05..6f6d89c 100644 (file)
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -24,6 +24,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/time.h>
+#include <linux/moduleparam.h>
 #include <sound/core.h>
 #include <sound/timer.h>
 #include <sound/control.h>
@@ -46,7 +47,7 @@ MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("ALSA timer interface");
 MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
-MODULE_PARM(timer_limit, "i");
+module_param(timer_limit, int, 0444);
 MODULE_PARM_DESC(timer_limit, "Maximum global timers in system.");
 
 typedef struct {
@@ -1252,7 +1253,7 @@ static void snd_timer_user_copy_id(snd_timer_id_t *id, snd_timer_t *timer)
        id->subdevice = timer->tmr_subdevice;
 }
 
-static int snd_timer_user_next_device(snd_timer_id_t *_tid)
+static int snd_timer_user_next_device(snd_timer_id_t __user *_tid)
 {
        snd_timer_id_t id;
        snd_timer_t *timer;
@@ -1343,7 +1344,7 @@ static int snd_timer_user_next_device(snd_timer_id_t *_tid)
        return 0;
 } 
 
-static int snd_timer_user_ginfo(struct file *file, snd_timer_ginfo_t *_ginfo)
+static int snd_timer_user_ginfo(struct file *file, snd_timer_ginfo_t __user *_ginfo)
 {
        snd_timer_ginfo_t ginfo;
        snd_timer_id_t tid;
@@ -1381,7 +1382,7 @@ static int snd_timer_user_ginfo(struct file *file, snd_timer_ginfo_t *_ginfo)
        return err;
 }
 
-static int snd_timer_user_gparams(struct file *file, snd_timer_gparams_t *_gparams)
+static int snd_timer_user_gparams(struct file *file, snd_timer_gparams_t __user *_gparams)
 {
        snd_timer_gparams_t gparams;
        snd_timer_t *t;
@@ -1407,7 +1408,7 @@ static int snd_timer_user_gparams(struct file *file, snd_timer_gparams_t *_gpara
        return err;
 }
 
-static int snd_timer_user_gstatus(struct file *file, snd_timer_gstatus_t *_gstatus)
+static int snd_timer_user_gstatus(struct file *file, snd_timer_gstatus_t __user *_gstatus)
 {
        snd_timer_gstatus_t gstatus;
        snd_timer_id_t tid;
@@ -1436,12 +1437,12 @@ static int snd_timer_user_gstatus(struct file *file, snd_timer_gstatus_t *_gstat
                err = -ENODEV;
        }
        up(&register_mutex);
-       if (err >= 0 && copy_from_user(_gstatus, &gstatus, sizeof(gstatus)))
+       if (err >= 0 && copy_to_user(_gstatus, &gstatus, sizeof(gstatus)))
                err = -EFAULT;
        return err;
 }
 
-static int snd_timer_user_tselect(struct file *file, snd_timer_select_t *_tselect)
+static int snd_timer_user_tselect(struct file *file, snd_timer_select_t __user *_tselect)
 {
        snd_timer_user_t *tu;
        snd_timer_select_t tselect;
@@ -1488,7 +1489,7 @@ static int snd_timer_user_tselect(struct file *file, snd_timer_select_t *_tselec
        return 0;
 }
 
-static int snd_timer_user_info(struct file *file, snd_timer_info_t *_info)
+static int snd_timer_user_info(struct file *file, snd_timer_info_t __user *_info)
 {
        snd_timer_user_t *tu;
        snd_timer_info_t info;
@@ -1510,9 +1511,8 @@ static int snd_timer_user_info(struct file *file, snd_timer_info_t *_info)
        return 0;
 }
 
-static int snd_timer_user_params(struct file *file, snd_timer_params_t *_params)
+static int snd_timer_user_params(struct file *file, snd_timer_params_t __user *_params)
 {
-       unsigned long flags;
        snd_timer_user_t *tu;
        snd_timer_params_t params;
        snd_timer_t *t;
@@ -1548,18 +1548,17 @@ static int snd_timer_user_params(struct file *file, snd_timer_params_t *_params)
                goto _end;
        }
        snd_timer_stop(tu->timeri);
-       spin_lock_irqsave(&t->lock, flags);
-       if (params.flags & SNDRV_TIMER_PSFLG_AUTO) {
+       spin_lock_irq(&t->lock);
+       tu->timeri->flags &= ~(SNDRV_TIMER_IFLG_AUTO|
+                              SNDRV_TIMER_IFLG_EXCLUSIVE|
+                              SNDRV_TIMER_IFLG_EARLY_EVENT);
+       if (params.flags & SNDRV_TIMER_PSFLG_AUTO)
                tu->timeri->flags |= SNDRV_TIMER_IFLG_AUTO;
-       } else {
-               tu->timeri->flags &= ~SNDRV_TIMER_IFLG_AUTO;
-       }
-       if (params.flags & SNDRV_TIMER_PSFLG_EXCLUSIVE) {
+       if (params.flags & SNDRV_TIMER_PSFLG_EXCLUSIVE)
                tu->timeri->flags |= SNDRV_TIMER_IFLG_EXCLUSIVE;
-       } else {
-               tu->timeri->flags &= ~SNDRV_TIMER_IFLG_EXCLUSIVE;
-       }
-       spin_unlock_irqrestore(&t->lock, flags);
+       if (params.flags & SNDRV_TIMER_PSFLG_EARLY_EVENT)
+               tu->timeri->flags |= SNDRV_TIMER_IFLG_EARLY_EVENT;
+       spin_unlock_irq(&t->lock);
        if (params.queue_size > 0 && (unsigned int)tu->queue_size != params.queue_size) {
                if (tu->tread) {
                        ttr = (snd_timer_tread_t *)kmalloc(params.queue_size * sizeof(snd_timer_tread_t), GFP_KERNEL);
@@ -1577,6 +1576,24 @@ static int snd_timer_user_params(struct file *file, snd_timer_params_t *_params)
                        }
                }
        }
+       tu->qhead = tu->qtail = tu->qused = 0;
+       if (tu->timeri->flags & SNDRV_TIMER_IFLG_EARLY_EVENT) {
+               if (tu->tread) {
+                       snd_timer_tread_t tread;
+                       tread.event = SNDRV_TIMER_EVENT_EARLY;
+                       tread.tstamp.tv_sec = 0;
+                       tread.tstamp.tv_nsec = 0;
+                       tread.val = 0;
+                       snd_timer_user_append_to_tqueue(tu, &tread);
+               } else {
+                       snd_timer_read_t *r = &tu->queue[0];
+                       r->resolution = 0;
+                       r->ticks = 0;
+                       tu->qused++;
+                       tu->qtail++;
+               }
+               
+       }
        tu->filter = params.filter;
        tu->ticks = params.ticks;
        err = 0;
@@ -1586,9 +1603,8 @@ static int snd_timer_user_params(struct file *file, snd_timer_params_t *_params)
        return err;
 }
 
-static int snd_timer_user_status(struct file *file, snd_timer_status_t *_status)
+static int snd_timer_user_status(struct file *file, snd_timer_status_t __user *_status)
 {
-       unsigned long flags;
        snd_timer_user_t *tu;
        snd_timer_status_t status;
        
@@ -1599,9 +1615,9 @@ static int snd_timer_user_status(struct file *file, snd_timer_status_t *_status)
        status.resolution = snd_timer_resolution(tu->timeri);
        status.lost = tu->timeri->lost;
        status.overrun = tu->overrun;
-       spin_lock_irqsave(&tu->qlock, flags);
+       spin_lock_irq(&tu->qlock);
        status.queue = tu->qused;
-       spin_unlock_irqrestore(&tu->qlock, flags);
+       spin_unlock_irq(&tu->qlock);
        if (copy_to_user(_status, &status, sizeof(status)))
                return -EFAULT;
        return 0;
@@ -1645,38 +1661,40 @@ static int snd_timer_user_ioctl(struct inode *inode, struct file *file,
                                unsigned int cmd, unsigned long arg)
 {
        snd_timer_user_t *tu;
+       void __user *argp = (void __user *)arg;
+       int __user *p = argp;
        
        tu = snd_magic_cast(snd_timer_user_t, file->private_data, return -ENXIO);
        switch (cmd) {
        case SNDRV_TIMER_IOCTL_PVERSION:
-               return put_user(SNDRV_TIMER_VERSION, (int *)arg) ? -EFAULT : 0;
+               return put_user(SNDRV_TIMER_VERSION, p) ? -EFAULT : 0;
        case SNDRV_TIMER_IOCTL_NEXT_DEVICE:
-               return snd_timer_user_next_device((snd_timer_id_t *)arg);
+               return snd_timer_user_next_device(argp);
        case SNDRV_TIMER_IOCTL_TREAD:
        {
                int xarg;
                
                if (tu->timeri)         /* too late */
                        return -EBUSY;
-               if (get_user(xarg, (int *) arg))
+               if (get_user(xarg, p))
                        return -EFAULT;
                tu->tread = xarg ? 1 : 0;
                return 0;
        }
        case SNDRV_TIMER_IOCTL_GINFO:
-               return snd_timer_user_ginfo(file, (snd_timer_ginfo_t *)arg);
+               return snd_timer_user_ginfo(file, argp);
        case SNDRV_TIMER_IOCTL_GPARAMS:
-               return snd_timer_user_gparams(file, (snd_timer_gparams_t *)arg);
+               return snd_timer_user_gparams(file, argp);
        case SNDRV_TIMER_IOCTL_GSTATUS:
-               return snd_timer_user_gstatus(file, (snd_timer_gstatus_t *)arg);
+               return snd_timer_user_gstatus(file, argp);
        case SNDRV_TIMER_IOCTL_SELECT:
-               return snd_timer_user_tselect(file, (snd_timer_select_t *)arg);
+               return snd_timer_user_tselect(file, argp);
        case SNDRV_TIMER_IOCTL_INFO:
-               return snd_timer_user_info(file, (snd_timer_info_t *)arg);
+               return snd_timer_user_info(file, argp);
        case SNDRV_TIMER_IOCTL_PARAMS:
-               return snd_timer_user_params(file, (snd_timer_params_t *)arg);
+               return snd_timer_user_params(file, argp);
        case SNDRV_TIMER_IOCTL_STATUS:
-               return snd_timer_user_status(file, (snd_timer_status_t *)arg);
+               return snd_timer_user_status(file, argp);
        case SNDRV_TIMER_IOCTL_START:
                return snd_timer_user_start(file);
        case SNDRV_TIMER_IOCTL_STOP:
@@ -1699,7 +1717,7 @@ static int snd_timer_user_fasync(int fd, struct file * file, int on)
        return 0;
 }
 
-static ssize_t snd_timer_user_read(struct file *file, char *buffer, size_t count, loff_t *offset)
+static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, size_t count, loff_t *offset)
 {
        snd_timer_user_t *tu;
        long result = 0, unit;
@@ -1848,18 +1866,6 @@ static void __exit alsa_timer_exit(void)
 module_init(alsa_timer_init)
 module_exit(alsa_timer_exit)
 
-#ifndef MODULE
-/* format is: snd-timer=timer_limit */
-
-static int __init alsa_timer_setup(char *str)
-{
-       (void)(get_option(&str,&timer_limit) == 2);
-       return 1;
-}
-
-__setup("snd-timer=", alsa_timer_setup);
-#endif /* ifndef MODULE */
-
 EXPORT_SYMBOL(snd_timer_open);
 EXPORT_SYMBOL(snd_timer_close);
 EXPORT_SYMBOL(snd_timer_resolution);