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

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

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);
                 }
         }