Skip to content

Commit

Permalink
V4L/DVB (12978): gspca - m5602-ov7660: Add red gain control
Browse files Browse the repository at this point in the history
Hook up the red gain controller

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 cbd1f7f commit 68fdb7a
Showing 1 changed file with 42 additions and 1 deletion.
43 changes: 42 additions & 1 deletion drivers/media/video/gspca/m5602/m5602_ov7660.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ static int ov7660_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
static int ov7660_set_gain(struct gspca_dev *gspca_dev, __s32 val);
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);

const static struct ctrl ov7660_ctrls[] = {
#define GAIN_IDX 1
Expand Down Expand Up @@ -54,7 +56,21 @@ const static struct ctrl ov7660_ctrls[] = {
.set = ov7660_set_blue_gain,
.get = ov7660_get_blue_gain
},

#define RED_BALANCE_IDX 3
{
{
.id = V4L2_CID_RED_BALANCE,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "red balance",
.minimum = 0x00,
.maximum = 0x7f,
.step = 0x1,
.default_value = OV7660_DEFAULT_RED_GAIN,
.flags = V4L2_CTRL_FLAG_SLIDER
},
.set = ov7660_set_red_gain,
.get = ov7660_get_red_gain
},
};

static struct v4l2_pix_format ov7660_modes[] = {
Expand Down Expand Up @@ -237,6 +253,31 @@ static int ov7660_set_blue_gain(struct gspca_dev *gspca_dev, __s32 val)
return err;
}

static int ov7660_get_red_gain(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;
s32 *sensor_settings = sd->sensor_priv;

*val = sensor_settings[RED_BALANCE_IDX];
PDEBUG(D_V4L2, "Read red balance %d", *val);
return 0;
}

static int ov7660_set_red_gain(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, "Setting red balance to %d", val);

sensor_settings[RED_BALANCE_IDX] = val;

err = m5602_write_sensor(sd, OV7660_RED_GAIN, &i2c_data, 1);
return err;
}

static void ov7660_dump_registers(struct sd *sd)
{
int address;
Expand Down

0 comments on commit 68fdb7a

Please sign in to comment.