lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] m5mols: Use proper sensor mode for the controls

Browse Source 
The parameters corresponding to the V4L controls can be reconfigured
only in associated M-5MOLS operation mode. Use struct v4l2_ctrl
priv field to assign the working mode to the controls which can be
modified only in certain conditions.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sylwester Nawrocki
2012-04-09 13:52:06 -03:00
committed by Mauro Carvalho Chehab
parent 3c5da0baaa
commit 0373e97496
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/video/m5mols/m5mols.h
View File

@@ -305,4 +305,15 @@ static inline struct v4l2_subdev *to_sd(struct v4l2_ctrl *ctrl)
return &info->sd; return &info->sd;
} }
static inline void m5mols_set_ctrl_mode(struct v4l2_ctrl *ctrl,
unsigned int mode)
{
ctrl->priv = (void *)mode;
}
static inline unsigned int m5mols_get_ctrl_mode(struct v4l2_ctrl *ctrl)
{
return (unsigned int)ctrl->priv;
}
#endif /* M5MOLS_H */ #endif /* M5MOLS_H */

28
drivers/media/video/m5mols/m5mols_controls.c
View File

@@ -321,10 +321,11 @@ static int m5mols_set_color_effect(struct m5mols_info *info, int val)
static int m5mols_s_ctrl(struct v4l2_ctrl *ctrl) static int m5mols_s_ctrl(struct v4l2_ctrl *ctrl)
{ {
unsigned int ctrl_mode = m5mols_get_ctrl_mode(ctrl);
struct v4l2_subdev *sd = to_sd(ctrl); struct v4l2_subdev *sd = to_sd(ctrl);
struct m5mols_info *info = to_m5mols(sd); struct m5mols_info *info = to_m5mols(sd);
int ispstate = info->mode; int last_mode = info->mode;
int ret; int ret = 0;
/* /*
* If needed, defer restoring the controls until * If needed, defer restoring the controls until
@@ -335,9 +336,14 @@ static int m5mols_s_ctrl(struct v4l2_ctrl *ctrl)
return 0; return 0;
} }
ret = m5mols_mode(info, REG_PARAMETER); v4l2_dbg(1, m5mols_debug, sd, "%s: %s, val: %d, priv: %#x\n",
if (ret < 0) __func__, ctrl->name, ctrl->val, (int)ctrl->priv);
return ret;
if (ctrl_mode && ctrl_mode != info->mode) {
ret = m5mols_set_mode(info, ctrl_mode);
if (ret < 0)
return ret;
}
switch (ctrl->id) { switch (ctrl->id) {
case V4L2_CID_ZOOM_ABSOLUTE: case V4L2_CID_ZOOM_ABSOLUTE:
@@ -360,10 +366,11 @@ static int m5mols_s_ctrl(struct v4l2_ctrl *ctrl)
ret = m5mols_set_color_effect(info, ctrl->val); ret = m5mols_set_color_effect(info, ctrl->val);
break; break;
} }
if (ret < 0)
return ret;
return m5mols_mode(info, ispstate); if (ret == 0 && info->mode != last_mode)
ret = m5mols_set_mode(info, last_mode);
return ret;
} }
static const struct v4l2_ctrl_ops m5mols_ctrl_ops = { static const struct v4l2_ctrl_ops m5mols_ctrl_ops = {
@@ -414,6 +421,11 @@ int m5mols_init_controls(struct v4l2_subdev *sd)
} }
v4l2_ctrl_auto_cluster(2, &info->auto_exposure, 1, false); v4l2_ctrl_auto_cluster(2, &info->auto_exposure, 1, false);
m5mols_set_ctrl_mode(info->auto_exposure, REG_PARAMETER);
m5mols_set_ctrl_mode(info->auto_wb, REG_PARAMETER);
m5mols_set_ctrl_mode(info->colorfx, REG_MONITOR);
sd->ctrl_handler = &info->handle; sd->ctrl_handler = &info->handle;
return 0; return 0;