V4L/DVB: Add closed captioning support for the HVR-950q

Add NTSC closed captioning support for au0828 based products.  Note that this
also required reworking the locking to support streaming on both the video and
VBI devices (the logic for which I copied from my changes made to the em28xx
several months ago).

This work was sponsored by GetWellNetwork Inc.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 17 insertions, 3 deletions

diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
index 207f32dec6a..9905bc4f5f5 100644
--- a/drivers/media/video/au0828/au0828.h
+++ b/drivers/media/video/au0828/au0828.h
@@ -60,6 +60,10 @@
 
 #define AU0828_MAX_INPUT        4
 
+/* au0828 resource types (used for res_get/res_lock etc */
+#define AU0828_RESOURCE_VIDEO 0x01
+#define AU0828_RESOURCE_VBI   0x02
+
 enum au0828_itype {
         AU0828_VMUX_UNDEFINED = 0,
         AU0828_VMUX_COMPOSITE,
@@ -115,8 +119,10 @@ enum au0828_dev_state {
 
 struct au0828_fh {
         struct au0828_dev *dev;
-        unsigned int  stream_on:1;      /* Locks streams */
+        unsigned int  resources;
+
         struct videobuf_queue        vb_vidq;
+        struct videobuf_queue        vb_vbiq;
         enum v4l2_buf_type           type;
 };
 
@@ -145,7 +151,8 @@ struct au0828_usb_isoc_ctl {
         int                             tmp_buf_len;
 
                 /* Stores already requested buffers */
-        struct au0828_buffer            *buf;
+        struct au0828_buffer            *buf;
+        struct au0828_buffer            *vbi_buf;
 
                 /* Stores the number of received fields */
         int                             nfields;
@@ -194,11 +201,14 @@ struct au0828_dev {
         /* Analog */
         struct v4l2_device v4l2_dev;
         int users;
-        unsigned int stream_on:1;       /* Locks streams */
+        unsigned int resources; /* resources in use */
         struct video_device *vdev;
         struct video_device *vbi_dev;
         int width;
         int height;
+        int vbi_width;
+        int vbi_height;
+        u32 vbi_read;
         u32 field_size;
         u32 frame_size;
         u32 bytesperline;
@@ -219,6 +229,7 @@ struct au0828_dev {
 
         /* Isoc control struct */
         struct au0828_dmaqueue vidq;
+        struct au0828_dmaqueue vbiq;
         struct au0828_usb_isoc_ctl isoc_ctl;
         spinlock_t slock;
 
@@ -278,6 +289,9 @@ void au0828_analog_unregister(struct au0828_dev *dev);
 extern int au0828_dvb_register(struct au0828_dev *dev);
 extern void au0828_dvb_unregister(struct au0828_dev *dev);
 
+/* au0828-vbi.c */
+extern struct videobuf_queue_ops au0828_vbi_qops;
+
 #define dprintk(level, fmt, arg...)\
         do { if (au0828_debug & level)\
                 printk(KERN_DEBUG DRIVER_NAME "/0: " fmt, ## arg);\