V4L/DVB (12082): gspca_stv06xx: Add support for st6422 bridge and sensor
Hans de Goede [Wed, 17 Jun 2009 21:37:57 +0000 (18:37 -0300)]
Add support for st6422 bridge and sensor to the stv06xx gspca sub driver,
tested with:
Logitech QuickCam Messenger     046d:08f0       ST6422  integrated
Logitech QuickCam Mess. Plus    046d:08f6       ST6422  integrated

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/media/video/gspca/stv06xx/Makefile
drivers/media/video/gspca/stv06xx/stv06xx.c
drivers/media/video/gspca/stv06xx/stv06xx.h
drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c
drivers/media/video/gspca/stv06xx/stv06xx_sensor.h
drivers/media/video/gspca/stv06xx/stv06xx_st6422.c [new file with mode: 0644]
drivers/media/video/gspca/stv06xx/stv06xx_st6422.h [new file with mode: 0644]

index feeaa94..2f3c3a6 100644 (file)
@@ -3,7 +3,8 @@ obj-$(CONFIG_USB_STV06XX) += gspca_stv06xx.o
 gspca_stv06xx-objs := stv06xx.o \
                      stv06xx_vv6410.o \
                      stv06xx_hdcs.o \
-                     stv06xx_pb0100.o
+                     stv06xx_pb0100.o \
+                     stv06xx_st6422.o
 
 EXTRA_CFLAGS += -Idrivers/media/video/gspca
 
