]> err.no Git - linux-2.6/blobdiff - drivers/media/radio/radio-rtrack2.c
V4L/DVB (8493): mt20xx: test below 0 on unsigned lo1a and lo2a
[linux-2.6] / drivers / media / radio / radio-rtrack2.c
index 28a47c9e7a819a4791d122d02380ca12e46ffd40..e065cb16dc5a3d44b7b574dd5dc2a269821c934e 100644 (file)
@@ -1,11 +1,12 @@
 /* RadioTrack II driver for Linux radio support (C) 1998 Ben Pfaff
- * 
+ *
  * Based on RadioTrack I/RadioReveal (C) 1997 M. Kirkwood
  * Converted to new API by Alan Cox <Alan.Cox@linux.org>
  * Various bugfixes and enhancements by Russell Kroll <rkroll@exploits.org>
  *
  * TODO: Allow for more than one of these foolish entities :-)
  *
+ * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>
  */
 
 #include <linux/module.h>      /* Modules                      */
 #include <linux/delay.h>       /* udelay                       */
 #include <asm/io.h>            /* outb, outb_p                 */
 #include <asm/uaccess.h>       /* copy to/from user            */
-#include <linux/videodev.h>    /* kernel radio structs         */
-#include <linux/config.h>      /* CONFIG_RADIO_RTRACK2_PORT    */
+#include <linux/videodev2.h>   /* kernel radio structs         */
+#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/spinlock.h>
 
+#include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
+#define RADIO_VERSION KERNEL_VERSION(0,0,2)
+
+static struct v4l2_queryctrl radio_qctrl[] = {
+       {
+               .id            = V4L2_CID_AUDIO_MUTE,
+               .name          = "Mute",
+               .minimum       = 0,
+               .maximum       = 1,
+               .default_value = 1,
+               .type          = V4L2_CTRL_TYPE_BOOLEAN,
+       },{
+               .id            = V4L2_CID_AUDIO_VOLUME,
+               .name          = "Volume",
+               .minimum       = 0,
+               .maximum       = 65535,
+               .step          = 65535,
+               .default_value = 0xff,
+               .type          = V4L2_CTRL_TYPE_INTEGER,
+       }
+};
+
 #ifndef CONFIG_RADIO_RTRACK2_PORT
 #define CONFIG_RADIO_RTRACK2_PORT -1
 #endif
 
-static int io = CONFIG_RADIO_RTRACK2_PORT; 
+static int io = CONFIG_RADIO_RTRACK2_PORT;
 static int radio_nr = -1;
 static spinlock_t lock;
 
@@ -38,7 +62,7 @@ struct rt_device
 
 static void rt_mute(struct rt_device *dev)
 {
-        if(dev->muted)
+       if(dev->muted)
                return;
        spin_lock(&lock);
        outb(1, io);
@@ -58,14 +82,14 @@ static void rt_unmute(struct rt_device *dev)
 
 static void zero(void)
 {
-        outb_p(1, io);
+       outb_p(1, io);
        outb_p(3, io);
        outb_p(1, io);
 }
 
 static void one(void)
 {
-        outb_p(5, io);
+       outb_p(5, io);
        outb_p(7, io);
        outb_p(5, io);
 }
@@ -75,7 +99,7 @@ static int rt_setfreq(struct rt_device *dev, unsigned long freq)
        int i;
 
        freq = freq / 200 + 856;
-       
+
        spin_lock(&lock);
 
        outb_p(0xc8, io);
@@ -94,11 +118,31 @@ static int rt_setfreq(struct rt_device *dev, unsigned long freq)
        outb_p(0xc8, io);
        if (!dev->muted)
                outb_p(0, io);
-               
+
        spin_unlock(&lock);
        return 0;
 }
 
+static int vidioc_querycap(struct file *file, void *priv,
+                               struct v4l2_capability *v)
+{
+       strlcpy(v->driver, "radio-rtrack2", sizeof(v->driver));
+       strlcpy(v->card, "RadioTrack II", sizeof(v->card));
+       sprintf(v->bus_info, "ISA");
+       v->version = RADIO_VERSION;
+       v->capabilities = V4L2_CAP_TUNER;
+       return 0;
+}
+
+static int vidioc_s_tuner(struct file *file, void *priv,
+                               struct v4l2_tuner *v)
+{
+       if (v->index > 0)
+               return -EINVAL;
+
+       return 0;
+}
+
 static int rt_getsigstr(struct rt_device *dev)
 {
        if (inb(io) & 2)        /* bit set = no signal present  */
@@ -106,110 +150,171 @@ static int rt_getsigstr(struct rt_device *dev)
        return 1;               /* signal present               */
 }
 
