openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] gspca - ov534_9: Add brightness to OmniVision 5621 sensor 

This patch adds brightness control to the OmniVision 5621 sensor.

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jose Alberto Reguero 2012-03-16 06:59:38 -03:00 committed by Mauro Carvalho Chehab
parent cd7f98fcd8
commit d9ef28a915
1 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/media/video/gspca/ov534_9.c
View File

@ -1107,16 +1107,34 @@ static void setbrightness(struct gspca_dev *gspca_dev)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
u8 val; u8 val;
s8 sval;
if (gspca_dev->ctrl_dis & (1 << BRIGHTNESS)) if (gspca_dev->ctrl_dis & (1 << BRIGHTNESS))
return; return;
val = sd->ctrls[BRIGHTNESS].val; if (sd->sensor == SENSOR_OV562x) {
if (val < 8) sval = sd->ctrls[BRIGHTNESS].val;
val = 15 - val; /* f .. 8 */ val = 0x76;
else val += sval;
val = val - 8; /* 0 .. 7 */ sccb_write(gspca_dev, 0x24, val);
sccb_write(gspca_dev, 0x55, /* brtn - brightness adjustment */ val = 0x6a;
0x0f | (val << 4)); val += sval;
sccb_write(gspca_dev, 0x25, val);
if (sval < -40)
val = 0x71;
else if (sval < 20)
val = 0x94;
else
val = 0xe6;
sccb_write(gspca_dev, 0x26, val);
} else {
val = sd->ctrls[BRIGHTNESS].val;
if (val < 8)
val = 15 - val; /* f .. 8 */
else
val = val - 8; /* 0 .. 7 */
sccb_write(gspca_dev, 0x55, /* brtn - brightness adjustment */
0x0f | (val << 4));
}
} }
static void setcontrast(struct gspca_dev *gspca_dev) static void setcontrast(struct gspca_dev *gspca_dev)
@ -1339,7 +1357,16 @@ static int sd_init(struct gspca_dev *gspca_dev)
reg_w(gspca_dev, 0x56, 0x17); reg_w(gspca_dev, 0x56, 0x17);
} else if ((sensor_id & 0xfff0) == 0x5620) { } else if ((sensor_id & 0xfff0) == 0x5620) {
sd->sensor = SENSOR_OV562x; sd->sensor = SENSOR_OV562x;
gspca_dev->ctrl_dis = (1 << CONTRAST) |
(1 << AUTOGAIN) |
(1 << EXPOSURE) |
(1 << SHARPNESS) |
(1 << SATUR) |
(1 << LIGHTFREQ);
sd->ctrls[BRIGHTNESS].min = -90;
sd->ctrls[BRIGHTNESS].max = 90;
sd->ctrls[BRIGHTNESS].def = 0;
gspca_dev->cam.cam_mode = ov562x_mode; gspca_dev->cam.cam_mode = ov562x_mode;
gspca_dev->cam.nmodes = ARRAY_SIZE(ov562x_mode); gspca_dev->cam.nmodes = ARRAY_SIZE(ov562x_mode);
@ -1360,8 +1387,12 @@ static int sd_start(struct gspca_dev *gspca_dev)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
if (sd->sensor == SENSOR_OV971x || sd->sensor == SENSOR_OV562x) if (sd->sensor == SENSOR_OV971x)
return gspca_dev->usb_err; return gspca_dev->usb_err;
else if (sd->sensor == SENSOR_OV562x) {
setbrightness(gspca_dev);
return gspca_dev->usb_err;
}
switch (gspca_dev->curr_mode) { switch (gspca_dev->curr_mode) {
case QVGA_MODE: /* 320x240 */ case QVGA_MODE: /* 320x240 */
sccb_w_array(gspca_dev, ov965x_start_1_vga, sccb_w_array(gspca_dev, ov965x_start_1_vga,