Changeset 89 for trunk/hal/x86_64/core/hal_kentry.S

Timestamp:

Jun 29, 2017, 9:54:01 AM (7 years ago)

Author:

max@…

Message:

Parse the IOAPIC structure in ACPI, map the IOAPIC, and enable
the keyboard interrupt. Its queue is not flushed yet.

File:

• trunk/hal/x86_64/core/hal_kentry.S (modified) (4 diffs)

trunk/hal/x86_64/core/hal_kentry.S

@@ -36 +36 @@
         .globl  hal_trap_entry
         .globl  hal_timer_intr
+        .globl  hal_keyboard_intr
         .type   hal_trap_entry, @function
         .type   hal_timer_intr, @function
+        .type   hal_keyboard_intr, @function
 
         /*
@@ -119 +121 @@
 
         /*
-         * LAPIC interrupts.
+         * APIC interrupts.
          */
 ASM_ENTRY(x86_lapic_spurious)
@@ -131 +133 @@
         movq    %rsp,%rdi
         call    hal_timer_intr
+
+        movq    lapic_va(%rip),%rax
+        movl    $0,LAPIC_EOI(%rax)
+
+        INTR_RESTORE_REGS
+        addq    $16,%rsp
+        iretq
+
+ASM_ENTRY(x86_ioapic_keyboard)
+        pushq   $0
+        pushq   $T_ASTFLT
+        INTR_SAVE_REGS
+
+        movq    %rsp,%rdi
+        call    hal_keyboard_intr
 
         movq    lapic_va(%rip),%rax
@@ -182 +199 @@
         .quad   x86_lapic_spurious
         .quad   x86_lapic_timer
-
+        .quad   x86_ioapic_keyboard
+