]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
[media] m5mols: Add wide dynamic range control
authorSylwester Nawrocki <s.nawrocki@samsung.com>
Tue, 6 Mar 2012 10:10:13 +0000 (07:10 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 14 May 2012 17:33:47 +0000 (14:33 -0300)
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/m5mols/m5mols.h
drivers/media/video/m5mols/m5mols_controls.c

index 03421fc1a965f3a635f4bb3646f5f2afd8173845..978a4abd37225aa2c51d5ab769ac8835ef615ac2 100644 (file)
@@ -169,6 +169,7 @@ struct m5mols_version {
  * @colorfx: color effect control
  * @saturation: saturation control
  * @zoom: zoom control
+ * @wdr: wide dynamic range control
  * @ver: information of the version
  * @cap: the capture mode attributes
  * @power: current sensor's power status
@@ -207,6 +208,7 @@ struct m5mols_info {
        struct v4l2_ctrl *colorfx;
        struct v4l2_ctrl *saturation;
        struct v4l2_ctrl *zoom;
+       struct v4l2_ctrl *wdr;
 
        struct m5mols_version ver;
        struct m5mols_capture cap;
index 797836315225141ebc8029b79009381b188b10bf..512c3603b280e28e35be306f7964b85828586507 100644 (file)
@@ -360,6 +360,21 @@ static int m5mols_set_iso(struct m5mols_info *info, int auto_iso)
        return m5mols_write(&info->sd, AE_ISO, iso);
 }
 
+static int m5mols_set_wdr(struct m5mols_info *info, int wdr)
+{
+       int ret;
+
+       ret = m5mols_write(&info->sd, MON_TONE_CTL, wdr ? 9 : 5);
+       if (ret < 0)
+               return ret;
+
+       ret = m5mols_set_mode(info, REG_CAPTURE);
+       if (ret < 0)
+               return ret;
+
+       return m5mols_write(&info->sd, CAPP_WDR_EN, wdr);
+}
+
 static int m5mols_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
 {
        struct v4l2_subdev *sd = to_sd(ctrl);
@@ -436,6 +451,10 @@ static int m5mols_s_ctrl(struct v4l2_ctrl *ctrl)
        case V4L2_CID_COLORFX:
                ret = m5mols_set_color_effect(info, ctrl->val);
                break;
+
+       case V4L2_CID_WIDE_DYNAMIC_RANGE:
+               ret = m5mols_set_wdr(info, ctrl->val);
+               break;
        }
 
        if (ret == 0 && info->mode != last_mode)
@@ -513,6 +532,9 @@ int m5mols_init_controls(struct v4l2_subdev *sd)
        info->colorfx = v4l2_ctrl_new_std_menu(&info->handle, &m5mols_ctrl_ops,
                        V4L2_CID_COLORFX, 4, 0, V4L2_COLORFX_NONE);
 
+       info->wdr = v4l2_ctrl_new_std(&info->handle, &m5mols_ctrl_ops,
+                       V4L2_CID_WIDE_DYNAMIC_RANGE, 0, 1, 1, 0);
+
        if (info->handle.error) {
                int ret = info->handle.error;
                v4l2_err(sd, "Failed to initialize controls: %d\n", ret);