V4L/DVB (10439): cx18: Clean-up and enable sliced VBI handling

Removed legacy ivtv state variables, added comments, and cleaned
up sliced VBI related code.  Enabled sliced VBI.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 72 insertions, 20 deletions

diff --git a/drivers/media/video/cx18/cx18-av-vbi.c b/drivers/media/video/cx18/cx18-av-vbi.c
index 1527ea4f6b0..72325d774a6 100644
--- a/drivers/media/video/cx18/cx18-av-vbi.c
+++ b/drivers/media/video/cx18/cx18-av-vbi.c
@@ -24,6 +24,52 @@
 
 #include "cx18-driver.h"
 
+/*
+ * For sliced VBI output, we set up to use VIP-1.1, 10-bit mode,
+ * NN counts 4 bytes Dwords, an IDID of 0x00 0x80 or one with the VBI line #.
+ * Thus, according to the VIP-2 Spec, our VBI ancillary data lines
+ * (should!) look like:
+ *      4 byte EAV code:          0xff 0x00 0x00 0xRP
+ *      unknown number of possible idle bytes
+ *      3 byte Anc data preamble: 0x00 0xff 0xff
+ *      1 byte data identifier:   ne010iii (parity bits, 010, DID bits)
+ *      1 byte secondary data id: nessssss (parity bits, SDID bits)
+ *      1 byte data word count:   necccccc (parity bits, NN Dword count)
+ *      2 byte Internal DID:      0x00 0x80 (programmed value)
+ *      4*NN data bytes
+ *      1 byte checksum
+ *      Fill bytes needed to fil out to 4*NN bytes of payload
+ *
+ * The RP codes for EAVs when in VIP-1.1 mode, not in raw mode, &
+ * in the vertical blanking interval are:
+ *      0xb0 (Task         0 VerticalBlank HorizontalBlank 0 0 0 0)
+ *      0xf0 (Task EvenField VerticalBlank HorizontalBlank 0 0 0 0)
+ *
+ * Since the V bit is only allowed to toggle in the EAV RP code, just
+ * before the first active region line and for active lines, they are:
+ *      0x90 (Task         0 0 HorizontalBlank 0 0 0 0)
+ *      0xd0 (Task EvenField 0 HorizontalBlank 0 0 0 0)
+ *
+ * The user application DID bytes we care about are:
+ *      0x91 (1 0 010        0 !ActiveLine AncDataPresent)
+ *      0x55 (0 1 010 2ndField !ActiveLine AncDataPresent)
+ *
+ */
+static const u8 sliced_vbi_did[2] = { 0x91, 0x55 };
+
+struct vbi_anc_data {
+        /* u8 eav[4]; */
+        /* u8 idle[]; Variable number of idle bytes */
+        u8 preamble[3];
+        u8 did;
+        u8 sdid;
+        u8 data_count;
+        u8 idid[2];
+        u8 payload[1]; /* 4*data_count of payload */
+        /* u8 checksum; */
+        /* u8 fill[]; Variable number of fill bytes */
+};
+
 static int odd_parity(u8 c)
 {
         c ^= (c >> 4);
@@ -96,7 +142,7 @@ int cx18_av_vbi(struct cx18 *cx, unsigned int cmd, void *arg)
                         0, V4L2_SLICED_TELETEXT_B, 0,   /* 1 */
                         0, V4L2_SLICED_WSS_625, 0,      /* 4 */
                         V4L2_SLICED_CAPTION_525,        /* 6 */
-                        0, 0, V4L2_SLICED_VPS, 0, 0,    /* 9 */
+                        V4L2_SLICED_VPS, 0, 0, 0, 0,    /* 7 - unlike cx25840 */
                         0, 0, 0, 0
                 };
                 int is_pal = !(state->std & V4L2_STD_525_60);
@@ -220,47 +266,53 @@ int cx18_av_vbi(struct cx18 *cx, unsigned int cmd, void *arg)
         case VIDIOC_INT_DECODE_VBI_LINE:
         {
                 struct v4l2_decode_vbi_line *vbi = arg;
-                u8 *p = vbi->p;
-                int id1, id2, l, err = 0;
-
-                if (p[0] || p[1] != 0xff || p[2] != 0xff ||
-                    (p[3] != 0x55 && p[3] != 0x91)) {
+                u8 *p;
+                struct vbi_anc_data *anc = (struct vbi_anc_data *) vbi->p;
+                int did, sdid, l, err = 0;
+
+                /*
+                 * Check for the ancillary data header for sliced VBI
+                 */
+                if (anc->preamble[0] ||
+                    anc->preamble[1] != 0xff || anc->preamble[2] != 0xff ||
+                    (anc->did != sliced_vbi_did[0] &&
+                     anc->did != sliced_vbi_did[1])) {
                         vbi->line = vbi->type = 0;
                         break;
                 }
 
-                p += 4;
-                id1 = p[-1];
-                id2 = p[0] & 0xf;
-                l = p[2] & 0x3f;
+                did = anc->did;
+                sdid = anc->sdid & 0xf;
+                l = anc->idid[0] & 0x3f;
                 l += state->vbi_line_offset;
-                p += 4;
+                p = anc->payload;
 
-                switch (id2) {
+                /* Decode the SDID set by the slicer */
+                switch (sdid) {
                 case 1:
-                        id2 = V4L2_SLICED_TELETEXT_B;
+                        sdid = V4L2_SLICED_TELETEXT_B;
                         break;
                 case 4:
-                        id2 = V4L2_SLICED_WSS_625;
+                        sdid = V4L2_SLICED_WSS_625;
                         break;
                 case 6:
-                        id2 = V4L2_SLICED_CAPTION_525;
+                        sdid = V4L2_SLICED_CAPTION_525;
                         err = !odd_parity(p[0]) || !odd_parity(p[1]);
                         break;
-                case 9:
-                        id2 = V4L2_SLICED_VPS;
+                case 7: /* Differs from cx25840 */
+                        sdid = V4L2_SLICED_VPS;
                         if (decode_vps(p, p) != 0)
                                 err = 1;
                         break;
                 default:
-                        id2 = 0;
+                        sdid = 0;
                         err = 1;
                         break;
                 }
 
-                vbi->type = err ? 0 : id2;
+                vbi->type = err ? 0 : sdid;
                 vbi->line = err ? 0 : l;
-                vbi->is_second_field = err ? 0 : (id1 == 0x55);
+                vbi->is_second_field = err ? 0 : (did == sliced_vbi_did[1]);
                 vbi->p = p;
                 break;
         }