diff options
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 22 | ||||
| -rw-r--r-- | linux/drivers/media/video/bttv.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 20 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/ir-kbd-i2c.c | 1 |
5 files changed, 43 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index 14654be4a..2a8c3f384 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -184,6 +184,7 @@ static struct CARD { { 0xff00bd11, BTTV_PINNACLE, "Pinnacle PCTV [bswap]" }, { 0x3000121a, BTTV_VOODOOTV_FM, "3Dfx VoodooTV FM/ VoodooTV 200" }, + { 0x263710b4, BTTV_VOODOOTV_FM, "3Dfx VoodooTV FM/ VoodooTV 200" }, { 0x3060121a, BTTV_STB2, "3Dfx VoodooTV 100/ STB OEM" }, { 0x3000144f, BTTV_MAGICTVIEW063, "(Askey Magic/others) TView99 CPH06x" }, @@ -297,6 +298,7 @@ static struct CARD { { 0x002611bd, BTTV_TWINHAN_DST, "Pinnacle PCTV SAT CI" }, { 0x00011822, BTTV_TWINHAN_DST, "Twinhan VisionPlus DVB-T" }, { 0xfc00270f, BTTV_TWINHAN_DST, "ChainTech digitop DST-1000 DVB-S" }, + { 0x07711461, BTTV_AVDVBT_771, "AVermedia DVB-T 771" }, { 0, -1, NULL } }; @@ -2053,9 +2055,26 @@ struct tvcard bttv_tvcards[] = { .gpiomask = 0x0000000f, .muxsel = { 2, 1, 1 }, .audiomux = { 0x02, 0x00, 0x00, 0x00, 0x00}, - .tuner_type = TEMIC_PAL, + .tuner_type = TUNER_TEMIC_PAL, .no_msp34xx = 1, .no_tda9875 = 1, +},{ + /* Wolfram Joost <wojo@frokaschwei.de> */ + .name = "AVerMedia AVerTV DVB-T 771", + .video_inputs = 2, + .svhs = 1, + .tuner = -1, + .tuner_type = TUNER_ABSENT, + .muxsel = { 3 , 3 }, + .no_msp34xx = 1, + .no_tda9875 = 1, + .no_tda7432 = 1, + .pll = PLL_28, + .has_dvb = 1, + .no_gpioirq = 1, +#if 0 /* untested */ + .has_remote = 1, +#endif }}; const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); @@ -2425,6 +2444,7 @@ void __devinit bttv_init_card1(struct bttv *btv) pvr_boot(btv); break; case BTTV_TWINHAN_DST: + case BTTV_AVDVBT_771: btv->use_i2c_hw = 1; break; } diff --git a/linux/drivers/media/video/bttv.h b/linux/drivers/media/video/bttv.h index ea108693c..9d820f6be 100644 --- a/linux/drivers/media/video/bttv.h +++ b/linux/drivers/media/video/bttv.h @@ -125,6 +125,7 @@ #define BTTV_NGSTV_PLUS 0x75 #define BTTV_LMLBT4 0x76 #define BTTV_PICOLO_TETRA_CHIP 0x79 +#define BTTV_AVDVBT_771 0x7b /* i2c address list */ #define I2C_TSA5522 0xc2 diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index adcb6c051..04e47ad95 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -248,6 +248,20 @@ struct cx88_board cx88_boards[] = { .gpio0 = 0xff00, }, }, + [CX88_BOARD_ASUS_PVR_416] = { + .name = "ASUS PVR-416", + .tuner_type = 43, + .input = {{ + .type = CX88_VMUX_TELEVISION, + .vmux = 0, + },{ + .type = CX88_VMUX_SVIDEO, + .vmux = 2, + }}, + .radio = { + .type = CX88_RADIO, + }, + }, }; const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); @@ -307,6 +321,10 @@ struct cx88_subid cx88_subids[] = { .subvendor = 0x10fc, .subdevice = 0xd003, .card = CX88_BOARD_IODATA_GVVCP3PCI, + },{ + .subvendor = 0x1043, + .subdevice = 0x4823, /* with mpeg encoder */ + .card = CX88_BOARD_ASUS_PVR_416, } }; const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); @@ -518,7 +536,7 @@ void cx88_card_list(struct cx8800_dev *dev) 0 == dev->pci->subsystem_device) { printk("%s: Your board has no valid PCI Subsystem ID and thus can't\n" "%s: be autodetected. Please pass card=<n> insmod option to\n" - "%s: workaround that. Redirect complains to the vendor of\n" + "%s: workaround that. Redirect complaints to the vendor of\n" "%s: the TV card. Best regards,\n" "%s: -- tux\n", dev->name,dev->name,dev->name,dev->name,dev->name); diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 35750ce23..c5cb76bfa 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -143,7 +143,7 @@ extern struct sram_channel cx88_sram_channels[]; #define CX88_BOARD_LEADTEK_PVR2000 9 #define CX88_BOARD_IODATA_GVVCP3PCI 10 #define CX88_BOARD_PROLINK_PLAYTVPVR 11 - +#define CX88_BOARD_ASUS_PVR_416 12 enum cx88_itype { CX88_VMUX_COMPOSITE1 = 1, diff --git a/linux/drivers/media/video/ir-kbd-i2c.c b/linux/drivers/media/video/ir-kbd-i2c.c index c5e5380a1..c00043a2e 100644 --- a/linux/drivers/media/video/ir-kbd-i2c.c +++ b/linux/drivers/media/video/ir-kbd-i2c.c @@ -77,6 +77,7 @@ static IR_KEYTAB_TYPE ir_codes_pv951[IR_KEYTAB_SIZE] = { [ 15 ] = KEY_SELECT, // SOURCE [ 10 ] = KEY_KPPLUS, // +100 [ 20 ] = KEY_KPEQUAL, // SYNC + [ 28 ] = KEY_MEDIA, // PC/TV }; static IR_KEYTAB_TYPE ir_codes_purpletv[IR_KEYTAB_SIZE] = { |