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

V4L/DVB (7947): videodev: add vidioc_g_std callback. 



The default videodev behavior for VIDIOC_G_STD is not correct for all devices.
Add a new callback that drivers can use instead.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 7bb846af

drivers/media/video/videodev.c

+8 −4
Original line number Diff line number Diff line
@@ -1206,11 +1206,15 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, 
	{

		v4l2_std_id *id = arg;



		ret = 0;

		/* Calls the specific handler */

		if (vfd->vidioc_g_std)

			ret = vfd->vidioc_g_std(file, fh, id);

		else

			*id = vfd->current_norm;



		if (!ret)

			dbgarg(cmd, "value=%08Lx\n", (long long unsigned)*id);



		ret=0;

		break;

	}

	case VIDIOC_S_STD:

include/media/v4l2-dev.h

+2 −1
Original line number Diff line number Diff line
@@ -212,8 +212,9 @@ struct video_device 
	int (*vidioc_streamoff)(struct file *file, void *fh, enum v4l2_buf_type i);



		/* Standard handling

			G_STD and ENUMSTD are handled by videodev.c

			ENUMSTD is handled by videodev.c

		 */

	int (*vidioc_g_std) (struct file *file, void *fh, v4l2_std_id *norm);

	int (*vidioc_s_std) (struct file *file, void *fh, v4l2_std_id *norm);

	int (*vidioc_querystd) (struct file *file, void *fh, v4l2_std_id *a);