2 files changed, 116 insertions, 48 deletions

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index a74c91577d3c..4bb443f72554 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -59,7 +59,7 @@ config RADIO_RTRACK_PORT
 
 config RADIO_RTRACK2
         tristate "AIMSlab RadioTrack II support"
-        depends on ISA && VIDEO_V4L1
+        depends on ISA && VIDEO_V4L2
         ---help---
           Choose Y here if you have this FM radio card, and then fill in the
           port address below.
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index e5e9d41e4bd0..b9e98483e58d 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -6,6 +6,7 @@
  *
  * 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                      */
@@ -14,10 +15,32 @@
 #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/videodev2.h>    /* kernel radio structs         */
 #include <media/v4l2-common.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
@@ -114,75 +137,120 @@ static int rt_do_ioctl(struct inode *inode, struct file *file,
 
         switch(cmd)
         {
-                case VIDIOCGCAP:
+                case VIDIOC_QUERYCAP:
                 {
-                        struct video_capability *v = arg;
+                        struct v4l2_capability *v = arg;
                         memset(v,0,sizeof(*v));
-                        v->type=VID_TYPE_TUNER;
-                        v->channels=1;
-                        v->audios=1;
-                        strcpy(v->name, "RadioTrack II");
+                        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;
                 }
-                case VIDIOCGTUNER:
+                case VIDIOC_G_TUNER:
                 {
-                        struct video_tuner *v = arg;
-                        if(v->tuner)    /* Only 1 tuner */
+                        struct v4l2_tuner *v = arg;
+
+                        if (v->index > 0)
                                 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);
+
+                        memset(v,0,sizeof(*v));
                         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;
                 }
-                case VIDIOCSTUNER:
+                case VIDIOC_S_TUNER:
                 {
-                        struct video_tuner *v = arg;
-                        if(v->tuner!=0)
+                        struct v4l2_tuner *v = arg;
+
+                        if (v->index > 0)
                                 return -EINVAL;
-                        /* Only 1 tuner so no setting needed ! */
+
                         return 0;
                 }
-                case VIDIOCGFREQ:
+                case VIDIOC_S_FREQUENCY:
                 {
-                        unsigned long *freq = arg;
-                        *freq = rt->curfreq;
+                        struct v4l2_frequency *f = arg;
+
+                        rt->curfreq = f->frequency;
+                        rt_setfreq(rt, rt->curfreq);
                         return 0;
                 }
-                case VIDIOCSFREQ:
+                case VIDIOC_G_FREQUENCY:
                 {
-                        unsigned long *freq = arg;
-                        rt->curfreq = *freq;
-                        rt_setfreq(rt, rt->curfreq);
+                        struct v4l2_frequency *f = arg;
+
+                        f->type = V4L2_TUNER_RADIO;
+                        f->frequency = rt->curfreq;
+
                         return 0;
                 }
-                case VIDIOCGAUDIO:
+                case VIDIOC_QUERYCTRL:
                 {
-                        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;
+                        struct v4l2_queryctrl *qc = arg;
+                        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);
+                                }
+                        }
+                        return -EINVAL;
                 }
-                case VIDIOCSAUDIO:
+                case VIDIOC_G_CTRL:
                 {
-                        struct video_audio *v = arg;
-                        if(v->audio)
-                                return -EINVAL;
-
-                        if(v->flags&VIDEO_AUDIO_MUTE)
-                                rt_mute(rt);
-                        else
-                                rt_unmute(rt);
-
-                        return 0;
+                        struct v4l2_control *ctrl= arg;
+
+                        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;
+                }
+                case VIDIOC_S_CTRL:
+                {
+                        struct v4l2_control *ctrl= arg;
+
+                        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;
                 }
                 default:
-                        return -ENOIOCTLCMD;
+                        return v4l_compat_translate_ioctl(inode,file,cmd,arg,
+                                                          rt_do_ioctl);
         }
 }
 
@@ -208,7 +276,7 @@ static struct video_device rtrack2_radio=
         .owner          = THIS_MODULE,
         .name           = "RadioTrack II radio",
         .type           = VID_TYPE_TUNER,
-        .hardware       = VID_HARDWARE_RTRACK2,
+        .hardware       = 0,
         .fops           = &rtrack2_fops,
 };