linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git] / drivers / media / video / cx25840 / cx25840-vbi.c
index 6cc8bf2..04d879d 100644 (file)
@@ -19,9 +19,8 @@
 #include <linux/videodev2.h>
 #include <linux/i2c.h>
 #include <media/v4l2-common.h>
-#include <media/cx25840.h>
 
-#include "cx25840-core.h"
+#include "cx25840.h"
 
 static int odd_parity(u8 c)
 {
@@ -84,140 +83,67 @@ static int decode_vps(u8 * dst, u8 * p)
 
 void cx25840_vbi_setup(struct i2c_client *client)
 {
-       struct cx25840_state *state = i2c_get_clientdata(client);
        v4l2_std_id std = cx25840_get_v4lstd(client);
-       int hblank,hactive,burst,vblank,vactive,sc,vblank656,src_decimation;
-       int luma_lpf,uv_lpf, comb;
-       u32 pll_int,pll_frac,pll_post;
 
-       /* datasheet startup, step 8d */
        if (std & ~V4L2_STD_NTSC) {
+               /* datasheet startup, step 8d */
                cx25840_write(client, 0x49f, 0x11);
-       } else {
-               cx25840_write(client, 0x49f, 0x14);
-       }
 
-       if (std & V4L2_STD_625_50) {
-               hblank=0x084;
-               hactive=0x2d0;
-               burst=0x5d;
-               vblank=0x024;
-               vactive=0x244;
-               vblank656=0x28;
-               src_decimation=0x21f;
+               cx25840_write(client, 0x470, 0x84);
+               cx25840_write(client, 0x471, 0x00);
+               cx25840_write(client, 0x472, 0x2d);
+               cx25840_write(client, 0x473, 0x5d);
+
+               cx25840_write(client, 0x474, 0x24);
+               cx25840_write(client, 0x475, 0x40);
+               cx25840_write(client, 0x476, 0x24);
+               cx25840_write(client, 0x477, 0x28);
+
+               cx25840_write(client, 0x478, 0x1f);
+               cx25840_write(client, 0x479, 0x02);
 
-               luma_lpf=2;
                if (std & V4L2_STD_SECAM) {
-                       uv_lpf=0;
-                       comb=0;
-                       sc=0x0a425f;
-               } else {
-                       uv_lpf=1;
-                       comb=0x20;
-                       sc=0x0a8263;
-               }
-       } else {
-               hactive=720;
-               hblank=122;
-               vactive=487;
-               luma_lpf=1;
-               uv_lpf=1;
-
-               src_decimation=0x21f;
-               if (std == V4L2_STD_PAL_M) {
-                       vblank=20;
-                       vblank656=24;
-                       burst=0x61;
-                       comb=0x20;
-
-                       sc=555452;
+                       cx25840_write(client, 0x47a, 0x80);
+                       cx25840_write(client, 0x47b, 0x00);
+                       cx25840_write(client, 0x47c, 0x5f);
+                       cx25840_write(client, 0x47d, 0x42);
                } else {
-                       vblank=26;
-                       vblank656=26;
-                       burst=0x5b;
-                       comb=0x66;
-                       sc=556063;
+                       cx25840_write(client, 0x47a, 0x90);
+                       cx25840_write(client, 0x47b, 0x20);
+                       cx25840_write(client, 0x47c, 0x63);
+                       cx25840_write(client, 0x47d, 0x82);
                }
-       }
-
-       /* DEBUG: Displays configured PLL frequency */
-       pll_int=cx25840_read(client, 0x108);
-       pll_frac=cx25840_read4(client, 0x10c)&0x1ffffff;
-       pll_post=cx25840_read(client, 0x109);
-       v4l_dbg(1, cx25840_debug, client,
-                               "PLL regs = int: %u, frac: %u, post: %u\n",
-                               pll_int,pll_frac,pll_post);
-
-       if (pll_post) {
-               int fin, fsc;
-               int pll= (28636363L*((((u64)pll_int)<<25L)+pll_frac)) >>25L;
-
-               pll/=pll_post;
-               v4l_dbg(1, cx25840_debug, client, "PLL = %d.%06d MHz\n",
-                                               pll/1000000, pll%1000000);
-               v4l_dbg(1, cx25840_debug, client, "PLL/8 = %d.%06d MHz\n",
-                                               pll/8000000, (pll/8)%1000000);
-
-               fin=((u64)src_decimation*pll)>>12;
-               v4l_dbg(1, cx25840_debug, client, "ADC Sampling freq = "
-                                               "%d.%06d MHz\n",
-                                               fin/1000000,fin%1000000);
-
-               fsc= (((u64)sc)*pll) >> 24L;
-               v4l_dbg(1, cx25840_debug, client, "Chroma sub-carrier freq = "
-                                               "%d.%06d MHz\n",
-                                               fsc/1000000,fsc%1000000);
-
-               v4l_dbg(1, cx25840_debug, client, "hblank %i, hactive %i, "
-                       "vblank %i , vactive %i, vblank656 %i, src_dec %i,"
-                       "burst 0x%02x, luma_lpf %i, uv_lpf %i, comb 0x%02x,"
-                       " sc 0x%06x\n",
-                       hblank, hactive, vblank, vactive, vblank656,
-                       src_decimation, burst, luma_lpf, uv_lpf, comb, sc);
-       }
-
-       /* Sets horizontal blanking delay and active lines */
-       cx25840_write(client, 0x470, hblank);
-       cx25840_write(client, 0x471, 0xff&(((hblank>>8)&0x3)|(hactive <<4)));
-       cx25840_write(client, 0x472, hactive>>4);
 
-       /* Sets burst gate delay */
-       cx25840_write(client, 0x473, burst);
-
-       /* Sets vertical blanking delay and active duration */
-       cx25840_write(client, 0x474, vblank);
-       cx25840_write(client, 0x475, 0xff&(((vblank>>8)&0x3)|(vactive <<4)));
-       cx25840_write(client, 0x476, vactive>>4);
-       cx25840_write(client, 0x477, vblank656);
-
-       /* Sets src decimation rate */
-       cx25840_write(client, 0x478, 0xff&src_decimation);
-       cx25840_write(client, 0x479, 0xff&(src_decimation>>8));
+               cx25840_write(client, 0x47e, 0x0a);
+               cx25840_write(client, 0x47f, 0x01);
+       } else {
+               /* datasheet startup, step 8d */
+               cx25840_write(client, 0x49f, 0x14);
 
-       /* Sets Luma and UV Low pass filters */
-       cx25840_write(client, 0x47a, luma_lpf<<6|((uv_lpf<<4)&0x30));
+               cx25840_write(client, 0x470, 0x7a);
+               cx25840_write(client, 0x471, 0x00);
+               cx25840_write(client, 0x472, 0x2d);
+               cx25840_write(client, 0x473, 0x5b);
 
-       /* Enables comb filters */
-       cx25840_write(client, 0x47b, comb);
+               cx25840_write(client, 0x474, 0x1a);
+               cx25840_write(client, 0x475, 0x70);
+               cx25840_write(client, 0x476, 0x1e);
+               cx25840_write(client, 0x477, 0x1e);
 
-       /* Sets SC Step*/
-       cx25840_write(client, 0x47c, sc);
-       cx25840_write(client, 0x47d, 0xff&sc>>8);
-       cx25840_write(client, 0x47e, 0xff&sc>>16);
+               cx25840_write(client, 0x478, 0x1f);
+               cx25840_write(client, 0x479, 0x02);
+               cx25840_write(client, 0x47a, 0x50);
+               cx25840_write(client, 0x47b, 0x66);
 
-       /* Sets VBI parameters */
-       if (std & V4L2_STD_625_50) {
-               cx25840_write(client, 0x47f, 0x01);
-               state->vbi_line_offset = 5;
-       } else {
+               cx25840_write(client, 0x47c, 0x1f);
+               cx25840_write(client, 0x47d, 0x7c);
+               cx25840_write(client, 0x47e, 0x08);
                cx25840_write(client, 0x47f, 0x00);
-               state->vbi_line_offset = 8;
        }
 }
 
 int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
 {
-       struct cx25840_state *state = i2c_get_clientdata(client);
        struct v4l2_format *fmt;
        struct v4l2_sliced_vbi_format *svbi;
 
@@ -255,7 +181,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
 
        case VIDIOC_S_FMT:
        {
-               int is_pal = !(cx25840_get_v4lstd(client) & V4L2_STD_525_60);
+               int is_pal = !(cx25840_get_v4lstd(client) & V4L2_STD_NTSC);
                int vbi_offset = is_pal ? 1 : 0;
                int i, x;
                u8 lcr[24];
@@ -284,7 +210,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
                cx25840_vbi_setup(client);
 
                /* Sliced VBI */
-               cx25840_write(client, 0x404, 0x32);     /* Ancillary data */
+               cx25840_write(client, 0x404, 0x36);     /* Ancillery data */
                cx25840_write(client, 0x406, 0x13);
                cx25840_write(client, 0x47f, vbi_offset);
 
@@ -321,18 +247,8 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
                        }
                }
 
-               if (is_pal) {
-                       for (x = 1, i = 0x424; i <= 0x434; i++, x++) {
-                               cx25840_write(client, i, lcr[6 + x]);
-                       }
-               }
-               else {
-                       for (x = 1, i = 0x424; i <= 0x430; i++, x++) {
-                               cx25840_write(client, i, lcr[9 + x]);
-                       }
-                       for (i = 0x431; i <= 0x434; i++) {
-                               cx25840_write(client, i, 0);
-                       }
+               for (x = 1, i = 0x424; i <= 0x434; i++, x++) {
+                       cx25840_write(client, i, lcr[6 + x]);
                }
 
                cx25840_write(client, 0x43c, 0x16);
@@ -340,7 +256,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
                if (is_pal) {
                        cx25840_write(client, 0x474, 0x2a);
                } else {
-                       cx25840_write(client, 0x474, 0x22);
+                       cx25840_write(client, 0x474, 0x1a + 6);
                }
                break;
        }
@@ -361,7 +277,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
                id1 = p[-1];
                id2 = p[0] & 0xf;
                l = p[2] & 0x3f;
-               l += state->vbi_line_offset;
+               l += 5;
                p += 4;
 
                switch (id2) {