Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / media / radio / radio-maxiradio.c

diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index f0bf47b..f93d7af 100644 (file)
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -1,15 +1,15 @@
-/* 
- * Guillemot Maxi Radio FM 2000 PCI radio card driver for Linux 
+/*
+ * Guillemot Maxi Radio FM 2000 PCI radio card driver for Linux
  * (C) 2001 Dimitromanolakis Apostolos <apdim@grecian.net>
  *
  * Based in the radio Maestro PCI driver. Actually it uses the same chip
  * for radio but different pci controller.
  *
  * I didn't have any specs I reversed engineered the protocol from
- * the windows driver (radio.dll). 
+ * the windows driver (radio.dll).
  *
  * The card uses the TEA5757 chip that includes a search function but it
- * is useless as I haven't found any way to read back the frequency. If 
+ * is useless as I haven't found any way to read back the frequency. If
  * anybody does please mail me.
  *
  * For the pdf file see:
@@ -24,7 +24,7 @@
  *     - tiding up
  *     - removed support for multiple devices as it didn't work anyway
  *
- * BUGS: 
+ * BUGS:
  *   - card unmutes if you change frequency
  *
  */
@@ -41,6 +41,7 @@
 
 #include <linux/pci.h>
 #include <linux/videodev.h>
+#include <media/v4l2-common.h>
 
 /* version 0.75      Sun Feb  4 22:51:27 EET 2001 */
 #define DRIVER_VERSION "0.75"
@@ -80,7 +81,7 @@ static struct file_operations maxiradio_fops = {
        .owner          = THIS_MODULE,
        .open           = video_exclusive_open,
        .release        = video_exclusive_release,
-       .ioctl          = radio_ioctl,
+       .ioctl          = radio_ioctl,
        .compat_ioctl   = v4l_compat_ioctl32,
        .llseek         = no_llseek,
 };
@@ -97,11 +98,11 @@ static struct radio_device
 {
        __u16   io,     /* base of radio io */
                muted,  /* VIDEO_AUDIO_MUTE */
-               stereo, /* VIDEO_TUNER_STEREO_ON */     
+               stereo, /* VIDEO_TUNER_STEREO_ON */
                tuned;  /* signal strength (0 or 0xffff) */
-               
+
        unsigned long freq;
-       
+
        struct mutex lock;
 } radio_unit = {0, 0, 0, 0, };
 
@@ -114,7 +115,7 @@ static void outbit(unsigned long bit, __u16 io)
                        outb(  power|wren|data|clk ,io); udelay(4);
                        outb(  power|wren|data     ,io); udelay(4);
                }
