Skip to content

Commit

Permalink
[media] gspca_pac7302: Improve the gain control
Browse files Browse the repository at this point in the history
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Hans de Goede authored and Mauro Carvalho Chehab committed May 7, 2012
1 parent 48bb731 commit df8b985
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions drivers/media/video/gspca/pac7302.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
* 0 | 0xc7 | setbluebalance()
* 0 | 0xdc | setbrightcont(), setcolors()
* 3 | 0x02 | setexposure()
* 3 | 0x10 | setgain()
* 3 | 0x10, 0x12 | setgain()
* 3 | 0x11 | setcolors(), setgain(), setexposure(), sethvflip()
* 3 | 0x21 | sethvflip()
*/
Expand Down Expand Up @@ -212,10 +212,10 @@ static const struct ctrl sd_ctrls[] = {
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Gain",
.minimum = 0,
.maximum = 255,
.maximum = 62,
.step = 1,
#define GAIN_DEF 127
#define GAIN_KNEE 255 /* Gain seems to cause little noise on the pac73xx */
#define GAIN_DEF 15
#define GAIN_KNEE 46
.default_value = GAIN_DEF,
},
.set_control = setgain
Expand Down Expand Up @@ -601,9 +601,19 @@ static void setbluebalance(struct gspca_dev *gspca_dev)
static void setgain(struct gspca_dev *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, 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) */
reg_w(gspca_dev, 0x11, 0x01);
Expand Down

0 comments on commit df8b985

Please sign in to comment.