diff options
| author | Michael Krufky <devnull@localhost> | 2005-10-12 03:16:15 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-10-12 03:16:15 +0000 |
| commit | 4bb3fbe1741d0b0e1f04eab0558c60435f847d98 (patch) | |
| tree | 5469ae37065a0fa7150faf08887fabfd09627a95 | |
| parent | 9d6677c418f8e234604e137f851851419a5f80da (diff) | |
| download | mediapointer-dvb-s2-4bb3fbe1741d0b0e1f04eab0558c60435f847d98.tar.gz mediapointer-dvb-s2-4bb3fbe1741d0b0e1f04eab0558c60435f847d98.tar.bz2 | |
- Added card 75 AVerMedia AVerTVHD MCE A180
s-video and composite inputs only.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.saa7134 | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 26 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
4 files changed, 38 insertions, 2 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134 index 57439d081..3bcfd8892 100644 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 @@ -73,3 +73,4 @@ 72 -> RTD Embedded Technologies VFG7350 [1435:7350] 73 -> RTD Embedded Technologies VFG7330 [1435:7330] 74 -> LifeView FlyTV Platinum Mini2 [14c0:1212] + 75 -> AVerMedia AVerTVHD MCE A180 [1461:1044] diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 15238cb2c..8eb325871 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-cards.c,v 1.100 2005/10/06 18:12:51 nsh Exp $ + * $Id: saa7134-cards.c,v 1.101 2005/10/12 03:16:15 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -2352,6 +2352,24 @@ struct saa7134_board saa7134_boards[] = { .amux = LINE2, }}, }, + [SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180] = { + /* FIXME: uses Alps Electric TDHU2, containing ATI NXT2004 ATSC Decoder */ + .name = "AVerMedia AVerTVHD MCE A180", + .audio_clock = 0x00187de7, + .tuner_type = TUNER_ABSENT, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .inputs = {{ + .name = name_comp1, + .vmux = 3, + .amux = LINE2, + },{ + .name = name_svideo, + .vmux = 8, + .amux = LINE2, + }}, + }, }; const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); @@ -2758,6 +2776,12 @@ struct pci_device_id saa7134_pci_tbl[] = { .subdevice = 0x7330, .driver_data = SAA7134_BOARD_RTD_VFG7330, },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x1461, + .subdevice = 0x1044, + .driver_data = SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180, + },{ /* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134, diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index b249f8778..028becb77 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -1,5 +1,5 @@ /* - * $Id: saa7134.h,v 1.64 2005/10/12 00:56:18 mkrufky Exp $ + * $Id: saa7134.h,v 1.65 2005/10/12 03:16:15 mkrufky Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -208,6 +208,7 @@ struct saa7134_format { #define SAA7134_BOARD_RTD_VFG7350 72 #define SAA7134_BOARD_RTD_VFG7330 73 #define SAA7134_BOARD_FLYTVPLATINUM_MINI2 74 +#define SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180 75 #define SAA7134_MAXBOARDS 8 #define SAA7134_INPUT_MAX 8 diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 985a0d777..05e9e077a 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-10-12 03:11 mkrufky + + * ../linux/Documentation/video4linux/CARDLIST.saa7134: + * ../linux/drivers/media/video/saa7134/saa7134-cards.c: + * ../linux/drivers/media/video/saa7134/saa7134.h: + - Added card 75 AVerMedia AVerTVHD MCE A180 + s-video and composite inputs only. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-12 00:52 mkrufky * ../linux/drivers/media/video/saa7134/saa7134.h: |