forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] gspca_pac7302: Improve the gain control

Browse source 
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans de Goede 2012-04-28 10:12:28 -03:00 • committed by Mauro Carvalho Chehab
parent 48bb7315f8
commit df8b98538c
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/media/video/gspca/pac7302.c
View file

@ -71,7 +71,7 @@
* 0 | 0xc7 | setbluebalance() * 0 | 0xc7 | setbluebalance()
* 0 | 0xdc | setbrightcont(), setcolors() * 0 | 0xdc | setbrightcont(), setcolors()
* 3 | 0x02 | setexposure() * 3 | 0x02 | setexposure()
* 3 | 0x10 | setgain() * 3 | 0x10, 0x12 | setgain()
* 3 | 0x11 | setcolors(), setgain(), setexposure(), sethvflip() * 3 | 0x11 | setcolors(), setgain(), setexposure(), sethvflip()
* 3 | 0x21 | sethvflip() * 3 | 0x21 | sethvflip()
*/ */
@ -212,10 +212,10 @@ static const struct ctrl sd_ctrls[] = {
.type = V4L2_CTRL_TYPE_INTEGER, .type = V4L2_CTRL_TYPE_INTEGER,
.name = "Gain", .name = "Gain",
.minimum = 0, .minimum = 0,
.maximum = 255, .maximum = 62,
.step = 1, .step = 1,
#define GAIN_DEF 127 #define GAIN_DEF 15
#define GAIN_KNEE 255 /* Gain seems to cause little noise on the pac73xx */ #define GAIN_KNEE 46
.default_value = GAIN_DEF, .default_value = GAIN_DEF,
}, },
.set_control = setgain .set_control = setgain
@ -601,9 +601,19 @@ static void setbluebalance(struct gspca_dev *gspca_dev)
static void setgain(struct gspca_dev *gspca_dev) static void setgain(struct gspca_dev *gspca_dev)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
u8 reg10, reg12;
if (sd->ctrls[GAIN].val < 32) {
reg10 = sd->ctrls[GAIN].val;
reg12 = 0;
} else {
reg10 = 31;
reg12 = sd->ctrls[GAIN].val - 31;
}
reg_w(gspca_dev, 0xff, 0x03); /* page 3 */ reg_w(gspca_dev, 0xff, 0x03); /* page 3 */
reg_w(gspca_dev, 0x10, sd->ctrls[GAIN].val >> 3); reg_w(gspca_dev, 0x10, reg10);
reg_w(gspca_dev, 0x12, reg12);
/* load registers to sensor (Bit 0, auto clear) */ /* load registers to sensor (Bit 0, auto clear) */
reg_w(gspca_dev, 0x11, 0x01); reg_w(gspca_dev, 0x11, 0x01);