From 7ddb97ff596d8c5aa2a62ef3bb8031545ae29e03 Mon Sep 17 00:00:00 2001
From: Mathieu Serandour <mathieu.serandour@telecom-paris.fr>
Date: Sun, 12 Dec 2021 12:24:19 +0100
Subject: [PATCH] scancode <-> keycode

---
 kernel/drivers/ps2kb.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/kernel/drivers/ps2kb.c b/kernel/drivers/ps2kb.c
index bd8d082..2f6d106 100644
--- a/kernel/drivers/ps2kb.c
+++ b/kernel/drivers/ps2kb.c
@@ -8,7 +8,7 @@
 
 static void kbevent_default_handler(const struct kbevent* event) {
     (void) event;
-    log_debug("%c ", event->scancode);
+    log_debug("%c ", event->keycode);
 }
 
 static kbevent_handler handler = kbevent_default_handler;
@@ -105,7 +105,7 @@ static void process_byte(uint8_t b) {
         return;
     struct kbevent ev = {
         .type     = (b&0x80) ? KEYRELEASED : KEYPRESSED,
-        .keycode  = b&0x7f,
+        .scancode  = b&0x7f,
     };
 
     if(ev.keycode == 0x2A) {
@@ -121,11 +121,11 @@ static void process_byte(uint8_t b) {
     }
 
     if(altgr_state)
-        ev.scancode = ps2_azerty_table_altgr[ev.keycode];
+        ev.keycode = ps2_azerty_table_altgr    [ev.scancode];
     else if(is_caps())
-        ev.scancode = ps2_azerty_table_uppercase[ev.keycode];
+        ev.keycode = ps2_azerty_table_uppercase[ev.scancode];
     else
-        ev.scancode = ps2_azerty_table_lowercase[ev.keycode];
+        ev.keycode = ps2_azerty_table_lowercase[ev.scancode];
     
     handler(&ev);
 }
@@ -159,7 +159,6 @@ void ps2kb_init(void) {
     uint8_t config;
     command_byte(0x20); // read config byte command
     config = get_byte();
-    log_debug("zdf");
 
     command_byte(0x6);
     command_byte(config | 1);