summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/amd64/isa/icu.h4
-rw-r--r--sys/amd64/isa/intr_machdep.c6
-rw-r--r--sys/amd64/isa/nmi.c6
-rw-r--r--sys/i386/include/asnames.h16
-rw-r--r--sys/i386/isa/icu.h4
-rw-r--r--sys/i386/isa/intr_machdep.c6
-rw-r--r--sys/i386/isa/nmi.c6
7 files changed, 44 insertions, 4 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 */
};
diff --git a/sys/i386/include/asnames.h b/sys/i386/include/asnames.h
index 891f30b..2cad36b 100644
--- a/sys/i386/include/asnames.h
+++ b/sys/i386/include/asnames.h
@@ -90,7 +90,15 @@
#define _Xfastintr21 Xfastintr21
#define _Xfastintr22 Xfastintr22
#define _Xfastintr23 Xfastintr23
+#define _Xfastintr24 Xfastintr24
+#define _Xfastintr25 Xfastintr25
+#define _Xfastintr26 Xfastintr26
+#define _Xfastintr27 Xfastintr27
+#define _Xfastintr28 Xfastintr28
+#define _Xfastintr29 Xfastintr29
#define _Xfastintr3 Xfastintr3
+#define _Xfastintr30 Xfastintr30
+#define _Xfastintr31 Xfastintr31
#define _Xfastintr4 Xfastintr4
#define _Xfastintr5 Xfastintr5
#define _Xfastintr6 Xfastintr6
@@ -119,7 +127,15 @@
#define _Xintr21 Xintr21
#define _Xintr22 Xintr22
#define _Xintr23 Xintr23
+#define _Xintr24 Xintr24
+#define _Xintr25 Xintr25
+#define _Xintr26 Xintr26
+#define _Xintr27 Xintr27
+#define _Xintr28 Xintr28
+#define _Xintr29 Xintr29
#define _Xintr3 Xintr3
+#define _Xintr30 Xintr30
+#define _Xintr31 Xintr31
#define _Xintr4 Xintr4
#define _Xintr5 Xintr5
#define _Xintr6 Xintr6
diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h
index b5f2de4..6423551 100644
--- a/sys/i386/isa/icu.h
+++ b/sys/i386/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/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c
index 5a669d2..00f5f23 100644
--- a/sys/i386/isa/intr_machdep.c
+++ b/sys/i386/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/i386/isa/nmi.c b/sys/i386/isa/nmi.c
index 5a669d2..00f5f23 100644
--- a/sys/i386/isa/nmi.c
+++ b/sys/i386/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 */
};
OpenPOWER on IntegriCloud