Skip to content

Commit

Permalink
V4L/DVB (12980): gspca - m5602-ov7660: Create auto white balance ctrl
Browse files Browse the repository at this point in the history
Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Erik Andrén authored and Mauro Carvalho Chehab committed Sep 19, 2009
1 parent a94e2f2 commit f1f59fe
Showing 1 changed file with 54 additions and 0 deletions.
54 changes: 54 additions & 0 deletions drivers/media/video/gspca/m5602/m5602_ov7660.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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[] = {
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit f1f59fe

Please sign in to comment.