diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/tda9887.c | 2 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 12 |
4 files changed, 17 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 2adcd5b29..662cf9f79 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-cards.c,v 1.99 2005/10/11 05:20:47 mkrufky Exp $ + * $Id: cx88-cards.c,v 1.100 2005/10/15 13:13:41 nsh Exp $ * * device driver for Conexant 2388x based TV cards * card-specific stuff. @@ -208,7 +208,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/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c index 0cd27d331..6d5e9ef46 100644 --- a/linux/drivers/media/video/tda9887.c +++ b/linux/drivers/media/video/tda9887.c @@ -472,6 +472,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/linux/include/media/tuner.h b/linux/include/media/tuner.h index 2e7866e00..9cc9cf396 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -1,4 +1,4 @@ -/* $Id: tuner.h,v 1.55 2005/10/05 04:19:55 mkrufky Exp $ +/* $Id: tuner.h,v 1.56 2005/10/15 13:13:42 nsh Exp $ * tuner.h - definition for different tuners @@ -149,6 +149,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) diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 5191255b6..ad0e82de0 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-10-15 13:11 nshmyrev + + * ../linux/drivers/media/video/cx88/cx88-cards.c: + * ../linux/drivers/media/video/tda9887.c: (tda9887_set_config): + * ../linux/include/media/tuner.h: + - New config option for tda9887 to specifically set intercarrier + depending on current standard and card. + + Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> + 2005-10-15 12:08 nshmyrev * ../linux/Documentation/video4linux/CARDLIST.bttv: @@ -6,7 +16,7 @@ Added Asound Skyeye bttv card. - Signed-off-by: Nickolay V. Shmyrev <<nshmyrev@yandex.ru>> + Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> 2005-10-15 09:19 nshmyrev |