diff options
| author | jhb <jhb@FreeBSD.org> | 2000-09-13 18:33:25 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2000-09-13 18:33:25 +0000 |
| commit | 7013b8322587468516f271030ba6f1e1e8ad2505 (patch) | |
| tree | 094e936b4c4d7213d8c6c9ada2d1b54c3631a970 /sys/isa | |
| parent | 2bef2cffd4590e0d732ee9af20c3fc37217d6b52 (diff) | |
| download | FreeBSD-src-7013b8322587468516f271030ba6f1e1e8ad2505.zip FreeBSD-src-7013b8322587468516f271030ba6f1e1e8ad2505.tar.gz | |
- Remove the inthand2_t type and use the equivalent driver_intr_t type from
newbus for referencing device interrupt handlers.
- Move the 'struct intrec' type which describes interrupt sources into
sys/interrupt.h instead of making it just be a x86 structure.
- Don't create 'ithd' and 'intrec' typedefs, instead, just use 'struct ithd'
and 'struct intrec'
- Move the code to translate new-bus interrupt flags into an interrupt thread
priority out of the x86 nexus code and into a MI ithread_priority()
function in sys/kern/kern_intr.c.
- Remove now-uneeded x86-specific headers from sys/dev/ata/ata-all.c and
sys/pci/pci_compat.c.
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/atrtc.c | 14 | ||||
| -rw-r--r-- | sys/isa/sio.c | 1 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index 724f3c2..0e2c098 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -1037,7 +1037,7 @@ cpu_initclocks() * 19 July 2000). */ /* Setup the PIC clk handler. The APIC handler is setup later */ - inthand_add("clk", 0, (inthand2_t *)clkintr, NULL, PI_REALTIME, + inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL, PI_REALTIME, INTR_EXCL); INTREN(IRQ0); @@ -1054,8 +1054,8 @@ cpu_initclocks() * XXX - if statclock is disabled, don't attempt the APIC * trial. Not sure this is sane for APIC_IO. */ - inthand_add("clk", apic_8254_intr, (inthand2_t *)clkintr, NULL, - PI_REALTIME, INTR_EXCL); + inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr, + NULL, PI_REALTIME, INTR_EXCL); INTREN(1 << apic_8254_intr); #endif /* APIC_IO */ return; @@ -1075,10 +1075,10 @@ cpu_initclocks() * interrupts. */ clkdesc = inthand_add("clk", apic_8254_intr, - (inthand2_t *)clkintr, NULL, PI_REALTIME, INTR_FAST); + (driver_intr_t *)clkintr, NULL, PI_REALTIME, INTR_FAST); INTREN(1 << apic_8254_intr); - rtcdesc = inthand_add("rtc", 8, (inthand2_t *)rtcintr, NULL, + rtcdesc = inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL, PI_REALTIME, INTR_FAST); /* XXX */ INTREN(APIC_IRQ8); writertc(RTC_STATUSB, rtc_statusb); @@ -1128,12 +1128,12 @@ cpu_initclocks() } /* Finally, setup the real clock handlers */ - inthand_add("clk", apic_8254_intr, (inthand2_t *)clkintr, NULL, + inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr, NULL, PI_REALTIME, INTR_EXCL); INTREN(1 << apic_8254_intr); #endif - inthand_add("rtc", 8, (inthand2_t *)rtcintr, NULL, PI_REALTIME, + inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL, PI_REALTIME, INTR_EXCL); #ifdef APIC_IO INTREN(APIC_IRQ8); diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 8826c41..2dbccdc 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -53,6 +53,7 @@ * - Added PC-Card driver table and handlers */ #include <sys/param.h> +#include <sys/bus.h> #include <sys/systm.h> #include <sys/reboot.h> #include <sys/malloc.h> |