-       else    
+       else
                {
                        outb(  power|wren          ,io); udelay(4);
                        outb(  power|wren|clk      ,io); udelay(4);
@@ -132,12 +133,12 @@ static void set_freq(__u16 io, __u32 data)
 {
        unsigned long int si;
        int bl;
-       
+
        /* TEA5757 shift register bits (see pdf) */
 
-       outbit(0,io); // 24  search 
+       outbit(0,io); // 24  search
        outbit(1,io); // 23  search up/down
-       
+
        outbit(0,io); // 22  stereo/mono
 
        outbit(0,io); // 21  band
@@ -145,24 +146,24 @@ static void set_freq(__u16 io, __u32 data)
 
        outbit(0,io); // 19  port ?
        outbit(0,io); // 18  port ?
-       
+
        outbit(0,io); // 17  search level
        outbit(0,io); // 16  search level
- 
+
        si = 0x8000;
        for(bl = 1; bl <= 16 ; bl++) { outbit(data & si,io); si >>=1; }
-       
+
        outb(power,io);
 }
 
 static int get_stereo(__u16 io)
-{      
+{
        outb(power,io); udelay(4);
        return !(inb(io) & mo_st);
 }
 
 static int get_tune(__u16 io)
-{      
+{
        outb(power+clk,io); udelay(4);
        return !(inb(io) & mo_st);
 }
@@ -177,7 +178,7 @@ static inline int radio_function(struct inode *inode, struct file *file,
        switch(cmd) {
                case VIDIOCGCAP: {
                        struct video_capability *v = arg;
-                       
+
                        memset(v,0,sizeof(*v));
                        strcpy(v->name, "Maxi Radio FM2000 radio");
                        v->type=VID_TYPE_TUNER;
@@ -186,22 +187,22 @@ static inline int radio_function(struct inode *inode, struct file *file,
                }
                case VIDIOCGTUNER: {
                        struct video_tuner *v = arg;
-                       
+
                        if(v->tuner)
                                return -EINVAL;
-                               
+
                        card->stereo = 0xffff * get_stereo(card->io);
                        card->tuned = 0xffff * get_tune(card->io);
-                       
+
                        v->flags = VIDEO_TUNER_LOW | card->stereo;
                        v->signal = card->tuned;
-                       
+
                        strcpy(v->name, "FM");
-                       
+
                        v->rangelow = FREQ_LO;
                        v->rangehigh = FREQ_HI;
                        v->mode = VIDEO_MODE_AUTO;
-                       
+
                        return 0;
                }
                case VIDIOCSTUNER: {
@@ -212,13 +213,13 @@ static inline int radio_function(struct inode *inode, struct file *file,
                }
                case VIDIOCGFREQ: {
                        unsigned long *freq = arg;
-                       
+
                        *freq = card->freq;
                        return 0;
                }
                case VIDIOCSFREQ: {
                        unsigned long *freq = arg;
-                       
+
                        if (*freq < FREQ_LO || *freq > FREQ_HI)
                                return -EINVAL;
                        card->freq = *freq;
@@ -226,18 +227,18 @@ static inline int radio_function(struct inode *inode, struct file *file,
                        msleep(125);
                        return 0;
                }
-               case VIDIOCGAUDIO: {    
+               case VIDIOCGAUDIO: {
                        struct video_audio *v = arg;
                        memset(v,0,sizeof(*v));
                        strcpy(v->name, "Radio");
                        v->flags=VIDEO_AUDIO_MUTABLE | card->muted;
                        v->mode=VIDEO_SOUND_STEREO;
-                       return 0;               
+                       return 0;
                }
-               
+
                case VIDIOCSAUDIO: {
                        struct video_audio *v = arg;
-                       
+
                        if(v->audio)
                                return -EINVAL;
                        card->muted = v->flags & VIDEO_AUDIO_MUTE;
@@ -249,13 +250,13 @@ static inline int radio_function(struct inode *inode, struct file *file,
                }
                case VIDIOCGUNIT: {
                        struct video_unit *v = arg;
-                       
+
                        v->video=VIDEO_NO_UNIT;
                        v->vbi=VIDEO_NO_UNIT;
                        v->radio=dev->minor;
                        v->audio=0;
                        v->teletext=VIDEO_NO_UNIT;
-                       return 0;               
+                       return 0;
                }
                default: return -ENOIOCTLCMD;
        }
@@ -267,7 +268,7 @@ static int radio_ioctl(struct inode *inode, struct file *file,
        struct video_device *dev = video_devdata(file);
        struct radio_device *card=dev->priv;
        int ret;
-       
+
        mutex_lock(&card->lock);
        ret = video_usercopy(inode, file, cmd, arg, radio_function);
        mutex_unlock(&card->lock);
@@ -282,21 +283,21 @@ MODULE_LICENSE("GPL");
 static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
        if(!request_region(pci_resource_start(pdev, 0),
-                          pci_resource_len(pdev, 0), "Maxi Radio FM 2000")) {
-               printk(KERN_ERR "radio-maxiradio: can't reserve I/O ports\n");
-               goto err_out;
+                          pci_resource_len(pdev, 0), "Maxi Radio FM 2000")) {
+               printk(KERN_ERR "radio-maxiradio: can't reserve I/O ports\n");
+               goto err_out;
        }
 
        if (pci_enable_device(pdev))
-               goto err_out_free_region;
+               goto err_out_free_region;
 
        radio_unit.io = pci_resource_start(pdev, 0);
        mutex_init(&radio_unit.lock);
        maxiradio_radio.priv = &radio_unit;
 
        if(video_register_device(&maxiradio_radio, VFL_TYPE_RADIO, radio_nr)==-1) {
-               printk("radio-maxiradio: can't register device!");
-               goto err_out_free_region;
+               printk("radio-maxiradio: can't register device!");
+               goto err_out_free_region;
        }
 
        printk(KERN_INFO "radio-maxiradio: version "