-static int rt_do_ioctl(struct inode *inode, struct file *file,
-                      unsigned int cmd, void *arg)
+static int vidioc_g_tuner(struct file *file, void *priv,
+                               struct v4l2_tuner *v)
 {
        struct video_device *dev = video_devdata(file);
-       struct rt_device *rt=dev->priv;
+       struct rt_device *rt = dev->priv;
 
-       switch(cmd)
-       {
-               case VIDIOCGCAP:
-               {
-                       struct video_capability *v = arg;
-                       memset(v,0,sizeof(*v));
-                       v->type=VID_TYPE_TUNER;
-                       v->channels=1;
-                       v->audios=1;
-                       strcpy(v->name, "RadioTrack II");
-                       return 0;
-               }
-               case VIDIOCGTUNER:
-               {
-                       struct video_tuner *v = arg;
-                       if(v->tuner)    /* Only 1 tuner */ 
-                               return -EINVAL;
-                       v->rangelow=88*16000;
-                       v->rangehigh=108*16000;
-                       v->flags=VIDEO_TUNER_LOW;
-                       v->mode=VIDEO_MODE_AUTO;
-                       v->signal=0xFFFF*rt_getsigstr(rt);
-                       strcpy(v->name, "FM");
-                       return 0;
-               }
-               case VIDIOCSTUNER:
-               {
-                       struct video_tuner *v = arg;
-                       if(v->tuner!=0)
-                               return -EINVAL;
-                       /* Only 1 tuner so no setting needed ! */
-                       return 0;
-               }
-               case VIDIOCGFREQ:
-               {
-                       unsigned long *freq = arg;
-                       *freq = rt->curfreq;
-                       return 0;
-               }
-               case VIDIOCSFREQ:
-               {
-                       unsigned long *freq = arg;
-                       rt->curfreq = *freq;
-                       rt_setfreq(rt, rt->curfreq);
-                       return 0;
-               }
-               case VIDIOCGAUDIO:
-               {       
-                       struct video_audio *v = arg;
-                       memset(v,0, sizeof(*v));
-                       v->flags|=VIDEO_AUDIO_MUTABLE;
-                       v->volume=1;
-                       v->step=65535;
-                       strcpy(v->name, "Radio");
-                       return 0;                       
-               }
-               case VIDIOCSAUDIO:
-               {
-                       struct video_audio *v = arg;
-                       if(v->audio) 
-                               return -EINVAL;
+       if (v->index > 0)
+               return -EINVAL;
+
+       strcpy(v->name, "FM");
+       v->type = V4L2_TUNER_RADIO;
+       v->rangelow = (88*16000);
+       v->rangehigh = (108*16000);
+       v->rxsubchans = V4L2_TUNER_SUB_MONO;
+       v->capability = V4L2_TUNER_CAP_LOW;
+       v->audmode = V4L2_TUNER_MODE_MONO;
+       v->signal = 0xFFFF*rt_getsigstr(rt);
+       return 0;
+}
+
+static int vidioc_s_frequency(struct file *file, void *priv,
+                               struct v4l2_frequency *f)
+{
+       struct video_device *dev = video_devdata(file);
+       struct rt_device *rt = dev->priv;
+
+       rt->curfreq = f->frequency;
+       rt_setfreq(rt, rt->curfreq);
+       return 0;
+}
+
+static int vidioc_g_frequency(struct file *file, void *priv,
+                               struct v4l2_frequency *f)
+{
+       struct video_device *dev = video_devdata(file);
+       struct rt_device *rt = dev->priv;
+
+       f->type = V4L2_TUNER_RADIO;
+       f->frequency = rt->curfreq;
+       return 0;
+}
 
-                       if(v->flags&VIDEO_AUDIO_MUTE) 
-                               rt_mute(rt);
-                       else
-                               rt_unmute(rt);
+static int vidioc_queryctrl(struct file *file, void *priv,
+                               struct v4l2_queryctrl *qc)
+{
+       int i;
 
+       for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
+               if (qc->id && qc->id == radio_qctrl[i].id) {
+                       memcpy(qc, &(radio_qctrl[i]),
+                                               sizeof(*qc));
                        return 0;
                }
-               default:
-                       return -ENOIOCTLCMD;
        }
+       return -EINVAL;
+}
+
+static int vidioc_g_ctrl(struct file *file, void *priv,
+                               struct v4l2_control *ctrl)
+{
+       struct video_device *dev = video_devdata(file);
+       struct rt_device *rt = dev->priv;
+
+       switch (ctrl->id) {
+       case V4L2_CID_AUDIO_MUTE:
+               ctrl->value = rt->muted;
+               return 0;
+       case V4L2_CID_AUDIO_VOLUME:
+               if (rt->muted)
+                       ctrl->value = 0;
+               else
+                       ctrl->value = 65535;
+               return 0;
+       }
+       return -EINVAL;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                               struct v4l2_control *ctrl)
+{
+       struct video_device *dev = video_devdata(file);
+       struct rt_device *rt = dev->priv;
+
+       switch (ctrl->id) {
+       case V4L2_CID_AUDIO_MUTE:
+               if (ctrl->value)
+                       rt_mute(rt);
+               else
+                       rt_unmute(rt);
+               return 0;
+       case V4L2_CID_AUDIO_VOLUME:
+               if (ctrl->value)
+                       rt_unmute(rt);
+               else
+                       rt_mute(rt);
+               return 0;
+       }
+       return -EINVAL;
 }
 
-static int rt_ioctl(struct inode *inode, struct file *file,
-                   unsigned int cmd, unsigned long arg)
+static int vidioc_g_audio(struct file *file, void *priv,
+                               struct v4l2_audio *a)
 {
-       return video_usercopy(inode, file, cmd, arg, rt_do_ioctl);
+       if (a->index > 1)
+               return -EINVAL;
+
+       strcpy(a->name, "Radio");
+       a->capability = V4L2_AUDCAP_STEREO;
+       return 0;
+}
+
+static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
+{
+       *i = 0;
+       return 0;
+}
+
+static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)
+{
+       if (i != 0)
+               return -EINVAL;
+       return 0;
+}
+
+static int vidioc_s_audio(struct file *file, void *priv,
+                               struct v4l2_audio *a)
+{
+       if (a->index != 0)
+               return -EINVAL;
+       return 0;
 }
 
 static struct rt_device rtrack2_unit;
 
