diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-05-29 13:16:20 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-05-29 13:16:20 -0400 |
| commit | cdaa31f6661f202b2a9cf658e88296be5417e531 (patch) | |
| tree | 964fd6e2aef9927308ad79b80d4c48ba008eb722 | |
| parent | 6bafb5d5309de9f52c56c8938be8baa35518ad7f (diff) | |
| parent | 3549c2c092a447c2c5bf1269f21b858acc4babdc (diff) | |
| download | mediapointer-dvb-s2-cdaa31f6661f202b2a9cf658e88296be5417e531.tar.gz mediapointer-dvb-s2-cdaa31f6661f202b2a9cf658e88296be5417e531.tar.bz2 | |
merge from ~mkrufky/trivial
From: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.bttv | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-cards.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 8 |
3 files changed, 4 insertions, 9 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.bttv b/linux/Documentation/video4linux/CARDLIST.bttv index b72706c58..b8dde0fb9 100644 --- a/linux/Documentation/video4linux/CARDLIST.bttv +++ b/linux/Documentation/video4linux/CARDLIST.bttv @@ -87,7 +87,7 @@ 86 -> Osprey 101/151 w/ svid 87 -> Osprey 200/201/250/251 88 -> Osprey 200/250 [0070:ff01] - 89 -> Osprey 210/220 + 89 -> Osprey 210/220/230 90 -> Osprey 500 [0070:ff02] 91 -> Osprey 540 [0070:ff04] 92 -> Osprey 2000 [0070:ff03] diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c index 909084515..8dab6b9b1 100644 --- a/linux/drivers/media/video/bt8xx/bttv-cards.c +++ b/linux/drivers/media/video/bt8xx/bttv-cards.c @@ -1926,7 +1926,7 @@ struct tvcard bttv_tvcards[] = { .no_tda7432 = 1, }, [BTTV_BOARD_OSPREY2x0] = { - .name = "Osprey 210/220", /* 0x1(A|B)-04C0-C1 */ + .name = "Osprey 210/220/230", /* 0x1(A|B)-04C0-C1 */ .video_inputs = 2, .audio_inputs = 1, .tuner = -1, @@ -3826,6 +3826,7 @@ static void __devinit osprey_eeprom(struct bttv *btv) break; case 0x0060: case 0x0070: + case 0x00A0: btv->c.type = BTTV_BOARD_OSPREY2x0; /* enable output on select control lines */ gpio_inout(0xffffff,0x000303); diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 06dd9f282..e09b3c37e 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1051,11 +1051,7 @@ struct cx88_board cx88_boards[] = { .dvb = 1, }, [CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT] = { - /* FIXME: Standard video using the cx88 broadcast decoder is - * working, but blackbird isn't working yet, audio is only - * working correctly for television mode. S-Video and Composite - * are working for video-only, so I have them disabled for now. - */ + /* FIXME: Audio not working for s-video / composite inputs. */ .name = "KWorld HardwareMpegTV XPert", .tuner_type = TUNER_PHILIPS_TDA8290, .radio_type = UNSET, @@ -1066,7 +1062,6 @@ struct cx88_board cx88_boards[] = { .vmux = 0, .gpio0 = 0x3de2, .gpio2 = 0x00ff, -#if 0 },{ .type = CX88_VMUX_COMPOSITE1, .vmux = 1, @@ -1075,7 +1070,6 @@ struct cx88_board cx88_boards[] = { .type = CX88_VMUX_SVIDEO, .vmux = 2, .gpio0 = 0x3de6, -#endif }}, .radio = { .type = CX88_RADIO, |