diff options
author | Mauro Carvalho Chehab <devnull@localhost> | 2005-08-30 17:52:33 +0000 |
---|---|---|
committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-08-30 17:52:33 +0000 |
commit | dd2ac1c45dacc0ace8b20091fd156ede662878fe (patch) | |
tree | 507f91ad7e640d39c3faf641b240213ce601de81 /linux/drivers/media/video/cx88/cx88.h | |
parent | e45b15bf72002c473a0e621ff96b0787a8d5267b (diff) | |
download | mediapointer-dvb-s2-dd2ac1c45dacc0ace8b20091fd156ede662878fe.tar.gz mediapointer-dvb-s2-dd2ac1c45dacc0ace8b20091fd156ede662878fe.tar.bz2 |
* cx88-core.c: (set_tvaudio):
* cx88-tvaudio.c: (set_audio_standard_NICAM),
(set_audio_standard_A2), (set_audio_standard_FM),
(cx88_detect_nicam), (cx88_set_tvaudio), (cx88_newstation),
(cx88_set_stereo):
* cx88.h:
- Added nicam autodetection for PAL B/G/D/K/I/L.
If it fails then falls back to fm / am mono audio.
- Added debug messages about detecting state.
- 'set_audio_standard_NICAM_L' and 'set_audio_standard_PAL_I'
moved to 'set_audio_standard_A2' and 'set_audio_standard_NICAM'
for cleaner code.
- Changed some WW_xx values for better handling.
- Added 'use_nicam' to 'core' to save nicam detecting state for
later use in 'cx88_set_stereo'.
- Not working:
- Auto fall back to fm / am mono if transmitting quality goes bad.
- A2 dual fm stereo auto detecting.
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 b97dda941..385436b07 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.74 2005/08/16 16:29:52 catalin Exp $ + * $Id: cx88.h,v 1.75 2005/08/30 17:52:33 mchehab Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -282,6 +282,7 @@ struct cx88_core { unsigned char radio_addr; unsigned int tda9887_conf; unsigned int has_radio; + unsigned int use_nicam; /* config info -- dvb */ struct dvb_pll_desc *pll_desc; @@ -545,22 +546,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 */ |