summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx18/cx18-av-core.c
diff options
context:
space:
mode:
authorAndy Walls <awalls@radix.net>2009-01-30 22:33:02 -0500
committerAndy Walls <awalls@radix.net>2009-01-30 22:33:02 -0500
commitadbc75d3cf3691d649c8dac1f32ee21f332f0f4c (patch)
tree0ed8a7c6105d4009a02f848b8c587f542af14554 /linux/drivers/media/video/cx18/cx18-av-core.c
parentc397fe6b033be4e7829a44325cb06a0852d5a6bd (diff)
downloadmediapointer-dvb-s2-adbc75d3cf3691d649c8dac1f32ee21f332f0f4c.tar.gz
mediapointer-dvb-s2-adbc75d3cf3691d649c8dac1f32ee21f332f0f4c.tar.bz2
cx18: Clean-up and enable sliced VBI handling
From: Andy Walls <awalls@radix.net> Removed legacy ivtv state variables, added comments, and cleaned up sliced VBI related code. Enabled sliced VBI. Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-av-core.c')
-rw-r--r--linux/drivers/media/video/cx18/cx18-av-core.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-av-core.c b/linux/drivers/media/video/cx18/cx18-av-core.c
index 0b1c84b4d..5279b8e45 100644
--- a/linux/drivers/media/video/cx18/cx18-av-core.c
+++ b/linux/drivers/media/video/cx18/cx18-av-core.c
@@ -169,9 +169,14 @@ static void cx18_av_initialize(struct cx18 *cx)
/* Set VGA_TRACK_RANGE to 0x20 */
cx18_av_and_or4(cx, CXADEC_DFE_CTRL2, 0xFFFF00FF, 0x00002000);
- /* Enable VBI capture */
- cx18_av_write4(cx, CXADEC_OUT_CTRL1, 0x4010253F);
- /* cx18_av_write4(cx, CXADEC_OUT_CTRL1, 0x4010253E); */
+ /*
+ * Initial VBI setup
+ * VIP-1.1, 10 bit mode, enable Raw, disable sliced,
+ * don't clamp raw samples when codes are in use, 4 byte user D-words,
+ * programmed IDID, RP code V bit transition on VBLANK, data during
+ * blanking intervals
+ */
+ cx18_av_write4(cx, CXADEC_OUT_CTRL1, 0x4010252e);
/* Set the video input.
The setting in MODE_CTRL gets lost when we do the above setup */