Hi, Am Dienstag, den 08.04.2008, 17:33 +0200 schrieb Matthias Schwarzott: > On Dienstag, 8. April 2008, Eduard Huguet wrote: > > Hi, > > Things are very quiet lately regarding this card. Is there any > > possibility that the card gets supported in any near future? I know > > Matthias Schwarzot had been working on it, but there's no messages from > > him lately on the list. > > > > Best regards, > > Eduard > > I did not made any progress since last time we corresponded. > > But: I think we agree that the patch that only adds composite and s-video > support works. > So we could request pulling it into v4l-dvb repository. > > Regards > Matthias > Matthias, attached is your patch after some fixes against checkpatch.pl on "make commit". Hartmut, can you have a look at it and, if no further issues, pull it in? Thanks, Hermann Reviewed-by: Hermann Pitton <hermann.pitton@xxxxxxxx> diff -r 0adfbc117b5b linux/Documentation/video4linux/CARDLIST.saa7134 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 Tue Apr 08 16:28:58 2008 -0300 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 Tue Apr 08 23:45:09 2008 +0200 @@ -138,3 +138,5 @@ 137 -> AVerMedia Hybrid TV/Radio (A16D) 137 -> AVerMedia Hybrid TV/Radio (A16D) [1461:f936] 138 -> Avermedia M115 [1461:a836] 139 -> Compro VideoMate T750 [185b:c900] +140 -> Avermedia DVB-S Pro A700 [1461:a7a1] +141 -> Avermedia DVB-S Hybrid+FM A700 [1461:a7a2] diff -r 0adfbc117b5b linux/drivers/media/video/saa7134/saa7134-cards.c --- a/linux/drivers/media/video/saa7134/saa7134-cards.c Tue Apr 08 16:28:58 2008 -0300 +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c Tue Apr 08 23:42:53 2008 +0200 @@ -4210,7 +4210,47 @@ struct saa7134_board saa7134_boards[] = .name = name_radio, .amux = TV, } - } + }, + [SAA7134_BOARD_AVERMEDIA_A700_PRO] = { + /* Matthias Schwarzott <zzam@xxxxxxxxxx> */ + .name = "Avermedia DVB-S Pro A700", + .audio_clock = 0x00187de7, + .tuner_type = TUNER_ABSENT, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + /* no DVB support for now */ + /* .mpeg = SAA7134_MPEG_DVB, */ + .inputs = {{ + .name = name_comp, + .vmux = 1, + .amux = LINE1, + }, { + .name = name_svideo, + .vmux = 6, + .amux = LINE1, + } }, + }, + [SAA7134_BOARD_AVERMEDIA_A700_HYBRID] = { + /* Matthias Schwarzott <zzam@xxxxxxxxxx> */ + .name = "Avermedia DVB-S Hybrid+FM A700", + .audio_clock = 0x00187de7, + .tuner_type = TUNER_ABSENT, /* TUNER_XC2028 */ + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + /* no DVB support for now */ + /* .mpeg = SAA7134_MPEG_DVB, */ + .inputs = {{ + .name = name_comp, + .vmux = 1, + .amux = LINE1, + }, { + .name = name_svideo, + .vmux = 6, + .amux = LINE1, + } }, + }, }; const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); @@ -5197,6 +5237,18 @@ struct pci_device_id saa7134_pci_tbl[] = .subvendor = 0x185b, .subdevice = 0xc900, .driver_data = SAA7134_BOARD_VIDEOMATE_T750, + }, { + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x1461, /* Avermedia Technologies Inc */ + .subdevice = 0xa7a1, + .driver_data = SAA7134_BOARD_AVERMEDIA_A700_PRO, + }, { + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x1461, /* Avermedia Technologies Inc */ + .subdevice = 0xa7a2, + .driver_data = SAA7134_BOARD_AVERMEDIA_A700_HYBRID, }, { /* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, @@ -5567,6 +5619,16 @@ int saa7134_board_init1(struct saa7134_d saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x8c040007, 0x8c040007); saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x0c0007cd, 0x0c0007cd); break; + case SAA7134_BOARD_AVERMEDIA_A700_PRO: + case SAA7134_BOARD_AVERMEDIA_A700_HYBRID: + /* write windows gpio values */ + saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x80040100, 0x80040100); + saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x80040100, 0x00040100); + printk(KERN_WARNING "%s: %s: hybrid analog/dvb card\n" + "%s: Sorry, only the analog inputs are supported for " + "now.\n", + dev->name, card(dev).name, dev->name); + break; } return 0; } diff -r 0adfbc117b5b linux/drivers/media/video/saa7134/saa7134.h --- a/linux/drivers/media/video/saa7134/saa7134.h Tue Apr 08 16:28:58 2008 -0300 +++ b/linux/drivers/media/video/saa7134/saa7134.h Tue Apr 08 23:01:34 2008 +0200 @@ -268,6 +268,8 @@ struct saa7134_format { #define SAA7134_BOARD_AVERMEDIA_A16D 137 #define SAA7134_BOARD_AVERMEDIA_M115 138 #define SAA7134_BOARD_VIDEOMATE_T750 139 +#define SAA7134_BOARD_AVERMEDIA_A700_PRO 140 +#define SAA7134_BOARD_AVERMEDIA_A700_HYBRID 141 #define SAA7134_MAXBOARDS 8 _______________________________________________ linux-dvb mailing list linux-dvb@xxxxxxxxxxx http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb