V4L/DVB (11675): ivtv/radio: fix V4L2_TUNER_MODE/V4L2_TUNER_SUB confusion
[linux-2.6.git] / drivers / media / radio / radio-sf16fmi.c
index 6f03ce4..5cf6c45 100644 (file)
@@ -3,7 +3,7 @@
  * (c) 1997 M. Kirkwood
  * (c) 1998 Petr Vandrovec, vandrove@vc.cvut.cz
  *
- * Fitted to new interface by Alan Cox <alan.cox@linux.org>
+ * Fitted to new interface by Alan Cox <alan@lxorguk.ukuu.org.uk>
  * Made working and cleaned up functions <mikael.hedin@irf.se>
  * Support for ISAPnP by Ladislav Michl <ladis@psi.cz>
  *
  *  Frequency control is done digitally -- ie out(port,encodefreq(95.8));
  *  No volume control - only mute/unmute - you have to use line volume
  *  control on SB-part of SF16FMI
- *  
+ *
+ * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>
  */
 
+#include <linux/version.h>
 #include <linux/kernel.h>      /* __setup                      */
 #include <linux/module.h>      /* Modules                      */
 #include <linux/init.h>                /* Initdata                     */
 #include <linux/ioport.h>      /* request_region               */
 #include <linux/delay.h>       /* udelay                       */
-#include <linux/videodev.h>    /* kernel radio structs         */
 #include <linux/isapnp.h>
-#include <asm/io.h>            /* outb, outb_p                 */
-#include <asm/uaccess.h>       /* copy to/from user            */
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
+#include <linux/videodev2.h>   /* kernel radio structs         */
+#include <linux/io.h>          /* outb, outb_p                 */
+#include <media/v4l2-device.h>
+#include <media/v4l2-ioctl.h>
+
+MODULE_AUTHOR("Petr Vandrovec, vandrove@vc.cvut.cz and M. Kirkwood");
+MODULE_DESCRIPTION("A driver for the SF16MI radio.");
+MODULE_LICENSE("GPL");
+
+static int io = -1;
+static int radio_nr = -1;
+
+module_param(io, int, 0);
+MODULE_PARM_DESC(io, "I/O address of the SF16MI card (0x284 or 0x384)");
+module_param(radio_nr, int, 0);
+
+#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
 
-struct fmi_device
+struct fmi
 {
-       int port;
-        int curvol; /* 1 or 0 */
-        unsigned long curfreq; /* freq in kHz */
-        __u32 flags;
+       struct v4l2_device v4l2_dev;
+       struct video_device vdev;
+       int io;
+       int curvol; /* 1 or 0 */
+       unsigned long curfreq; /* freq in kHz */
+       __u32 flags;
+       struct mutex lock;
 };
 
-static int io = -1; 
-static int radio_nr = -1;
-static struct pnp_dev *dev = NULL;
-static struct semaphore lock;
+static struct fmi fmi_card;
+static struct pnp_dev *dev;
 
 /* freq is in 1/16 kHz to internal number, hw precision is 50 kHz */
 /* It is only useful to give freq in intervall of 800 (=0.05Mhz),
- * other bits will be truncated, e.g 92.7400016 -> 92.7, but 
+ * other bits will be truncated, e.g 92.7400016 -> 92.7, but
  * 92.7400017 -> 92.75
  */
-#define RSF16_ENCODE(x)        ((x)/800+214)
-#define RSF16_MINFREQ 87*16000
-#define RSF16_MAXFREQ 108*16000
+#define RSF16_ENCODE(x)        ((x) / 800 + 214)
+#define RSF16_MINFREQ (87 * 16000)
+#define RSF16_MAXFREQ (108 * 16000)
 
