1 files changed, 23 insertions, 3 deletions

diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 0f2ba9a40d17..0a73e8bf0d6e 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -109,6 +109,7 @@
 #define EM2882_BOARD_EVGA_INDTUBE                 70
 #define EM2820_BOARD_SILVERCREST_WEBCAM           71
 #define EM2861_BOARD_GADMEI_UTV330PLUS           72
+#define EM2870_BOARD_REDDO_DVB_C_USB_BOX          73
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4
@@ -214,7 +215,8 @@ struct em28xx_usb_isoc_ctl {
         int                             tmp_buf_len;
 
                 /* Stores already requested buffers */
-        struct em28xx_buffer            *buf;
+        struct em28xx_buffer            *vid_buf;
+        struct em28xx_buffer            *vbi_buf;
 
                 /* Stores the number of received fields */
         int                             nfields;
@@ -443,6 +445,10 @@ enum em28xx_dev_state {
 #define EM28XX_AUDIO   0x10
 #define EM28XX_DVB     0x20
 
+/* em28xx resource types (used for res_get/res_lock etc */
+#define EM28XX_RESOURCE_VIDEO 0x01
+#define EM28XX_RESOURCE_VBI   0x02
+
 struct em28xx_audio {
         char name[50];
         char *transfer_buffer[EM28XX_AUDIO_BUFS];
@@ -463,10 +469,11 @@ struct em28xx;
 
 struct em28xx_fh {
         struct em28xx *dev;
-        unsigned int  stream_on:1;      /* Locks streams */
         int           radio;
+        unsigned int  resources;
 
         struct videobuf_queue        vb_vidq;
+        struct videobuf_queue        vb_vbiq;
 
         enum v4l2_buf_type           type;
 };
@@ -493,7 +500,6 @@ struct em28xx {
         /* Vinmode/Vinctl used at the driver */
         int vinmode, vinctl;
 
-        unsigned int stream_on:1;       /* Locks streams */
         unsigned int has_audio_class:1;
         unsigned int has_alsa_audio:1;
 
@@ -544,6 +550,12 @@ struct em28xx {
         enum em28xx_dev_state state;
         enum em28xx_io_method io;
 
+        /* vbi related state tracking */
+        int capture_type;
+        int vbi_read;
+        unsigned char cur_field;
+
+
         struct work_struct         request_module_wk;
 
         /* locks */
@@ -555,10 +567,14 @@ struct em28xx {
         struct video_device *vbi_dev;
         struct video_device *radio_dev;
 
+        /* resources in use */
+        unsigned int resources;
+
         unsigned char eedata[256];
 
         /* Isoc control struct */
         struct em28xx_dmaqueue vidq;
+        struct em28xx_dmaqueue vbiq;
         struct em28xx_usb_isoc_ctl isoc_ctl;
         spinlock_t slock;
 
@@ -639,6 +655,7 @@ int em28xx_audio_setup(struct em28xx *dev);
 
 int em28xx_colorlevels_set_default(struct em28xx *dev);
 int em28xx_capture_start(struct em28xx *dev, int start);
+int em28xx_vbi_supported(struct em28xx *dev);
 int em28xx_set_outfmt(struct em28xx *dev);
 int em28xx_resolution_set(struct em28xx *dev);
 int em28xx_set_alternate(struct em28xx *dev);
@@ -686,6 +703,9 @@ void em28xx_deregister_snapshot_button(struct em28xx *dev);
 int em28xx_ir_init(struct em28xx *dev);
 int em28xx_ir_fini(struct em28xx *dev);
 
+/* Provided by em28xx-vbi.c */
+extern struct videobuf_queue_ops em28xx_vbi_qops;
+
 /* printk macros */
 
 #define em28xx_err(fmt, arg...) do {\