*** bttv-cards.c.orig Thu Jul 19 18:00:41 2001 --- bttv-cards.c Thu Jul 22 14:02:38 2001 *************** *** 125,132 **** { 0x6606107d, BTTV_WINFAST2000, "Leadtek WinFast TV 2000" }, { 0x263610b4, BTTV_STB2, "STB TV PCI FM, P/N 6000704" }, ! { 0x402010fc, BTTV_GVBCTV3PCI, "I-O Data Co. GV-BCV3/PCI" }, ! { 0x405010fc, BTTV_GVBCTV3PCI, "I-O Data Co. GV-BCV4/PCI" }, { 0x001211bd, BTTV_PINNACLE, "Pinnacle PCTV" }, { 0x3000121a, 0/* no entry yet */,"VoodooTV 200" }, --- 125,132 ---- { 0x6606107d, BTTV_WINFAST2000, "Leadtek WinFast TV 2000" }, { 0x263610b4, BTTV_STB2, "STB TV PCI FM, P/N 6000704" }, ! { 0x402010fc, BTTV_GVBCTV3PCI, "I-O DATA DEVICE,INC. GV-BCTV3/PCI" }, ! { 0x405010fc, BTTV_GVBCTV4PCI, "I-O DATA DEVICE,INC. GV-BCTV4/PCI" }, { 0x001211bd, BTTV_PINNACLE, "Pinnacle PCTV" }, { 0x3000121a, 0/* no entry yet */,"VoodooTV 200" }, *************** *** 756,762 **** pll: PLL_28, tuner_type: -1, },{ ! name: "GV-BCTV3", video_inputs: 3, audio_inputs: 1, tuner: 0, --- 756,762 ---- pll: PLL_28, tuner_type: -1, },{ ! name: "GV-BCTV3/PCI", video_inputs: 3, audio_inputs: 1, tuner: 0, *************** *** 1004,1009 **** --- 1004,1022 ---- needs_tvaudio: 1, pll: PLL_28, tuner_type: TUNER_PHILIPS_PAL, + },{ + name: "GV-BCTV4/PCI", + video_inputs: 3, + audio_inputs: 1, + tuner: 0, + svhs: 2, + gpiomask: 0x010f00, + muxsel: {2, 3, 0, 0}, + audiomux: {0x10000, 0, 0x10000, 0, 0, 0}, + no_msp34xx: 1, + pll: PLL_28, + tuner_type: TUNER_SHARP_2U5JF5540_NTSC, + audio_hook: gvbctv3pci_audio, }}; const int bttv_num_tvcards = (sizeof(bttv_tvcards)/sizeof(struct tvcard)); *** bttv.h.orig Tue Jul 10 16:35:40 2001 --- bttv.h Thu Jul 22 14:02:50 2001 *************** *** 81,86 **** --- 81,87 ---- #define BTTV_ATI_TVWONDERVE 0x40 #define BTTV_FLYVIDEO2000 0x41 #define BTTV_TERRATVALUER 0x42 + #define BTTV_GVBCTV4PCI 0x43 /* i2c address list */ #define I2C_TSA5522 0xc2 *** tuner.c.orig Fri Jun 22 18:45:53 2001 --- tuner.c Thu Jul 22 14:02:07 2001 *************** *** 193,199 **** { "LG PAL_BG (TPI8PSB11D)", LGINNOTEK, PAL, 16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623}, { "Temic PAL* auto + FM (4009 FN5)", TEMIC, PAL, ! 16*141.00, 16*464.00, 0xa0,0x90,0x30,0x8e,623} }; #define TUNERS (sizeof(tuners)/sizeof(struct tunertype)) --- 193,201 ---- { "LG PAL_BG (TPI8PSB11D)", LGINNOTEK, PAL, 16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623}, { "Temic PAL* auto + FM (4009 FN5)", TEMIC, PAL, ! 16*141.00, 16*464.00, 0xa0,0x90,0x30,0x8e,623}, ! { "SHARP NTSC (2U5JF5540)", SHARP, NTSC, /* 940=16*58.75 NTSC@Japan */ ! 16*137.25,16*317.25,0x01,0x02,0x08,0x8e,940} }; #define TUNERS (sizeof(tuners)/sizeof(struct tunertype)) *** tuner.h.orig Mon Apr 23 18:10:37 2001 --- tuner.h Thu Jul 22 14:02:53 2001 *************** *** 53,58 **** --- 53,59 ---- #define TUNER_LG_PAL_FM 28 #define TUNER_LG_PAL 29 #define TUNER_TEMIC_4009FN5_MULTI_PAL_FM 30 /* B/G, I and D/K autodetected */ + #define TUNER_SHARP_2U5JF5540_NTSC 31 #define NOTUNER 0 *************** *** 67,72 **** --- 68,74 ---- #define Sony 3 #define Alps 4 #define LGINNOTEK 5 + #define SHARP 6 #define TUNER_SET_TYPE _IOW('t',1,int) /* set tuner type */ #define TUNER_SET_TVFREQ _IOW('t',2,int) /* set tv freq */