152,10 → 152,8 |
{ 0xff020070, BTTV_OSPREY500, "Osprey-500" }, |
{ 0xff030070, BTTV_OSPREY2000, "Osprey-2000" }, |
{ 0xff040070, BTTV_OSPREY540, "Osprey-540" }, |
|
{ 0x00011002, BTTV_ATI_TVWONDER, "ATI TV Wonder" }, |
{ 0x00031002, BTTV_ATI_TVWONDERVE,"ATI TV Wonder/VE" }, |
|
{ 0x6606107d, BTTV_WINFAST2000, "Leadtek WinFast TV 2000" }, |
{ 0x6607107d, BTTV_WINFAST2000, "Leadtek WinFast VC 100" }, |
{ 0x263610b4, BTTV_STB2, "STB TV PCI FM, Gateway P/N 6000704" }, |
163,64 → 161,49 |
{ 0x402010fc, BTTV_GVBCTV3PCI, "I-O Data Co. GV-BCTV3/PCI" }, |
{ 0x405010fc, BTTV_GVBCTV4PCI, "I-O Data Co. GV-BCTV4/PCI" }, |
{ 0x407010fc, BTTV_GVBCTV5PCI, "I-O Data Co. GV-BCTV5/PCI" }, |
|
{ 0x001211bd, BTTV_PINNACLE, "Pinnacle PCTV" }, |
{ 0x001c11bd, BTTV_PINNACLESAT, "Pinnacle PCTV Sat" }, |
// some cards ship with byteswapped IDs ... |
{ 0x1200bd11, BTTV_PINNACLE, "Pinnacle PCTV [bswap]" }, |
{ 0xff00bd11, BTTV_PINNACLE, "Pinnacle PCTV [bswap]" }, |
|
{ 0x3000121a, BTTV_VOODOOTV_FM, "3Dfx VoodooTV FM/ VoodooTV 200" }, |
{ 0x3060121a, BTTV_STB2, "3Dfx VoodooTV 100/ STB OEM" }, |
|
{ 0x3000144f, BTTV_MAGICTVIEW063, "(Askey Magic/others) TView99 CPH06x" }, |
{ 0x3002144f, BTTV_MAGICTVIEW061, "(Askey Magic/others) TView99 CPH05x" }, |
{ 0x3005144f, BTTV_MAGICTVIEW061, "(Askey Magic/others) TView99 CPH061/06L (T1/LC)" }, |
{ 0x5000144f, BTTV_MAGICTVIEW061, "Askey CPH050" }, |
|
{ 0x00011461, BTTV_AVPHONE98, "AVerMedia TVPhone98" }, |
{ 0x00021461, BTTV_AVERMEDIA98, "AVermedia TVCapture 98" }, |
{ 0x00031461, BTTV_AVPHONE98, "AVerMedia TVPhone98" }, |
{ 0x00041461, BTTV_AVERMEDIA98, "AVerMedia TVCapture 98" }, |
{ 0x03001461, BTTV_AVERMEDIA98, "VDOMATE TV TUNER CARD" }, |
|
{ 0x300014ff, BTTV_MAGICTVIEW061, "TView 99 (CPH061)" }, |
{ 0x300214ff, BTTV_PHOEBE_TVMAS, "Phoebe TV Master (CPH060)" }, |
|
{ 0x1117153b, BTTV_TERRATVALUE, "Terratec TValue (Philips PAL B/G)" }, |
{ 0x1118153b, BTTV_TERRATVALUE, "Terratec TValue (Temic PAL B/G)" }, |
{ 0x1119153b, BTTV_TERRATVALUE, "Terratec TValue (Philips PAL I)" }, |
{ 0x111a153b, BTTV_TERRATVALUE, "Terratec TValue (Temic PAL I)" }, |
|
{ 0x1123153b, BTTV_TERRATVRADIO, "Terratec TV Radio+" }, |
{ 0x1127153b, BTTV_TERRATV, "Terratec TV+ (V1.05)" }, |
// clashes with FlyVideo |
//{ 0x18521852, BTTV_TERRATV, "Terratec TV+ (V1.10)" }, |
{ 0x1134153b, BTTV_TERRATVALUE, "Terratec TValue (LR102)" }, |
{ 0x1135153b, BTTV_TERRATVALUER, "Terratec TValue Radio" }, // LR102 |
{ 0x5018153b, BTTV_TERRATVALUE, "Terratec TValue" }, // ?? |
|
{ 0x400015b0, BTTV_ZOLTRIX_GENIE, "Zoltrix Genie TV" }, |
{ 0x400a15b0, BTTV_ZOLTRIX_GENIE, "Zoltrix Genie TV" }, |
{ 0x400d15b0, BTTV_ZOLTRIX_GENIE, "Zoltrix Genie TV / Radio" }, |
{ 0x401015b0, BTTV_ZOLTRIX_GENIE, "Zoltrix Genie TV / Radio" }, |
{ 0x401615b0, BTTV_ZOLTRIX_GENIE, "Zoltrix Genie TV / Radio" }, |
|
{ 0x1430aa00, BTTV_PV143, "Provideo PV143A" }, |
{ 0x1431aa00, BTTV_PV143, "Provideo PV143B" }, |
{ 0x1432aa00, BTTV_PV143, "Provideo PV143C" }, |
{ 0x1433aa00, BTTV_PV143, "Provideo PV143D" }, |
|
{ 0x1460aa00, BTTV_PV150, "Provideo PV150A-1" }, |
{ 0x1461aa01, BTTV_PV150, "Provideo PV150A-2" }, |
{ 0x1462aa02, BTTV_PV150, "Provideo PV150A-3" }, |
{ 0x1463aa03, BTTV_PV150, "Provideo PV150A-4" }, |
|
{ 0x1464aa04, BTTV_PV150, "Provideo PV150B-1" }, |
{ 0x1465aa05, BTTV_PV150, "Provideo PV150B-2" }, |
{ 0x1466aa06, BTTV_PV150, "Provideo PV150B-3" }, |
{ 0x1467aa07, BTTV_PV150, "Provideo PV150B-4" }, |
|
{ 0xa132ff00, BTTV_IVC100, "IVC-100" }, |
{ 0xa1550000, BTTV_IVC200, "IVC-200" }, |
{ 0xa1550001, BTTV_IVC200, "IVC-200" }, |
246,10 → 229,8 |
{ 0xa182ff0d, BTTV_IVC120, "IVC-120G" }, |
{ 0xa182ff0e, BTTV_IVC120, "IVC-120G" }, |
{ 0xa182ff0f, BTTV_IVC120, "IVC-120G" }, |
|
{ 0x41424344, BTTV_GRANDTEC, "GrandTec Multi Capture" }, |
{ 0x01020304, BTTV_XGUARD, "Grandtec Grand X-Guard" }, |
|
{ 0x010115cb, BTTV_GMV1, "AG GMV1" }, |
{ 0x010114c7, BTTV_MODTEC_205, "Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV" }, |
{ 0x18501851, BTTV_CHRONOS_VS2, "FlyVideo 98 (LR50)/ Chronos Video Shuttle II" }, |
261,10 → 242,7 |
{ 0x00790e11, BTTV_WINDVR, "Canopus WinDVR PCI" }, |
{ 0xa0fca1a0, BTTV_ZOLTRIX, "Face to Face Tvmax" }, |
{ 0x01010071, BTTV_NEBULA_DIGITV, "Nebula Electronics DigiTV" }, |
|
{ 0x200A1295, BTTV_PXC200, "Imagenation PXC200"}, |
//{ 0xa0fca04f, BTTV_MAGICTVIEW063, "Guillemot Maxi TV Video 3" }, |
|
{ 0, -1, NULL } |
}; |
|
1867,8 → 1845,16 |
{ |
unsigned int gpiobits; |
int i,type; |
unsigned short tmp; |
#ifndef __FORCE_PXC__ |
unsigned short tmp; |
#endif |
|
#ifdef __FORCE_PXC__ |
type = 98; |
btv->type = cards[type].cardnr; |
#else |
|
|
/* read PCI subsystem ID */ |
pci_read_config_word(btv->dev, PCI_SUBSYSTEM_ID, &tmp); |
btv->cardid = tmp << 16; |
1903,6 → 1889,8 |
if (card[btv->nr] < bttv_num_tvcards) |
btv->type=card[btv->nr]; |
|
#endif |
|
/* print which card config we are using */ |
printk(KERN_INFO "bttv%d: using: %s [card=%d,%s]\n",btv->nr, |
bttv_tvcards[btv->type].name, btv->type, |
2203,9 → 2191,6 |
if (BTTV_UNKNOWN == btv->type) { |
bttv_readee(btv,eeprom_data,0xa0); |
identify_by_eeprom(btv,eeprom_data); |
#ifdef __FORCE_PXC__ |
init_PXC200(btv); |
#endif |
} |
|
switch (btv->type) { |
2880,13 → 2865,15 |
|
static void __devinit init_PXC200(struct bttv *btv) |
{ |
/* |
static int vals[] __devinitdata = { 0x08, 0x09, 0x0a, 0x0b, 0x0d, 0x0d, |
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, |
0x00 }; |
unsigned int i; |
int tmp; |
u32 val; |
|
*/ |
int val; |
|
pll[btv->nr] = 28; |
|
/* Initialise GPIO-connevted stuff */ |
btwrite(1<<13,BT848_GPIO_OUT_EN); /* Reset pin only */ |
btwrite(0,BT848_GPIO_DATA); |