diff options
| author | bde <bde@FreeBSD.org> | 1998-06-03 09:43:38 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-06-03 09:43:38 +0000 |
| commit | e32c63389fe21d584961e99c27d8fac6f56468bf (patch) | |
| tree | e8e7af1b41bc2c3bf33ad4a36546b0a1eda44137 /sys/isa | |
| parent | 3503326bdd815ea2fbbd668efc6137aab889d4f6 (diff) | |
| download | FreeBSD-src-e32c63389fe21d584961e99c27d8fac6f56468bf.zip FreeBSD-src-e32c63389fe21d584961e99c27d8fac6f56468bf.tar.gz | |
Fixed a printf() arg botch in the previous commit.
Only complain about an irq mismatch in the probe if the configured
irq doesn't become active, and then print the bitmap of irqs that
became active (including clock irqs) instead of just the first
(not including clock irqs).
Bugs reported by: msmith
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/sio.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/isa/sio.c b/sys/isa/sio.c index c122213..63c4248 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.202 1998/05/20 06:46:58 phk Exp $ + * $Id: sio.c,v 1.203 1998/05/31 10:53:55 bde Exp $ */ #include "opt_comconsole.h" @@ -775,14 +775,13 @@ sioprobe(dev) enable_intr(); - /* XXX the magic mask is to discard transient (clock) irqs. */ - irqs = irqmap[1] & ~irqmap[0] & ~0x0105; - if (irqs != idev->id_irq) + irqs = irqmap[1] & ~irqmap[0]; + if (idev->id_irq != 0 && (idev->id_irq & irqs) == 0) printf( - "sio%d: probed irq %d does not match configured irq %d\n", - ffs(irqs) - 1, ffs(idev->id_irq) - 1); + "sio%d: configured irq %d not in bitmap of probed irqs %#x\n", + dev->id_unit, ffs(idev->id_irq) - 1, irqs); if (bootverbose) - printf("sio%d: irq maps: %04x %04x %04x %04x\n", + printf("sio%d: irq maps: %#x %#x %#x %#x\n", dev->id_unit, irqmap[0], irqmap[1], irqmap[2], irqmap[3]); result = IO_COMSIZE; |
