diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-09-10 10:30:52 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-09-10 10:30:52 +0000 |
| commit | 55aee0625043a4cc35db2e9fdea83ccad535a835 (patch) | |
| tree | d318e219ddf7b6bd8ff4e5d4df40bfc4f0430930 /linux/drivers/media/video/cx88/cx88.h | |
| parent | 75d984074d45a2a4187ff4aa36a8677de17d1277 (diff) | |
| download | mediapointer-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.h')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 061afebcf..97e03b421 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -1,5 +1,5 @@ /* - * $Id: cx88.h,v 1.78 2005/09/06 21:58:43 catalin Exp $ + * $Id: cx88.h,v 1.79 2005/09/10 10:30:52 mchehab Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -296,6 +296,7 @@ struct cx88_core { u32 audiomode_current; u32 input; u32 astat; + u32 use_nicam; /* IR remote control state */ struct cx88_IR *ir; @@ -558,22 +559,20 @@ extern void cx88_card_setup(struct cx88_core *core); #define WW_NONE 1 #define WW_BTSC 2 -#define WW_NICAM_I 3 -#define WW_NICAM_BGDKL 4 -#define WW_A1 5 -#define WW_A2_BG 6 -#define WW_A2_DK 7 -#define WW_A2_M 8 -#define WW_EIAJ 9 -#define WW_SYSTEM_L_AM 10 -#define WW_I2SPT 11 -#define WW_FM 12 +#define WW_BG 3 +#define WW_DK 4 +#define WW_I 5 +#define WW_L 6 +#define WW_EIAJ 7 +#define WW_I2SPT 8 +#define WW_FM 9 void cx88_set_tvaudio(struct cx88_core *core); void cx88_newstation(struct cx88_core *core); void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t); void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual); int cx88_audio_thread(void *data); +int cx88_detect_nicam(struct cx88_core *core); /* ----------------------------------------------------------- */ /* cx88-input.c */ |