diff options
| author | darron@kewl.org <darron@kewl.org> | 2008-10-30 07:53:07 +0000 |
|---|---|---|
| committer | darron@kewl.org <darron@kewl.org> | 2008-10-30 07:53:07 +0000 |
| commit | 5a55bcc93f549b3db2df8029f040487352ab9759 (patch) | |
| tree | 75d9b2073f54ce2055662a52b012a4b0d07063d2 /linux/drivers/media | |
| parent | e6404f328c9bf8ea423b3e78078dcba7fec4fcb8 (diff) | |
| download | mediapointer-dvb-s2-5a55bcc93f549b3db2df8029f040487352ab9759.tar.gz mediapointer-dvb-s2-5a55bcc93f549b3db2df8029f040487352ab9759.tar.bz2 | |
tda9887/cx88: secam-bgh
From: Frederic CAND <frederic.cand@anevia.com>
Adds secam bgh support
Signed-off-by: Frederic CAND <frederic.cand@anevia.com>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/common/tuners/tda9887.c | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/linux/drivers/media/common/tuners/tda9887.c b/linux/drivers/media/common/tuners/tda9887.c index effbf31da..8df82bfab 100644 --- a/linux/drivers/media/common/tuners/tda9887.c +++ b/linux/drivers/media/common/tuners/tda9887.c @@ -181,11 +181,10 @@ static struct tvnorm tvnorms[] = { },{ .std = V4L2_STD_SECAM_B | V4L2_STD_SECAM_G | V4L2_STD_SECAM_H, .name = "SECAM-BGH", - .b = ( cPositiveAmTV | + .b = ( cNegativeFmTV | cQSS ), .c = ( cTopDefault), - .e = ( cGating_36 | - cAudioIF_5_5 | + .e = ( cAudioIF_5_5 | cVideoIF_38_90 ), },{ .std = V4L2_STD_SECAM_L, diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index b2f6dc5c3..c9de13b56 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -869,6 +869,9 @@ static int set_tvaudio(struct cx88_core *core) } else if (V4L2_STD_SECAM_L & norm) { core->tvaudio = WW_L; + } else if ((V4L2_STD_SECAM_B | V4L2_STD_SECAM_G | V4L2_STD_SECAM_H) & norm) { + core->tvaudio = WW_BG; + } else if (V4L2_STD_SECAM_DK & norm) { core->tvaudio = WW_DK; diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 164e3453d..922cfba3b 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -59,7 +59,8 @@ V4L2_STD_NTSC_M| V4L2_STD_NTSC_M_JP| V4L2_STD_NTSC_443 | \ V4L2_STD_PAL_BG| V4L2_STD_PAL_DK | V4L2_STD_PAL_I | \ V4L2_STD_PAL_M | V4L2_STD_PAL_N | V4L2_STD_PAL_Nc | \ - V4L2_STD_PAL_60| V4L2_STD_SECAM_L | V4L2_STD_SECAM_DK ) + V4L2_STD_PAL_60| V4L2_STD_SECAM_L | V4L2_STD_SECAM_DK | \ + V4L2_STD_SECAM_B| V4L2_STD_SECAM_G | V4L2_STD_SECAM_H ) #define FORMAT_FLAGS_PACKED 0x01 #define FORMAT_FLAGS_PLANAR 0x02 |