git.openpandora.org / pandora-kernel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
V4L/DVB (11470): gspca - m5602-mt9m111: Implement an auto white balancing control
[pandora-kernel.git] / drivers / media / video / gspca / m5602 / m5602_mt9m111.c
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.c b/drivers/media/video/gspca/m5602/m5602_mt9m111.c
index 7d3f9e3..37a7fc8 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_mt9m111.c
+++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.c
@@ -18,6 +18,18 @@
 
 #include "m5602_mt9m111.h"
 
+static int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
+static int mt9m111_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
+static int mt9m111_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
+static int mt9m111_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
+static int mt9m111_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
+static int mt9m111_set_gain(struct gspca_dev *gspca_dev, __s32 val);
+static int mt9m111_set_auto_white_balance(struct gspca_dev *gspca_dev,
+                                        __s32 val);
+static int mt9m111_get_auto_white_balance(struct gspca_dev *gspca_dev,
+                                         __s32 *val);
+
+
 static struct v4l2_pix_format mt9m111_modes[] = {
        {
                640,
@@ -32,6 +44,7 @@ static struct v4l2_pix_format mt9m111_modes[] = {
 };
 
 const static struct ctrl mt9m111_ctrls[] = {
+#define VFLIP_IDX 0
        {
                {
                        .id             = V4L2_CID_VFLIP,
@@ -44,7 +57,9 @@ const static struct ctrl mt9m111_ctrls[] = {
                },
                .set = mt9m111_set_vflip,
                .get = mt9m111_get_vflip
-       }, {
+       },
+#define HFLIP_IDX 1
+       {
                {
                        .id             = V4L2_CID_HFLIP,
                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
@@ -56,7 +71,9 @@ const static struct ctrl mt9m111_ctrls[] = {
                },
                .set = mt9m111_set_hflip,
                .get = mt9m111_get_hflip
-       }, {
+       },
+#define GAIN_IDX 2
+       {
                {
                        .id             = V4L2_CID_GAIN,
                        .type           = V4L2_CTRL_TYPE_INTEGER,
@@ -69,16 +86,30 @@ const static struct ctrl mt9m111_ctrls[] = {
                },
                .set = mt9m111_set_gain,
                .get = mt9m111_get_gain
+       },
+#define AUTO_WHITE_BALANCE_IDX 3
+       {
+               {
+                       .id             = V4L2_CID_AUTO_WHITE_BALANCE,
+                       .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                       .name           = "auto white balance",
+                       .minimum        = 0,
+                       .maximum        = 1,
+                       .step           = 1,
+                       .default_value  = 0,
+               },
+               .set = mt9m111_set_auto_white_balance,
+               .get = mt9m111_get_auto_white_balance
        }
 };
 
-
 static void mt9m111_dump_registers(struct sd *sd);
 
 int mt9m111_probe(struct sd *sd)
 {
        u8 data[2] = {0x00, 0x00};
        int i;
+       s32 *sensor_settings;
 
        if (force_sensor) {
                if (force_sensor == MT9M111_SENSOR) {
@@ -117,16 +148,27 @@ int mt9m111_probe(struct sd *sd)
        return -ENODEV;
 
 sensor_found:
+       sensor_settings = kmalloc(ARRAY_SIZE(mt9m111_ctrls) * sizeof(s32),
+                                 GFP_KERNEL);
+       if (!sensor_settings)
+               return -ENOMEM;
+
        sd->gspca_dev.cam.cam_mode = mt9m111_modes;
        sd->gspca_dev.cam.nmodes = ARRAY_SIZE(mt9m111_modes);
        sd->desc->ctrls = mt9m111_ctrls;
        sd->desc->nctrls = ARRAY_SIZE(mt9m111_ctrls);
+
+       for (i = 0; i < ARRAY_SIZE(mt9m111_ctrls); i++)
+               sensor_settings[i] = mt9m111_ctrls[i].qctrl.default_value;
+       sd->sensor_priv = sensor_settings;
+
        return 0;
 }
 
 int mt9m111_init(struct sd *sd)
 {
        int i, err = 0;
+       s32 *sensor_settings = sd->sensor_priv;
 
        /* Init the sensor */
        for (i = 0; i < ARRAY_SIZE(init_mt9m111) && !err; i++) {
@@ -147,36 +189,47 @@ int mt9m111_init(struct sd *sd)
        if (dump_sensor)
                mt9m111_dump_registers(sd);
 
-       return (err < 0) ? err : 0;
+       err = mt9m111_set_vflip(&sd->gspca_dev, sensor_settings[VFLIP_IDX]);
+       if (err < 0)
+               return err;
+
+       err = mt9m111_set_hflip(&sd->gspca_dev, sensor_settings[HFLIP_IDX]);
+       if (err < 0)
+               return err;
+
+       err = mt9m111_set_gain(&sd->gspca_dev, sensor_settings[GAIN_IDX]);
+
+       return err;
 }
 
-int mt9m111_power_down(struct sd *sd)
+void mt9m111_disconnect(struct sd *sd)
 {
-       return 0;
+       sd->sensor = NULL;
+       kfree(sd->sensor_priv);
 }
 
-int mt9m111_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
+static int mt9m111_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
 {
-       int err;
-       u8 data[2] = {0x00, 0x00};
        struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
 
-       err = m5602_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,
-                                 data, 2);
-       *val = data[0] & MT9M111_RMB_MIRROR_ROWS;
+       *val = sensor_settings[VFLIP_IDX];
        PDEBUG(D_V4L2, "Read vertical flip %d", *val);
 
-       return err;
+       return 0;
 }
 
-int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
+static int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
 {
        int err;
        u8 data[2] = {0x00, 0x00};
        struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
 
        PDEBUG(D_V4L2, "Set vertical flip to %d", val);
 
+       sensor_settings[VFLIP_IDX] = val;
+
        /* Set the correct page map */
        err = m5602_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);
        if (err < 0)
@@ -192,28 +245,27 @@ int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
        return err;
 }
 
-int mt9m111_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
+static int mt9m111_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
 {
-       int err;
-       u8 data[2] = {0x00, 0x00};
        struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
 
-       err = m5602_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,
-                                 data, 2);
-       *val = data[0] & MT9M111_RMB_MIRROR_COLS;
+       *val = sensor_settings[HFLIP_IDX];
        PDEBUG(D_V4L2, "Read horizontal flip %d", *val);
 
-       return err;
+       return 0;
 }
 
-int mt9m111_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
+static int mt9m111_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
 {
        int err;
        u8 data[2] = {0x00, 0x00};
        struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
 
        PDEBUG(D_V4L2, "Set horizontal flip to %d", val);
 
+       sensor_settings[HFLIP_IDX] = val;
        /* Set the correct page map */
        err = m5602_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);
        if (err < 0)
@@ -229,30 +281,56 @@ int mt9m111_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
        return err;
 }
 
-int mt9m111_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
+static int mt9m111_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
 {
-       int err, tmp;
-       u8 data[2] = {0x00, 0x00};
        struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
 
-       err = m5602_read_sensor(sd, MT9M111_SC_GLOBAL_GAIN, data, 2);
-       tmp = ((data[1] << 8) | data[0]);
+       *val = sensor_settings[GAIN_IDX];
+       PDEBUG(D_V4L2, "Read gain %d", *val);
 
-       *val = ((tmp & (1 << 10)) * 2) |
-             ((tmp & (1 <<  9)) * 2) |
-             ((tmp & (1 <<  8)) * 2) |
-              (tmp & 0x7f);
+       return 0;
+}
 
-       PDEBUG(D_V4L2, "Read gain %d", *val);
+static int mt9m111_set_auto_white_balance(struct gspca_dev *gspca_dev,
+                                         __s32 val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+       int err;
+       u8 data[2];
+
+       err = m5602_read_sensor(sd, MT9M111_CP_OPERATING_MODE_CTL, data, 2);
+       if (err < 0)
+               return err;
+
+       sensor_settings[AUTO_WHITE_BALANCE_IDX] = val & 0x01;
+       data[0] = ((data[0] & 0xfd) | ((val & 0x01) << 1));
+
+       err = m5602_write_sensor(sd, MT9M111_CP_OPERATING_MODE_CTL, data, 2);
 
+       PDEBUG(D_V4L2, "Set auto white balance %d", val);
        return err;
 }
 
-int mt9m111_set_gain(struct gspca_dev *gspca_dev, __s32 val)
+static int mt9m111_get_auto_white_balance(struct gspca_dev *gspca_dev,
+                                         __s32 *val) {
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[AUTO_WHITE_BALANCE_IDX];
+       PDEBUG(D_V4L2, "Read auto white balance %d", *val);
+       return 0;
+}
+
+static int mt9m111_set_gain(struct gspca_dev *gspca_dev, __s32 val)
 {
        int err, tmp;
        u8 data[2] = {0x00, 0x00};
        struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       sensor_settings[GAIN_IDX] = val;
 
        /* Set the correct page map */
        err = m5602_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);
Pandora Kernel Repository