diff options
| author | Michael Krufky <devnull@localhost> | 2005-07-28 05:21:59 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-07-28 05:21:59 +0000 |
| commit | 1ffd9bad4966ec5f8bd8596163cd896ee5b97c9e (patch) | |
| tree | 3ac54801b042b6a091afc3d0129ad10de6f68aa3 | |
| parent | b0adc4b04d22a8c00c62b18c845a35d7f5fc448f (diff) | |
| download | mediapointer-dvb-s2-1ffd9bad4966ec5f8bd8596163cd896ee5b97c9e.tar.gz mediapointer-dvb-s2-1ffd9bad4966ec5f8bd8596163cd896ee5b97c9e.tar.bz2 | |
* bttv-cards.c, bttv.h:
- Added card DViCO FusionHDTV5 Lite.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.bttv | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 21 | ||||
| -rw-r--r-- | linux/drivers/media/video/bttv.h | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 6 |
4 files changed, 28 insertions, 3 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.bttv b/linux/Documentation/video4linux/CARDLIST.bttv index 62a12a08e..1330fa48f 100644 --- a/linux/Documentation/video4linux/CARDLIST.bttv +++ b/linux/Documentation/video4linux/CARDLIST.bttv @@ -133,3 +133,4 @@ card=131 - Tibet Systems 'Progress DVR' CS16 card=132 - Kodicom 4400R (master) card=133 - Kodicom 4400R (slave) card=134 - Adlink RTV24 +card=135 - DVICO FusionHDTV 5 Lite diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index f1e35c534..e1a22c53e 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -1,5 +1,5 @@ /* - $Id: bttv-cards.c,v 1.55 2005/07/28 02:42:28 mkrufky Exp $ + $Id: bttv-cards.c,v 1.56 2005/07/28 05:21:59 mkrufky Exp $ bttv-cards.c @@ -312,6 +312,7 @@ static struct CARD { { 0xfc00270f, BTTV_TWINHAN_DST, "ChainTech digitop DST-1000 DVB-S" }, { 0x07711461, BTTV_AVDVBT_771, "AVermedia AverTV DVB-T 771" }, { 0xdb1018ac, BTTV_DVICO_DVBT_LITE, "DVICO FusionHDTV DVB-T Lite" }, + { 0xd50018ac, BTTV_DVICO_FUSIONHDTV_5_LITE, "DVICO FusionHDTV 5 Lite" }, { 0, -1, NULL } }; @@ -2281,7 +2282,23 @@ struct tvcard bttv_tvcards[] = { .muxsel = { 2, 3, 1, 0}, .tuner_type = -1, .pll = PLL_28, - +}, +{ + /* ---- card 0x87---------------------------------- */ + /* Michael Krufky <mkrufky@m1k.net> + * FIXME - Audio doesn't work + */ + .name = "DVICO FusionHDTV 5 Lite", + .tuner = 0, + .tuner_type = TUNER_LG_TDVS_H062F, + .video_inputs = 2, + .audio_inputs = 1, + .needs_tvaudio = 1, + .svhs = 2, + .muxsel = { 2, 3, 1, 1}, +#if 0 + .has_dvb = 1, +#endif }}; static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); diff --git a/linux/drivers/media/video/bttv.h b/linux/drivers/media/video/bttv.h index 5af0300cb..84c3098eb 100644 --- a/linux/drivers/media/video/bttv.h +++ b/linux/drivers/media/video/bttv.h @@ -1,5 +1,5 @@ /* - * $Id: bttv.h,v 1.18 2005/05/24 23:41:42 nsh Exp $ + * $Id: bttv.h,v 1.19 2005/07/28 05:21:59 mkrufky Exp $ * * bttv - Bt848 frame grabber driver * @@ -155,6 +155,7 @@ #define I2C_TEA6300 0x80 /* also used by 6320 */ #define I2C_DPL3518 0x84 #define I2C_TDA9887 0x86 +#define BTTV_DVICO_FUSIONHDTV_5_LITE 0x87 /* more card-specific defines */ #define PT2254_L_CHANNEL 0x10 diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 8861c89f7..54e75ad8f 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,9 @@ +2005-07-28 05:19 mkrufky + * bttv-cards.c, bttv.h: + - Added card DViCO FusionHDTV5 Lite. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-07-27 18:47 mkrufky * cx88-dvb.c: - Correct PLL programming for FusionHDTV5 Gold. |