V4L/DVB: gspca - ov534: Add Auto Exposure

This also makes manual exposure actually work: it never worked before
because AEC was always enabled.

Signed-off-by: Max Thrun <bear24rw@gmail.com>
Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c
index 4058e224d6a4c4855c3bfefc3d50602314730689..2d8965003077c1de2d9a9f3501984789058f25d2 100644 (file)
--- a/drivers/media/video/gspca/ov534.c
+++ b/drivers/media/video/gspca/ov534.c
@@ -62,6 +62,7 @@ struct sd {
        u8 exposure;
        u8 agc;
        u8 awb;
+       u8 aec;
        s8 sharpness;
        u8 hflip;
        u8 vflip;
@@ -83,6 +84,8 @@ static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val);
 static int sd_setawb(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getawb(struct gspca_dev *gspca_dev, __s32 *val);
+static int sd_setaec(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_getaec(struct gspca_dev *gspca_dev, __s32 *val);
 static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
 static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
@@ -175,6 +178,20 @@ static const struct ctrl sd_ctrls[] = {
        .get = sd_getawb,
     },
     {                                                  /* 6 */
+       {
+               .id      = V4L2_CID_EXPOSURE_AUTO,
+               .type    = V4L2_CTRL_TYPE_BOOLEAN,
+               .name    = "Auto Exposure",
+               .minimum = 0,
+               .maximum = 1,
+               .step    = 1,
+#define AEC_DEF 1
+               .default_value = AEC_DEF,
+       },
+       .set = sd_setaec,
+       .get = sd_getaec,
+    },
+    {                                                  /* 7 */
        {
            .id      = V4L2_CID_SHARPNESS,
            .type    = V4L2_CTRL_TYPE_INTEGER,
@@ -188,7 +205,7 @@ static const struct ctrl sd_ctrls[] = {
        .set = sd_setsharpness,
        .get = sd_getsharpness,
     },
-    {                                                  /* 7 */
+    {                                                  /* 8 */
        {
            .id      = V4L2_CID_HFLIP,
            .type    = V4L2_CTRL_TYPE_BOOLEAN,
@@ -202,7 +219,7 @@ static const struct ctrl sd_ctrls[] = {
        .set = sd_sethflip,
        .get = sd_gethflip,
     },
-    {                                                  /* 8 */
+    {                                                  /* 9 */
        {
            .id      = V4L2_CID_VFLIP,
            .type    = V4L2_CTRL_TYPE_BOOLEAN,
@@ -703,6 +720,20 @@ static void setawb(struct gspca_dev *gspca_dev)
                sccb_reg_write(gspca_dev, 0x63, 0xaa);  /* AWB off */
 }
 
+static void setaec(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       if (sd->aec)
+               sccb_reg_write(gspca_dev, 0x13,
+                               sccb_reg_read(gspca_dev, 0x13) | 0x01);
+       else {
+               sccb_reg_write(gspca_dev, 0x13,
+                               sccb_reg_read(gspca_dev, 0x13) & ~0x01);
+               setexposure(gspca_dev);
+       }
+}
+
 static void setsharpness(struct gspca_dev *gspca_dev)
 {
        struct sd *sd = (struct sd *) gspca_dev;
@@ -768,6 +799,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
 #if AWB_DEF != 0
        sd->awb = AWB_DEF
 #endif
+       sd->aec = AEC_DEF;
 #if SHARPNESS_DEF != 0
        sd->sharpness = SHARPNESS_DEF;
 #endif
@@ -838,6 +870,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
        setagc(gspca_dev);
        setawb(gspca_dev);
+       setaec(gspca_dev);
        setgain(gspca_dev);
        setexposure(gspca_dev);
        setbrightness(gspca_dev);
@@ -1066,6 +1099,24 @@ static int sd_getawb(struct gspca_dev *gspca_dev, __s32 *val)
        return 0;
 }
 
+static int sd_setaec(struct gspca_dev *gspca_dev, __s32 val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->aec = val;
+       if (gspca_dev->streaming)
+               setaec(gspca_dev);
+       return 0;
+}
+
+static int sd_getaec(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       *val = sd->aec;
+       return 0;
+}
+
 static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val)
 {
        struct sd *sd = (struct sd *) gspca_dev;