This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / usb / media / sn9c102_tas5110c1b.c

diff --git a/drivers/usb/media/sn9c102_tas5110c1b.c b/drivers/usb/media/sn9c102_tas5110c1b.c
index 03153ca..68e1b2e 100644 (file)
--- a/drivers/usb/media/sn9c102_tas5110c1b.c
+++ b/drivers/usb/media/sn9c102_tas5110c1b.c
@@ -1,6 +1,6 @@
 /***************************************************************************
- * Plug-in for TAS5110C1B image sensor connected to the SN9C10x PC Camera  *
- * Controllers                                                             *
+ * Driver for TAS5110C1B image sensor connected to the SN9C10[12] PC       *
+ * Camera Controllers                                                      *
  *                                                                         *
  * Copyright (C) 2004 by Luca Risolia <luca.risolia@studio.unibo.it>       *
  *                                                                         *
@@ -24,8 +24,6 @@
 
 static struct sn9c102_sensor tas5110c1b;
 
-static struct v4l2_control tas5110c1b_gain;
-
 
 static int tas5110c1b_init(struct sn9c102_device* cam)
 {
@@ -40,42 +38,25 @@ static int tas5110c1b_init(struct sn9c102_device* cam)
        err += sn9c102_write_reg(cam, 0x06, 0x18);
        err += sn9c102_write_reg(cam, 0xfb, 0x19);
 
-       err += sn9c102_i2c_write(cam, 0xc0, 0x80);
+       err += sn9c102_i2c_try_raw_write(cam, &tas5110c1b, 4, 0x11, 0x00, 0xc0,
+                                        0x80, 0, 0);
 
        return err;
 }
 
 
-static int tas5110c1b_get_ctrl(struct sn9c102_device* cam, 
-                               struct v4l2_control* ctrl)
-{
-       switch (ctrl->id) {
-       case V4L2_CID_GAIN:
-               ctrl->value = tas5110c1b_gain.value;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-
 static int tas5110c1b_set_ctrl(struct sn9c102_device* cam, 
                                const struct v4l2_control* ctrl)
 {
-       int err = 0;
-
        switch (ctrl->id) {
        case V4L2_CID_GAIN:
-               if (!(err += sn9c102_i2c_write(cam, 0x20, 0xf6 - ctrl->value)))
-                       tas5110c1b_gain.value = ctrl->value;
-               break;
+               return sn9c102_i2c_try_raw_write(cam, &tas5110c1b, 4, 0x11,
+                                                0x02, 0x20,
+                                                0xff - (ctrl->value & 0xff),
+                                                0, 0);
        default:
                return -EINVAL;
        }
-
-       return err ? -EIO : 0;
 }
 
 
@@ -104,8 +85,6 @@ static struct sn9c102_sensor tas5110c1b = {
        .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
        .frequency = SN9C102_I2C_100KHZ,
        .interface = SN9C102_I2C_3WIRES,
-       .slave_read_id = SN9C102_I2C_SLAVEID_UNAVAILABLE,
-       .slave_write_id = SN9C102_I2C_SLAVEID_FICTITIOUS,
        .init = &tas5110c1b_init,
        .qctrl = {
                {
@@ -113,9 +92,9 @@ static struct sn9c102_sensor tas5110c1b = {
                        .type = V4L2_CTRL_TYPE_INTEGER,
                        .name = "global gain",
                        .minimum = 0x00,
-                       .maximum = 0xf6,
+                       .maximum = 0xff,
                        .step = 0x01,
-                       .default_value = 0x40,
+                       .default_value = 0x48,
                        .flags = 0,
                },
        },
@@ -134,7 +113,6 @@ static struct sn9c102_sensor tas5110c1b = {
                        .height = 288,
                },
        },
-       .get_ctrl = &tas5110c1b_get_ctrl,
        .set_crop = &tas5110c1b_set_crop,
        .pix_format = {
                .width = 352,
@@ -150,10 +128,9 @@ int sn9c102_probe_tas5110c1b(struct sn9c102_device* cam)
        /* This sensor has no identifiers, so let's attach it anyway */
        sn9c102_attach_sensor(cam, &tas5110c1b);
 
-       /* Sensor detection is based on USB pid/vid */
+       /* At the moment, sensor detection is based on USB pid/vid */
        if (tas5110c1b.usbdev->descriptor.idProduct != 0x6001 &&
-           tas5110c1b.usbdev->descriptor.idProduct != 0x6005 &&
-           tas5110c1b.usbdev->descriptor.idProduct != 0x60ab)
+           tas5110c1b.usbdev->descriptor.idProduct != 0x6005)
                return -ENODEV;
 
        return 0;