[media] saa7146: move vbi fields from saa7146_fh to saa7146_vv

[firefly-linux-kernel-4.4.55.git] / include / media / saa7146_vv.h

diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index 4aeff96ff7d8105f7bfe5e97b69ec94e1db6d4e8..658ae8361d5e20883a937b6cd633469ab836ce74 100644 (file)
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -88,17 +88,11 @@ struct saa7146_fh {
        /* if this is a vbi or capture open */
        enum v4l2_buf_type      type;
 
-       /* video overlay */
-       struct saa7146_overlay  ov;
-
        /* video capture */
        struct videobuf_queue   video_q;
-       struct v4l2_pix_format  video_fmt;
 
        /* vbi capture */
        struct videobuf_queue   vbi_q;
-       struct v4l2_vbi_format  vbi_fmt;
-       struct timer_list       vbi_read_timeout;
 
        unsigned int resources; /* resource management for device open */
 };
@@ -110,6 +104,8 @@ struct saa7146_vv
 {
        /* vbi capture */
        struct saa7146_dmaqueue         vbi_q;
+       struct v4l2_vbi_format          vbi_fmt;
+       struct timer_list               vbi_read_timeout;
        /* vbi workaround interrupt queue */
        wait_queue_head_t               vbi_wq;
        int                             vbi_fieldcount;
@@ -119,13 +115,14 @@ struct saa7146_vv
        struct saa7146_fh               *video_fh;
 
        /* video overlay */
+       struct saa7146_overlay          ov;
        struct v4l2_framebuffer         ov_fb;
        struct saa7146_format           *ov_fmt;
-       struct saa7146_overlay          *ov_data;
        struct saa7146_fh               *ov_suspend;
 
        /* video capture */
        struct saa7146_dmaqueue         video_q;
+       struct v4l2_pix_format          video_fmt;
        enum v4l2_field                 last_field;
 
        /* common: fixme? shouldn't this be in saa7146_fh?
@@ -206,6 +203,7 @@ extern struct saa7146_use_ops saa7146_video_uops;
 int saa7146_start_preview(struct saa7146_fh *fh);
 int saa7146_stop_preview(struct saa7146_fh *fh);
 long saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg);
+int saa7146_s_ctrl(struct v4l2_ctrl *ctrl);
 
 /* from saa7146_vbi.c */
 extern struct saa7146_use_ops saa7146_vbi_uops;