Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79fbc209 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2-ctrl: move function prototypes from common.h to ctrls.h 



For some unknown reason several control prototypes where in v4l2-common.c
instead of in v4l2-ctrls.h. Move them and document them.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 4ed0d6a9

include/media/v4l2-common.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -84,9 +84,6 @@ 




int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl,

int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl,

		const char * const *menu_items);

		const char * const *menu_items);

const char *v4l2_ctrl_get_name(u32 id);

const char * const *v4l2_ctrl_get_menu(u32 id);

const s64 *v4l2_ctrl_get_int_menu(u32 id, u32 *len);

int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def);

int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def);





/* ------------------------------------------------------------------------- */

/* ------------------------------------------------------------------------- */

include/media/v4l2-ctrls.h

+25 −0
Original line number Original line Diff line number Diff line
@@ -670,6 +670,31 @@ static inline int v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl, 
  */

  */

void v4l2_ctrl_notify(struct v4l2_ctrl *ctrl, v4l2_ctrl_notify_fnc notify, void *priv);

void v4l2_ctrl_notify(struct v4l2_ctrl *ctrl, v4l2_ctrl_notify_fnc notify, void *priv);





/** v4l2_ctrl_get_name() - Get the name of the control

 * @id:		The control ID.

 *

 * This function returns the name of the given control ID or NULL if it isn't

 * a known control.

 */

const char *v4l2_ctrl_get_name(u32 id);



/** v4l2_ctrl_get_menu() - Get the menu string array of the control

 * @id:		The control ID.

 *

 * This function returns the NULL-terminated menu string array name of the

 * given control ID or NULL if it isn't a known menu control.

 */

const char * const *v4l2_ctrl_get_menu(u32 id);



/** v4l2_ctrl_get_int_menu() - Get the integer menu array of the control

 * @id:		The control ID.

 * @len:	The size of the integer array.

 *

 * This function returns the integer array of the given control ID or NULL if it

 * if it isn't a known integer menu control.

 */

const s64 *v4l2_ctrl_get_int_menu(u32 id, u32 *len);



/** v4l2_ctrl_g_ctrl() - Helper function to get the control's value from within a driver.

/** v4l2_ctrl_g_ctrl() - Helper function to get the control's value from within a driver.

  * @ctrl:	The control.

  * @ctrl:	The control.

  *

  *