V4L/DVB (3269): ioctls cleanups.

[pandora-kernel.git] / drivers / media / video / tvaudio.c

diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 5b20e81..fec6200 100644 (file)
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -31,6 +31,7 @@
 #include <linux/smp_lock.h>
 
 #include <media/audiochip.h>
+#include <media/v4l2-common.h>
 
 #include "tvaudio.h"
 
@@ -46,16 +47,18 @@ MODULE_LICENSE("GPL");
 
 #define UNSET    (-1U)
 
-#define tvaudio_info(fmt, arg...) do {\
-       printk(KERN_INFO "tvaudio %d-%04x: " fmt, \
-                       chip->c.adapter->nr, chip->c.addr , ##arg); } while (0)
-#define tvaudio_warn(fmt, arg...) do {\
-       printk(KERN_WARNING "tvaudio %d-%04x: " fmt, \
-                       chip->c.adapter->nr, chip->c.addr , ##arg); } while (0)
-#define tvaudio_dbg(fmt, arg...) do {\
-       if (debug) \
-               printk(KERN_INFO "tvaudio %d-%04x: " fmt, \
-                       chip->c.adapter->nr, chip->c.addr , ##arg); } while (0)
+#define tvaudio_info(fmt, arg...) do { \
+       printk(KERN_INFO "%s %d-%04x: " fmt, chip->c.driver->name, \
+              i2c_adapter_id(chip->c.adapter), chip->c.addr , ## arg); } while (0)
+#define tvaudio_warn(fmt, arg...) do { \
+       printk(KERN_WARNING "%s %d-%04x: " fmt, chip->c.driver->name, \
+              i2c_adapter_id(chip->c.adapter), chip->c.addr , ## arg); } while (0)
+#define tvaudio_dbg(fmt, arg...) \
+       do { \
+               if (debug) \
+                       printk(KERN_INFO "%s debug %d-%04x: " fmt, chip->c.driver->name, \
+                              i2c_adapter_id(chip->c.adapter), chip->c.addr , ## arg); \
+       } while (0)
 
 /* ---------------------------------------------------------------------- */
 /* our structs                                                            */
@@ -131,7 +134,7 @@ struct CHIPSTATE {
        /* current settings */
        __u16 left,right,treble,bass,mode;
        int prevmode;
-       int norm;
+       int radio;
 
        /* thread */
        pid_t                tpid;
@@ -142,8 +145,6 @@ struct CHIPSTATE {
        int                  watch_stereo;
 };
 
-#define VIDEO_MODE_RADIO 16      /* norm magic for radio mode */
-
 /* ---------------------------------------------------------------------- */
 /* i2c addresses                                                          */
 
@@ -301,7 +302,7 @@ static int chip_thread(void *data)
                tvaudio_dbg("%s: thread wakeup\n", chip->c.name);
 
                /* don't do anything for radio or if mode != auto */
-               if (chip->norm == VIDEO_MODE_RADIO || chip->mode != 0)
+               if (chip->radio || chip->mode != 0)
                        continue;
 
                /* have a look what's going on */
@@ -1563,17 +1564,8 @@ static int chip_probe(struct i2c_adapter *adap)
           because dedicated drivers are used */
        if ((adap->id == I2C_HW_SAA7146))
                return 0;
-#ifdef I2C_CLASS_TV_ANALOG
        if (adap->class & I2C_CLASS_TV_ANALOG)
                return i2c_probe(adap, &addr_data, chip_attach);
-#else
-       switch (adap->id) {
-       case I2C_HW_B_BT848:
-       case I2C_HW_B_RIVA:
-       case I2C_HW_SAA7134:
-               return i2c_probe(adap, &addr_data, chip_attach);
-       }
-#endif
        return 0;
 }
 
@@ -1617,7 +1609,7 @@ static int chip_command(struct i2c_client *client,
                break;
 
        case AUDC_SET_RADIO:
-               chip->norm = VIDEO_MODE_RADIO;
+               chip->radio = 1;
                chip->watch_stereo = 0;
                /* del_timer(&chip->wt); */
                break;
@@ -1643,7 +1635,7 @@ static int chip_command(struct i2c_client *client,
                        va->bass   = chip->bass;
                        va->treble = chip->treble;
                }
-               if (chip->norm != VIDEO_MODE_RADIO) {
+               if (!chip->radio) {
                        if (desc->getmode)
                                va->mode = desc->getmode(chip);
                        else
@@ -1678,15 +1670,80 @@ static int chip_command(struct i2c_client *client,
                }
                break;
        }
-       case VIDIOCSCHAN:
+
+       case VIDIOC_S_TUNER:
        {
-               struct video_channel *vc = arg;
+               struct v4l2_tuner *vt = arg;
+               int mode = 0;
 
-               chip->norm = vc->norm;
+               switch (vt->audmode) {
+               case V4L2_TUNER_MODE_MONO:
+                       mode = VIDEO_SOUND_MONO;
+                       break;
+               case V4L2_TUNER_MODE_STEREO:
+                       mode = VIDEO_SOUND_STEREO;
+                       break;
+               case V4L2_TUNER_MODE_LANG1:
+                       mode = VIDEO_SOUND_LANG1;
+                       break;
+               case V4L2_TUNER_MODE_LANG2:
+                       mode = VIDEO_SOUND_LANG2;
+                       break;
+               default:
+                       break;
+               }
+
+               if (desc->setmode && mode) {
+                       chip->watch_stereo = 0;
+                       /* del_timer(&chip->wt); */
+                       chip->mode = mode;
+                       desc->setmode(chip, mode);
+               }
                break;
        }
-       case VIDIOCSFREQ:
+
+       case VIDIOC_G_TUNER:
        {
+               struct v4l2_tuner *vt = arg;
+               int mode = VIDEO_SOUND_MONO;
+
+               if (chip->radio)
+                       break;
+               vt->audmode = 0;
+               vt->rxsubchans = 0;
+               vt->capability = V4L2_TUNER_CAP_STEREO |
+                       V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
+
+               if (desc->getmode)
+                       mode = desc->getmode(chip);
+
+               if (mode & VIDEO_SOUND_MONO)
+                       vt->rxsubchans |= V4L2_TUNER_SUB_MONO;
+               if (mode & VIDEO_SOUND_STEREO)
+                       vt->rxsubchans |= V4L2_TUNER_SUB_STEREO;
+               if (mode & VIDEO_SOUND_LANG1)
+                       vt->rxsubchans |= V4L2_TUNER_SUB_LANG1 |
+                                         V4L2_TUNER_SUB_LANG2;
+
+               mode = chip->mode;
+               if (mode & VIDEO_SOUND_MONO)
+                       vt->audmode = V4L2_TUNER_MODE_MONO;
+               if (mode & VIDEO_SOUND_STEREO)
+                       vt->audmode = V4L2_TUNER_MODE_STEREO;
+               if (mode & VIDEO_SOUND_LANG1)
+                       vt->audmode = V4L2_TUNER_MODE_LANG1;
+               if (mode & VIDEO_SOUND_LANG2)
+                       vt->audmode = V4L2_TUNER_MODE_LANG2;
+               break;
+       }
+
+       case VIDIOCSCHAN:
+       case VIDIOC_S_STD:
+               chip->radio = 0;
+               break;
+
+       case VIDIOCSFREQ:
+       case VIDIOC_S_FREQUENCY:
                chip->mode = 0; /* automatic */
                if (desc->checkmode) {
                        desc->setmode(chip,VIDEO_SOUND_MONO);
@@ -1695,17 +1752,17 @@ static int chip_command(struct i2c_client *client,
                        mod_timer(&chip->wt, jiffies+2*HZ);
                        /* the thread will call checkmode() later */
                }
-       }
+               break;
        }
        return 0;
 }
 
 
 static struct i2c_driver driver = {
-       .owner           = THIS_MODULE,
-       .name            = "generic i2c audio driver",
+       .driver = {
+               .name    = "generic i2c audio driver",
+       },
        .id              = I2C_DRIVERID_TVAUDIO,
-       .flags           = I2C_DF_NOTIFY,
        .attach_adapter  = chip_probe,
        .detach_client   = chip_detach,
        .command         = chip_command,
@@ -1714,7 +1771,6 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
        .name       = "(unset)",
-       .flags      = I2C_CLIENT_ALLOW_USE,
        .driver     = &driver,
 };