diff options
| author | joerg <joerg@FreeBSD.org> | 2010-01-23 21:33:33 +0000 |
|---|---|---|
| committer | joerg <joerg@FreeBSD.org> | 2010-01-23 21:33:33 +0000 |
| commit | 042b9762358313c74efdffea26059301544b6174 (patch) | |
| tree | 57e3ac26fb977f2b2dcb5e1d162028719f1b9b2d /sys/dev/ieee488/pcii.c | |
| parent | d6d56bade7de371ecbb6e900ae78b63d480d4327 (diff) | |
| download | FreeBSD-src-042b9762358313c74efdffea26059301544b6174.zip FreeBSD-src-042b9762358313c74efdffea26059301544b6174.tar.gz | |
Fix breakage introduced to the tnt4882 driver in r202870. This PCI
frontend uses the same uPD7210 backend as the pcii ISA frontend, so
the backend has to cope with both situations.
Also, hide the first printf in pcii_probe (address mismatch) behind
bootverbose as the ISA bus parent tries to probe all configured ISA
devices against each driver, so a the console has been cluttered with
this message for a bunch of unrelated driver probes.
MFC after: 3 days
Diffstat (limited to 'sys/dev/ieee488/pcii.c')
| -rw-r--r-- | sys/dev/ieee488/pcii.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/ieee488/pcii.c b/sys/dev/ieee488/pcii.c index fdff61e..7e92432 100644 --- a/sys/dev/ieee488/pcii.c +++ b/sys/dev/ieee488/pcii.c @@ -138,9 +138,10 @@ pcii_probe(device_t dev) * 1989 Edition, National Instruments.) */ if ((start & 0x3ff) != 0x2e1) { - printf("pcii_probe: PCIIA base address 0x%lx not " - "0x2e1/0x22e1/0x42e1/0x62e1\n", - start); + if (bootverbose) + printf("pcii_probe: PCIIA base address 0x%lx not " + "0x2e1/0x22e1/0x42e1/0x62e1\n", + start); return (ENXIO); } @@ -234,6 +235,7 @@ pcii_attach(device_t dev) for (rid = 0; rid < 8; rid++) { sc->upd7210.reg_res[rid] = sc->res[2 + rid]; + sc->upd7210.reg_offset[rid] = 0; } sc->upd7210.irq_clear_res = sc->res[10]; |
