Changeset 2a103b5 in mainline for kernel/arch/ia32/include

Timestamp:

2019-06-09T11:31:38Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c48de91

Parents:

b401b33

Message:

Introduce PIC operations indirection mechanism

Some architectures switch from one interrupt controller implementation
to another during runtime. By providing a cleaner indirection mechanism,
it is possible e.g. for the ia32 IRQ 7 handler to distinguish i8259
spurious interrupts from actual IRQ 7 device interrupts, even when the
i8259 interrupt controller is no longer active.

Location:

kernel/arch/ia32/include/arch

Files:

• interrupt.h (modified) (1 diff)
• smp/apic.h (modified) (2 diffs)

kernel/arch/ia32/include/arch/interrupt.h

@@ -88 +88 @@
 #define VECTOR_DEBUG_IPI          (IVT_FREEBASE + 2)
 
-extern void (*disable_irqs_function)(uint16_t);
-extern void (*enable_irqs_function)(uint16_t);
-extern void (*eoi_function)(unsigned int);
-extern const char *irqs_info;
-
 extern void interrupt_init(void);
-extern void trap_virtual_enable_irqs(uint16_t);
-extern void trap_virtual_disable_irqs(uint16_t);
 
 #endif

kernel/arch/ia32/include/arch/smp/apic.h

@@ -43 +43 @@
 #include <cpu.h>
 #include <stdint.h>
+#include <genarch/pic/pic_ops.h>
 
 #define FIXED  (0 << 0)
@@ -347 +348 @@
 } io_apic_id_t;
 
+extern pic_ops_t apic_pic_ops;
+
 extern volatile uint32_t *l_apic;
 extern volatile uint32_t *io_apic;