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

Commit fda10214 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: V4L: Events: Add new ioctls for events 

This patch adds a set of new ioctls to the V4L2 API. The ioctls conform to
V4L2 Events RFC version 2.3:

<URL:http://www.spinics.net/lists/linux-media/msg12033.html

>

Signed-off-by: default avatarSakari Ailus <sakari.ailus@maxwell.research.nokia.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6cd84b78

drivers/media/video/v4l2-compat-ioctl32.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1086,6 +1086,9 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) 
	case VIDIOC_QUERY_DV_PRESET:

	case VIDIOC_QUERY_DV_PRESET:

	case VIDIOC_S_DV_TIMINGS:

	case VIDIOC_S_DV_TIMINGS:

	case VIDIOC_G_DV_TIMINGS:

	case VIDIOC_G_DV_TIMINGS:

	case VIDIOC_DQEVENT:

	case VIDIOC_SUBSCRIBE_EVENT:

	case VIDIOC_UNSUBSCRIBE_EVENT:

		ret = do_video_ioctl(file, cmd, arg);

		ret = do_video_ioctl(file, cmd, arg);

		break;

		break;

drivers/media/video/v4l2-ioctl.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -291,6 +291,9 @@ static const char *v4l2_ioctls[] = { 
	[_IOC_NR(VIDIOC_QUERY_DV_PRESET)]  = "VIDIOC_QUERY_DV_PRESET",

	[_IOC_NR(VIDIOC_QUERY_DV_PRESET)]  = "VIDIOC_QUERY_DV_PRESET",

	[_IOC_NR(VIDIOC_S_DV_TIMINGS)]     = "VIDIOC_S_DV_TIMINGS",

	[_IOC_NR(VIDIOC_S_DV_TIMINGS)]     = "VIDIOC_S_DV_TIMINGS",

	[_IOC_NR(VIDIOC_G_DV_TIMINGS)]     = "VIDIOC_G_DV_TIMINGS",

	[_IOC_NR(VIDIOC_G_DV_TIMINGS)]     = "VIDIOC_G_DV_TIMINGS",

	[_IOC_NR(VIDIOC_DQEVENT)]	   = "VIDIOC_DQEVENT",

	[_IOC_NR(VIDIOC_SUBSCRIBE_EVENT)]  = "VIDIOC_SUBSCRIBE_EVENT",

	[_IOC_NR(VIDIOC_UNSUBSCRIBE_EVENT)] = "VIDIOC_UNSUBSCRIBE_EVENT",

};

};

#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)

#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)

include/linux/videodev2.h

+26 −0
Original line number Original line Diff line number Diff line
@@ -1636,6 +1636,29 @@ struct v4l2_streamparm { 
	} parm;

	} parm;

};

};





/*

 *	E V E N T S

 */



struct v4l2_event {

	__u32				type;

	union {

		__u8			data[64];

	} u;

	__u32				pending;

	__u32				sequence;

	struct timespec			timestamp;

	__u32				reserved[9];

};



struct v4l2_event_subscription {

	__u32				type;

	__u32				reserved[7];

};



#define V4L2_EVENT_ALL				0

#define V4L2_EVENT_PRIVATE_START		0x08000000



/*

/*

 *	A D V A N C E D   D E B U G G I N G

 *	A D V A N C E D   D E B U G G I N G

 *

 *
@@ -1758,6 +1781,9 @@ struct v4l2_dbg_chip_ident { 
#define	VIDIOC_QUERY_DV_PRESET	_IOR('V',  86, struct v4l2_dv_preset)

#define	VIDIOC_QUERY_DV_PRESET	_IOR('V',  86, struct v4l2_dv_preset)

#define	VIDIOC_S_DV_TIMINGS	_IOWR('V', 87, struct v4l2_dv_timings)

#define	VIDIOC_S_DV_TIMINGS	_IOWR('V', 87, struct v4l2_dv_timings)

#define	VIDIOC_G_DV_TIMINGS	_IOWR('V', 88, struct v4l2_dv_timings)

#define	VIDIOC_G_DV_TIMINGS	_IOWR('V', 88, struct v4l2_dv_timings)

#define	VIDIOC_DQEVENT		 _IOR('V', 89, struct v4l2_event)

#define	VIDIOC_SUBSCRIBE_EVENT	 _IOW('V', 90, struct v4l2_event_subscription)

#define	VIDIOC_UNSUBSCRIBE_EVENT _IOW('V', 91, struct v4l2_event_subscription)





/* Reminder: when adding new ioctls please add support for them to

/* Reminder: when adding new ioctls please add support for them to

   drivers/media/video/v4l2-compat-ioctl32.c as well! */

   drivers/media/video/v4l2-compat-ioctl32.c as well! */