diff options
| author | Gerd Knorr <devnull@localhost> | 2004-04-23 09:21:28 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-04-23 09:21:28 +0000 |
| commit | e192917a387304520a2197beaa69425366702689 (patch) | |
| tree | 8ac81c06484b18fd9743e4f76cfeb75f177eed0d /linux/drivers/media/video | |
| parent | 40071535e29c93386ddaff16e75441700568e411 (diff) | |
| download | mediapointer-dvb-s2-e192917a387304520a2197beaa69425366702689.tar.gz mediapointer-dvb-s2-e192917a387304520a2197beaa69425366702689.tar.bz2 | |
- cx88: MSI TVanywhere fixes from dscaler via Michal.
- cx88: fix nicam kernel oops.
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 21 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-tvaudio.c | 4 |
2 files changed, 20 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 69b5c881c..6d125d166 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -150,22 +150,33 @@ struct cx88_board cx88_boards[] = { .vmux = 0, }}, }, - [CX88_BOARD_MSI_TVANYWHERE] = { + [CX88_BOARD_MSI_TVANYWHERE] = { + //added gpio values thanks to Torsten Seeboth + //values for PAL from DScaler .name = "MSI TV-@nywhere Master", .tuner_type = 33, + .needs_tda9887 = 1, .input = {{ .type = CX88_VMUX_TELEVISION, .vmux = 0, + .gpio0 = 0x000040bf, + .gpio1 = 0x000080c0, + .gpio2 = 0x0000ff40, + .gpio3 = 0x00000000, },{ .type = CX88_VMUX_COMPOSITE1, .vmux = 1, - },{ - // temporarly for testing ... - .type = CX88_VMUX_COMPOSITE2, - .vmux = 2, + .gpio0 = 0x000040bf, + .gpio1 = 0x000080c0, + .gpio2 = 0x0000ff40, + .gpio3 = 0x00000000, },{ .type = CX88_VMUX_SVIDEO, .vmux = 2, + .gpio0 = 0x000040bf, + .gpio1 = 0x000080c0, + .gpio2 = 0x0000ff40, + .gpio3 = 0x00000000, }}, .radio = { .type = CX88_RADIO, diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c index 25d83e754..1e4479326 100644 --- a/linux/drivers/media/video/cx88/cx88-tvaudio.c +++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c @@ -305,11 +305,15 @@ static void set_audio_standard_NICAM(struct cx8800_dev *dev) { AUD_PDF_DDS_CNST_BYTE0, 0x12 }, { AUD_PHACC_FREQ_8MSB, 0x3a }, { AUD_PHACC_FREQ_8LSB, 0x93 }, + + { /* end of list */ }, }; static const struct rlist nicam_default[] = { { AUD_PDF_DDS_CNST_BYTE0, 0x16 }, { AUD_PHACC_FREQ_8MSB, 0x34 }, { AUD_PHACC_FREQ_8LSB, 0x4c }, + + { /* end of list */ }, }; set_audio_start(dev, 0x0010, |