index e573c34..0da8e0d 100644 (file)
@@ -92,11 +92,10 @@ static int stv06xx_write_sensor_finish(struct sd *sd)
 {
        int err = 0;
 
-       if (IS_850(sd)) {
+       if (sd->bridge == BRIDGE_STV610) {
                struct usb_device *udev = sd->gspca_dev.dev;
                __u8 *buf = sd->gspca_dev.usb_buf;
 
-               /* Quickam Web needs an extra packet */
                buf[0] = 0;
                err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                                      0x04, 0x40, 0x1704, 0, buf, 1,
@@ -253,7 +252,7 @@ static int stv06xx_init(struct gspca_dev *gspca_dev)
 
        err = sd->sensor->init(sd);
 
-       if (dump_sensor)
+       if (dump_sensor && sd->sensor->dump)
                sd->sensor->dump(sd);
 
        return (err < 0) ? err : 0;
@@ -318,6 +317,8 @@ static void stv06xx_pkt_scan(struct gspca_dev *gspca_dev,
                        __u8 *data,                     /* isoc packet */
                        int len)                        /* iso packet length */
 {
+       struct sd *sd = (struct sd *) gspca_dev;
+
        PDEBUG(D_PACK, "Packet of length %d arrived", len);
 
        /* A packet may contain several frames
@@ -343,14 +344,29 @@ static void stv06xx_pkt_scan(struct gspca_dev *gspca_dev,
                if (len < chunk_len) {
                        PDEBUG(D_ERR, "URB packet length is smaller"
                                " than the specified chunk length");
+                       gspca_dev->last_packet_type = DISCARD_PACKET;
                        return;
                }
 
+               /* First byte seem to be 02=data 2nd byte is unknown??? */
+               if (sd->bridge == BRIDGE_ST6422 && (id & 0xFF00) == 0x0200)
+                       goto frame_data;
+
                switch (id) {
                case 0x0200:
                case 0x4200:
+frame_data:
                        PDEBUG(D_PACK, "Frame data packet detected");
 
+                       if (sd->to_skip) {
+                               int skip = (sd->to_skip < chunk_len) ?
+                                           sd->to_skip : chunk_len;
+                               data += skip;
+                               len -= skip;
+                               chunk_len -= skip;
+                               sd->to_skip -= skip;
+                       }
+
                        gspca_frame_add(gspca_dev, INTER_PACKET, frame,
                                        data, chunk_len);
                        break;
@@ -365,6 +381,9 @@ static void stv06xx_pkt_scan(struct gspca_dev *gspca_dev,
                        gspca_frame_add(gspca_dev, FIRST_PACKET,
                                        frame, data, 0);
 
+                       if (sd->bridge == BRIDGE_ST6422)
+                               sd->to_skip = gspca_dev->width * 4;
+
                        if (chunk_len)
                                PDEBUG(D_ERR, "Chunk length is "
                                              "non-zero on a SOF");
@@ -395,8 +414,12 @@ static void stv06xx_pkt_scan(struct gspca_dev *gspca_dev,
                        /* Unknown chunk with 2 bytes of data,
                           occurs 2-3 times per USB interrupt */
                        break;
+               case 0x42ff:
+                       PDEBUG(D_PACK, "Chunk 0x42ff detected");
+                       /* Special chunk seen sometimes on the ST6422 */
+                       break;
                default:
-                       PDEBUG(D_PACK, "Unknown chunk %d detected", id);
+                       PDEBUG(D_PACK, "Unknown chunk 0x%04x detected", id);
                        /* Unknown chunk */
                }
                data    += chunk_len;
@@ -428,11 +451,16 @@ static int stv06xx_config(struct gspca_dev *gspca_dev,
 
        cam = &gspca_dev->cam;
        sd->desc = sd_desc;
+       sd->bridge = id->driver_info;
        gspca_dev->sd_desc = &sd->desc;
 
        if (dump_bridge)
                stv06xx_dump_bridge(sd);
 
+       sd->sensor = &stv06xx_sensor_st6422;
+       if (!sd->sensor->probe(sd))
+               return 0;
+
        sd->sensor = &stv06xx_sensor_vv6410;
        if (!sd->sensor->probe(sd))
                return 0;
@@ -457,9 +485,20 @@ static int stv06xx_config(struct gspca_dev *gspca_dev,
 
 /* -- module initialisation -- */
 static const __devinitdata struct usb_device_id device_table[] = {
-       {USB_DEVICE(0x046d, 0x0840)}, /* QuickCam Express */
-       {USB_DEVICE(0x046d, 0x0850)}, /* LEGO cam / QuickCam Web */
-       {USB_DEVICE(0x046d, 0x0870)}, /* Dexxa WebCam USB */
+       /* QuickCam Express */
+       {USB_DEVICE(0x046d, 0x0840), .driver_info = BRIDGE_STV600 },
+       /* LEGO cam / QuickCam Web */
+       {USB_DEVICE(0x046d, 0x0850), .driver_info = BRIDGE_STV610 },
+       /* Dexxa WebCam USB */
+       {USB_DEVICE(0x046d, 0x0870), .driver_info = BRIDGE_STV602 },
+       /* QuickCam Messenger */
+       {USB_DEVICE(0x046D, 0x08F0), .driver_info = BRIDGE_ST6422 },
+       /* QuickCam Communicate */
+       {USB_DEVICE(0x046D, 0x08F5), .driver_info = BRIDGE_ST6422 },
+       /* QuickCam Messenger (new) */
+       {USB_DEVICE(0x046D, 0x08F6), .driver_info = BRIDGE_ST6422 },
+       /* QuickCam Messenger (new) */
+       {USB_DEVICE(0x046D, 0x08DA), .driver_info = BRIDGE_ST6422 },
        {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
index 1207e7d..9df7137 100644 (file)
@@ -93,6 +93,17 @@ struct sd {
 
        /* Sensor private data */
        void *sensor_priv;
+
+       /* The first 4 lines produced by the stv6422 are no good, this keeps
+          track of how many bytes we still need to skip during a frame */
+       int to_skip;
+
+       /* Bridge / Camera type */
+       u8 bridge;
+       #define BRIDGE_STV600 0
+       #define BRIDGE_STV602 1
+       #define BRIDGE_STV610 2
+       #define BRIDGE_ST6422 3 /* With integrated sensor */
 };
 
 int stv06xx_write_bridge(struct sd *sd, u16 address, u16 i2c_data);
index b169038..3039ec2 100644 (file)
@@ -434,7 +434,7 @@ static int hdcs_probe_1x00(struct sd *sd)
        hdcs->exp.er = 100;
 
        /*
-        * Frame rate on HDCS-1000 0x46D:0x840 depends on PSMP:
+        * Frame rate on HDCS-1000 with STV600 depends on PSMP:
         *  4 = doesn't work at all
         *  5 = 7.8 fps,
         *  6 = 6.9 fps,
@@ -443,7 +443,7 @@ static int hdcs_probe_1x00(struct sd *sd)
         * 15 = 4.4 fps,
         * 31 = 2.8 fps
         *
-        * Frame rate on HDCS-1000 0x46D:0x870 depends on PSMP:
+        * Frame rate on HDCS-1000 with STV602 depends on PSMP:
         * 15 = doesn't work at all
         * 18 = doesn't work at all
         * 19 = 7.3 fps
@@ -453,7 +453,7 @@ static int hdcs_probe_1x00(struct sd *sd)
         * 24 = 6.3 fps
         * 30 = 5.4 fps
         */
-       hdcs->psmp = IS_870(sd) ? 20 : 5;
+       hdcs->psmp = (sd->bridge == BRIDGE_STV602) ? 20 : 5;
 
        sd->sensor_priv = hdcs;
 
@@ -530,7 +530,7 @@ static int hdcs_init(struct sd *sd)
        int i, err = 0;
 
        /* Set the STV0602AA in STV0600 emulation mode */
-       if (IS_870(sd))
+       if (sd->bridge == BRIDGE_STV602)
                stv06xx_write_bridge(sd, STV_STV0600_EMULATION, 1);
 
        /* Execute the bridge init */
@@ -558,7 +558,7 @@ static int hdcs_init(struct sd *sd)
                return err;
 
        /* Set PGA sample duration
-       (was 0x7E for IS_870, but caused slow framerate with HDCS-1020) */
+       (was 0x7E for the STV602, but caused slow framerate with HDCS-1020) */
        if (IS_1020(sd))
                err = stv06xx_write_sensor(sd, HDCS_TCTRL,
                                (HDCS_ADC_START_SIG_DUR << 6) | hdcs->psmp);
index e88c42f..934b9ce 100644 (file)
 
 #include "stv06xx.h"
 
-#define IS_850(sd)     ((sd)->gspca_dev.dev->descriptor.idProduct == 0x850)
-#define IS_870(sd)     ((sd)->gspca_dev.dev->descriptor.idProduct == 0x870)
 #define IS_1020(sd)    ((sd)->sensor == &stv06xx_sensor_hdcs1020)
 
 extern const struct stv06xx_sensor stv06xx_sensor_vv6410;
 extern const struct stv06xx_sensor stv06xx_sensor_hdcs1x00;
 extern const struct stv06xx_sensor stv06xx_sensor_hdcs1020;
 extern const struct stv06xx_sensor stv06xx_sensor_pb0100;
+extern const struct stv06xx_sensor stv06xx_sensor_st6422;
 
 struct stv06xx_sensor {
        /* Defines the name of a sensor */
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_st6422.c b/drivers/media/video/gspca/stv06xx/stv06xx_st6422.c
new file mode 100644 (file)
index 0000000..87cb5b9
--- /dev/null
@@ -0,0 +1,453 @@
+/*
+ * Support for the sensor part which is integrated (I think) into the
+ * st6422 stv06xx alike bridge, as its integrated there are no i2c writes
+ * but instead direct bridge writes.
+ *
+ * Copyright (c) 2009 Hans de Goede <hdegoede@redhat.com>
+ *
+ * Strongly based on qc-usb-messenger, which is:
+ * Copyright (c) 2001 Jean-Fredric Clere, Nikolas Zimmermann, Georg Acher
+ *                   Mark Cave-Ayland, Carlo E Prelz, Dick Streefland
+ * Copyright (c) 2002, 2003 Tuukka Toivonen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include "stv06xx_st6422.h"
+
+static struct v4l2_pix_format st6422_mode[] = {
+       /* Note we actually get 124 lines of data, of which we skip the 4st
+          4 as they are garbage */
+       {
+               162,
+               120,
+               V4L2_PIX_FMT_SGRBG8,
+               V4L2_FIELD_NONE,
+               .sizeimage = 162 * 120,
+               .bytesperline = 162,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 1
+       },
+       /* Note we actually get 248 lines of data, of which we skip the 4st
+          4 as they are garbage, and we tell the app it only gets the
+          first 240 of the 244 lines it actually gets, so that it ignores
+          the last 4. */
+       {
+               324,
+               240,
+               V4L2_PIX_FMT_SGRBG8,
+               V4L2_FIELD_NONE,
+               .sizeimage = 324 * 244,
+               .bytesperline = 324,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 0
+       },
+};
+
+static const struct ctrl st6422_ctrl[] = {
+#define BRIGHTNESS_IDX 0
+       {
+               {
+                       .id             = V4L2_CID_BRIGHTNESS,
+                       .type           = V4L2_CTRL_TYPE_INTEGER,
+                       .name           = "Brightness",
+                       .minimum        = 0,
+                       .maximum        = 31,
+                       .step           = 1,
+                       .default_value  = 3
+               },
+               .set = st6422_set_brightness,
+               .get = st6422_get_brightness
+       },
+#define CONTRAST_IDX 1
+       {
+               {
+                       .id             = V4L2_CID_CONTRAST,
+                       .type           = V4L2_CTRL_TYPE_INTEGER,
+                       .name           = "Contrast",
+                       .minimum        = 0,
+                       .maximum        = 15,
+                       .step           = 1,
+                       .default_value  = 11
+               },
+               .set = st6422_set_contrast,
+               .get = st6422_get_contrast
+       },
+#define GAIN_IDX 2
+       {
+               {
+                       .id             = V4L2_CID_GAIN,
+                       .type           = V4L2_CTRL_TYPE_INTEGER,
+                       .name           = "Gain",
+                       .minimum        = 0,
+                       .maximum        = 255,
+                       .step           = 1,
+                       .default_value  = 64
+               },
+               .set = st6422_set_gain,
+               .get = st6422_get_gain
+       },
+#define EXPOSURE_IDX 3
+       {
+               {
+                       .id             = V4L2_CID_EXPOSURE,
+                       .type           = V4L2_CTRL_TYPE_INTEGER,
+                       .name           = "Exposure",
+                       .minimum        = 0,
+                       .maximum        = 1023,
+                       .step           = 1,
+                       .default_value  = 256
+               },
+               .set = st6422_set_exposure,
+               .get = st6422_get_exposure
+       },
+};
+
+static int st6422_probe(struct sd *sd)
+{
+       int i;
+       s32 *sensor_settings;
+
+       if (sd->bridge != BRIDGE_ST6422)
+               return -ENODEV;
+
+       info("st6422 sensor detected");
+
+       sensor_settings = kmalloc(ARRAY_SIZE(st6422_ctrl) * sizeof(s32),
+                                 GFP_KERNEL);
+       if (!sensor_settings)
+               return -ENOMEM;
+
+       sd->gspca_dev.cam.cam_mode = st6422_mode;
+       sd->gspca_dev.cam.nmodes = ARRAY_SIZE(st6422_mode);
+       sd->desc.ctrls = st6422_ctrl;
+       sd->desc.nctrls = ARRAY_SIZE(st6422_ctrl);
+       sd->sensor_priv = sensor_settings;
+
+       for (i = 0; i < sd->desc.nctrls; i++)
+               sensor_settings[i] = st6422_ctrl[i].qctrl.default_value;
+
+       return 0;
+}
+
+static int st6422_init(struct sd *sd)
+{
+       int err = 0, i;
+
+       const u16 st6422_bridge_init[][2] = {
+               { STV_ISO_ENABLE, 0x00 }, /* disable capture */
+               { 0x1436, 0x00 },
+               { 0x1432, 0x03 },       /* 0x00-0x1F brightness */
+               { 0x143a, 0xF9 },       /* 0x00-0x0F contrast */
+               { 0x0509, 0x38 },       /* R */
+               { 0x050a, 0x38 },       /* G */
+               { 0x050b, 0x38 },       /* B */
+               { 0x050c, 0x2A },
+               { 0x050d, 0x01 },
+
+
+               { 0x1431, 0x00 },       /* 0x00-0x07 ??? */
+               { 0x1433, 0x34 },       /* 160x120, 0x00-0x01 night filter */
+               { 0x1438, 0x18 },       /* 640x480 */
+/* 18 bayes */
+/* 10 compressed? */
+
+               { 0x1439, 0x00 },
+/* antiflimmer??  0xa2 ger perfekt bild mot monitor */
+
+               { 0x143b, 0x05 },
+               { 0x143c, 0x00 },       /* 0x00-0x01 - ??? */
+
+
+/* shutter time 0x0000-0x03FF */
+/* low value  give good picures on moving objects (but requires much light) */
+/* high value gives good picures in darkness (but tends to be overexposed) */
+               { 0x143e, 0x01 },
+               { 0x143d, 0x00 },
+
+               { 0x1442, 0xe2 },
+/* write: 1x1x xxxx */
+/* read:  1x1x xxxx */
+/*        bit 5 == button pressed and hold if 0 */
+/* write 0xe2,0xea */
+
+/* 0x144a */
+/* 0x00 init */
+/* bit 7 == button has been pressed, but not handled */
+
+/* interrupt */
+/* if(urb->iso_frame_desc[i].status == 0x80) { */
+/* if(urb->iso_frame_desc[i].status == 0x88) { */
+
+               { 0x1500, 0xd0 },
+               { 0x1500, 0xd0 },
+               { 0x1500, 0x50 },       /* 0x00 - 0xFF  0x80 == compr ? */
+
+               { 0x1501, 0xaf },
+/* high val-> ljus area blir morkare. */
+/* low val -> ljus area blir ljusare. */
+               { 0x1502, 0xc2 },
+/* high val-> ljus area blir morkare. */
+/* low val -> ljus area blir ljusare. */
+               { 0x1503, 0x45 },
+/* high val-> ljus area blir morkare. */
+/* low val -> ljus area blir ljusare. */
+
+               { 0x1505, 0x02 },
+/* 2  : 324x248  80352 bytes */
+/* 7  : 248x162  40176 bytes */
+/* c+f: 162*124  20088 bytes */
+
+               { 0x150e, 0x8e },
+               { 0x150f, 0x37 },
+               { 0x15c0, 0x00 },
+               { 0x15c1, 1023 }, /* 160x120, ISOC_PACKET_SIZE */
+               { 0x15c3, 0x08 },       /* 0x04/0x14 ... test pictures ??? */
+
+
+               { 0x143f, 0x01 },       /* commit settings */
+
+       };
+
+       for (i = 0; i < ARRAY_SIZE(st6422_bridge_init) && !err; i++) {
+               err = stv06xx_write_bridge(sd, st6422_bridge_init[i][0],
+                                              st6422_bridge_init[i][1]);
+       }
+
+       return err;
+}
+
+static void st6422_disconnect(struct sd *sd)
+{
+       sd->sensor = NULL;
+       kfree(sd->sensor_priv);
+}
+
+static int st6422_start(struct sd *sd)
+{
+       int err, packet_size;
+       struct cam *cam = &sd->gspca_dev.cam;
+       s32 *sensor_settings = sd->sensor_priv;
+       struct usb_host_interface *alt;
+       struct usb_interface *intf;
+
+       intf = usb_ifnum_to_if(sd->gspca_dev.dev, sd->gspca_dev.iface);
+       alt = usb_altnum_to_altsetting(intf, sd->gspca_dev.alt);
+       if (!alt) {
+               PDEBUG(D_ERR, "Couldn't get altsetting");
+               return -EIO;
+       }
+
+       packet_size = le16_to_cpu(alt->endpoint[0].desc.wMaxPacketSize);
+       err = stv06xx_write_bridge(sd, 0x15c1, packet_size);
+       if (err < 0)
+               return err;
+
+       if (cam->cam_mode[sd->gspca_dev.curr_mode].priv)
+               err = stv06xx_write_bridge(sd, 0x1505, 0x0f);
+       else
+               err = stv06xx_write_bridge(sd, 0x1505, 0x02);
+       if (err < 0)
+               return err;
+
+       err = st6422_set_brightness(&sd->gspca_dev,
+                                   sensor_settings[BRIGHTNESS_IDX]);
+       if (err < 0)
+               return err;
+
+       err = st6422_set_contrast(&sd->gspca_dev,
+                                 sensor_settings[CONTRAST_IDX]);
+       if (err < 0)
+               return err;
+
+       err = st6422_set_exposure(&sd->gspca_dev,
+                                 sensor_settings[EXPOSURE_IDX]);
+       if (err < 0)
+               return err;
+
+       err = st6422_set_gain(&sd->gspca_dev,
+                             sensor_settings[GAIN_IDX]);
+       if (err < 0)
+               return err;
+
+       PDEBUG(D_STREAM, "Starting stream");
+
+       return 0;
+}
+
+static int st6422_stop(struct sd *sd)
+{
+       PDEBUG(D_STREAM, "Halting stream");
+
+       return 0;
+}
+
+static int st6422_get_brightness(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[BRIGHTNESS_IDX];
+
+       PDEBUG(D_V4L2, "Read brightness %d", *val);
+
+       return 0;
+}
+
+static int st6422_set_brightness(struct gspca_dev *gspca_dev, __s32 val)
+{
+       int err;
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       sensor_settings[BRIGHTNESS_IDX] = val;
+
+       if (!gspca_dev->streaming)
+               return 0;
+
+       /* val goes from 0 -> 31 */
+       PDEBUG(D_V4L2, "Set brightness to %d", val);
+       err = stv06xx_write_bridge(sd, 0x1432, val);
+       if (err < 0)
+               return err;
+
+       /* commit settings */
+       err = stv06xx_write_bridge(sd, 0x143f, 0x01);
+       return (err < 0) ? err : 0;
+}
+
+static int st6422_get_contrast(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[CONTRAST_IDX];
+
+       PDEBUG(D_V4L2, "Read contrast %d", *val);
+
+       return 0;
+}
+
+static int st6422_set_contrast(struct gspca_dev *gspca_dev, __s32 val)
+{
+       int err;
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       sensor_settings[CONTRAST_IDX] = val;
+
+       if (!gspca_dev->streaming)
+               return 0;
+
+       /* Val goes from 0 -> 15 */
+       PDEBUG(D_V4L2, "Set contrast to %d\n", val);
+       err = stv06xx_write_bridge(sd, 0x143a, 0xf0 | val);
+       if (err < 0)
+               return err;
+
+       /* commit settings */
+       err = stv06xx_write_bridge(sd, 0x143f, 0x01);
+       return (err < 0) ? err : 0;
+}
+
+static int st6422_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[GAIN_IDX];
+
+       PDEBUG(D_V4L2, "Read gain %d", *val);
+
+       return 0;
+}
+
+static int st6422_set_gain(struct gspca_dev *gspca_dev, __s32 val)
+{
+       int err;
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       sensor_settings[GAIN_IDX] = val;
+
+       if (!gspca_dev->streaming)
+               return 0;
+
+       PDEBUG(D_V4L2, "Set gain to %d", val);
+
+       /* Set red, green, blue, gain */
+       err = stv06xx_write_bridge(sd, 0x0509, val);
+       if (err < 0)
+               return err;
+
+       err = stv06xx_write_bridge(sd, 0x050a, val);
+       if (err < 0)
+               return err;
+
+       err = stv06xx_write_bridge(sd, 0x050b, val);
+       if (err < 0)
+               return err;
+
+       /* 2 mystery writes */
+       err = stv06xx_write_bridge(sd, 0x050c, 0x2a);
+       if (err < 0)
+               return err;
+
+       err = stv06xx_write_bridge(sd, 0x050d, 0x01);
+       if (err < 0)
+               return err;
+
+       /* commit settings */
+       err = stv06xx_write_bridge(sd, 0x143f, 0x01);
+       return (err < 0) ? err : 0;
+}
+
+static int st6422_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[EXPOSURE_IDX];
+
+       PDEBUG(D_V4L2, "Read exposure %d", *val);
+
+       return 0;
+}
+
+static int st6422_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
+{
+       int err;
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       sensor_settings[EXPOSURE_IDX] = val;
+
+       if (!gspca_dev->streaming)
+               return 0;
+
+       PDEBUG(D_V4L2, "Set exposure to %d\n", val);
+       err = stv06xx_write_bridge(sd, 0x143d, val & 0xff);
+       if (err < 0)
+               return err;
+
+       err = stv06xx_write_bridge(sd, 0x143e, val >> 8);
+       if (err < 0)
+               return err;
+
+       /* commit settings */
+       err = stv06xx_write_bridge(sd, 0x143f, 0x01);
+       return (err < 0) ? err : 0;
+}
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_st6422.h b/drivers/media/video/gspca/stv06xx/stv06xx_st6422.h
new file mode 100644 (file)
index 0000000..b2d45fe
--- /dev/null
@@ -0,0 +1,59 @@
+/*
+ * Support for the sensor part which is integrated (I think) into the
+ * st6422 stv06xx alike bridge, as its integrated there are no i2c writes
+ * but instead direct bridge writes.
+ *
+ * Copyright (c) 2009 Hans de Goede <hdegoede@redhat.com>
+ *
+ * Strongly based on qc-usb-messenger, which is:
+ * Copyright (c) 2001 Jean-Fredric Clere, Nikolas Zimmermann, Georg Acher
+ *                   Mark Cave-Ayland, Carlo E Prelz, Dick Streefland
+ * Copyright (c) 2002, 2003 Tuukka Toivonen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef STV06XX_ST6422_H_
+#define STV06XX_ST6422_H_
+
+#include "stv06xx_sensor.h"
+
+static int st6422_probe(struct sd *sd);
+static int st6422_start(struct sd *sd);
+static int st6422_init(struct sd *sd);
+static int st6422_stop(struct sd *sd);
+static void st6422_disconnect(struct sd *sd);
+
+/* V4L2 controls supported by the driver */
+static int st6422_get_brightness(struct gspca_dev *gspca_dev, __s32 *val);
+static int st6422_set_brightness(struct gspca_dev *gspca_dev, __s32 val);
+static int st6422_get_contrast(struct gspca_dev *gspca_dev, __s32 *val);
+static int st6422_set_contrast(struct gspca_dev *gspca_dev, __s32 val);
+static int st6422_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
+static int st6422_set_gain(struct gspca_dev *gspca_dev, __s32 val);
+static int st6422_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
+static int st6422_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
+
+const struct stv06xx_sensor stv06xx_sensor_st6422 = {
+       .name = "ST6422",
+       .init = st6422_init,
+       .probe = st6422_probe,
+       .start = st6422_start,
+       .stop = st6422_stop,
+       .disconnect = st6422_disconnect,
+};
+
+#endif