Changeset 91

Timestamp:

Jun 29, 2017, 11:02:22 AM (7 years ago)

Author:

max@…

Message:

retrieve the pressed key, and display it

Location:

trunk/hal/x86_64/core

Files:

• hal_cpu.S (modified) (1 diff)
• hal_internal.h (modified) (1 diff)
• hal_trap.c (modified) (2 diffs)

trunk/hal/x86_64/core/hal_cpu.S

@@ -56 +56 @@
         ret
 
+ASM_ENTRY(in8)
+        movq    %rdi,%rdx
+        xorq    %rax,%rax
+        inb     %dx,%al
+        ret
+
 ASM_ENTRY(out8)
         movq    %rdi,%rdx

trunk/hal/x86_64/core/hal_internal.h

@@ -35 +35 @@
 void sti();
 void cli();
+uint8_t in8(uint32_t port);
 void out8(uint32_t port, uint8_t val);
 uint64_t rdmsr(uint32_t);

trunk/hal/x86_64/core/hal_trap.c

@@ -22 +22 @@
 #include <hal_types.h>
 #include <hal_kentry.h>
+#include <hal_internal.h>
 
 static const char *trap_type[] = {
@@ -82 +83 @@
 }
 
+/* -------------------------------------------------------------------------- */
+
+#define PS2_DATA        0x60
+
+#define PS2_STATUS      0x64
+#       define STATUS_OUT_FULL  0x00
+#       define STATUS_IN_FULL   0x01
+#       define STATUS_SYS_FLAG  0x02
+
+#define PS2_CMD 0x64
+
 /*
- * Keyboard interrupt
+ * US scancode table, found on the internet.
+ */
+unsigned char scancode_US[128] =
+{
+         0,     27, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=',
+        '\b', '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']',
+        '\n',
+         0,     /* 29   - Control */
+        'a',   's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '`',
+         0,     /* Left shift */
+        '\\',  'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/',
+         0,     /* Right shift */
+        '*',
+         0,     /* Alt */
+        ' ',    /* Space bar */
+         0,     /* Caps lock */
+         0,     /* 59 - F1 key ... > */
+         0,   0,   0,   0,   0,   0,   0,   0,
+         0,     /* < ... F10 */
+         0,     /* 69 - Num lock*/
+         0,     /* Scroll Lock */
+         0,     /* Home key */
+         0,     /* Up Arrow */
+         0,     /* Page Up */
+        '-',
+         0,     /* Left Arrow */
+         0,
+         0,     /* Right Arrow */
+        '+',
+         0,     /* 79 - End key*/
+         0,     /* Down Arrow */
+         0,     /* Page Down */
+         0,     /* Insert Key */
+         0,     /* Delete Key */
+         0,   0,   0,
+         0,     /* F11 Key */
+         0,     /* F12 Key */
+         0,     /* All other keys are undefined */
+};      
+
+/*
+ * Keyboard interrupt (8042 PS/2)
  */
 void hal_keyboard_intr(struct trapframe *tf)
 {
-        x86_printf("-> got keyboard: rip=%Z\n", tf->tf_rip);
+        uint64_t val;
+
+        do {
+                val = in8(PS2_STATUS);
+        } while ((val & STATUS_IN_FULL) == 0);
+
+        val = in8(PS2_DATA);
+
+        x86_printf("-> got keyboard: rip=%Z key=%c ", tf->tf_rip, scancode_US[val]);
+
+        if (val & 0x80)
+                x86_printf("[released]\n");
+        else
+                x86_printf("[pressed]\n");
+
         return;
 }