basic modification from way back
[powerpc.git] / drivers / media / radio / radio-typhoon.c
index edd0122..8ff5a23 100644 (file)
@@ -27,6 +27,8 @@
  * value where I do expect just noise and turn the speaker volume down.
  * The frequency change is necessary since the card never seems to be
  * completely silent.
+ *
+ * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>
  */
 
 #include <linux/module.h>      /* Modules                        */
 #include <linux/proc_fs.h>     /* radio card status report       */
 #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/config.h>      /* CONFIG_RADIO_TYPHOON_*         */
 
-#define BANNER "Typhoon Radio Card driver v0.1\n"
+#include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
+#define RADIO_VERSION KERNEL_VERSION(0,1,1)
+#define BANNER "Typhoon Radio Card driver v0.1.1\n"
+
+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          = 1<<14,
+               .default_value = 0xff,
+               .type          = V4L2_CTRL_TYPE_INTEGER,
+       }
+};
+
 
 #ifndef CONFIG_RADIO_TYPHOON_PORT
 #define CONFIG_RADIO_TYPHOON_PORT -1
@@ -70,8 +93,6 @@ static int typhoon_setfreq(struct typhoon_device *dev, unsigned long frequency);
 static void typhoon_mute(struct typhoon_device *dev);
 static void typhoon_unmute(struct typhoon_device *dev);
 static int typhoon_setvol(struct typhoon_device *dev, int vol);
-static int typhoon_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg);
 #ifdef CONFIG_RADIO_TYPHOON_PROC_FS
 static int typhoon_get_info(char *buf, char **start, off_t offset, int len);
 #endif
@@ -163,91 +184,148 @@ static int typhoon_setvol(struct typhoon_device *dev, int vol)
        return 0;
 }
 
+static int vidioc_querycap(struct file *file, void  *priv,
+                                       struct v4l2_capability *v)
+{
+       strlcpy(v->driver, "radio-typhoon", sizeof(v->driver));
+       strlcpy(v->card, "Typhoon Radio", sizeof(v->card));
+       sprintf(v->bus_info, "ISA");
+       v->version = RADIO_VERSION;
+       v->capabilities = V4L2_CAP_TUNER;
+       return 0;
+}
+
+static int vidioc_g_tuner(struct file *file, void *priv,
+                                       struct v4l2_tuner *v)
+{
+       if (v->index > 0)
+               return -EINVAL;
+
+       strcpy(v->name, "FM");
+       v->type = V4L2_TUNER_RADIO;
+       v->rangelow = (87.5*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;     /* We can't get the signal strength */
+       return 0;
+}
 
-static int typhoon_do_ioctl(struct inode *inode, struct file *file,
-                           unsigned int cmd, void *arg)
+static int vidioc_s_tuner(struct file *file, void *priv,
+                                       struct v4l2_tuner *v)
+{
+       if (v->index > 0)
+               return -EINVAL;
+
+       return 0;
+}
+
+static int vidioc_s_frequency(struct file *file, void *priv,
+                                       struct v4l2_frequency *f)
 {
        struct video_device *dev = video_devdata(file);
        struct typhoon_device *typhoon = 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, "Typhoon Radio");
-                       return 0;
-               }
-       case VIDIOCGTUNER:
-               {
-                       struct video_tuner *v = arg;
-                       if (v->tuner)   /* Only 1 tuner */
-                               return -EINVAL;
-                       v->rangelow = 875 * 1600;
-                       v->rangehigh = 1080 * 1600;
-                       v->flags = VIDEO_TUNER_LOW;
-                       v->mode = VIDEO_MODE_AUTO;
-                       v->signal = 0xFFFF;     /* We can't get the signal strength */
-                       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 ! */
+       typhoon->curfreq = f->frequency;
+       typhoon_setfreq(typhoon, typhoon->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 typhoon_device *typhoon = dev->priv;
+
+       f->type = V4L2_TUNER_RADIO;
+       f->frequency = typhoon->curfreq;
+
+       return 0;
+}
+
+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;
                }
-       case VIDIOCGFREQ:
-       {
-               unsigned long *freq = arg;
-               *freq = typhoon->curfreq;
-               return 0;
        }
