diff options
| author | Hartmut Hackmann <devnull@localhost> | 2006-01-31 02:21:58 +0200 |
|---|---|---|
| committer | Hartmut Hackmann <devnull@localhost> | 2006-01-31 02:21:58 +0200 |
| commit | aa1d594271944fd82c2cd1c61ef2ef749932d38b (patch) | |
| tree | 7b0b2648185c06635bd83cbca10695b360eba2b9 | |
| parent | abd757d0632ef14ecb2ca1ed27e16f54e982bd91 (diff) | |
| download | mediapointer-dvb-s2-aa1d594271944fd82c2cd1c61ef2ef749932d38b.tar.gz mediapointer-dvb-s2-aa1d594271944fd82c2cd1c61ef2ef749932d38b.tar.bz2 | |
Allow SAA7134 to fall back to AM sound when there is NICAM-L
From: Hartmut Hackmann <hartmut.hackmann@t-online.de>
This patch allows to select AM sound even if NICAM is detected.
Proposed by Alain Frappin
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-tvaudio.c | 14 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c index bbf145b74..ccf3ea2b3 100644 --- a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c +++ b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c @@ -142,6 +142,12 @@ static struct saa7134_tvaudio tvaudio[] = { .carr2 = 5850, .mode = TVAUDIO_NICAM_AM, },{ + .name = "SECAM-L MONO", + .std = V4L2_STD_SECAM, + .carr1 = 6500, + .carr2 = -1, + .mode = TVAUDIO_AM_MONO, + },{ .name = "SECAM-D/K", .std = V4L2_STD_SECAM, .carr1 = 6500, @@ -336,6 +342,12 @@ static void tvaudio_setmode(struct saa7134_dev *dev, saa_writeb(SAA7134_STEREO_DAC_OUTPUT_SELECT, 0xa1); saa_writeb(SAA7134_NICAM_CONFIG, 0x00); break; + case TVAUDIO_AM_MONO: + saa_writeb(SAA7134_DEMODULATOR, 0x12); + saa_writeb(SAA7134_DCXO_IDENT_CTRL, 0x00); + saa_writeb(SAA7134_FM_DEEMPHASIS, 0x44); + saa_writeb(SAA7134_STEREO_DAC_OUTPUT_SELECT, 0xa0); + break; case TVAUDIO_FM_SAT_STEREO: /* not implemented (yet) */ break; @@ -438,6 +450,7 @@ static int tvaudio_getstereo(struct saa7134_dev *dev, struct saa7134_tvaudio *au switch (audio->mode) { case TVAUDIO_FM_MONO: + case TVAUDIO_AM_MONO: return V4L2_TUNER_SUB_MONO; case TVAUDIO_FM_K_STEREO: case TVAUDIO_FM_BG_STEREO: @@ -504,6 +517,7 @@ static int tvaudio_setstereo(struct saa7134_dev *dev, struct saa7134_tvaudio *au switch (audio->mode) { case TVAUDIO_FM_MONO: + case TVAUDIO_AM_MONO: /* nothing to do ... */ break; case TVAUDIO_FM_K_STEREO: diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 0a93d0167..c6780aeab 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -68,6 +68,7 @@ enum saa7134_tvaudio_mode { TVAUDIO_FM_K_STEREO = 4, TVAUDIO_NICAM_AM = 5, TVAUDIO_NICAM_FM = 6, + TVAUDIO_AM_MONO = 7 }; enum saa7134_audio_in { |