Changes in kernel/arch/ia32/src/smp/apic.c [2a103b5:ef56a43] in mainline

File:

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

kernel/arch/ia32/src/smp/apic.c

@@ -47 +47 @@
 #include <arch.h>
 #include <ddi/irq.h>
-#include <genarch/pic/pic_ops.h>
 
 #ifdef CONFIG_SMP
@@ -63 +62 @@
  *
  */
-
-static const char *apic_get_name(void);
-static bool l_apic_is_spurious(unsigned int);
-static void l_apic_handle_spurious(unsigned int);
-
-pic_ops_t apic_pic_ops = {
-        .get_name = apic_get_name,
-        .enable_irqs = io_apic_enable_irqs,
-        .disable_irqs = io_apic_disable_irqs,
-        .eoi = l_apic_eoi,
-        .is_spurious = l_apic_is_spurious,
-        .handle_spurious = l_apic_handle_spurious,
-};
 
 /*
@@ -139 +125 @@
 #endif /* LAPIC_VERBOSE */
 
-const char *apic_get_name(void)
-{
-        return "apic";
-}
-
-bool l_apic_is_spurious(unsigned int n)
-{
-        return n == VECTOR_APIC_SPUR;
-}
-
-void l_apic_handle_spurious(unsigned int n)
-{
-}
-
 /** APIC spurious interrupt handler.
  *
@@ -162 +134 @@
     istate_t *istate __attribute__((unused)))
 {
+#ifdef CONFIG_DEBUG
+        log(LF_ARCH, LVL_DEBUG, "cpu%u: APIC spurious interrupt", CPU->id);
+#endif
 }
 
@@ -200 +175 @@
             (iroutine_t) apic_spurious);
 
-        pic_ops = &apic_pic_ops;
+        enable_irqs_function = io_apic_enable_irqs;
+        disable_irqs_function = io_apic_disable_irqs;
+        eoi_function = l_apic_eoi;
+        irqs_info = "apic";
 
         /*