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

Commit 593403c5 authored by Javier Martin's avatar Javier Martin Committed by Mauro Carvalho Chehab
Browse files

[media] mcam-core: implement the control framework 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarJavier Martin <javier.martin@vista-silicon.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 492959c7

drivers/media/platform/marvell-ccic/mcam-core.c

+9 −45
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/videodev2.h>

#include <linux/videodev2.h>

#include <media/v4l2-device.h>

#include <media/v4l2-device.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-chip-ident.h>

#include <media/ov7670.h>

#include <media/ov7670.h>

#include <media/videobuf2-vmalloc.h>

#include <media/videobuf2-vmalloc.h>
@@ -1225,47 +1226,6 @@ static int mcam_vidioc_dqbuf(struct file *filp, void *priv, 
	return ret;

	return ret;

}

}









static int mcam_vidioc_queryctrl(struct file *filp, void *priv,

		struct v4l2_queryctrl *qc)

{

	struct mcam_camera *cam = priv;

	int ret;



	mutex_lock(&cam->s_mutex);

	ret = sensor_call(cam, core, queryctrl, qc);

	mutex_unlock(&cam->s_mutex);

	return ret;

}





static int mcam_vidioc_g_ctrl(struct file *filp, void *priv,

		struct v4l2_control *ctrl)

{

	struct mcam_camera *cam = priv;

	int ret;



	mutex_lock(&cam->s_mutex);

	ret = sensor_call(cam, core, g_ctrl, ctrl);

	mutex_unlock(&cam->s_mutex);

	return ret;

}





static int mcam_vidioc_s_ctrl(struct file *filp, void *priv,

		struct v4l2_control *ctrl)

{

	struct mcam_camera *cam = priv;

	int ret;



	mutex_lock(&cam->s_mutex);

	ret = sensor_call(cam, core, s_ctrl, ctrl);

	mutex_unlock(&cam->s_mutex);

	return ret;

}





static int mcam_vidioc_querycap(struct file *file, void *priv,

static int mcam_vidioc_querycap(struct file *file, void *priv,

		struct v4l2_capability *cap)

		struct v4l2_capability *cap)

{

{
@@ -1513,9 +1473,6 @@ static const struct v4l2_ioctl_ops mcam_v4l_ioctl_ops = { 
	.vidioc_dqbuf		= mcam_vidioc_dqbuf,

	.vidioc_dqbuf		= mcam_vidioc_dqbuf,

	.vidioc_streamon	= mcam_vidioc_streamon,

	.vidioc_streamon	= mcam_vidioc_streamon,

	.vidioc_streamoff	= mcam_vidioc_streamoff,

	.vidioc_streamoff	= mcam_vidioc_streamoff,

	.vidioc_queryctrl	= mcam_vidioc_queryctrl,

	.vidioc_g_ctrl		= mcam_vidioc_g_ctrl,

	.vidioc_s_ctrl		= mcam_vidioc_s_ctrl,

	.vidioc_g_parm		= mcam_vidioc_g_parm,

	.vidioc_g_parm		= mcam_vidioc_g_parm,

	.vidioc_s_parm		= mcam_vidioc_s_parm,

	.vidioc_s_parm		= mcam_vidioc_s_parm,

	.vidioc_enum_framesizes = mcam_vidioc_enum_framesizes,

	.vidioc_enum_framesizes = mcam_vidioc_enum_framesizes,
@@ -1782,14 +1739,19 @@ int mccic_register(struct mcam_camera *cam) 
	/*

	/*

	 * Get the v4l2 setup done.

	 * Get the v4l2 setup done.

	 */

	 */

	ret = v4l2_ctrl_handler_init(&cam->ctrl_handler, 10);

	if (ret)

		goto out_unregister;

	cam->v4l2_dev.ctrl_handler = &cam->ctrl_handler;



	mutex_lock(&cam->s_mutex);

	mutex_lock(&cam->s_mutex);

	cam->vdev = mcam_v4l_template;

	cam->vdev = mcam_v4l_template;

	cam->vdev.debug = 0;

	cam->vdev.debug = 0;

	cam->vdev.v4l2_dev = &cam->v4l2_dev;

	cam->vdev.v4l2_dev = &cam->v4l2_dev;

	video_set_drvdata(&cam->vdev, cam);

	ret = video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1);

	ret = video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1);

	if (ret)

	if (ret)

		goto out;

		goto out;

	video_set_drvdata(&cam->vdev, cam);





	/*

	/*

	 * If so requested, try to get our DMA buffers now.

	 * If so requested, try to get our DMA buffers now.
@@ -1801,6 +1763,7 @@ int mccic_register(struct mcam_camera *cam) 
	}

	}





out:

out:

	v4l2_ctrl_handler_free(&cam->ctrl_handler);

	mutex_unlock(&cam->s_mutex);

	mutex_unlock(&cam->s_mutex);

	return ret;

	return ret;

out_unregister:

out_unregister:
@@ -1825,6 +1788,7 @@ void mccic_shutdown(struct mcam_camera *cam) 
	if (cam->buffer_mode == B_vmalloc)

	if (cam->buffer_mode == B_vmalloc)

		mcam_free_dma_bufs(cam);

		mcam_free_dma_bufs(cam);

	video_unregister_device(&cam->vdev);

	video_unregister_device(&cam->vdev);

	v4l2_ctrl_handler_free(&cam->ctrl_handler);

	v4l2_device_unregister(&cam->v4l2_dev);

	v4l2_device_unregister(&cam->v4l2_dev);

}

}

drivers/media/platform/marvell-ccic/mcam-core.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ 




#include <linux/list.h>

#include <linux/list.h>

#include <media/v4l2-common.h>

#include <media/v4l2-common.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-dev.h>

#include <media/v4l2-dev.h>

#include <media/videobuf2-core.h>

#include <media/videobuf2-core.h>
@@ -112,6 +113,7 @@ struct mcam_camera { 
	 * should not be touched by the platform code.

	 * should not be touched by the platform code.

	 */

	 */

	struct v4l2_device v4l2_dev;

	struct v4l2_device v4l2_dev;

	struct v4l2_ctrl_handler ctrl_handler;

	enum mcam_state state;

	enum mcam_state state;

	unsigned long flags;		/* Buffer status, mainly (dev_lock) */

	unsigned long flags;		/* Buffer status, mainly (dev_lock) */

	int users;			/* How many open FDs */

	int users;			/* How many open FDs */