Commit f1739ec4 authored by Xavier Roumegue's avatar Xavier Roumegue Committed by Mauro Carvalho Chehab
Browse files

media: v4l2-ctrls: Export default v4l2_ctrl_type_ops callbacks 



Export the callback functions of the default v4l2 control type operations
such as a driver defining its own operations could reuse some of them.

Signed-off-by: default avatarXavier Roumegue <xavier.roumegue@oss.nxp.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 6b1aaa68

drivers/media/v4l2-core/v4l2-ctrls-core.c

+17 −13
Original line number Diff line number Diff line
@@ -65,9 +65,8 @@ void send_event(struct v4l2_fh *fh, struct v4l2_ctrl *ctrl, u32 changes) 
			v4l2_event_queue_fh(sev->fh, &ev);

}



static bool std_equal(const struct v4l2_ctrl *ctrl, u32 elems,

		      union v4l2_ctrl_ptr ptr1,

		      union v4l2_ctrl_ptr ptr2)

bool v4l2_ctrl_type_op_equal(const struct v4l2_ctrl *ctrl, u32 elems,

			     union v4l2_ctrl_ptr ptr1, union v4l2_ctrl_ptr ptr2)

{

	unsigned int i;
@@ -88,6 +87,7 @@ static bool std_equal(const struct v4l2_ctrl *ctrl, u32 elems, 
			       elems * ctrl->elem_size);

	}

}

EXPORT_SYMBOL(v4l2_ctrl_type_op_equal);



/* Default intra MPEG-2 quantisation coefficients, from the specification. */

static const u8 mpeg2_intra_quant_matrix[64] = {
@@ -177,8 +177,8 @@ static void std_init_compound(const struct v4l2_ctrl *ctrl, u32 idx, 
	}

}



static void std_init(const struct v4l2_ctrl *ctrl, u32 from_idx, u32 tot_elems,

		     union v4l2_ctrl_ptr ptr)

void v4l2_ctrl_type_op_init(const struct v4l2_ctrl *ctrl, u32 from_idx,

			    u32 tot_elems, union v4l2_ctrl_ptr ptr)

{

	unsigned int i;

	u32 elems = tot_elems - from_idx;
@@ -244,8 +244,9 @@ static void std_init(const struct v4l2_ctrl *ctrl, u32 from_idx, u32 tot_elems, 
		break;

	}

}

EXPORT_SYMBOL(v4l2_ctrl_type_op_init);



static void std_log(const struct v4l2_ctrl *ctrl)

void v4l2_ctrl_type_op_log(const struct v4l2_ctrl *ctrl)

{

	union v4l2_ctrl_ptr ptr = ctrl->p_cur;
@@ -353,6 +354,7 @@ static void std_log(const struct v4l2_ctrl *ctrl) 
		break;

	}

}

EXPORT_SYMBOL(v4l2_ctrl_type_op_log);



/*

 * Round towards the closest legal value. Be careful when we are
@@ -546,7 +548,8 @@ validate_vp9_frame(struct v4l2_ctrl_vp9_frame *frame) 


/*

 * Compound controls validation requires setting unused fields/flags to zero

 * in order to properly detect unchanged controls with std_equal's memcmp.

 * in order to properly detect unchanged controls with v4l2_ctrl_type_op_equal's

 * memcmp.

 */

static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx,

				 union v4l2_ctrl_ptr ptr)
@@ -992,7 +995,7 @@ static int std_validate_elem(const struct v4l2_ctrl *ctrl, u32 idx, 
	}

}



static int std_validate(const struct v4l2_ctrl *ctrl, u32 elems,

int v4l2_ctrl_type_op_validate(const struct v4l2_ctrl *ctrl, u32 elems,

			       union v4l2_ctrl_ptr ptr)

{

	unsigned int i;
@@ -1022,12 +1025,13 @@ static int std_validate(const struct v4l2_ctrl *ctrl, u32 elems, 
		ret = std_validate_elem(ctrl, i, ptr);

	return ret;

}

EXPORT_SYMBOL(v4l2_ctrl_type_op_validate);



static const struct v4l2_ctrl_type_ops std_type_ops = {

	.equal = std_equal,

	.init = std_init,

	.log = std_log,

	.validate = std_validate,

	.equal = v4l2_ctrl_type_op_equal,

	.init = v4l2_ctrl_type_op_init,

	.log = v4l2_ctrl_type_op_log,

	.validate = v4l2_ctrl_type_op_validate,

};



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

include/media/v4l2-ctrls.h

+48 −0
Original line number Diff line number Diff line
@@ -1538,4 +1538,52 @@ int v4l2_ctrl_subdev_log_status(struct v4l2_subdev *sd); 
int v4l2_ctrl_new_fwnode_properties(struct v4l2_ctrl_handler *hdl,

				    const struct v4l2_ctrl_ops *ctrl_ops,

				    const struct v4l2_fwnode_device_properties *p);



/**

 * v4l2_ctrl_type_op_equal - Default v4l2_ctrl_type_ops equal callback.

 *

 * @ctrl: The v4l2_ctrl pointer.

 * @elems: The number of elements to compare.

 * @ptr1: A v4l2 control value.

 * @ptr2: A v4l2 control value.

 *

 * Return: true if values are equal, otherwise false.

 */

bool v4l2_ctrl_type_op_equal(const struct v4l2_ctrl *ctrl, u32 elems,

			     union v4l2_ctrl_ptr ptr1, union v4l2_ctrl_ptr ptr2);



/**

 * v4l2_ctrl_type_op_init - Default v4l2_ctrl_type_ops init callback.

 *

 * @ctrl: The v4l2_ctrl pointer.

 * @from_idx: Starting element index.

 * @elems: The number of elements to initialize.

 * @ptr: The v4l2 control value.

 *

 * Return: void

 */

void v4l2_ctrl_type_op_init(const struct v4l2_ctrl *ctrl, u32 from_idx,

			    u32 elems, union v4l2_ctrl_ptr ptr);



/**

 * v4l2_ctrl_type_op_log - Default v4l2_ctrl_type_ops log callback.

 *

 * @ctrl: The v4l2_ctrl pointer.

 *

 * Return: void

 */

void v4l2_ctrl_type_op_log(const struct v4l2_ctrl *ctrl);



/**

 * v4l2_ctrl_type_op_validate - Default v4l2_ctrl_type_ops validate callback.

 *

 * @ctrl: The v4l2_ctrl pointer.

 * @elems: The number of elements in the control.

 * @ptr: The v4l2 control value.

 *

 * Return: 0 on success, a negative error code on failure.

 */

int v4l2_ctrl_type_op_validate(const struct v4l2_ctrl *ctrl, u32 elems,

			       union v4l2_ctrl_ptr ptr);



#endif