lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (9855): gspca: Simplify frame rate setting and debug in ov534.

Browse Source 
Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antonio Ospite
2008-12-03 14:01:54 -03:00
committed by Mauro Carvalho Chehab
parent a9da98a433
commit 3adba44224
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/media/video/gspca/ov534.c
View File

@@ -48,7 +48,6 @@ static int frame_rate;
/* specific webcam descriptor */ /* specific webcam descriptor */
struct sd { struct sd {
struct gspca_dev gspca_dev; /* !! must be the first item */ struct gspca_dev gspca_dev; /* !! must be the first item */
__u8 frame_rate;
}; };
/* V4L2 controls supported by the driver */ /* V4L2 controls supported by the driver */
@@ -358,45 +357,38 @@ static int sd_config(struct gspca_dev *gspca_dev,
/* this function is called at probe and resume time */ /* this function is called at probe and resume time */
static int sd_init(struct gspca_dev *gspca_dev) static int sd_init(struct gspca_dev *gspca_dev)
{ {
struct sd *sd = (struct sd *)gspca_dev; int fr;
ov534_setup(gspca_dev->dev); ov534_setup(gspca_dev->dev);
if (frame_rate > 0) fr = frame_rate;
sd->frame_rate = frame_rate;
PDEBUG(D_PROBE, "frame_rate = %d", sd->frame_rate); switch (fr) {
switch (sd->frame_rate) {
case 50: case 50:
sccb_reg_write(gspca_dev->dev, 0x11, 0x01); sccb_reg_write(gspca_dev->dev, 0x11, 0x01);
sccb_check_status(gspca_dev->dev);
sccb_reg_write(gspca_dev->dev, 0x0d, 0x41); sccb_reg_write(gspca_dev->dev, 0x0d, 0x41);
sccb_check_status(gspca_dev->dev);
ov534_reg_verify_write(gspca_dev->dev, 0xe5, 0x02); ov534_reg_verify_write(gspca_dev->dev, 0xe5, 0x02);
break; break;
case 40: case 40:
sccb_reg_write(gspca_dev->dev, 0x11, 0x02); sccb_reg_write(gspca_dev->dev, 0x11, 0x02);
sccb_check_status(gspca_dev->dev);
sccb_reg_write(gspca_dev->dev, 0x0d, 0xc1); sccb_reg_write(gspca_dev->dev, 0x0d, 0xc1);
sccb_check_status(gspca_dev->dev);
ov534_reg_verify_write(gspca_dev->dev, 0xe5, 0x04); ov534_reg_verify_write(gspca_dev->dev, 0xe5, 0x04);
break; break;
case 30: /* case 30: */
default: default:
fr = 30;
sccb_reg_write(gspca_dev->dev, 0x11, 0x04); sccb_reg_write(gspca_dev->dev, 0x11, 0x04);
sccb_check_status(gspca_dev->dev);
sccb_reg_write(gspca_dev->dev, 0x0d, 0x81); sccb_reg_write(gspca_dev->dev, 0x0d, 0x81);
sccb_check_status(gspca_dev->dev);
ov534_reg_verify_write(gspca_dev->dev, 0xe5, 0x02); ov534_reg_verify_write(gspca_dev->dev, 0xe5, 0x02);
break; break;
case 15: case 15:
sccb_reg_write(gspca_dev->dev, 0x11, 0x03); sccb_reg_write(gspca_dev->dev, 0x11, 0x03);
sccb_check_status(gspca_dev->dev);
sccb_reg_write(gspca_dev->dev, 0x0d, 0x41); sccb_reg_write(gspca_dev->dev, 0x0d, 0x41);
sccb_check_status(gspca_dev->dev);
ov534_reg_verify_write(gspca_dev->dev, 0xe5, 0x04); ov534_reg_verify_write(gspca_dev->dev, 0xe5, 0x04);
break; break;
}; }
PDEBUG(D_PROBE, "frame_rate: %d", fr);
return 0; return 0;
} }