---

yaml --- r: 13366 b: refs/heads/master c: 3ae1adc h: refs/heads/master v: v3
git-mirror · Nov 9, 2005 · 1b488ff · 1b488ff
1 parent c60cb36
commit 1b488ff
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71633c05724d85f1afb87629bb96fdf2ef18b41f
+refs/heads/master: 3ae1adc6ed93d55a27523f395284940fbe056401
diff --git a/trunk/drivers/media/video/cx88/cx88-cards.c b/trunk/drivers/media/video/cx88/cx88-cards.c
@@ -206,7 +206,7 @@ struct cx88_board cx88_boards[] = {
 		.radio_type     = UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.radio_addr	= ADDR_UNSET,
-		.tda9887_conf	= TDA9887_PRESENT,
+		.tda9887_conf	= TDA9887_PRESENT | TDA9887_INTERCARRIER_NTSC,
 		.input          = {{
 			.type   = CX88_VMUX_TELEVISION,
 			.vmux   = 0,

diff --git a/trunk/drivers/media/video/tda9887.c b/trunk/drivers/media/video/tda9887.c
@@ -464,6 +464,8 @@ static int tda9887_set_config(struct tda9887 *t, char *buf)
 			break;
 		}
 	}
+	if ((t->config & TDA9887_INTERCARRIER_NTSC) && (t->std & V4L2_STD_NTSC))
+		buf[1] &= ~cQSS;
 	return 0;
 }
 

diff --git a/trunk/include/media/tuner.h b/trunk/include/media/tuner.h
@@ -148,6 +148,7 @@
 # define TDA9887_INTERCARRIER        (1<<4)
 # define TDA9887_PORT1_ACTIVE        (1<<5)
 # define TDA9887_PORT2_ACTIVE        (1<<6)
+# define TDA9887_INTERCARRIER_NTSC   (1<<7)
 /* config options */
 # define TDA9887_DEEMPHASIS_MASK     (3<<16)
 # define TDA9887_DEEMPHASIS_NONE     (1<<16)
-Original file line number
+Diff line change
@@ Expand Up / @@ -464,6 +464,8 @@ static int tda9887_set_config(struct tda9887 *t, char *buf) @@
     			break;
     		}
     	}
+    	if ((t->config & TDA9887_INTERCARRIER_NTSC) && (t->std & V4L2_STD_NTSC))
+    		buf[1] &= ~cQSS;
     	return 0;
     }
@@ Expand Down @@