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-cadet.c
index f1b5ac8..8641aec 100644 (file)
@@ -8,7 +8,7 @@
  * Russell Kroll    (rkroll@exploits.org)
  * Quay Ly
  * Donald Song
- * Jason Lewis      (jlewis@twilight.vtc.vsc.edu) 
+ * Jason Lewis      (jlewis@twilight.vtc.vsc.edu)
  * Scott McGrath    (smcgrath@twilight.vtc.vsc.edu)
  * William McGrath  (wmcgrath@twilight.vtc.vsc.edu)
  *
@@ -34,6 +34,7 @@
 #include <asm/io.h>            /* outb, outb_p                 */
 #include <asm/uaccess.h>       /* copy to/from user            */
 #include <linux/videodev.h>    /* kernel radio structs         */
+#include <media/v4l2-common.h>
 #include <linux/param.h>
 #include <linux/pnp.h>
 
@@ -55,29 +56,29 @@ static int cadet_probe(void);
 
 /*
  * Signal Strength Threshold Values
- * The V4L API spec does not define any particular unit for the signal 
+ * The V4L API spec does not define any particular unit for the signal
  * strength value.  These values are in microvolts of RF at the tuner's input.
  */
 static __u16 sigtable[2][4]={{5,10,30,150},{28,40,63,1000}};
 
 static int cadet_getrds(void)
 {
-        int rdsstat=0;
+       int rdsstat=0;
 
        spin_lock(&cadet_io_lock);
-        outb(3,io);                 /* Select Decoder Control/Status */
+       outb(3,io);                 /* Select Decoder Control/Status */
        outb(inb(io+1)&0x7f,io+1);  /* Reset RDS detection */
        spin_unlock(&cadet_io_lock);
-       
+
        msleep(100);
 
-       spin_lock(&cadet_io_lock);      
-        outb(3,io);                 /* Select Decoder Control/Status */
+       spin_lock(&cadet_io_lock);
+       outb(3,io);                 /* Select Decoder Control/Status */
        if((inb(io+1)&0x80)!=0) {
-               rdsstat|=VIDEO_TUNER_RDS_ON;
+               rdsstat|=VIDEO_TUNER_RDS_ON;
        }
        if((inb(io+1)&0x10)!=0) {
-               rdsstat|=VIDEO_TUNER_MBS_ON;
+               rdsstat|=VIDEO_TUNER_MBS_ON;
        }
        spin_unlock(&cadet_io_lock);
        return rdsstat;
@@ -86,49 +87,49 @@ static int cadet_getrds(void)
 static int cadet_getstereo(void)
 {
        int ret = 0;
-        if(curtuner != 0)      /* Only FM has stereo capability! */
-               return 0;
+       if(curtuner != 0)       /* Only FM has stereo capability! */
+               return 0;
 
        spin_lock(&cadet_io_lock);
-        outb(7,io);          /* Select tuner control */
+       outb(7,io);          /* Select tuner control */
        if( (inb(io+1) & 0x40) == 0)
-               ret = 1;
-        spin_unlock(&cadet_io_lock);
-        return ret;
+               ret = 1;
+       spin_unlock(&cadet_io_lock);
+       return ret;
 }
 
 static unsigned cadet_gettune(void)
 {
-        int curvol,i;
+       int curvol,i;
        unsigned fifo=0;
 
-        /*
-         * Prepare for read
-         */
+       /*
+        * Prepare for read
+        */
 
        spin_lock(&cadet_io_lock);
-       
-        outb(7,io);       /* Select tuner control */
-        curvol=inb(io+1); /* Save current volume/mute setting */
-        outb(0x00,io+1);  /* Ensure WRITE-ENABLE is LOW */
+
+       outb(7,io);       /* Select tuner control */
+       curvol=inb(io+1); /* Save current volume/mute setting */
+       outb(0x00,io+1);  /* Ensure WRITE-ENABLE is LOW */
        tunestat=0xffff;
 
-        /*
-         * Read the shift register
-         */
-        for(i=0;i<25;i++) {
-                fifo=(fifo<<1)|((inb(io+1)>>7)&0x01);
-                if(i<24) {
-                        outb(0x01,io+1);
+       /*
+        * Read the shift register
+        */
+       for(i=0;i<25;i++) {
+               fifo=(fifo<<1)|((inb(io+1)>>7)&0x01);
+               if(i<24) {
+                       outb(0x01,io+1);
                        tunestat&=inb(io+1);
-                        outb(0x00,io+1);
-                }
-        }
-
-        /*
-         * Restore volume/mute setting
-         */
-        outb(curvol,io+1);
+                       outb(0x00,io+1);
+               }
+       }
+
+       /*
+        * Restore volume/mute setting
+        */
+       outb(curvol,io+1);
        spin_unlock(&cadet_io_lock);
 
        return fifo;
@@ -136,43 +137,43 @@ static unsigned cadet_gettune(void)
 
 static unsigned cadet_getfreq(void)
 {
-        int i;
-        unsigned freq=0,test,fifo=0;
+       int i;
+       unsigned freq=0,test,fifo=0;
 
        /*
         * Read current tuning
         */
        fifo=cadet_gettune();
 
-        /*
-         * Convert to actual frequency
-         */
+       /*
+        * Convert to actual frequency
+        */
        if(curtuner==0) {    /* FM */
-               test=12500;
-                for(i=0;i<14;i++) {
-                        if((fifo&0x01)!=0) {
-                                freq+=test;
-                        }
-                        test=test<<1;
-                        fifo=fifo>>1;
-                }
-                freq-=10700000;           /* IF frequency is 10.7 MHz */
-                freq=(freq*16)/1000000;   /* Make it 1/16 MHz */
+               test=12500;
+               for(i=0;i<14;i++) {
+                       if((fifo&0x01)!=0) {
+                               freq+=test;
+                       }
+                       test=test<<1;
+                       fifo=fifo>>1;
+               }
+               freq-=10700000;           /* IF frequency is 10.7 MHz */
+               freq=(freq*16)/1000000;   /* Make it 1/16 MHz */
        }
        if(curtuner==1) {    /* AM */
-               freq=((fifo&0x7fff)-2010)*16;
+               freq=((fifo&0x7fff)-2010)*16;
        }
 
-        return freq;
+       return freq;
 }
 
 static void cadet_settune(unsigned fifo)
 {
-        int i;
-       unsigned test;  
+       int i;
+       unsigned test;
 
        spin_lock(&cadet_io_lock);
-       
+
        outb(7,io);                /* Select tuner control */
        /*
         * Write the shift register
@@ -183,7 +184,7 @@ static void cadet_settune(unsigned fifo)
        outb(7,io);                /* Select tuner control */
        outb(test,io+1);           /* Initialize for write */
        for(i=0;i<25;i++) {
-               test|=0x01;              /* Toggle SCK High */
+               test|=0x01;              /* Toggle SCK High */
                outb(test,io+1);
                test&=0xfe;              /* Toggle SCK Low */
                outb(test,io+1);
@@ -196,57 +197,57 @@ static void cadet_settune(unsigned fifo)
 
 static void cadet_setfreq(unsigned freq)
 {
-        unsigned fifo;
-        int i,j,test;
-        int curvol;
+       unsigned fifo;
+       int i,j,test;
+       int curvol;
 
-        /* 
-         * Formulate a fifo command
-         */
+       /*
+        * Formulate a fifo command
+        */
        fifo=0;
        if(curtuner==0) {    /* FM */
-               test=102400;
-                freq=(freq*1000)/16;       /* Make it kHz */
-                freq+=10700;               /* IF is 10700 kHz */
-                for(i=0;i<14;i++) {
-                        fifo=fifo<<1;
-                        if(freq>=test) {
-                                fifo|=0x01;
-                                freq-=test;
-                        }
-                        test=test>>1;
-                }
+               test=102400;
+               freq=(freq*1000)/16;       /* Make it kHz */
+               freq+=10700;               /* IF is 10700 kHz */
+               for(i=0;i<14;i++) {
+                       fifo=fifo<<1;
+                       if(freq>=test) {
+                               fifo|=0x01;
+                               freq-=test;
+                       }
+                       test=test>>1;
+               }
        }
        if(curtuner==1) {    /* AM */
-                fifo=(freq/16)+2010;            /* Make it kHz */
+               fifo=(freq/16)+2010;            /* Make it kHz */
                fifo|=0x100000;            /* Select AM Band */
        }
 
-        /*
-         * Save current volume/mute setting
-         */
+       /*
+        * Save current volume/mute setting
+        */
 
        spin_lock(&cadet_io_lock);
        outb(7,io);                /* Select tuner control */
-        curvol=inb(io+1); 
-        spin_unlock(&cadet_io_lock);
+       curvol=inb(io+1);
+       spin_unlock(&cadet_io_lock);
 
        /*
         * Tune the card
         */
        for(j=3;j>-1;j--) {
-               cadet_settune(fifo|(j<<16));
-               
-               spin_lock(&cadet_io_lock);
+               cadet_settune(fifo|(j<<16));
+
+               spin_lock(&cadet_io_lock);
                outb(7,io);         /* Select tuner control */
                outb(curvol,io+1);
                spin_unlock(&cadet_io_lock);
-               
+
                msleep(100);
 
                cadet_gettune();
                if((tunestat & 0x40) == 0) {   /* Tuned */
-                       sigstrength=sigtable[curtuner][j];
+                       sigstrength=sigtable[curtuner][j];
                        return;
                }
        }
@@ -257,28 +258,28 @@ static void cadet_setfreq(unsigned freq)
 static int cadet_getvol(void)
 {
        int ret = 0;
-       
+
        spin_lock(&cadet_io_lock);
-       
-        outb(7,io);                /* Select tuner control */
-        if((inb(io + 1) & 0x20) != 0)
-               ret = 0xffff;
-        
-        spin_unlock(&cadet_io_lock);
-        return ret;
+
+       outb(7,io);                /* Select tuner control */
+       if((inb(io + 1) & 0x20) != 0)
+               ret = 0xffff;
+
+       spin_unlock(&cadet_io_lock);
+       return ret;
 }
 
 
 static void cadet_setvol(int vol)
 {
        spin_lock(&cadet_io_lock);
-        outb(7,io);                /* Select tuner control */
-        if(vol>0)
-                outb(0x20,io+1);
-        else
-                outb(0x00,io+1);
+       outb(7,io);                /* Select tuner control */
+       if(vol>0)
+               outb(0x20,io+1);
+       else
+               outb(0x00,io+1);
        spin_unlock(&cadet_io_lock);
-}  
+}
 
 static void cadet_handler(unsigned long data)
 {
@@ -288,15 +289,15 @@ static void cadet_handler(unsigned long data)
 
        if(spin_trylock(&cadet_io_lock))
        {
-               outb(0x3,io);       /* Select RDS Decoder Control */
+               outb(0x3,io);       /* Select RDS Decoder Control */
                if((inb(io+1)&0x20)!=0) {
-                       printk(KERN_CRIT "cadet: RDS fifo overflow\n");
+                       printk(KERN_CRIT "cadet: RDS fifo overflow\n");
                }
                outb(0x80,io);      /* Select RDS fifo */
                while((inb(io)&0x80)!=0) {
-                       rdsbuf[rdsin]=inb(io+1);
+                       rdsbuf[rdsin]=inb(io+1);
                        if(rdsin==rdsout)
-                               printk(KERN_WARNING "cadet: RDS buffer overflow\n");
+                               printk(KERN_WARNING "cadet: RDS buffer overflow\n");
                        else
                                rdsin++;
                }
@@ -307,9 +308,9 @@ static void cadet_handler(unsigned long data)
         * Service pending read
         */
        if( rdsin!=rdsout)
-               wake_up_interruptible(&read_queue);
+               wake_up_interruptible(&read_queue);
 
-       /* 
+       /*
         * Clean up and exit
         */
        init_timer(&readtimer);
@@ -324,12 +325,12 @@ static void cadet_handler(unsigned long data)
 static ssize_t cadet_read(struct file *file, char __user *data,
                          size_t count, loff_t *ppos)
 {
-        int i=0;
+       int i=0;
        unsigned char readbuf[RDS_BUFFER];
 
-        if(rdsstat==0) {
+       if(rdsstat==0) {
                spin_lock(&cadet_io_lock);
-               rdsstat=1;
+               rdsstat=1;
                outb(0x80,io);        /* Select RDS fifo */
                spin_unlock(&cadet_io_lock);
                init_timer(&readtimer);
@@ -339,15 +340,15 @@ static ssize_t cadet_read(struct file *file, char __user *data,
                add_timer(&readtimer);
        }
        if(rdsin==rdsout) {
-               if (file->f_flags & O_NONBLOCK)
-                       return -EWOULDBLOCK;
-               interruptible_sleep_on(&read_queue);
-       }               
+               if (file->f_flags & O_NONBLOCK)
+                       return -EWOULDBLOCK;
+               interruptible_sleep_on(&read_queue);
+       }
        while( i<count && rdsin!=rdsout)
-               readbuf[i++]=rdsbuf[rdsout++];
+               readbuf[i++]=rdsbuf[rdsout++];
 
        if (copy_to_user(data,readbuf,i))
-               return -EFAULT;
+               return -EFAULT;
        return i;
 }
 
@@ -375,29 +376,29 @@ static int cadet_do_ioctl(struct inode *inode, struct file *file,
                                return -EINVAL;
                        }
                        switch(v->tuner) {
-                               case 0:
-                               strcpy(v->name,"FM");
-                               v->rangelow=1400;     /* 87.5 MHz */
-                               v->rangehigh=1728;    /* 108.0 MHz */
-                               v->flags=0;
-                               v->mode=0;
-                               v->mode|=VIDEO_MODE_AUTO;
-                               v->signal=sigstrength;
-                               if(cadet_getstereo()==1) {
-                                       v->flags|=VIDEO_TUNER_STEREO_ON;
-                               }
+                               case 0:
+                               strcpy(v->name,"FM");
+                               v->rangelow=1400;     /* 87.5 MHz */
+                               v->rangehigh=1728;    /* 108.0 MHz */
+                               v->flags=0;
+                               v->mode=0;
+                               v->mode|=VIDEO_MODE_AUTO;
+                               v->signal=sigstrength;
+                               if(cadet_getstereo()==1) {
+                                       v->flags|=VIDEO_TUNER_STEREO_ON;
+                               }
                                v->flags|=cadet_getrds();
-                               break;
-                               case 1:
-                               strcpy(v->name,"AM");
-                               v->rangelow=8320;      /* 520 kHz */
-                               v->rangehigh=26400;    /* 1650 kHz */
-                               v->flags=0;
-                               v->flags|=VIDEO_TUNER_LOW;
-                               v->mode=0;
-                               v->mode|=VIDEO_MODE_AUTO;
-                               v->signal=sigstrength;
-                               break;
+                               break;
+                               case 1:
+                               strcpy(v->name,"AM");
+                               v->rangelow=8320;      /* 520 kHz */
+                               v->rangehigh=26400;    /* 1650 kHz */
+                               v->flags=0;
+                               v->flags|=VIDEO_TUNER_LOW;
+                               v->mode=0;
+                               v->mode|=VIDEO_MODE_AUTO;
+                               v->signal=sigstrength;
+                               break;
                        }
                        return 0;
                }
@@ -407,49 +408,49 @@ static int cadet_do_ioctl(struct inode *inode, struct file *file,
                        if((v->tuner<0)||(v->tuner>1)) {
                                return -EINVAL;
                        }
-                       curtuner=v->tuner;      
+                       curtuner=v->tuner;
                        return 0;
                }
                case VIDIOCGFREQ:
                {
-                       unsigned long *freq = arg;
+                       unsigned long *freq = arg;
                        *freq = cadet_getfreq();
                        return 0;
                }
                case VIDIOCSFREQ:
                {
-                       unsigned long *freq = arg;
+                       unsigned long *freq = arg;
                        if((curtuner==0)&&((*freq<1400)||(*freq>1728))) {
-                               return -EINVAL;
+                               return -EINVAL;
                        }
                        if((curtuner==1)&&((*freq<8320)||(*freq>26400))) {
-                               return -EINVAL;
+                               return -EINVAL;
                        }
                        cadet_setfreq(*freq);
                        return 0;
                }
                case VIDIOCGAUDIO:
-               {       
+               {
                        struct video_audio *v = arg;
                        memset(v,0, sizeof(*v));
                        v->flags=VIDEO_AUDIO_MUTABLE|VIDEO_AUDIO_VOLUME;
                        if(cadet_getstereo()==0) {
-                               v->mode=VIDEO_SOUND_MONO;
+                               v->mode=VIDEO_SOUND_MONO;
                        } else {
                                v->mode=VIDEO_SOUND_STEREO;
                        }
                        v->volume=cadet_getvol();
                        v->step=0xffff;
                        strcpy(v->name, "Radio");
-                       return 0;                       
+                       return 0;
                }
                case VIDIOCSAUDIO:
                {
                        struct video_audio *v = arg;
-                       if(v->audio) 
+                       if(v->audio)
                                return -EINVAL;
                        cadet_setvol(v->volume);
-                       if(v->flags&VIDEO_AUDIO_MUTE) 
+                       if(v->flags&VIDEO_AUDIO_MUTE)
                                cadet_setvol(0);
                        else
                                cadet_setvol(0xffff);
@@ -539,16 +540,16 @@ static struct pnp_driver cadet_pnp_driver = {
 
 static int cadet_probe(void)
 {
-        static int iovals[8]={0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e};
+       static int iovals[8]={0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e};
        int i;
 
        for(i=0;i<8;i++) {
-               io=iovals[i];
+               io=iovals[i];
                if (request_region(io, 2, "cadet-probe")) {
-                       cadet_setfreq(1410);
+                       cadet_setfreq(1410);
                        if(cadet_getfreq()==1410) {
                                release_region(io, 2);
-                               return io;
+                               return io;
                        }
                        release_region(io, 2);
                }
@@ -556,7 +557,7 @@ static int cadet_probe(void)
        return -1;
 }
 
-/* 
+/*
  * io should only be set if the user has used something like
  * isapnp (the userspace program) to initialize this card for us
  */
@@ -564,7 +565,7 @@ static int cadet_probe(void)
 static int __init cadet_init(void)
 {
        spin_lock_init(&cadet_io_lock);
-       
+
        /*
         *      If a probe was requested then probe ISAPnP first (safest)
         */
@@ -579,12 +580,12 @@ static int __init cadet_init(void)
        /*
         *      Else we bail out
         */
-        
-        if(io < 0) {
-#ifdef MODULE        
+
+       if(io < 0) {
+#ifdef MODULE
                printk(KERN_ERR "You must set an I/O address with io=0x???\n");
 #endif
-               goto fail;
+               goto fail;
        }
        if (!request_region(io,2,"cadet"))
                goto fail;