Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357047
b: refs/heads/master
c: 143dd34
h: refs/heads/master
i:
  357045: fada448
  357043: 56effbe
  357039: ad36813
v: v3
  • Loading branch information
Hans de Goede authored and Mauro Carvalho Chehab committed Dec 21, 2012
1 parent 6544c41 commit 0aae602
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 04881127340c43fc5b8dbc2c381c1928ee22559e
refs/heads/master: 143dd34597a2e051cb0938b28387b94742d4e4e4
32 changes: 26 additions & 6 deletions trunk/drivers/media/usb/gspca/pac207.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ MODULE_LICENSE("GPL");

#define PAC207_AUTOGAIN_DEADZONE 30

/* global parameters */
static int led_invert;
module_param(led_invert, int, 0644);
MODULE_PARM_DESC(led_invert, "Invert led");

/* specific webcam descriptor */
struct sd {
struct gspca_dev gspca_dev; /* !! must be the first item */
Expand Down Expand Up @@ -187,10 +192,14 @@ static int sd_config(struct gspca_dev *gspca_dev,
/* this function is called at probe and resume time */
static int sd_init(struct gspca_dev *gspca_dev)
{
pac207_write_reg(gspca_dev, 0x41, 0x00);
/* Bit_0=Image Format,
* Bit_1=LED,
* Bit_2=Compression test mode enable */
u8 mode;

/* mode: Image Format (Bit 0), LED (1), Compr. test mode (2) */
if (led_invert)
mode = 0x02;
else
mode = 0x00;
pac207_write_reg(gspca_dev, 0x41, mode);
pac207_write_reg(gspca_dev, 0x0f, 0x00); /* Power Control */

return gspca_dev->usb_err;
Expand Down Expand Up @@ -303,7 +312,11 @@ static int sd_start(struct gspca_dev *gspca_dev)
pac207_write_reg(gspca_dev, 0x02,
v4l2_ctrl_g_ctrl(gspca_dev->exposure)); /* PXCK = 12MHz /n */

mode = 0x02; /* Image Format (Bit 0), LED (1), Compr. test mode (2) */
/* mode: Image Format (Bit 0), LED (1), Compr. test mode (2) */
if (led_invert)
mode = 0x00;
else
mode = 0x02;
if (gspca_dev->width == 176) { /* 176x144 */
mode |= 0x01;
PDEBUG(D_STREAM, "pac207_start mode 176x144");
Expand All @@ -325,8 +338,15 @@ static int sd_start(struct gspca_dev *gspca_dev)

static void sd_stopN(struct gspca_dev *gspca_dev)
{
u8 mode;

/* mode: Image Format (Bit 0), LED (1), Compr. test mode (2) */
if (led_invert)
mode = 0x02;
else
mode = 0x00;
pac207_write_reg(gspca_dev, 0x40, 0x00); /* Stop ISO pipe */
pac207_write_reg(gspca_dev, 0x41, 0x00); /* Turn of LED */
pac207_write_reg(gspca_dev, 0x41, mode); /* Turn off LED */
pac207_write_reg(gspca_dev, 0x0f, 0x00); /* Power Control */
}

Expand Down

0 comments on commit 0aae602

Please sign in to comment.