diff options
| author | julian <julian@FreeBSD.org> | 2005-02-10 22:26:28 +0000 |
|---|---|---|
| committer | julian <julian@FreeBSD.org> | 2005-02-10 22:26:28 +0000 |
| commit | ba3f8d87f5faf2f81cab3adf006abe513cb67573 (patch) | |
| tree | d655c79ae3744a266a9a953f89ee5121eb0808b9 /sys/dev/bktr | |
| parent | 885ba938474734fbe7b08d698b6f7e24bad20fab (diff) | |
| download | FreeBSD-src-ba3f8d87f5faf2f81cab3adf006abe513cb67573.zip FreeBSD-src-ba3f8d87f5faf2f81cab3adf006abe513cb67573.tar.gz | |
Take into account that Pinnacle screwed up their PCI ID in the beginning..
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
Diffstat (limited to 'sys/dev/bktr')
| -rw-r--r-- | sys/dev/bktr/bktr_card.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c index 8d9a681..aa224d9 100644 --- a/sys/dev/bktr/bktr_card.c +++ b/sys/dev/bktr/bktr_card.c @@ -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); |
