diff options
| author | tegge <tegge@FreeBSD.org> | 1998-09-06 22:41:42 +0000 |
|---|---|---|
| committer | tegge <tegge@FreeBSD.org> | 1998-09-06 22:41:42 +0000 |
| commit | 857a03a573e70a598db37cc5e2751f5a6b09c020 (patch) | |
| tree | abbb6f5a4e56e7d82120efc18e2c6de6ec06843b /sys/i386/isa/clock.c | |
| parent | ac59a0c5cd4a2de80842186c8dd22ff48fe29da8 (diff) | |
| download | FreeBSD-src-857a03a573e70a598db37cc5e2751f5a6b09c020.zip FreeBSD-src-857a03a573e70a598db37cc5e2751f5a6b09c020.tar.gz | |
Maintain a mapping from irq number to (ioapic number, int pin) tuple,
and use this when masking/unmasking interrupts.
Maintain a mapping from (iopaic number, int pin) tuple to irq number,
and use this when configuring devices and programming the ioapics.
Previous code assumed that irq number was equal to int pin number, and
that the ioapic number was 0.
Don't let an AP enter _cpu_switch before all local apics are initialized.
Diffstat (limited to 'sys/i386/isa/clock.c')
| -rw-r--r-- | sys/i386/isa/clock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index 4e14052..3d8f8cd 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.123 1998/06/07 20:36:39 phk Exp $ + * $Id: clock.c,v 1.124 1998/06/09 13:10:46 phk Exp $ */ /* @@ -953,7 +953,7 @@ cpu_initclocks() /* Finish initializing 8253 timer 0. */ #ifdef APIC_IO - apic_8254_intr = isa_apic_pin(0); + apic_8254_intr = isa_apic_irq(0); apic_8254_trial = 0; if (apic_8254_intr >= 0 ) { if (apic_int_type(0, 0) == 3) @@ -993,7 +993,7 @@ cpu_initclocks() printf("RTC BIOS diagnostic error %b\n", diag, RTCDG_BITS); #ifdef APIC_IO - if (isa_apic_pin(8) != 8) + if (isa_apic_irq(8) != 8) panic("APIC RTC != 8"); #endif /* APIC_IO */ |
