Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 102961 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-5 / +58 lines)
Line  Link Here
0
-- linux-2.6.12/drivers/media/video/saa7134/saa7134-cards.c.gotview    2005-06-17 22:48:29.000000000 +0300
0
++ linux-2.6.12/drivers/media/video/saa7134/saa7134-cards.c    2005-07-26 19:13:45.000000000 +0300
Lines 1546-1551 struct saa7134_board saa7134_boards[] = Link Here
1546
//                     .gpio = 0x4000,
1546
//                     .gpio = 0x4000,
1547
               }},
1547
               }},
1548
       },
1548
       },
1549
       [SAA7135_BOARD_GOTVIEW_7135] = {
1550
               /* Andrey Cvetcov <ays14@yandex.ru> */
1551
               .name = "GoTview 7135 PCI",
1552
               .audio_clock = 0x00187de7,
1553
               .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
1554
               /* We need to comment this */
1555
//             .tda9887_conf = TDA9887_PRESENT,
1556
               .gpiomask= 0x00200003,
1557
               .inputs = {{
1558
                       .name = name_tv,
1559
                       .vmux = 1,              /* It's true */
1560
                       .amux = TV,             /* Use TV instead LINE0 - BigBiker <adminbsd@gmail.com> */
1561
                       .gpio = 0x00200003,
1562
                       .tv = 1,
1563
               },{
1564
                       .name = name_comp1,     /* Composite signal on S-Video input */
1565
                       .vmux = 3,
1566
                       .amux = LINE1,
1567
                       .gpio = 0x00200003,
1568
               },{
1569
                       .name = name_comp2,     /* Composite Input */
1570
                       .vmux = 8,
1571
                       .amux = LINE1,
1572
                       .gpio = 0x00200003,
1573
               },{
1574
                       .name = name_tv_mono,   /* TV - mono only */
1575
                       .vmux = 1,
1576
                       .amux = LINE2,
1577
                       .gpio = 0x00200003,
1578
               }},
1579
               .radio = {
1580
                       .name = name_radio,
1581
//                     .vmux = TV,
1582
                       .vmux = 1,
1583
                       .amux = LINE2,
1584
                       .gpio = 0x00200003,
1585
               },
1586
       },
1587
                                                                                                                 
1549
};
1588
};
1550
const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
1589
const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
1551
1590
Lines 1846-1851 struct pci_device_id saa7134_pci_tbl[] = Link Here
1846
               .driver_data  = SAA7134_BOARD_FLYDVBTDUO,
1885
               .driver_data  = SAA7134_BOARD_FLYDVBTDUO,
1847
1886
1848
       },{
1887
       },{
1888
               .vendor       = 0x1131,
1889
               .device       = 0x7133,
1890
               .subvendor    = 0x5456, /* GoTView */
1891
               .subdevice    = 0x7135, /* Model PCI 7135 */
1892
               .driver_data  = SAA7135_BOARD_GOTVIEW_7135
1893
       },{
1849
               /* --- boards without eeprom + subsystem ID --- */
1894
               /* --- boards without eeprom + subsystem ID --- */
1850
                .vendor       = PCI_VENDOR_ID_PHILIPS,
1895
                .vendor       = PCI_VENDOR_ID_PHILIPS,
1851
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
1896
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
Lines 1965-1970 int saa7134_board_init1(struct saa7134_d Link Here
1965
       case SAA7134_BOARD_AVERMEDIA_305:
2010
       case SAA7134_BOARD_AVERMEDIA_305:
1966
       case SAA7134_BOARD_AVERMEDIA_307:
2011
       case SAA7134_BOARD_AVERMEDIA_307:
1967
//     case SAA7134_BOARD_SABRENT_SBTTVFM:  /* not finished yet */
2012
//     case SAA7134_BOARD_SABRENT_SBTTVFM:  /* not finished yet */
2013
       case SAA7135_BOARD_GOTVIEW_7135:
1968
       case SAA7134_BOARD_VIDEOMATE_TV_PVR:
2014
       case SAA7134_BOARD_VIDEOMATE_TV_PVR:
1969
               dev->has_remote = 1;
2015
               dev->has_remote = 1;
1970
               break;
2016
               break;
1971
-- linux-2.6.12/drivers/media/video/saa7134/saa7134-input.c.gotview    2005-06-17 22:48:29.000000000 +0300
2017
++ linux-2.6.12/drivers/media/video/saa7134/saa7134-input.c    2005-07-26 18:56:20.000000000 +0300
Lines 415-420 int saa7134_input_init1(struct saa7134_d Link Here
415
               saa_setb(SAA7134_GPIO_GPMODE0, 0x4);
415
               saa_setb(SAA7134_GPIO_GPMODE0, 0x4);
416
               saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
416
               saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
417
               break;
417
               break;
418
       case SAA7135_BOARD_GOTVIEW_7135:
419
               ir_codes     = md2819_codes;
420
               mask_keycode = 0x0007C8;
421
               mask_keydown = 0x000010;
422
               polling      = 50; // ms
423
               break;
418
       case SAA7134_BOARD_VIDEOMATE_TV_PVR:
424
       case SAA7134_BOARD_VIDEOMATE_TV_PVR:
419
               ir_codes     = videomate_tv_pvr_codes;
425
               ir_codes     = videomate_tv_pvr_codes;
420
               mask_keycode = 0x00003F;
426
               mask_keycode = 0x00003F;
421
-- linux-2.6.12/drivers/media/video/saa7134/saa7134.h.gotview  2005-06-17 22:48:29.000000000 +0300
427
++ linux-2.6.12/drivers/media/video/saa7134/saa7134.h  2005-07-26 18:54:49.000000000 +0300
Lines 178-183 struct saa7134_format { Link Here
178
#define SAA7135_BOARD_ASUSTeK_TVFM7135 53
178
#define SAA7135_BOARD_ASUSTeK_TVFM7135 53
179
#define SAA7134_BOARD_FLYTVPLATINUM_FM 54
179
#define SAA7134_BOARD_FLYTVPLATINUM_FM 54
180
#define SAA7134_BOARD_FLYDVBTDUO 55
180
#define SAA7134_BOARD_FLYDVBTDUO 55
181
#define SAA7135_BOARD_GOTVIEW_7135 56
181
182
182
#define SAA7134_MAXBOARDS 8
183
#define SAA7134_MAXBOARDS 8
183
#define SAA7134_INPUT_MAX 8
184
#define SAA7134_INPUT_MAX 8
184
-- linux-2.6.12/drivers/media/video/tda9887.c.gotview  2005-06-17 22:48:29.000000000 +0300
185
++ linux-2.6.12/drivers/media/video/tda9887.c  2005-07-26 19:15:53.000000000 +0300
Lines 217-224 static struct tvnorm radio = { Link Here
217
       .name = "radio",
217
       .name = "radio",
218
       .b    = ( cFmRadio       |
218
       .b    = ( cFmRadio       |
219
                 cQSS           ),
219
                 cQSS           ),
220
  	.c = ( cDeemphasisON | cDeemphasis50 ), 
220
	.c = ( cDeemphasisOFF ), 
221
       .e    = ( cAudioIF_5_5   | cRadioIF_38_90 ),
221
       .e    = ( cAudioIF_5_5   | cRadioIF_38_90 ),
222
};
222
};

Return to bug 102961