Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

1 files changed, 45 insertions, 49 deletions

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 24a48f8a48c1..9a02515fe18b 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -33,6 +33,7 @@
 #include <asm/div64.h>
 
 #include "cx88.h"
+#include <media/v4l2-common.h>
 
 /* Include V4L1 specific functions. Should be removed soon */
 #include <linux/videodev.h>
@@ -240,7 +241,7 @@ static struct cx88_ctrl cx8800_ctls[] = {
                         .minimum       = 0,
                         .maximum       = 0xff,
                         .step          = 1,
-                        .default_value = 0,
+                        .default_value = 0x3f,
                         .type          = V4L2_CTRL_TYPE_INTEGER,
                 },
                 .off                   = 0,
@@ -271,7 +272,7 @@ static struct cx88_ctrl cx8800_ctls[] = {
                         .minimum       = 0,
                         .maximum       = 0xff,
                         .step          = 1,
-                        .default_value = 0,
+                        .default_value = 0x7f,
                         .type          = V4L2_CTRL_TYPE_INTEGER,
                 },
                 .off                   = 0,
@@ -285,6 +286,7 @@ static struct cx88_ctrl cx8800_ctls[] = {
                         .name          = "Mute",
                         .minimum       = 0,
                         .maximum       = 1,
+                        .default_value = 1,
                         .type          = V4L2_CTRL_TYPE_BOOLEAN,
                 },
                 .reg                   = AUD_VOL_CTL,
@@ -298,7 +300,7 @@ static struct cx88_ctrl cx8800_ctls[] = {
                         .minimum       = 0,
                         .maximum       = 0x3f,
                         .step          = 1,
-                        .default_value = 0,
+                        .default_value = 0x1f,
                         .type          = V4L2_CTRL_TYPE_INTEGER,
                 },
                 .reg                   = AUD_VOL_CTL,
@@ -917,6 +919,9 @@ static int get_control(struct cx88_core *core, struct v4l2_control *ctl)
                 ctl->value = ((value + (c->off << c->shift)) & c->mask) >> c->shift;
                 break;
         }
+        printk("get_control id=0x%X reg=0x%02x val=0x%02x (mask 0x%02x)%s\n",
+                                        ctl->id, c->reg, ctl->value,
+                                        c->mask, c->sreg ? " [shadowed]" : "");
         return 0;
 }
 
@@ -925,13 +930,13 @@ static int set_control(struct cx88_core *core, struct v4l2_control *ctl)
 {
         /* struct cx88_core *core = dev->core; */
         struct cx88_ctrl *c = NULL;
-        u32 v_sat_value;
-        u32 value;
+        u32 value,mask;
         int i;
-
-        for (i = 0; i < CX8800_CTLS; i++)
-                if (cx8800_ctls[i].v.id == ctl->id)
+        for (i = 0; i < CX8800_CTLS; i++) {
+                if (cx8800_ctls[i].v.id == ctl->id) {
                         c = &cx8800_ctls[i];
+                }
+        }
         if (NULL == c)
                 return -EINVAL;
 
@@ -939,6 +944,7 @@ static int set_control(struct cx88_core *core, struct v4l2_control *ctl)
                 ctl->value = c->v.minimum;
         if (ctl->value > c->v.maximum)
                 ctl->value = c->v.maximum;
+        mask=c->mask;
         switch (ctl->id) {
         case V4L2_CID_AUDIO_BALANCE:
                 value = (ctl->value < 0x40) ? (0x40 - ctl->value) : ctl->value;
@@ -948,56 +954,44 @@ static int set_control(struct cx88_core *core, struct v4l2_control *ctl)
                 break;
         case V4L2_CID_SATURATION:
                 /* special v_sat handling */
-                v_sat_value = ctl->value - (0x7f - 0x5a);
-                if (v_sat_value > 0xff)
-                        v_sat_value = 0xff;
-                if (v_sat_value < 0x00)
-                        v_sat_value = 0x00;
-                cx_andor(MO_UV_SATURATION, 0xff00, v_sat_value << 8);
-                /* fall through to default route for u_sat */
+
+                value = ((ctl->value - c->off) << c->shift) & c->mask;
+
+                if (core->tvnorm->id & V4L2_STD_SECAM) {
+                        /* For SECAM, both U and V sat should be equal */
+                        value=value<<8|value;
+                } else {
+                        /* Keeps U Saturation proportional to V Sat */
+                        value=(value*0x5a)/0x7f<<8|value;
+                }
+                mask=0xffff;
+                break;
         default:
                 value = ((ctl->value - c->off) << c->shift) & c->mask;
                 break;
         }
-        dprintk(1,"set_control id=0x%X reg=0x%x val=0x%x%s\n",
-                ctl->id, c->reg, value, c->sreg ? " [shadowed]" : "");
+        printk("set_control id=0x%X reg=0x%02x val=0x%02x (mask 0x%02x)%s\n",
+                                        ctl->id, c->reg, value,
+                                        mask, c->sreg ? " [shadowed]" : "");
         if (c->sreg) {
-                cx_sandor(c->sreg, c->reg, c->mask, value);
+                cx_sandor(c->sreg, c->reg, mask, value);
         } else {
-                cx_andor(c->reg, c->mask, value);
+                cx_andor(c->reg, mask, value);
         }
         return 0;
 }
 
