Changeset 2a103b5 in mainline for kernel/arch/mips32/src/mach/malta/malta.c

Timestamp:

2019-06-09T11:31:38Z (5 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.

File:

• kernel/arch/mips32/src/mach/malta/malta.c (modified) (3 diffs)

kernel/arch/mips32/src/mach/malta/malta.c

@@ -75 +75 @@
 {
         uint8_t isa_irq = host2uint32_t_le(pio_read_32(GT64120_PCI0_INTACK));
-        if (pic_is_spurious(isa_irq)) {
-                pic_handle_spurious(isa_irq);
+        if (i8259_is_spurious(isa_irq)) {
+                i8259_handle_spurious(isa_irq);
 #ifdef CONFIG_DEBUG
                 log(LF_ARCH, LVL_DEBUG, "cpu%u: PIC spurious interrupt %u",
@@ -93 +93 @@
 #endif
         }
-        pic_eoi(isa_irq);
+        i8259_eoi(isa_irq);
 }
 
@@ -146 +146 @@
                         indev_t *srln = srln_wire(srln_instance, sink);
                         ns16550_wire(tty_instance, srln);
-                        pic_enable_irqs(1 << TTY_ISA_IRQ);
+                        i8259_enable_irqs(1 << TTY_ISA_IRQ);
                 }
         }