| Message ID | 1372157835-27663-7-git-send-email-arun.kk@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue June 25 2013 12:57:13 Arun Kumar K wrote: > From: Sylwester Nawrocki <s.nawrocki@samsung.com> > > The patch modifies the helper function v4l2_ctrl_new_std_menu > to accept integer menu controls with standard menu items. > > Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> > Signed-off-by: Arun Kumar K <arun.kk@samsung.com> After fixing the very minor correction below you have my ack: Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Regards, Hans > --- > Documentation/video4linux/v4l2-controls.txt | 21 ++++++++++---------- > drivers/media/v4l2-core/v4l2-ctrls.c | 28 ++++++++++++++++++++++++--- > 2 files changed, 36 insertions(+), 13 deletions(-) > > diff --git a/Documentation/video4linux/v4l2-controls.txt b/Documentation/video4linux/v4l2-controls.txt > index 676f873..e06e768 100644 > --- a/Documentation/video4linux/v4l2-controls.txt > +++ b/Documentation/video4linux/v4l2-controls.txt > @@ -124,26 +124,27 @@ You add non-menu controls by calling v4l2_ctrl_new_std: > const struct v4l2_ctrl_ops *ops, > u32 id, s32 min, s32 max, u32 step, s32 def); > > -Menu controls are added by calling v4l2_ctrl_new_std_menu: > +Menu and integer menu controls are added by calling v4l2_ctrl_new_std_menu: > > struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl, > const struct v4l2_ctrl_ops *ops, > u32 id, s32 max, s32 skip_mask, s32 def); > > -Or alternatively for integer menu controls, by calling v4l2_ctrl_new_int_menu: > +Menu controls with a driver specific menu are added by calling > +v4l2_ctrl_new_std_menu_items: > + > + struct v4l2_ctrl *v4l2_ctrl_new_std_menu_items( > + struct v4l2_ctrl_handler *hdl, > + const struct v4l2_ctrl_ops *ops, u32 id, s32 max, > + s32 skip_mask, s32 def, const char * const *qmenu); > + > +Integer menu controls with driver specific menu can be added by calling s/with driver/with a driver/ > +v4l2_ctrl_new_int_menu: > > struct v4l2_ctrl *v4l2_ctrl_new_int_menu(struct v4l2_ctrl_handler *hdl, > const struct v4l2_ctrl_ops *ops, > u32 id, s32 max, s32 def, const s64 *qmenu_int); > > -Standard menu controls with a driver specific menu are added by calling > -v4l2_ctrl_new_std_menu_items: > - > - struct v4l2_ctrl *v4l2_ctrl_new_std_menu_items( > - struct v4l2_ctrl_handler *hdl, > - const struct v4l2_ctrl_ops *ops, u32 id, s32 max, > - s32 skip_mask, s32 def, const char * const *qmenu); > - > These functions are typically called right after the v4l2_ctrl_handler_init: > > static const s64 exp_bias_qmenu[] = { > diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c > index fccd08b..e03a2e8 100644 > --- a/drivers/media/v4l2-core/v4l2-ctrls.c > +++ b/drivers/media/v4l2-core/v4l2-ctrls.c > @@ -552,6 +552,20 @@ const char * const *v4l2_ctrl_get_menu(u32 id) > } > EXPORT_SYMBOL(v4l2_ctrl_get_menu); > > +/* > + * Returns NULL or an s64 type array containing the menu for given > + * control ID. The total number of the menu items is returned in @len. > + */ > +const s64 const *v4l2_ctrl_get_int_menu(u32 id, u32 *len) > +{ > + switch (id) { > + default: > + *len = 0; > + return NULL; > + }; > +} > +EXPORT_SYMBOL(v4l2_ctrl_get_int_menu); > + > /* Return the control name. */ > const char *v4l2_ctrl_get_name(u32 id) > { > @@ -1712,20 +1726,28 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl, > const struct v4l2_ctrl_ops *ops, > u32 id, s32 max, s32 mask, s32 def) > { > - const char * const *qmenu = v4l2_ctrl_get_menu(id); > + const char * const *qmenu = NULL; > + const s64 *qmenu_int = NULL; > const char *name; > enum v4l2_ctrl_type type; > + unsigned int qmenu_int_len; > s32 min; > s32 step; > u32 flags; > > v4l2_ctrl_fill(id, &name, &type, &min, &max, &step, &def, &flags); > - if (type != V4L2_CTRL_TYPE_MENU) { > + > + if (type == V4L2_CTRL_TYPE_MENU) > + qmenu = v4l2_ctrl_get_menu(id); > + else if (type == V4L2_CTRL_TYPE_INTEGER_MENU) > + qmenu_int = v4l2_ctrl_get_int_menu(id, &qmenu_int_len); > + > + if ((!qmenu && !qmenu_int) || (qmenu_int && max > qmenu_int_len)) { > handler_set_err(hdl, -EINVAL); > return NULL; > } > return v4l2_ctrl_new(hdl, ops, id, name, type, > - 0, max, mask, def, flags, qmenu, NULL, NULL); > + 0, max, mask, def, flags, qmenu, qmenu_int, NULL); > } > EXPORT_SYMBOL(v4l2_ctrl_new_std_menu); > > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/video4linux/v4l2-controls.txt b/Documentation/video4linux/v4l2-controls.txt index 676f873..e06e768 100644 --- a/Documentation/video4linux/v4l2-controls.txt +++ b/Documentation/video4linux/v4l2-controls.txt @@ -124,26 +124,27 @@ You add non-menu controls by calling v4l2_ctrl_new_std: const struct v4l2_ctrl_ops *ops, u32 id, s32 min, s32 max, u32 step, s32 def); -Menu controls are added by calling v4l2_ctrl_new_std_menu: +Menu and integer menu controls are added by calling v4l2_ctrl_new_std_menu: struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl, const struct v4l2_ctrl_ops *ops, u32 id, s32 max, s32 skip_mask, s32 def); -Or alternatively for integer menu controls, by calling v4l2_ctrl_new_int_menu: +Menu controls with a driver specific menu are added by calling +v4l2_ctrl_new_std_menu_items: + + struct v4l2_ctrl *v4l2_ctrl_new_std_menu_items( + struct v4l2_ctrl_handler *hdl, + const struct v4l2_ctrl_ops *ops, u32 id, s32 max, + s32 skip_mask, s32 def, const char * const *qmenu); + +Integer menu controls with driver specific menu can be added by calling +v4l2_ctrl_new_int_menu: struct v4l2_ctrl *v4l2_ctrl_new_int_menu(struct v4l2_ctrl_handler *hdl, const struct v4l2_ctrl_ops *ops, u32 id, s32 max, s32 def, const s64 *qmenu_int); -Standard menu controls with a driver specific menu are added by calling -v4l2_ctrl_new_std_menu_items: - - struct v4l2_ctrl *v4l2_ctrl_new_std_menu_items( - struct v4l2_ctrl_handler *hdl, - const struct v4l2_ctrl_ops *ops, u32 id, s32 max, - s32 skip_mask, s32 def, const char * const *qmenu); - These functions are typically called right after the v4l2_ctrl_handler_init: static const s64 exp_bias_qmenu[] = { diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index fccd08b..e03a2e8 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -552,6 +552,20 @@ const char * const *v4l2_ctrl_get_menu(u32 id) } EXPORT_SYMBOL(v4l2_ctrl_get_menu); +/* + * Returns NULL or an s64 type array containing the menu for given + * control ID. The total number of the menu items is returned in @len. + */ +const s64 const *v4l2_ctrl_get_int_menu(u32 id, u32 *len) +{ + switch (id) { + default: + *len = 0; + return NULL; + }; +} +EXPORT_SYMBOL(v4l2_ctrl_get_int_menu); + /* Return the control name. */ const char *v4l2_ctrl_get_name(u32 id) { @@ -1712,20 +1726,28 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl, const struct v4l2_ctrl_ops *ops, u32 id, s32 max, s32 mask, s32 def) { - const char * const *qmenu = v4l2_ctrl_get_menu(id); + const char * const *qmenu = NULL; + const s64 *qmenu_int = NULL; const char *name; enum v4l2_ctrl_type type; + unsigned int qmenu_int_len; s32 min; s32 step; u32 flags; v4l2_ctrl_fill(id, &name, &type, &min, &max, &step, &def, &flags); - if (type != V4L2_CTRL_TYPE_MENU) { + + if (type == V4L2_CTRL_TYPE_MENU) + qmenu = v4l2_ctrl_get_menu(id); + else if (type == V4L2_CTRL_TYPE_INTEGER_MENU) + qmenu_int = v4l2_ctrl_get_int_menu(id, &qmenu_int_len); + + if ((!qmenu && !qmenu_int) || (qmenu_int && max > qmenu_int_len)) { handler_set_err(hdl, -EINVAL); return NULL; } return v4l2_ctrl_new(hdl, ops, id, name, type, - 0, max, mask, def, flags, qmenu, NULL, NULL); + 0, max, mask, def, flags, qmenu, qmenu_int, NULL); } EXPORT_SYMBOL(v4l2_ctrl_new_std_menu);