From c67f9e5ae6252d200d920d3e082d8a1dfd7ff89c Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Tue, 6 Mar 2012 07:10:27 -0300 Subject: [PATCH] --- yaml --- r: 306373 b: refs/heads/master c: efcb07c1bbd43846aff192f28ad755fc8c93ad81 h: refs/heads/master i: 306371: 1d0da5e2f9ab1b8c45a1f3cdb1f42daa0a3ee207 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/m5mols/m5mols.h | 2 ++ .../media/video/m5mols/m5mols_controls.c | 20 +++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5c9d580d271f..75ab12c6f1af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4eb3419d401579b262f61d4d03cf10598ab0e2a2 +refs/heads/master: efcb07c1bbd43846aff192f28ad755fc8c93ad81 diff --git a/trunk/drivers/media/video/m5mols/m5mols.h b/trunk/drivers/media/video/m5mols/m5mols.h index 978a4abd3722..305a75bc6a9f 100644 --- a/trunk/drivers/media/video/m5mols/m5mols.h +++ b/trunk/drivers/media/video/m5mols/m5mols.h @@ -170,6 +170,7 @@ struct m5mols_version { * @saturation: saturation control * @zoom: zoom control * @wdr: wide dynamic range control + * @stabilization: image stabilization control * @ver: information of the version * @cap: the capture mode attributes * @power: current sensor's power status @@ -209,6 +210,7 @@ struct m5mols_info { struct v4l2_ctrl *saturation; struct v4l2_ctrl *zoom; struct v4l2_ctrl *wdr; + struct v4l2_ctrl *stabilization; struct m5mols_version ver; struct m5mols_capture cap; diff --git a/trunk/drivers/media/video/m5mols/m5mols_controls.c b/trunk/drivers/media/video/m5mols/m5mols_controls.c index 512c3603b280..6c607d467c6e 100644 --- a/trunk/drivers/media/video/m5mols/m5mols_controls.c +++ b/trunk/drivers/media/video/m5mols/m5mols_controls.c @@ -375,6 +375,19 @@ static int m5mols_set_wdr(struct m5mols_info *info, int wdr) return m5mols_write(&info->sd, CAPP_WDR_EN, wdr); } +static int m5mols_set_stabilization(struct m5mols_info *info, int val) +{ + struct v4l2_subdev *sd = &info->sd; + unsigned int evp = val ? 0xe : 0x0; + int ret; + + ret = m5mols_write(sd, AE_EV_PRESET_MONITOR, evp); + if (ret < 0) + return ret; + + return m5mols_write(sd, AE_EV_PRESET_CAPTURE, evp); +} + static int m5mols_g_volatile_ctrl(struct v4l2_ctrl *ctrl) { struct v4l2_subdev *sd = to_sd(ctrl); @@ -455,6 +468,10 @@ static int m5mols_s_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_WIDE_DYNAMIC_RANGE: ret = m5mols_set_wdr(info, ctrl->val); break; + + case V4L2_CID_IMAGE_STABILIZATION: + ret = m5mols_set_stabilization(info, ctrl->val); + break; } if (ret == 0 && info->mode != last_mode) @@ -535,6 +552,9 @@ int m5mols_init_controls(struct v4l2_subdev *sd) info->wdr = v4l2_ctrl_new_std(&info->handle, &m5mols_ctrl_ops, V4L2_CID_WIDE_DYNAMIC_RANGE, 0, 1, 1, 0); + info->stabilization = v4l2_ctrl_new_std(&info->handle, &m5mols_ctrl_ops, + V4L2_CID_IMAGE_STABILIZATION, 0, 1, 1, 0); + if (info->handle.error) { int ret = info->handle.error; v4l2_err(sd, "Failed to initialize controls: %d\n", ret);