summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/amd64/amd64/tsc.c16
-rw-r--r--sys/amd64/isa/clock.c16
-rw-r--r--sys/i386/i386/tsc.c16
-rw-r--r--sys/i386/isa/clock.c16
-rw-r--r--sys/isa/atrtc.c16
5 files changed, 40 insertions, 40 deletions
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index bbd066b..5edd84b 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -968,7 +968,7 @@ cpu_initclocks()
int diag;
#ifdef APIC_IO
int apic_8254_trial;
- struct intrhand *clkdesc;
+ void *clkdesc;
#endif /* APIC_IO */
if (statclock_disable) {
@@ -1002,8 +1002,8 @@ cpu_initclocks()
panic("APIC_IO: Cannot route 8254 interrupt to CPU");
}
- clkdesc = inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr,
- NULL, PI_REALTIME, INTR_FAST);
+ inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, &clkdesc);
INTREN(1 << apic_8254_intr);
#else /* APIC_IO */
@@ -1013,8 +1013,8 @@ cpu_initclocks()
* couldn't find anything suitable in the BSD/OS code (grog,
* 19 July 2000).
*/
- inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL, PI_REALTIME,
- INTR_FAST);
+ inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, NULL);
INTREN(IRQ0);
#endif /* APIC_IO */
@@ -1035,8 +1035,8 @@ cpu_initclocks()
panic("APIC RTC != 8");
#endif /* APIC_IO */
- inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL, PI_REALTIME,
- INTR_FAST);
+ inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, NULL);
#ifdef APIC_IO
INTREN(APIC_IRQ8);
@@ -1081,7 +1081,7 @@ cpu_initclocks()
setup_8254_mixed_mode();
inthand_add("clk", apic_8254_intr,
(driver_intr_t *)clkintr, NULL,
- PI_REALTIME, INTR_FAST);
+ INTR_TYPE_CLK | INTR_FAST, NULL);
INTREN(1 << apic_8254_intr);
}
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index bbd066b..5edd84b 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -968,7 +968,7 @@ cpu_initclocks()
int diag;
#ifdef APIC_IO
int apic_8254_trial;
- struct intrhand *clkdesc;
+ void *clkdesc;
#endif /* APIC_IO */
if (statclock_disable) {
@@ -1002,8 +1002,8 @@ cpu_initclocks()
panic("APIC_IO: Cannot route 8254 interrupt to CPU");
}
- clkdesc = inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr,
- NULL, PI_REALTIME, INTR_FAST);
+ inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, &clkdesc);
INTREN(1 << apic_8254_intr);
#else /* APIC_IO */
@@ -1013,8 +1013,8 @@ cpu_initclocks()
* couldn't find anything suitable in the BSD/OS code (grog,
* 19 July 2000).
*/
- inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL, PI_REALTIME,
- INTR_FAST);
+ inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, NULL);
INTREN(IRQ0);
#endif /* APIC_IO */
@@ -1035,8 +1035,8 @@ cpu_initclocks()
panic("APIC RTC != 8");
#endif /* APIC_IO */
- inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL, PI_REALTIME,
- INTR_FAST);
+ inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, NULL);
#ifdef APIC_IO
INTREN(APIC_IRQ8);
@@ -1081,7 +1081,7 @@ cpu_initclocks()
setup_8254_mixed_mode();
inthand_add("clk", apic_8254_intr,
(driver_intr_t *)clkintr, NULL,
- PI_REALTIME, INTR_FAST);
+ INTR_TYPE_CLK | INTR_FAST, NULL);
INTREN(1 << apic_8254_intr);
}
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index bbd066b..5edd84b 100644
--- a/sys/i386/i386/tsc.c
+++ b/sys/i386/i386/tsc.c
@@ -968,7 +968,7 @@ cpu_initclocks()
int diag;
#ifdef APIC_IO
int apic_8254_trial;
- struct intrhand *clkdesc;
+ void *clkdesc;
#endif /* APIC_IO */
if (statclock_disable) {
@@ -1002,8 +1002,8 @@ cpu_initclocks()
panic("APIC_IO: Cannot route 8254 interrupt to CPU");
}
- clkdesc = inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr,
- NULL, PI_REALTIME, INTR_FAST);
+ inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, &clkdesc);
INTREN(1 << apic_8254_intr);
#else /* APIC_IO */
@@ -1013,8 +1013,8 @@ cpu_initclocks()
* couldn't find anything suitable in the BSD/OS code (grog,
* 19 July 2000).
*/
- inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL, PI_REALTIME,
- INTR_FAST);
+ inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, NULL);
INTREN(IRQ0);
#endif /* APIC_IO */
@@ -1035,8 +1035,8 @@ cpu_initclocks()
panic("APIC RTC != 8");
#endif /* APIC_IO */
- inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL, PI_REALTIME,
- INTR_FAST);
+ inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, NULL);
#ifdef APIC_IO
INTREN(APIC_IRQ8);
@@ -1081,7 +1081,7 @@ cpu_initclocks()
setup_8254_mixed_mode();
inthand_add("clk", apic_8254_intr,
(driver_intr_t *)clkintr, NULL,
- PI_REALTIME, INTR_FAST);
+ INTR_TYPE_CLK | INTR_FAST, NULL);
INTREN(1 << apic_8254_intr);
}
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index bbd066b..5edd84b 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -968,7 +968,7 @@ cpu_initclocks()
int diag;
#ifdef APIC_IO
int apic_8254_trial;
- struct intrhand *clkdesc;
+ void *clkdesc;
#endif /* APIC_IO */
if (statclock_disable) {
@@ -1002,8 +1002,8 @@ cpu_initclocks()
panic("APIC_IO: Cannot route 8254 interrupt to CPU");
}
- clkdesc = inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr,
- NULL, PI_REALTIME, INTR_FAST);
+ inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, &clkdesc);
INTREN(1 << apic_8254_intr);
#else /* APIC_IO */
@@ -1013,8 +1013,8 @@ cpu_initclocks()
* couldn't find anything suitable in the BSD/OS code (grog,
* 19 July 2000).
*/
- inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL, PI_REALTIME,
- INTR_FAST);
+ inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, NULL);
INTREN(IRQ0);
#endif /* APIC_IO */
@@ -1035,8 +1035,8 @@ cpu_initclocks()
panic("APIC RTC != 8");
#endif /* APIC_IO */
- inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL, PI_REALTIME,
- INTR_FAST);
+ inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, NULL);
#ifdef APIC_IO
INTREN(APIC_IRQ8);
@@ -1081,7 +1081,7 @@ cpu_initclocks()
setup_8254_mixed_mode();
inthand_add("clk", apic_8254_intr,
(driver_intr_t *)clkintr, NULL,
- PI_REALTIME, INTR_FAST);
+ INTR_TYPE_CLK | INTR_FAST, NULL);
INTREN(1 << apic_8254_intr);
}
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index bbd066b..5edd84b 100644
--- a/sys/isa/atrtc.c
+++ b/sys/isa/atrtc.c
@@ -968,7 +968,7 @@ cpu_initclocks()
int diag;
#ifdef APIC_IO
int apic_8254_trial;
- struct intrhand *clkdesc;
+ void *clkdesc;
#endif /* APIC_IO */
if (statclock_disable) {
@@ -1002,8 +1002,8 @@ cpu_initclocks()
panic("APIC_IO: Cannot route 8254 interrupt to CPU");
}
- clkdesc = inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr,
- NULL, PI_REALTIME, INTR_FAST);
+ inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, &clkdesc);
INTREN(1 << apic_8254_intr);
#else /* APIC_IO */
@@ -1013,8 +1013,8 @@ cpu_initclocks()
* couldn't find anything suitable in the BSD/OS code (grog,
* 19 July 2000).
*/
- inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL, PI_REALTIME,
- INTR_FAST);
+ inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, NULL);
INTREN(IRQ0);
#endif /* APIC_IO */
@@ -1035,8 +1035,8 @@ cpu_initclocks()
panic("APIC RTC != 8");
#endif /* APIC_IO */
- inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL, PI_REALTIME,
- INTR_FAST);
+ inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL,
+ INTR_TYPE_CLK | INTR_FAST, NULL);
#ifdef APIC_IO
INTREN(APIC_IRQ8);
@@ -1081,7 +1081,7 @@ cpu_initclocks()
setup_8254_mixed_mode();
inthand_add("clk", apic_8254_intr,
(driver_intr_t *)clkintr, NULL,
- PI_REALTIME, INTR_FAST);
+ INTR_TYPE_CLK | INTR_FAST, NULL);
INTREN(1 << apic_8254_intr);
}
OpenPOWER on IntegriCloud