summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-05-05 08:50:54 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-05-05 08:50:54 -0300
commit761117ef9d86061f47fda80f18837a57a0feb72a (patch)
tree33a09a5b2427094ff7441652af78c89508df7f64 /linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h
parentb6d0c4b9b47910a71f4fcec532cd503f319da0d8 (diff)
parent5a57ca61d1316da19d76ac86ef8bf76b2f9b3746 (diff)
downloadmediapointer-dvb-s2-761117ef9d86061f47fda80f18837a57a0feb72a.tar.gz
mediapointer-dvb-s2-761117ef9d86061f47fda80f18837a57a0feb72a.tar.bz2
merge: http://linuxtv.org/hg/~eandren/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h')
-rw-r--r--linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h b/linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h
index 95ac55891..487d40555 100644
--- a/linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h
+++ b/linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h
@@ -173,6 +173,8 @@
#define VV6410_SUBSAMPLE 0x01
#define VV6410_CROP_TO_QVGA 0x02
+#define VV6410_CIF_LINELENGTH 415
+
static int vv6410_probe(struct sd *sd);
static int vv6410_start(struct sd *sd);
static int vv6410_init(struct sd *sd);
@@ -187,6 +189,8 @@ static int vv6410_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
static int vv6410_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
static int vv6410_get_analog_gain(struct gspca_dev *gspca_dev, __s32 *val);
static int vv6410_set_analog_gain(struct gspca_dev *gspca_dev, __s32 val);
+static int vv6410_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
+static int vv6410_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
const struct stv06xx_sensor stv06xx_sensor_vv6410 = {
.name = "ST VV6410",
@@ -242,12 +246,6 @@ static const u8 vv6410_sensor_init[][2] = {
/* Pre-clock generator divide off */
{VV6410_DATAFORMAT, BIT(7) | BIT(0)},
- /* Exposure registers */
- {VV6410_FINEH, VV6410_FINE_EXPOSURE >> 8},
- {VV6410_FINEL, VV6410_FINE_EXPOSURE & 0xff},
- {VV6410_COARSEH, VV6410_COARSE_EXPOSURE >> 8},
- {VV6410_COARSEL, VV6410_COARSE_EXPOSURE & 0xff},
- {VV6410_ANALOGGAIN, 0xf0 | VV6410_DEFAULT_GAIN},
{VV6410_CLKDIV, VV6410_CLK_DIV_2},
/* System registers */