diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-05 02:31:46 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-05 02:31:46 +0000 |
| commit | 612c907e788235feb98ab5fa3f4610f57f588ad7 (patch) | |
| tree | e2e2cd73e8013e94867a1ea3942d40146f8ddc05 /linux/drivers/media/video/cx88/cx88-tvaudio.c | |
| parent | 59f6dfc471e70d46707befa95db7a23472fb90e2 (diff) | |
| download | mediapointer-dvb-s2-612c907e788235feb98ab5fa3f4610f57f588ad7.tar.gz mediapointer-dvb-s2-612c907e788235feb98ab5fa3f4610f57f588ad7.tar.bz2 | |
Several fixes for Hauppauge Roselyn Design (blackbird)
From: Steven Toth <stoth@hauppauge.com>
- This patch adds eeprom awareness for the Roslyn. In effect, the
blackbird will query the tuner V4L2_STD_xxxx definitions to determine
whether it's connected to a NTSC or PAL tuner. Based on that, various
default values will change for blackbird encoding.
- Fixes back panel SVIDEO/COMPOSITE with audio, work properly.
- Fixes a problem with lip sync issues, due to bad framerate vs
audio rate assumptions.
- Fixed a problem with the GPIO configuration in cx88-cards.
- Removed the comments in cx88-cards that made no sense.
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-tvaudio.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-tvaudio.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c index e5190ef96..478723ca5 100644 --- a/linux/drivers/media/video/cx88/cx88-tvaudio.c +++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c @@ -1,5 +1,5 @@ /* - $Id: cx88-tvaudio.c,v 1.50 2005/11/18 20:20:47 mchehab Exp $ + $Id: cx88-tvaudio.c,v 1.51 2005/12/05 02:31:46 mchehab Exp $ cx88x-audio.c - Conexant CX23880/23881 audio downstream driver driver @@ -147,7 +147,11 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) if (cx88_boards[core->board].blackbird) { /* sets sound input from external adc */ - cx_set(AUD_CTL, EN_I2SIN_ENABLE); + if (core->board == CX88_BOARD_HAUPPAUGE_ROSLYN) + cx_clear(AUD_CTL, EN_I2SIN_ENABLE); + else + cx_set(AUD_CTL, EN_I2SIN_ENABLE); + cx_write(AUD_I2SINPUTCNTL, 4); cx_write(AUD_BAUDRATE, 1); /* 'pass-thru mode': this enables the i2s output to the mpeg encoder */ |