-/* static void init_controls(struct cx8800_dev *dev) */
 static void init_controls(struct cx88_core *core)
 {
-        static struct v4l2_control mute = {
-                .id    = V4L2_CID_AUDIO_MUTE,
-                .value = 1,
-        };
-        static struct v4l2_control volume = {
-                .id    = V4L2_CID_AUDIO_VOLUME,
-                .value = 0x3f,
-        };
-        static struct v4l2_control hue = {
-                .id    = V4L2_CID_HUE,
-                .value = 0x80,
-        };
-        static struct v4l2_control contrast = {
-                .id    = V4L2_CID_CONTRAST,
-                .value = 0x80,
-        };
-        static struct v4l2_control brightness = {
-                .id    = V4L2_CID_BRIGHTNESS,
-                .value = 0x80,
-        };
+        struct v4l2_control ctrl;
+        int i;
 
-        set_control(core,&mute);
-        set_control(core,&volume);
-        set_control(core,&hue);
-        set_control(core,&contrast);
-        set_control(core,&brightness);
+        for (i = 0; i < CX8800_CTLS; i++) {
+                ctrl.id=cx8800_ctls[i].v.id;
+                ctrl.value=cx8800_ctls[i].v.default_value
+                                +cx8800_ctls[i].off;
+                set_control(core, &ctrl);
+        }
 }
 
 /* ------------------------------------------------------------------ */
@@ -1125,7 +1119,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
         int err;
 
         if (video_debug > 1)
-                cx88_print_ioctl(core->name,cmd);
+                v4l_print_ioctl(core->name,cmd);
         switch (cmd) {
 
         /* --- capabilities ------------------------------------------ */
@@ -1261,7 +1255,7 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
 
         dprintk( 1, "CORE IOCTL: 0x%x\n", cmd );
         if (video_debug > 1)
-                cx88_print_ioctl(core->name,cmd);
+                v4l_print_ioctl(core->name,cmd);
 
         switch (cmd) {
         /* ---------- tv norms ---------- */
@@ -1481,7 +1475,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
         struct cx88_core  *core = dev->core;
 
         if (video_debug > 1)
-                cx88_print_ioctl(core->name,cmd);
+                v4l_print_ioctl(core->name,cmd);
 
         switch (cmd) {
         case VIDIOC_QUERYCAP:
@@ -1740,6 +1734,7 @@ static struct file_operations video_fops =
         .poll          = video_poll,
         .mmap          = video_mmap,
         .ioctl         = video_ioctl,
+        .compat_ioctl  = v4l_compat_ioctl32,
         .llseek        = no_llseek,
 };
 
@@ -1767,6 +1762,7 @@ static struct file_operations radio_fops =
         .open          = video_open,
         .release       = video_release,
         .ioctl         = radio_ioctl,
+        .compat_ioctl  = v4l_compat_ioctl32,
         .llseek        = no_llseek,
 };
 
@@ -1928,8 +1924,8 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
 
         /* initial device configuration */
         down(&core->lock);
-        init_controls(core);
         cx88_set_tvnorm(core,tvnorms);
+        init_controls(core);
         video_mux(core,0);
         up(&core->lock);