linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/usb/media/sn9c102_tas5130d1b.c b/drivers/usb/media/sn9c102_tas5130d1b.c
index 36b00d1..a0728f0 100644 (file)
--- a/drivers/usb/media/sn9c102_tas5130d1b.c
+++ b/drivers/usb/media/sn9c102_tas5130d1b.c
@@ -2,7 +2,7 @@
  * Plug-in for TAS5130D1B image sensor connected to the SN9C10x PC Camera  *
  * Controllers                                                             *
  *                                                                         *
- * Copyright (C) 2004 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -24,8 +24,6 @@
 
 static struct sn9c102_sensor tas5130d1b;
 
-static struct v4l2_control tas5130d1b_gain, tas5130d1b_exposure;
-
 
 static int tas5130d1b_init(struct sn9c102_device* cam)
 {
@@ -44,24 +42,6 @@ static int tas5130d1b_init(struct sn9c102_device* cam)
 }
 
 
-static int tas5130d1b_get_ctrl(struct sn9c102_device* cam, 
-                               struct v4l2_control* ctrl)
-{
-       switch (ctrl->id) {
-       case V4L2_CID_GAIN:
-               ctrl->value = tas5130d1b_gain.value;
-               break;
-       case V4L2_CID_EXPOSURE:
-               ctrl->value = tas5130d1b_exposure.value;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-
 static int tas5130d1b_set_ctrl(struct sn9c102_device* cam, 
                                const struct v4l2_control* ctrl)
 {
@@ -69,12 +49,10 @@ static int tas5130d1b_set_ctrl(struct sn9c102_device* cam,
 
        switch (ctrl->id) {
        case V4L2_CID_GAIN:
-               if (!(err += sn9c102_i2c_write(cam, 0x20, 0xf6 - ctrl->value)))
-                       tas5130d1b_gain.value = ctrl->value;
+               err += sn9c102_i2c_write(cam, 0x20, 0xf6 - ctrl->value);
                break;
        case V4L2_CID_EXPOSURE:
-               if (!(err += sn9c102_i2c_write(cam, 0x40, 0x47 - ctrl->value)))
-                       tas5130d1b_exposure.value = ctrl->value;
+               err += sn9c102_i2c_write(cam, 0x40, 0x47 - ctrl->value);
                break;
        default:
                return -EINVAL;
@@ -98,7 +76,21 @@ static int tas5130d1b_set_crop(struct sn9c102_device* cam,
        /* Do NOT change! */
        err += sn9c102_write_reg(cam, 0x1f, 0x1a);
        err += sn9c102_write_reg(cam, 0x1a, 0x1b);
-       err += sn9c102_write_reg(cam, 0xf3, 0x19);
+       err += sn9c102_write_reg(cam, sn9c102_pread_reg(cam, 0x19), 0x19);
+
+       return err;
+}
+
+
+static int tas5130d1b_set_pix_format(struct sn9c102_device* cam, 
+                                     const struct v4l2_pix_format* pix)
+{
+       int err = 0;
+
+       if (pix->pixelformat == V4L2_PIX_FMT_SN9C10X)
+               err += sn9c102_write_reg(cam, 0x63, 0x19);
+       else
+               err += sn9c102_write_reg(cam, 0xf3, 0x19);
 
        return err;
 }
@@ -107,10 +99,9 @@ static int tas5130d1b_set_crop(struct sn9c102_device* cam,
 static struct sn9c102_sensor tas5130d1b = {
        .name = "TAS5130D1B",
        .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
+       .sysfs_ops = SN9C102_I2C_WRITE,
        .frequency = SN9C102_I2C_100KHZ,
        .interface = SN9C102_I2C_3WIRES,
-       .slave_read_id = SN9C102_I2C_SLAVEID_UNAVAILABLE,
-       .slave_write_id = SN9C102_I2C_SLAVEID_FICTITIOUS,
        .init = &tas5130d1b_init,
        .qctrl = {
                {
@@ -134,7 +125,6 @@ static struct sn9c102_sensor tas5130d1b = {
                        .flags = 0,
                },
        },
-       .get_ctrl = &tas5130d1b_get_ctrl,
        .set_ctrl = &tas5130d1b_set_ctrl,
        .cropcap = {
                .bounds = {
@@ -156,7 +146,8 @@ static struct sn9c102_sensor tas5130d1b = {
                .height = 480,
                .pixelformat = V4L2_PIX_FMT_SBGGR8,
                .priv = 8,
-       }
+       },
+       .set_pix_format = &tas5130d1b_set_pix_format
 };
 
 
@@ -166,8 +157,8 @@ int sn9c102_probe_tas5130d1b(struct sn9c102_device* cam)
        sn9c102_attach_sensor(cam, &tas5130d1b);
 
        /* Sensor detection is based on USB pid/vid */
-       if (tas5130d1b.usbdev->descriptor.idProduct != 0x6025 &&
-           tas5130d1b.usbdev->descriptor.idProduct != 0x60aa)
+       if (le16_to_cpu(tas5130d1b.usbdev->descriptor.idProduct) != 0x6025 &&
+           le16_to_cpu(tas5130d1b.usbdev->descriptor.idProduct) != 0x60aa)
                return -ENODEV;
 
        return 0;