diff options
| author | peter <peter@FreeBSD.org> | 2001-01-19 10:55:13 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2001-01-19 10:55:13 +0000 |
| commit | 7544f1ff1f68650e9bd48e15ca75584696acb700 (patch) | |
| tree | 898c64bae998e227e4fab7dc64f9d68fec5e87c1 /sys/amd64 | |
| parent | a8f714ad895b15dfabf9ad58dede8757be13ee19 (diff) | |
| download | FreeBSD-src-7544f1ff1f68650e9bd48e15ca75584696acb700.zip FreeBSD-src-7544f1ff1f68650e9bd48e15ca75584696acb700.tar.gz | |
EEK! I missed a couple of places with the 24->32 interrupt change.
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/isa/icu.h | 4 | ||||
| -rw-r--r-- | sys/amd64/isa/intr_machdep.c | 6 | ||||
| -rw-r--r-- | sys/amd64/isa/nmi.c | 6 |
3 files changed, 14 insertions, 2 deletions
diff --git a/sys/amd64/isa/icu.h b/sys/amd64/isa/icu.h index b5f2de4..6423551 100644 --- a/sys/amd64/isa/icu.h +++ b/sys/amd64/isa/icu.h @@ -116,8 +116,8 @@ extern unsigned imen; /* interrupt mask enable */ #ifdef APIC_IO -/* 32-47: ISA IRQ0-IRQ15, 48-55: IO APIC IRQ16-IRQ23 */ -#define ICU_LEN 24 +/* 32-47: ISA IRQ0-IRQ15, 48-55: IO APIC IRQ16-IRQ31 */ +#define ICU_LEN 32 #else diff --git a/sys/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c index 5a669d2..00f5f23 100644 --- a/sys/amd64/isa/intr_machdep.c +++ b/sys/amd64/isa/intr_machdep.c @@ -112,6 +112,10 @@ static inthand_t *fastintr[ICU_LEN] = { &IDTVEC(fastintr18), &IDTVEC(fastintr19), &IDTVEC(fastintr20), &IDTVEC(fastintr21), &IDTVEC(fastintr22), &IDTVEC(fastintr23), + &IDTVEC(fastintr24), &IDTVEC(fastintr25), + &IDTVEC(fastintr26), &IDTVEC(fastintr27), + &IDTVEC(fastintr28), &IDTVEC(fastintr29), + &IDTVEC(fastintr30), &IDTVEC(fastintr31), #endif /* APIC_IO */ }; @@ -123,6 +127,8 @@ static inthand_t *slowintr[ICU_LEN] = { #if defined(APIC_IO) &IDTVEC(intr16), &IDTVEC(intr17), &IDTVEC(intr18), &IDTVEC(intr19), &IDTVEC(intr20), &IDTVEC(intr21), &IDTVEC(intr22), &IDTVEC(intr23), + &IDTVEC(intr24), &IDTVEC(intr25), &IDTVEC(intr26), &IDTVEC(intr27), + &IDTVEC(intr28), &IDTVEC(intr29), &IDTVEC(intr30), &IDTVEC(intr31), #endif /* APIC_IO */ }; diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c index 5a669d2..00f5f23 100644 --- a/sys/amd64/isa/nmi.c +++ b/sys/amd64/isa/nmi.c @@ -112,6 +112,10 @@ static inthand_t *fastintr[ICU_LEN] = { &IDTVEC(fastintr18), &IDTVEC(fastintr19), &IDTVEC(fastintr20), &IDTVEC(fastintr21), &IDTVEC(fastintr22), &IDTVEC(fastintr23), + &IDTVEC(fastintr24), &IDTVEC(fastintr25), + &IDTVEC(fastintr26), &IDTVEC(fastintr27), + &IDTVEC(fastintr28), &IDTVEC(fastintr29), + &IDTVEC(fastintr30), &IDTVEC(fastintr31), #endif /* APIC_IO */ }; @@ -123,6 +127,8 @@ static inthand_t *slowintr[ICU_LEN] = { #if defined(APIC_IO) &IDTVEC(intr16), &IDTVEC(intr17), &IDTVEC(intr18), &IDTVEC(intr19), &IDTVEC(intr20), &IDTVEC(intr21), &IDTVEC(intr22), &IDTVEC(intr23), + &IDTVEC(intr24), &IDTVEC(intr25), &IDTVEC(intr26), &IDTVEC(intr27), + &IDTVEC(intr28), &IDTVEC(intr29), &IDTVEC(intr30), &IDTVEC(intr31), #endif /* APIC_IO */ }; |
