diff options
| author | Julian Elischer <julian@FreeBSD.org> | 2005-01-23 07:13:09 +0000 |
|---|---|---|
| committer | Julian Elischer <julian@FreeBSD.org> | 2005-01-23 07:13:09 +0000 |
| commit | 2f4829e6cba52f7afeafe5f31e8639fa98512df5 (patch) | |
| tree | 518e7323080979d2f83085af6219f83a43c8fc42 /sys/dev/bktr/bktr_card.c | |
| parent | 796a9ee34245eb3d4d78df5570bdb07d2c92892a (diff) | |
| download | src-2f4829e6cba52f7afeafe5f31e8639fa98512df5.tar.gz src-2f4829e6cba52f7afeafe5f31e8639fa98512df5.zip | |
Add code to do better auto detection of tuner types etc.
PR: kern/75831
Submitted by: Branko Lankester <branko@euro.net>
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=140655
Diffstat (limited to 'sys/dev/bktr/bktr_card.c')
| -rw-r--r-- | sys/dev/bktr/bktr_card.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c index 79f142dc2143..8d9a6810cf9f 100644 --- a/sys/dev/bktr/bktr_card.c +++ b/sys/dev/bktr/bktr_card.c @@ -739,21 +739,6 @@ probeCard( bktr_ptr_t bktr, int verbose, int unit ) goto checkTuner; } - if (subsystem_vendor_id == PCI_VENDOR_PINNACLE_NEW) { - bktr->card = cards[ (card = CARD_PINNACLE_PCTV_RAVE) ]; - bktr->card.eepromAddr = eeprom_i2c_address; - bktr->card.eepromSize = (u_char)(256 / EEPROMBLOCKSIZE); - - TDA9887_init(bktr, 0); - - /* look for a tuner */ - tuner_i2c_address = locate_tuner_address( bktr ); - printf( "%s: tuner @ %#x\n", bktr_name(bktr), tuner_i2c_address ); - select_tuner( bktr, TUNER_MT2032 ); - - goto checkDBX; - } - /* Vendor is unknown. We will use the standard probe code */ /* which may not give best results */ printf("%s: Warning - card vendor 0x%04x (model 0x%04x) unknown.\n", @@ -884,6 +869,12 @@ checkEEPROM: checkTuner: + if (card == CARD_MIRO && mt2032_init(bktr) == 0) { + bktr->card = cards[ (card = CARD_PINNACLE_PCTV_RAVE) ]; + select_tuner( bktr, TUNER_MT2032 ); + goto checkDBX; + } + /* look for a tuner */ tuner_i2c_address = locate_tuner_address( bktr ); if ( tuner_i2c_address == -1 ) { |