]> git.karo-electronics.de Git - linux-beck.git/commitdiff
V4L/DVB (12980): gspca - m5602-ov7660: Create auto white balance ctrl
authorErik Andrén <erik.andren@gmail.com>
Sat, 20 Jun 2009 11:01:27 +0000 (08:01 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 19 Sep 2009 03:16:53 +0000 (00:16 -0300)
Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/gspca/m5602/m5602_ov7660.c

index 9d0cf2ccd1fe015748d154dfa46f64774205fba1..00f8365db1a10eebc623646e48085f9adfed2a5e 100644 (file)
@@ -24,6 +24,11 @@ static int ov7660_get_blue_gain(struct gspca_dev *gspca_dev, __s32 *val);
 static int ov7660_set_blue_gain(struct gspca_dev *gspca_dev, __s32 val);
 static int ov7660_get_red_gain(struct gspca_dev *gspca_dev, __s32 *val);
 static int ov7660_set_red_gain(struct gspca_dev *gspca_dev, __s32 val);
+static int ov7660_get_auto_white_balance(struct gspca_dev *gspca_dev,
+                                        __s32 *val);
+static int ov7660_set_auto_white_balance(struct gspca_dev *gspca_dev,
+                                        __s32 val);
+
 
 const static struct ctrl ov7660_ctrls[] = {
 #define GAIN_IDX 1
@@ -71,6 +76,21 @@ const static struct ctrl ov7660_ctrls[] = {
                .set = ov7660_set_red_gain,
                .get = ov7660_get_red_gain
        },
+#define AUTO_WHITE_BALANCE_IDX 4
+       {
+               {
+                       .id             = V4L2_CID_AUTO_WHITE_BALANCE,
+                       .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                       .name           = "auto white balance",
+                       .minimum        = 0,
+                       .maximum        = 1,
+                       .step           = 1,
+                       .default_value  = 1
+               },
+               .set = ov7660_set_auto_white_balance,
+               .get = ov7660_get_auto_white_balance
+       },
+
 };
 
 static struct v4l2_pix_format ov7660_modes[] = {
@@ -182,6 +202,9 @@ int ov7660_init(struct sd *sd)
        if (err < 0)
                return err;
 
+       err = ov7660_set_auto_white_balance(&sd->gspca_dev,
+               sensor_settings[AUTO_WHITE_BALANCE_IDX]);
+
        return err;
 }
 
@@ -278,6 +301,37 @@ static int ov7660_set_red_gain(struct gspca_dev *gspca_dev, __s32 val)
        return err;
 }
 
+static int ov7660_get_auto_white_balance(struct gspca_dev *gspca_dev,
+                                        __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[AUTO_WHITE_BALANCE_IDX];
+       return 0;
+}
+
+static int ov7660_set_auto_white_balance(struct gspca_dev *gspca_dev,
+                                        __s32 val)
+{
+       int err;
+       u8 i2c_data;
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       PDEBUG(D_V4L2, "Set auto white balance to %d", val);
+
+       sensor_settings[AUTO_WHITE_BALANCE_IDX] = val;
+       err = m5602_read_sensor(sd, OV7660_COM8, &i2c_data, 1);
+       if (err < 0)
+               return err;
+
+       i2c_data = ((i2c_data & 0xfd) | ((val & 0x01) << 1));
+       err = m5602_write_sensor(sd, OV7660_COM8, &i2c_data, 1);
+
+       return err;
+}
+
 static void ov7660_dump_registers(struct sd *sd)
 {
        int address;