diff options
author | peter <peter@FreeBSD.org> | 2008-04-19 07:25:57 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2008-04-19 07:25:57 +0000 |
commit | a2a93ed9dfcdbaf0e83f5db2335e766305a6d7ae (patch) | |
tree | 69f5e71e559b0094a5c645c701ae2cad34499187 | |
parent | 27e53e835a3b6849a877c135a5dfe6d7b901befe (diff) | |
download | FreeBSD-src-a2a93ed9dfcdbaf0e83f5db2335e766305a6d7ae.zip FreeBSD-src-a2a93ed9dfcdbaf0e83f5db2335e766305a6d7ae.tar.gz |
Put in a real isa_irq_pending() stub in order to remove two lines of dmesg
noise from sio per unit. sio likes to probe if interrupts are configured
correctly by looking at the pending bits of the atpic in order to put a
non-fatal warning on the console. I think I'd rather read the pending
bits from the apics, but I'm not sure its worth the hassle.
-rw-r--r-- | sys/amd64/amd64/machdep.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 8873231..9d26e53 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -847,11 +847,23 @@ ssdtosyssd(ssd, sd) #if !defined(DEV_ATPIC) && defined(DEV_ISA) #include <isa/isavar.h> -u_int +#include <isa/isareg.h> +/* + * Return a bitmap of the current interrupt requests. This is 8259-specific + * and is only suitable for use at probe time. + * This is only here to pacify sio. It is NOT FATAL if this doesn't work. + * It shouldn't be here. There should probably be an APIC centric + * implementation in the apic driver code, if at all. + */ +intrmask_t isa_irq_pending(void) { + u_char irr1; + u_char irr2; - return (0); + irr1 = inb(IO_ICU1); + irr2 = inb(IO_ICU2); + return ((irr2 << 8) | irr1); } #endif |