-static void outbits(int bits, unsigned int data, int port)
+static void outbits(int bits, unsigned int data, int io)
 {
-       while(bits--) {
-               if(data & 1) {
-                       outb(5, port);
+       while (bits--) {
+               if (data & 1) {
+                       outb(5, io);
                        udelay(6);
-                       outb(7, port);
+                       outb(7, io);
                        udelay(6);
                } else {
-                       outb(1, port);
+                       outb(1, io);
                        udelay(6);
-                       outb(3, port);
+                       outb(3, io);
                        udelay(6);
                }
-               data>>=1;
+               data >>= 1;
        }
 }
 
-static inline void fmi_mute(int port)
+static inline void fmi_mute(struct fmi *fmi)
 {
-       down(&lock);
-       outb(0x00, port);
-       up(&lock);
+       mutex_lock(&fmi->lock);
+       outb(0x00, fmi->io);
+       mutex_unlock(&fmi->lock);
 }
 
-static inline void fmi_unmute(int port)
+static inline void fmi_unmute(struct fmi *fmi)
 {
-       down(&lock);
-       outb(0x08, port);
-       up(&lock);
+       mutex_lock(&fmi->lock);
+       outb(0x08, fmi->io);
+       mutex_unlock(&fmi->lock);
 }
 
-static inline int fmi_setfreq(struct fmi_device *dev)
+static inline int fmi_setfreq(struct fmi *fmi, unsigned long freq)
 {
-       int myport = dev->port;
-       unsigned long freq = dev->curfreq;
-
-       down(&lock);
+       mutex_lock(&fmi->lock);
+       fmi->curfreq = freq;
 
-       outbits(16, RSF16_ENCODE(freq), myport);
-       outbits(8, 0xC0, myport);
+       outbits(16, RSF16_ENCODE(freq), fmi->io);
+       outbits(8, 0xC0, fmi->io);
        msleep(143);            /* was schedule_timeout(HZ/7) */
-       up(&lock);
-       if (dev->curvol) fmi_unmute(myport);
+       mutex_unlock(&fmi->lock);
+       if (fmi->curvol)
+               fmi_unmute(fmi);
        return 0;
 }
 
-static inline int fmi_getsigstr(struct fmi_device *dev)
+static inline int fmi_getsigstr(struct fmi *fmi)
 {
        int val;
        int res;
-       int myport = dev->port;
 
-       
-       down(&lock);
-       val = dev->curvol ? 0x08 : 0x00;        /* unmute/mute */
-       outb(val, myport);
-       outb(val | 0x10, myport);
+       mutex_lock(&fmi->lock);
+       val = fmi->curvol ? 0x08 : 0x00;        /* unmute/mute */
+       outb(val, fmi->io);
+       outb(val | 0x10, fmi->io);
        msleep(143);            /* was schedule_timeout(HZ/7) */
-       res = (int)inb(myport+1);
-       outb(val, myport);
-       
-       up(&lock);
+       res = (int)inb(fmi->io + 1);
+       outb(val, fmi->io);
+
+       mutex_unlock(&fmi->lock);
        return (res & 2) ? 0 : 0xFFFF;
 }
 
-static int fmi_do_ioctl(struct inode *inode, struct file *file,
-                       unsigned int cmd, void *arg)
+static int vidioc_querycap(struct file *file, void  *priv,
+                                       struct v4l2_capability *v)
 {
-       struct video_device *dev = video_devdata(file);
-       struct fmi_device *fmi=dev->priv;
-       
-       switch(cmd)
-       {
-               case VIDIOCGCAP:
-               {
-                       struct video_capability *v = arg;
-                       memset(v,0,sizeof(*v));
-                       strcpy(v->name, "SF16-FMx radio");
-                       v->type=VID_TYPE_TUNER;
-                       v->channels=1;
-                       v->audios=1;
-                       return 0;
-               }
-               case VIDIOCGTUNER:
-               {
-                       struct video_tuner *v = arg;
-                       int mult;
-
-                       if(v->tuner)    /* Only 1 tuner */
-                               return -EINVAL;
-                       strcpy(v->name, "FM");
-                       mult = (fmi->flags & VIDEO_TUNER_LOW) ? 1 : 1000;
-                       v->rangelow = RSF16_MINFREQ/mult;
-                       v->rangehigh = RSF16_MAXFREQ/mult;
-                       v->flags=fmi->flags;
-                       v->mode=VIDEO_MODE_AUTO;
-                       v->signal = fmi_getsigstr(fmi);
-                       return 0;
-               }
-               case VIDIOCSTUNER:
-               {
-                       struct video_tuner *v = arg;
-                       if(v->tuner!=0)
-                               return -EINVAL;
-                       fmi->flags = v->flags & VIDEO_TUNER_LOW;
-                       /* Only 1 tuner so no setting needed ! */
-                       return 0;
-               }
-               case VIDIOCGFREQ:
-               {
-                       unsigned long *freq = arg;
-                       *freq = fmi->curfreq;
-                       if (!(fmi->flags & VIDEO_TUNER_LOW))
-                           *freq /= 1000;
-                       return 0;
-               }
-               case VIDIOCSFREQ:
-               {
-                       unsigned long *freq = arg;
-                       if (!(fmi->flags & VIDEO_TUNER_LOW))
-                               *freq *= 1000;
-                       if (*freq < RSF16_MINFREQ || *freq > RSF16_MAXFREQ )
-                               return -EINVAL;
-                       /*rounding in steps of 800 to match th freq
-                         that will be used */
-                       fmi->curfreq = (*freq/800)*800; 
-                       fmi_setfreq(fmi);
-                       return 0;
-               }
-               case VIDIOCGAUDIO:
-               {       
-                       struct video_audio *v = arg;
-                       memset(v,0,sizeof(*v));
-                       v->flags=( (!fmi->curvol)*VIDEO_AUDIO_MUTE | VIDEO_AUDIO_MUTABLE);
-                       strcpy(v->name, "Radio");
-                       v->mode=VIDEO_SOUND_STEREO;
-                       return 0;                       
-               }
-               case VIDIOCSAUDIO:
-               {
-                       struct video_audio *v = arg;
-                       if(v->audio)
-                               return -EINVAL;
-                       fmi->curvol= v->flags&VIDEO_AUDIO_MUTE ? 0 : 1;
-                       fmi->curvol ? 
-                               fmi_unmute(fmi->port) : fmi_mute(fmi->port);
-                       return 0;
-               }
-               case VIDIOCGUNIT:
-               {
-                               struct video_unit *v = arg;
-                       v->video=VIDEO_NO_UNIT;
-                       v->vbi=VIDEO_NO_UNIT;
-                       v->radio=dev->minor;
-                       v->audio=0; /* How do we find out this??? */
-                       v->teletext=VIDEO_NO_UNIT;
-                       return 0;                       
-               }
-               default:
-                       return -ENOIOCTLCMD;
+       strlcpy(v->driver, "radio-sf16fmi", sizeof(v->driver));
+       strlcpy(v->card, "SF16-FMx radio", sizeof(v->card));
+       strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
+       v->version = RADIO_VERSION;
+       v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
+       return 0;
+}
+
+static int vidioc_g_tuner(struct file *file, void *priv,
+                                       struct v4l2_tuner *v)
+{
+       int mult;
+       struct fmi *fmi = video_drvdata(file);
+
+       if (v->index > 0)
+               return -EINVAL;
+
+       strlcpy(v->name, "FM", sizeof(v->name));
+       v->type = V4L2_TUNER_RADIO;
+       mult = (fmi->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000;
+       v->rangelow = RSF16_MINFREQ / mult;
+       v->rangehigh = RSF16_MAXFREQ / mult;
+       v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
+       v->capability = fmi->flags & V4L2_TUNER_CAP_LOW;
+       v->audmode = V4L2_TUNER_MODE_STEREO;
+       v->signal = fmi_getsigstr(fmi);
+       return 0;
+}
+
+static int vidioc_s_tuner(struct file *file, void *priv,
+                                       struct v4l2_tuner *v)
+{
+       return v->index ? -EINVAL : 0;
+}
+
+static int vidioc_s_frequency(struct file *file, void *priv,
+                                       struct v4l2_frequency *f)
+{
+       struct fmi *fmi = video_drvdata(file);
+
+       if (!(fmi->flags & V4L2_TUNER_CAP_LOW))
+               f->frequency *= 1000;
+       if (f->frequency < RSF16_MINFREQ ||
+                       f->frequency > RSF16_MAXFREQ)
+               return -EINVAL;
+       /* rounding in steps of 800 to match the freq
+          that will be used */
+       fmi_setfreq(fmi, (f->frequency / 800) * 800);
+       return 0;
+}
+
+static int vidioc_g_frequency(struct file *file, void *priv,
+                                       struct v4l2_frequency *f)
+{
+       struct fmi *fmi = video_drvdata(file);
+
+       f->type = V4L2_TUNER_RADIO;
+       f->frequency = fmi->curfreq;
+       if (!(fmi->flags & V4L2_TUNER_CAP_LOW))
+               f->frequency /= 1000;
+       return 0;
+}
+
+static int vidioc_queryctrl(struct file *file, void *priv,
+                                       struct v4l2_queryctrl *qc)
+{
+       switch (qc->id) {
+       case V4L2_CID_AUDIO_MUTE:
+               return v4l2_ctrl_query_fill(qc, 0, 1, 1, 1);
        }
+       return -EINVAL;
 }
 
-static int fmi_ioctl(struct inode *inode, struct file *file,
-                    unsigned int cmd, unsigned long arg)
+static int vidioc_g_ctrl(struct file *file, void *priv,
+                                       struct v4l2_control *ctrl)
 {
-       return video_usercopy(inode, file, cmd, arg, fmi_do_ioctl);
+       struct fmi *fmi = video_drvdata(file);
+
+       switch (ctrl->id) {
+       case V4L2_CID_AUDIO_MUTE:
+               ctrl->value = fmi->curvol;
+               return 0;
+       }
+       return -EINVAL;
 }
 
-static struct fmi_device fmi_unit;
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                                       struct v4l2_control *ctrl)
+{
+       struct fmi *fmi = video_drvdata(file);
 
-static struct file_operations fmi_fops = {
-       .owner          = THIS_MODULE,
-       .open           = video_exclusive_open,
-       .release        = video_exclusive_release,
-       .ioctl          = fmi_ioctl,
-       .llseek         = no_llseek,
-};
+       switch (ctrl->id) {
+       case V4L2_CID_AUDIO_MUTE:
+               if (ctrl->value)
+                       fmi_mute(fmi);
+               else
+                       fmi_unmute(fmi);
+               fmi->curvol = ctrl->value;
+               return 0;
+       }
+       return -EINVAL;
+}
+
+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)
+{
+       return i ? -EINVAL : 0;
+}
 
-static struct video_device fmi_radio=
+static int vidioc_g_audio(struct file *file, void *priv,
+                                       struct v4l2_audio *a)
 {
+       a->index = 0;
+       strlcpy(a->name, "Radio", sizeof(a->name));
+       a->capability = V4L2_AUDCAP_STEREO;
+       return 0;
+}
+
+static int vidioc_s_audio(struct file *file, void *priv,
+                                       struct v4l2_audio *a)
+{
+       return a->index ? -EINVAL : 0;
+}
+
+static const struct v4l2_file_operations fmi_fops = {
        .owner          = THIS_MODULE,
-       .name           = "SF16FMx radio",
-       .type           = VID_TYPE_TUNER,
-       .hardware       = VID_HARDWARE_SF16MI,
-       .fops           = &fmi_fops,
+       .ioctl          = video_ioctl2,
+};
+
+static const struct v4l2_ioctl_ops fmi_ioctl_ops = {
+       .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,
 };
 
 /* ladis: this is my card. does any other types exist? */
@@ -246,7 +289,7 @@ static struct isapnp_device_id id_table[] __devinitdata = {
 
 MODULE_DEVICE_TABLE(isapnp, id_table);
 
-static int isapnp_fmi_probe(void)
+static int __init isapnp_fmi_probe(void)
 {
        int i = 0;
 
@@ -261,7 +304,7 @@ static int isapnp_fmi_probe(void)
        if (pnp_device_attach(dev) < 0)
                return -EAGAIN;
        if (pnp_activate_dev(dev) < 0) {
-               printk ("radio-sf16fmi: PnP configure failed (out of resources?)\n");
+               printk(KERN_ERR "radio-sf16fmi: PnP configure failed (out of resources?)\n");
                pnp_device_detach(dev);
                return -ENOMEM;
        }
@@ -271,58 +314,72 @@ static int isapnp_fmi_probe(void)
        }
 
        i = pnp_port_start(dev, 0);
-       printk ("radio-sf16fmi: PnP reports card at %#x\n", i);
+       printk(KERN_INFO "radio-sf16fmi: PnP reports card at %#x\n", i);
 
        return i;
 }
 
 static int __init fmi_init(void)
 {
+       struct fmi *fmi = &fmi_card;
+       struct v4l2_device *v4l2_dev = &fmi->v4l2_dev;
+       int res;
+
        if (io < 0)
                io = isapnp_fmi_probe();
-       if (io < 0) {
-               printk(KERN_ERR "radio-sf16fmi: No PnP card found.\n");
-               return io;
+       strlcpy(v4l2_dev->name, "sf16fmi", sizeof(v4l2_dev->name));
+       fmi->io = io;
+       if (fmi->io < 0) {
+               v4l2_err(v4l2_dev, "No PnP card found.\n");
+               return fmi->io;
        }
        if (!request_region(io, 2, "radio-sf16fmi")) {
-               printk(KERN_ERR "radio-sf16fmi: port 0x%x already in use\n", io);
+               v4l2_err(v4l2_dev, "port 0x%x already in use\n", fmi->io);
+               pnp_device_detach(dev);
                return -EBUSY;
        }
 
-       fmi_unit.port = io;
-       fmi_unit.curvol = 0;
-       fmi_unit.curfreq = 0;
-       fmi_unit.flags = VIDEO_TUNER_LOW;
-       fmi_radio.priv = &fmi_unit;
-       
-       init_MUTEX(&lock);
-       
-       if (video_register_device(&fmi_radio, VFL_TYPE_RADIO, radio_nr) == -1) {
-               release_region(io, 2);
+       res = v4l2_device_register(NULL, v4l2_dev);
+       if (res < 0) {
+               release_region(fmi->io, 2);
+               pnp_device_detach(dev);
+               v4l2_err(v4l2_dev, "Could not register v4l2_device\n");
+               return res;
+       }
+
+       fmi->flags = V4L2_TUNER_CAP_LOW;
+       strlcpy(fmi->vdev.name, v4l2_dev->name, sizeof(fmi->vdev.name));
+       fmi->vdev.v4l2_dev = v4l2_dev;
+       fmi->vdev.fops = &fmi_fops;
+       fmi->vdev.ioctl_ops = &fmi_ioctl_ops;
+       fmi->vdev.release = video_device_release_empty;
+       video_set_drvdata(&fmi->vdev, fmi);
+
+       mutex_init(&fmi->lock);
+
+       if (video_register_device(&fmi->vdev, VFL_TYPE_RADIO, radio_nr) < 0) {
+               v4l2_device_unregister(v4l2_dev);
+               release_region(fmi->io, 2);
+               pnp_device_detach(dev);
                return -EINVAL;
        }
-               
-       printk(KERN_INFO "SF16FMx radio card driver at 0x%x\n", io);
+
+       v4l2_info(v4l2_dev, "card driver at 0x%x\n", fmi->io);
        /* mute card - prevents noisy bootups */
-       fmi_mute(io);
+       fmi_mute(fmi);
        return 0;
 }
 
-MODULE_AUTHOR("Petr Vandrovec, vandrove@vc.cvut.cz and M. Kirkwood");
-MODULE_DESCRIPTION("A driver for the SF16MI radio.");
-MODULE_LICENSE("GPL");
-
-module_param(io, int, 0);
-MODULE_PARM_DESC(io, "I/O address of the SF16MI card (0x284 or 0x384)");
-module_param(radio_nr, int, 0);
-
-static void __exit fmi_cleanup_module(void)
+static void __exit fmi_exit(void)
 {
-       video_unregister_device(&fmi_radio);
-       release_region(io, 2);
+       struct fmi *fmi = &fmi_card;
+
+       video_unregister_device(&fmi->vdev);
+       v4l2_device_unregister(&fmi->v4l2_dev);
+       release_region(fmi->io, 2);
        if (dev)
                pnp_device_detach(dev);
 }
 
 module_init(fmi_init);
-module_exit(fmi_cleanup_module);
+module_exit(fmi_exit);