Commit 8d125c50 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] cx25821: switch to v4l2_fh, add event and prio handling

It is now possible to remove cx25821_fh and replace it with v4l2_fh,
which in turn makes event handling and core prio handling possible.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 84293f08
This diff is collapsed.
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include "cx25821.h" #include "cx25821.h"
#include <media/v4l2-common.h> #include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
#include <media/v4l2-event.h>
#define VIDEO_DEBUG 0 #define VIDEO_DEBUG 0
......
...@@ -116,15 +116,6 @@ struct cx25821_tvnorm { ...@@ -116,15 +116,6 @@ struct cx25821_tvnorm {
u32 cxoformat; u32 cxoformat;
}; };
struct cx25821_fh {
struct cx25821_dev *dev;
enum v4l2_priority prio;
/* video capture */
int channel_id;
};
enum cx25821_itype { enum cx25821_itype {
CX25821_VMUX_COMPOSITE = 1, CX25821_VMUX_COMPOSITE = 1,
CX25821_VMUX_SVIDEO, CX25821_VMUX_SVIDEO,
...@@ -207,8 +198,7 @@ struct cx25821_dev; ...@@ -207,8 +198,7 @@ struct cx25821_dev;
struct cx25821_channel { struct cx25821_channel {
unsigned id; unsigned id;
struct cx25821_dev *dev; struct cx25821_dev *dev;
struct cx25821_fh *streaming_fh; struct v4l2_fh *streaming_fh;
struct v4l2_prio_state prio;
struct v4l2_ctrl_handler hdl; struct v4l2_ctrl_handler hdl;
struct cx25821_data timeout_data; struct cx25821_data timeout_data;
...@@ -360,7 +350,6 @@ struct cx25821_dev { ...@@ -360,7 +350,6 @@ struct cx25821_dev {
int pixel_format; int pixel_format;
int channel_select; int channel_select;
int command; int command;
int channel_opened;
}; };
struct upstream_user_struct { struct upstream_user_struct {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment