fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / drivers / media / radio / radio-aztech.c
index 523be82..3ba5fa8 100644 (file)
@@ -1,11 +1,12 @@
-/* radio-aztech.c - Aztech radio card driver for Linux 2.2 
+/* radio-aztech.c - Aztech radio card driver for Linux 2.2
  *
- * Adapted to support the Video for Linux API by 
+ * 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:
  *
  * 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)
  *
 #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/config.h>      /* CONFIG_RADIO_AZTECH_PORT     */
+#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) */
 
 #define CONFIG_RADIO_AZTECH_PORT -1
 #endif
 
-static int io = CONFIG_RADIO_AZTECH_PORT; 
+static int io = CONFIG_RADIO_AZTECH_PORT;
 static int radio_nr = -1;
 static int radio_wait_time = 1000;
-static struct semaphore lock;
+static struct mutex lock;
 
 struct az_device
 {
@@ -53,15 +76,15 @@ struct az_device
 
 static int volconvert(int level)
 {
-       level>>=14;             /* Map 16bits down to 2 bit */
-       level&=3;
-       
+       level>>=14;             /* Map 16bits down to 2 bit */
+       level&=3;
+
        /* convert to card-friendly values */
-       switch (level) 
+       switch (level)
        {
-               case 0: 
+               case 0:
                        return 0;
-               case 1: 
+               case 1:
                        return 1;
                case 2:
                        return 4;
@@ -87,9 +110,9 @@ static void send_1_byte (struct az_device *dev)
 
 static int az_setvol(struct az_device *dev, int vol)
 {
-       down(&lock);
+       mutex_lock(&lock);
        outb (volconvert(vol), io);
-       up(&lock);
+       mutex_unlock(&lock);
        return 0;
 }
 
@@ -121,9 +144,9 @@ static int az_setfreq(struct az_device *dev, unsigned long frequency)
 
        frequency += 171200;            /* Add 10.7 MHz IF              */
        frequency /= 800;               /* Convert to 50 kHz units      */
-                                       
-       down(&lock);
-       
+
+       mutex_lock(&lock);
+
        send_0_byte (dev);              /*  0: LSB of frequency       */
 
        for (i = 0; i < 13; i++)        /*   : frequency bits (1-13)  */
@@ -151,8 +174,8 @@ static int az_setfreq(struct az_device *dev, unsigned long frequency)
 
        udelay (radio_wait_time);
        outb_p(128+64+volconvert(dev->curvol), io);
-       
-       up(&lock);
+
+       mutex_unlock(&lock);
 
        return 0;
 }
@@ -162,84 +185,124 @@ static int az_do_ioctl(struct inode *inode, struct file *file,
 {
        struct video_device *dev = video_devdata(file);
        struct az_device *az = dev->priv;
-       
+
        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:
-               {       
-                       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;                       
+
+               case VIDIOC_QUERYCTRL:
+               {
+                       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);
        }
 }
 
@@ -265,7 +328,7 @@ static struct video_device aztech_radio=
        .owner          = THIS_MODULE,
        .name           = "Aztech radio",
        .type           = VID_TYPE_TUNER,
-       .hardware       = VID_HARDWARE_AZTECH,
+       .hardware       = 0,
        .fops           = &aztech_fops,
 };
 
@@ -277,21 +340,21 @@ static int __init aztech_init(void)
                return -EINVAL;
        }
 
-       if (!request_region(io, 2, "aztech")) 
+       if (!request_region(io, 2, "aztech"))
        {
                printk(KERN_ERR "aztech: port 0x%x already in use\n", io);
                return -EBUSY;
        }
 
-       init_MUTEX(&lock);
+       mutex_init(&lock);
        aztech_radio.priv=&aztech_unit;
-       
+
        if(video_register_device(&aztech_radio, VFL_TYPE_RADIO, radio_nr)==-1)
        {
                release_region(io,2);
                return -EINVAL;
        }
-               
+
        printk(KERN_INFO "Aztech radio card driver v1.00/19990224 rkroll@exploits.org\n");
        /* mute card - prevents noisy bootups */
        outb (0, io);