summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88/cx88-core.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-09-10 10:30:52 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-09-10 10:30:52 +0000
commit55aee0625043a4cc35db2e9fdea83ccad535a835 (patch)
treed318e219ddf7b6bd8ff4e5d4df40bfc4f0430930 /linux/drivers/media/video/cx88/cx88-core.c
parent75d984074d45a2a4187ff4aa36a8677de17d1277 (diff)
downloadmediapointer-dvb-s2-55aee0625043a4cc35db2e9fdea83ccad535a835.tar.gz
mediapointer-dvb-s2-55aee0625043a4cc35db2e9fdea83ccad535a835.tar.bz2
- some clean up in cx88-tvaudio.c
- replaced hex values when writing to AUD_CTL to EN_xx for better reading. - Moved writing to register AUD_CTL from "set_audio_start" to "set_audio_finish". - Changed the order of writing Lang2 to work correctly - Added an "#if 0" to comment out existing code in "cx88_get_stereo" because simply reading from register "AUD_STATUS" is _not_ enough to auto-detect btsc-sap, dual-fm-stereo or nicam. It is simply not working. - Using "EN_A2_AUTO_STEREO" does not work. - Allow select by hand between Mono, Lang1, Lang2 and Stereo. - *Bad side effect* is now if I'm selecting for example stereo but it is not supported from tv-channel I'm currently receiving loud noise. Signed-off-by: Torsten Seeboth <Torsten.Seeboth@t-online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-core.c')
-rw-r--r--linux/drivers/media/video/cx88/cx88-core.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c
index d2102d5d6..b42f8a42e 100644
--- a/linux/drivers/media/video/cx88/cx88-core.c
+++ b/linux/drivers/media/video/cx88/cx88-core.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-core.c,v 1.40 2005/09/07 01:03:03 mkrufky Exp $
+ * $Id: cx88-core.c,v 1.41 2005/09/10 10:30:52 mchehab Exp $
*
* device driver for Conexant 2388x based TV cards
* driver core
@@ -878,19 +878,19 @@ static int set_tvaudio(struct cx88_core *core)
return 0;
if (V4L2_STD_PAL_BG & norm->id) {
- core->tvaudio = nicam ? WW_NICAM_BGDKL : WW_A2_BG;
+ core->tvaudio = WW_BG;
} else if (V4L2_STD_PAL_DK & norm->id) {
- core->tvaudio = nicam ? WW_NICAM_BGDKL : WW_A2_DK;
+ core->tvaudio = WW_DK;
} else if (V4L2_STD_PAL_I & norm->id) {
- core->tvaudio = WW_NICAM_I;
+ core->tvaudio = WW_I;
} else if (V4L2_STD_SECAM_L & norm->id) {
- core->tvaudio = WW_SYSTEM_L_AM;
+ core->tvaudio = WW_L;
} else if (V4L2_STD_SECAM_DK & norm->id) {
- core->tvaudio = WW_A2_DK;
+ core->tvaudio = WW_DK;
} else if ((V4L2_STD_NTSC_M & norm->id) ||
(V4L2_STD_PAL_M & norm->id)) {