Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 266 → Rev 267

/shark/trunk/drivers/bttv/bttv-cards.c
80,6 → 80,7
{ 0x45000070, BTTV_HAUPPAUGE878, "Hauppauge WinTV/PVR" },
{ 0xff000070, BTTV_OSPREY1x0, "Osprey-100" },
{ 0xff010070, BTTV_OSPREY2x0_SVID,"Osprey-200" },
{ 0x036e109e, BTTV_OSPREY2x0_SVID,"Osprey-210" },
{ 0xff020070, BTTV_OSPREY5x0, "Osprey-500" },
{ 0xff030070, BTTV_OSPREY2000, "Osprey-2000" },
 
775,7 → 776,7
},{
 
/* ---- card 0x34 ---------------------------------- */
/* David Härdeman <david@2gen.com> */
/* David H€rdeman <david@2gen.com> */
name: "Pinnacle PCTV Studio Pro",
video_inputs: 3,
audio_inputs: 1,
803,7 → 804,7
tuner_type: TUNER_PHILIPS_PAL_I,
has_radio: 1,
},{
/* Tim Röstermundt <rosterm@uni-muenster.de>
/* Tim R€stermundt <rosterm@uni-muenster.de>
in de.comp.os.unix.linux.hardware:
options bttv card=0 pll=1 radio=1 gpiomask=0x18e0
audiomux=0x44c71f,0x44d71f,0,0x44d71f,0x44dfff
1305,6 → 1306,7
pci_read_config_word(btv->dev, 0, &tmp);
btv->cardid |= tmp;
 
printk(KERN_INFO,"cardid=%08x",btv->cardid);
if (0 != btv->cardid && 0xffffffff != btv->cardid) {
/* look for the card */
for (type = -1, i = 0; cards[i].id != 0; i++)
1873,7 → 1875,7
 
/*
* reset/enable the MSP on some Hauppauge cards
* Thanks to Kyösti Mälkki (kmalkki@cc.hut.fi)!
* Thanks to Ky€sti M€lkki (kmalkki@cc.hut.fi)!
*
* Hauppauge: pin 5
* Voodoo: pin 20