mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-14 10:09:48 +00:00
Code Issues Releases Activity

Take into account that Pinnacle screwed up their PCI ID in the beginning..

Browse Source 
Older cards have it reversed.
Also, use some already defined values instead of magic numbers.

PR:	 73324
Submitted by:	arne_woerner@yahoo.com
MFC after:	1 week
This commit is contained in:
Julian Elischer 2005-02-10 22:26:28 +00:00
parent 3d2a3ff25e
commit ade68ea226
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=141669
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/bktr/bktr_card.c
View File

@ -591,8 +591,8 @@ static int locate_eeprom_address( bktr_ptr_t bktr) {
#define PCI_VENDOR_LEADTEK_ALT_3 0x107d
#define PCI_VENDOR_FLYVIDEO 0x1851
#define PCI_VENDOR_FLYVIDEO_2 0x1852
#define PCI_VENDOR_PINNACLE_ALT 0xBD11
#define PCI_VENDOR_IODATA 0x10fc
#define PCI_VENDOR_PINNACLE_ALT 0xBD11 /* They got their own ID backwards? */
#define PCI_VENDOR_PINNACLE_NEW 0x11BD
#define MODEL_IODATA_GV_BCTV3_PCI 0x4020
@ -724,15 +724,16 @@ probeCard( bktr_ptr_t bktr, int verbose, int unit )
goto checkTuner;
}
if (subsystem_vendor_id == PCI_VENDOR_PINNACLE_ALT) {
if (subsystem_vendor_id == PCI_VENDOR_PINNACLE_ALT ||
subsystem_vendor_id == PCI_VENDOR_PINNACLE_NEW) {
bktr->card = cards[ (card = CARD_MIRO) ];
bktr->card.eepromAddr = eeprom_i2c_address;
bktr->card.eepromSize = (u_char)(256 / EEPROMBLOCKSIZE);
goto checkTuner;
}
if (subsystem_vendor_id == 0x10fc &&
subsystem_id == 0x4020) {
if (subsystem_vendor_id == PCI_VENDOR_IODATA &&
subsystem_id == MODEL_IODATA_GV_BCTV3_PCI) {
bktr->card = cards[ (card = CARD_IO_BCTV3) ];
bktr->card.eepromAddr = eeprom_i2c_address;
bktr->card.eepromSize = (u_char)(256 / EEPROMBLOCKSIZE);