2 files changed, 114 insertions, 51 deletions

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index f17fc21247e7..81e2f35aeae8 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -82,7 +82,7 @@ config RADIO_RTRACK2_PORT
 
 config RADIO_AZTECH
         tristate "Aztech/Packard Bell Radio"
-        depends on ISA && VIDEO_V4L1
+        depends on ISA && VIDEO_V4L2
         ---help---
           Choose Y here if you have one of these FM radio cards, and then fill
           in the port address below.
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 63697ab517f9..f21d918b3f99 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -1,5 +1,6 @@
 /* radio-aztech.c - Aztech radio card driver for Linux 2.2
  *
+ * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>
  * Adapted to support the Video for Linux API by
  * Russell Kroll <rkroll@exploits.org>.  Based on original tuner code by:
  *
@@ -30,9 +31,31 @@
 #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/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       = 0xff,
+                .step          = 1,
+                .default_value = 0xff,
+                .type          = V4L2_CTRL_TYPE_INTEGER,
+        }
+};
+
 /* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */
 
 #ifndef CONFIG_RADIO_AZTECH_PORT
@@ -165,81 +188,121 @@ static int az_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, "Aztech Radio");
+                        strlcpy(v->driver, "radio-aztech", sizeof (v->driver));
+                        strlcpy(v->card, "Aztech Radio", 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;
+
+                        memset(v,0,sizeof(*v));
+                        strcpy(v->name, "FM");
+                        v->type = V4L2_TUNER_RADIO;
+
                         v->rangelow=(87*16000);
                         v->rangehigh=(108*16000);
-                        v->flags=VIDEO_TUNER_LOW;
-                        v->mode=VIDEO_MODE_AUTO;
-                        v->signal=0xFFFF*az_getsigstr(az);
+                        v->rxsubchans =V4L2_TUNER_SUB_MONO|V4L2_TUNER_SUB_STEREO;
+                        v->capability=V4L2_TUNER_CAP_LOW;
                         if(az_getstereo(az))
-                                v->flags|=VIDEO_TUNER_STEREO_ON;
-                        strcpy(v->name, "FM");
+                                v->audmode = V4L2_TUNER_MODE_STEREO;
+                        else
+                                v->audmode = V4L2_TUNER_MODE_MONO;
+                        v->signal=0xFFFF*az_getsigstr(az);
+
                         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;
+
                         return 0;
                 }
-                case VIDIOCGFREQ:
+                case VIDIOC_S_FREQUENCY:
                 {
-                        unsigned long *freq = arg;
-                        *freq = az->curfreq;
+                        struct v4l2_frequency *f = arg;
+
+                        az->curfreq = f->frequency;
+                        az_setfreq(az, az->curfreq);
                         return 0;
                 }
-                case VIDIOCSFREQ:
+                case VIDIOC_G_FREQUENCY:
                 {
-                        unsigned long *freq = arg;
-                        az->curfreq = *freq;
-                        az_setfreq(az, az->curfreq);
+                        struct v4l2_frequency *f = arg;
+
+                        f->type = V4L2_TUNER_RADIO;
+                        f->frequency = az->curfreq;
+
                         return 0;
                 }
-                case VIDIOCGAUDIO:
+
+                case VIDIOC_QUERYCTRL:
                 {
-                        struct video_audio *v = arg;
-                        memset(v,0, sizeof(*v));
-                        v->flags|=VIDEO_AUDIO_MUTABLE|VIDEO_AUDIO_VOLUME;
-                        if(az->stereo)
-                                v->mode=VIDEO_SOUND_STEREO;
-                        else
-                                v->mode=VIDEO_SOUND_MONO;
-                        v->volume=az->curvol;
-                        v->step=16384;
-                        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;
-                        az->curvol=v->volume;
-
-                        az->stereo=(v->mode&VIDEO_SOUND_STEREO)?1:0;
-                        if(v->flags&VIDEO_AUDIO_MUTE)
-                                az_setvol(az,0);
-                        else
-                                az_setvol(az,az->curvol);
-                        return 0;
+                        struct v4l2_control *ctrl= arg;
+
+                        switch (ctrl->id) {
+                                case V4L2_CID_AUDIO_MUTE:
+                                        if (az->curvol==0)
+                                                ctrl->value=1;
+                                        else
+                                                ctrl->value=0;
+                                        return (0);
+                                case V4L2_CID_AUDIO_VOLUME:
+                                        ctrl->value=az->curvol * 6554;
+                                        return (0);
+                        }
+                        return -EINVAL;
+                }
+                case VIDIOC_S_CTRL:
+                {
+                        struct v4l2_control *ctrl= arg;
+
+                        switch (ctrl->id) {
+                                case V4L2_CID_AUDIO_MUTE:
+                                        if (ctrl->value) {
+                                                az_setvol(az,0);
+                                        } else {
+                                                az_setvol(az,az->curvol);
+                                        }
+                                        return (0);
+                                case V4L2_CID_AUDIO_VOLUME:
+                                        az_setvol(az,ctrl->value);
+                                        return (0);
+                        }
+                        return -EINVAL;
                 }
+
                 default:
-                        return -ENOIOCTLCMD;
+                        return v4l_compat_translate_ioctl(inode,file,cmd,arg,
+                                                          az_do_ioctl);
         }
 }