diff options
| author | Gerd Knorr <devnull@localhost> | 2004-06-07 13:22:29 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-06-07 13:22:29 +0000 |
| commit | 0df8b50070b410cb439ddf590c05f8998778fb3e (patch) | |
| tree | 0084ce0c11cb4fbd2ce5468b2ea8311ede40dc70 /linux/drivers/media/video/cx88 | |
| parent | 70ff74cdfade32fc3e6563db50fe9d012f33dbc3 (diff) | |
| download | mediapointer-dvb-s2-0df8b50070b410cb439ddf590c05f8998778fb3e.tar.gz mediapointer-dvb-s2-0df8b50070b410cb439ddf590c05f8998778fb3e.tar.bz2 | |
- added more cards to cx88 + bttv, this time tried to compile before
commit Anja ;)
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 20 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 2 |
2 files changed, 20 insertions, 2 deletions
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, |