diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-01-24 12:02:47 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-01-24 12:02:47 +0100 |
| commit | e30891c22cbad9f8099004481b43588f84905801 (patch) | |
| tree | 857def94eb83cdf5ddc8db414307fe1c313326d9 /linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | |
| parent | 7675a6ebbda69456487f54377309a922b4f415e9 (diff) | |
| parent | 5c23c4c25b7a5368c45f7ee2c0c5dedaf6af346a (diff) | |
| download | mediapointer-dvb-s2-e30891c22cbad9f8099004481b43588f84905801.tar.gz mediapointer-dvb-s2-e30891c22cbad9f8099004481b43588f84905801.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h')
| -rw-r--r-- | linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 58 |
1 files changed, 2 insertions, 56 deletions
diff --git a/linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h b/linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h index 3ff8c4ea3..95ac55891 100644 --- a/linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h +++ b/linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h @@ -178,6 +178,7 @@ static int vv6410_start(struct sd *sd); static int vv6410_init(struct sd *sd); static int vv6410_stop(struct sd *sd); static int vv6410_dump(struct sd *sd); +static void vv6410_disconnect(struct sd *sd); /* V4L2 controls supported by the driver */ static int vv6410_get_hflip(struct gspca_dev *gspca_dev, __s32 *val); @@ -197,62 +198,7 @@ const struct stv06xx_sensor stv06xx_sensor_vv6410 = { .start = vv6410_start, .stop = vv6410_stop, .dump = vv6410_dump, - - .nctrls = 3, - .ctrls = { - { - { - .id = V4L2_CID_HFLIP, - .type = V4L2_CTRL_TYPE_BOOLEAN, - .name = "horizontal flip", - .minimum = 0, - .maximum = 1, - .step = 1, - .default_value = 0 - }, - .set = vv6410_set_hflip, - .get = vv6410_get_hflip - }, { - { - .id = V4L2_CID_VFLIP, - .type = V4L2_CTRL_TYPE_BOOLEAN, - .name = "vertical flip", - .minimum = 0, - .maximum = 1, - .step = 1, - .default_value = 0 - }, - .set = vv6410_set_vflip, - .get = vv6410_get_vflip - }, { - { - .id = V4L2_CID_GAIN, - .type = V4L2_CTRL_TYPE_INTEGER, - .name = "analog gain", - .minimum = 0, - .maximum = 15, - .step = 1, - .default_value = 0 - }, - .set = vv6410_set_analog_gain, - .get = vv6410_get_analog_gain - } - }, - - .nmodes = 1, - .modes = { - { - 356, - 292, - V4L2_PIX_FMT_SGRBG8, - V4L2_FIELD_NONE, - .sizeimage = - 356 * 292, - .bytesperline = 356, - .colorspace = V4L2_COLORSPACE_SRGB, - .priv = 0 - } - } + .disconnect = vv6410_disconnect, }; /* If NULL, only single value to write, stored in len */ |