-       case VIDIOCSFREQ:
-       {
-               unsigned long *freq = arg;
-               typhoon->curfreq = *freq;
-               typhoon_setfreq(typhoon, typhoon->curfreq);
+       return -EINVAL;
+}
+
+static int vidioc_g_ctrl(struct file *file, void *priv,
+                                       struct v4l2_control *ctrl)
+{
+       struct video_device *dev = video_devdata(file);
+       struct typhoon_device *typhoon = dev->priv;
+
+       switch (ctrl->id) {
+       case V4L2_CID_AUDIO_MUTE:
+               ctrl->value = typhoon->muted;
+               return 0;
+       case V4L2_CID_AUDIO_VOLUME:
+               ctrl->value = typhoon->curvol;
                return 0;
        }
-       case VIDIOCGAUDIO:
-               {
-                       struct video_audio *v = arg;
-                       memset(v, 0, sizeof(*v));
-                       v->flags |= VIDEO_AUDIO_MUTABLE | VIDEO_AUDIO_VOLUME;
-                       v->mode |= VIDEO_SOUND_MONO;
-                       v->volume = typhoon->curvol;
-                       v->step = 1 << 14;
-                       strcpy(v->name, "Typhoon Radio");
-                       return 0;
-               }
-       case VIDIOCSAUDIO:
-               {
-                       struct video_audio *v = arg;
-                       if (v->audio)
-                               return -EINVAL;
-                       if (v->flags & VIDEO_AUDIO_MUTE)
-                               typhoon_mute(typhoon);
-                       else
-                               typhoon_unmute(typhoon);
-                       if (v->flags & VIDEO_AUDIO_VOLUME)
-                               typhoon_setvol(typhoon, v->volume);
-                       return 0;
-               }
-       default:
-               return -ENOIOCTLCMD;
+       return -EINVAL;
+}
+
+static int vidioc_s_ctrl (struct file *file, void *priv,
+                                       struct v4l2_control *ctrl)
+{
+       struct video_device *dev = video_devdata(file);
+       struct typhoon_device *typhoon = dev->priv;
+
+       switch (ctrl->id) {
+       case V4L2_CID_AUDIO_MUTE:
+               if (ctrl->value)
+                       typhoon_mute(typhoon);
+               else
+                       typhoon_unmute(typhoon);
+               return 0;
+       case V4L2_CID_AUDIO_VOLUME:
+               typhoon_setvol(typhoon, ctrl->value);
+               return 0;
        }
+       return -EINVAL;
+}
+
+static int vidioc_g_audio(struct file *file, void *priv,
+                                       struct v4l2_audio *a)
+{
+       if (a->index > 1)
+               return -EINVAL;
+
+       strcpy(a->name, "Radio");
+       a->capability = V4L2_AUDCAP_STEREO;
+       return 0;
 }
 
-static int typhoon_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg)
+static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
 {
-       return video_usercopy(inode, file, cmd, arg, typhoon_do_ioctl);
+       *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 typhoon_device typhoon_unit =
@@ -257,11 +335,11 @@ static struct typhoon_device typhoon_unit =
        .mutefreq       = CONFIG_RADIO_TYPHOON_MUTEFREQ,
 };
 
-static struct file_operations typhoon_fops = {
+static const struct file_operations typhoon_fops = {
        .owner          = THIS_MODULE,
        .open           = video_exclusive_open,
        .release        = video_exclusive_release,
-       .ioctl          = typhoon_ioctl,
+       .ioctl          = video_ioctl2,
        .compat_ioctl   = v4l_compat_ioctl32,
        .llseek         = no_llseek,
 };
@@ -271,8 +349,20 @@ static struct video_device typhoon_radio =
        .owner          = THIS_MODULE,
        .name           = "Typhoon Radio",
        .type           = VID_TYPE_TUNER,
-       .hardware       = VID_HARDWARE_TYPHOON,
+       .hardware       = 0,
        .fops           = &typhoon_fops,
+       .vidioc_querycap    = vidioc_querycap,
+       .vidioc_g_tuner     = vidioc_g_tuner,
+       .vidioc_s_tuner     = vidioc_s_tuner,
+       .vidioc_g_audio     = vidioc_g_audio,
+       .vidioc_s_audio     = vidioc_s_audio,
+       .vidioc_g_input     = vidioc_g_input,
+       .vidioc_s_input     = vidioc_s_input,
+       .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,
 };
 
 #ifdef CONFIG_RADIO_TYPHOON_PROC_FS