diff options
| author | cognet <cognet@FreeBSD.org> | 2005-05-24 21:12:49 +0000 |
|---|---|---|
| committer | cognet <cognet@FreeBSD.org> | 2005-05-24 21:12:49 +0000 |
| commit | 0edc708bf4d059c2a069cea3f0f72572b029ecfd (patch) | |
| tree | 68fc26d39f70a7f518f75ca389a892234f0ae7f6 /sys/dev/bktr/bktr_card.c | |
| parent | 7ade1149a62aab81148e731984e2ddac62fb4c8a (diff) | |
| download | FreeBSD-src-0edc708bf4d059c2a069cea3f0f72572b029ecfd.zip FreeBSD-src-0edc708bf4d059c2a069cea3f0f72572b029ecfd.tar.gz | |
Don't set the tuner type to TUNER_MT2032 if BKTR_OVERRIDE_TUNER is defined or
if hw.bt848.tuner has been set, so that we can force the tuner.
Diffstat (limited to 'sys/dev/bktr/bktr_card.c')
| -rw-r--r-- | sys/dev/bktr/bktr_card.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c index 0dbc633..c0493ff 100644 --- a/sys/dev/bktr/bktr_card.c +++ b/sys/dev/bktr/bktr_card.c @@ -870,11 +870,14 @@ checkEEPROM: checkTuner: - if (card == CARD_MIRO && mt2032_init(bktr) == 0) { +#if !defined( BKTR_OVERRIDE_TUNER ) + if (card == CARD_MIRO && mt2032_init(bktr) == 0 && + bktr->bt848_tuner == -1) { bktr->card = cards[ (card = CARD_PINNACLE_PCTV_RAVE) ]; select_tuner( bktr, TUNER_MT2032 ); goto checkDBX; } +#endif /* look for a tuner */ tuner_i2c_address = locate_tuner_address( bktr ); |