-static struct file_operations rtrack2_fops = {
+static const struct file_operations rtrack2_fops = {
        .owner          = THIS_MODULE,
        .open           = video_exclusive_open,
        .release        = video_exclusive_release,
-       .ioctl          = rt_ioctl,
+       .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
        .compat_ioctl   = v4l_compat_ioctl32,
+#endif
        .llseek         = no_llseek,
 };
 
-static struct video_device rtrack2_radio=
-{
-       .owner          = THIS_MODULE,
+static const struct v4l2_ioctl_ops rtrack2_ioctl_ops = {
+       .vidioc_querycap    = vidioc_querycap,
+       .vidioc_g_tuner     = vidioc_g_tuner,
+       .vidioc_s_tuner     = vidioc_s_tuner,
+       .vidioc_g_frequency = vidioc_g_frequency,
+       .vidioc_s_frequency = vidioc_s_frequency,
+       .vidioc_queryctrl   = vidioc_queryctrl,
+       .vidioc_g_ctrl      = vidioc_g_ctrl,
+       .vidioc_s_ctrl      = vidioc_s_ctrl,
+       .vidioc_g_audio     = vidioc_g_audio,
+       .vidioc_s_audio     = vidioc_s_audio,
+       .vidioc_g_input     = vidioc_g_input,
+       .vidioc_s_input     = vidioc_s_input,
+};
+
+static struct video_device rtrack2_radio = {
        .name           = "RadioTrack II radio",
        .type           = VID_TYPE_TUNER,
-       .hardware       = VID_HARDWARE_RTRACK2,
        .fops           = &rtrack2_fops,
+       .ioctl_ops      = &rtrack2_ioctl_ops,
 };
 
 static int __init rtrack2_init(void)
@@ -219,7 +324,7 @@ static int __init rtrack2_init(void)
                printk(KERN_ERR "You must set an I/O address with io=0x20c or io=0x30c\n");
                return -EINVAL;
        }
-       if (!request_region(io, 4, "rtrack2")) 
+       if (!request_region(io, 4, "rtrack2"))
        {
                printk(KERN_ERR "rtrack2: port 0x%x already in use\n", io);
                return -EBUSY;
@@ -227,16 +332,16 @@ static int __init rtrack2_init(void)
 
        rtrack2_radio.priv=&rtrack2_unit;
 
-       spin_lock_init(&lock);  
+       spin_lock_init(&lock);
        if(video_register_device(&rtrack2_radio, VFL_TYPE_RADIO, radio_nr)==-1)
        {
                release_region(io, 4);
                return -EINVAL;
        }
-               
+
        printk(KERN_INFO "AIMSlab Radiotrack II card driver.\n");
 
-       /* mute card - prevents noisy bootups */
+       /* mute card - prevents noisy bootups */
        outb(1, io);
        rtrack2_unit.muted = 1;