Changeset fcfac420 in mainline for arch/ia32/src/smp/apic.c

Timestamp:

2005-12-10T01:02:31Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6095342

Parents:

973be64e

Message:

Changed ia32 & amd64 to use exc_register instead of trap_register.

Fixed dependency list building. I hope you all have 'makedepend' installed,
if you don't it's time to install it, as CC -M builds the dependency
list without directory names..and it just does not work.

File:

• arch/ia32/src/smp/apic.c (modified) (6 diffs)

arch/ia32/src/smp/apic.c

@@ -33 +33 @@
 #include <mm/page.h>
 #include <time/delay.h>
+#include <interrupt.h>
 #include <arch/interrupt.h>
 #include <print.h>
@@ -109 +110 @@
 #endif /* LAPIC_VERBOSE */
 
+
+static void apic_spurious(int n, void *stack);
+static void l_apic_timer_interrupt(int n, void *stack);
+
 /** Initialize APIC on BSP. */
 void apic_init(void)
@@ -115 +120 @@
         int i;
 
-        trap_register(VECTOR_APIC_SPUR, apic_spurious);
+        exc_register(VECTOR_APIC_SPUR, "apic_spurious", apic_spurious);
 
         enable_irqs_function = io_apic_enable_irqs;
@@ -127 +132 @@
          */
         io_apic_disable_irqs(0xffff);
-        trap_register(VECTOR_CLK, l_apic_timer_interrupt);
+        exc_register(VECTOR_CLK, "l_apic_timer", l_apic_timer_interrupt);
         for (i = 0; i < IRQ_COUNT; i++) {
                 int pin;
@@ -163 +168 @@
  * @param stack Interrupted stack.
  */
-void apic_spurious(__u8 n, __native stack[])
+void apic_spurious(int n, void *stack)
 {
         printf("cpu%d: APIC spurious interrupt\n", CPU->id);
@@ -402 +407 @@
  * @param stack Interrupted stack.
  */
-void l_apic_timer_interrupt(__u8 n, __native stack[])
+void l_apic_timer_interrupt(int n, void *stack)
 {
         l_apic_eoi();