From 450512799cf699701aab3f5b4bcc4fdc61e5a9a2 Mon Sep 17 00:00:00 2001
From: Jolan Rathelot <jrathelo@student.42nice.fr>
Date: Thu, 14 Mar 2024 11:18:41 +0100
Subject: [PATCH] added key parsing

Signed-off-by: Jolan Rathelot <jrathelo@student.42nice.fr>
---
 .idea/workspace.xml          | 66 ++++++++++++++++++++----------------
 src/drivers_and_interrupts.h |  2 +-
 src/keyboard_logger.c        | 38 +++++++++++++++++----
 src/main.c                   |  5 ++-
 4 files changed, 73 insertions(+), 38 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1fcbd6e..ef829ca 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -17,7 +17,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="2686ebbf-1c6c-4484-bb57-dec59a208d53" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/keyboard_logger.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/keyboard_logger.c" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -65,30 +66,30 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ASKED_ADD_EXTERNAL_FILES": "true",
-    "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "cf.first.check.clang-format": "false",
-    "cidr.known.project.marker": "true",
-    "git-widget-placeholder": "master",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "org.rust.cargo.project.model.PROJECT_DISCOVERY": "true",
-    "org.rust.hideNoCargoProjectNotifications/root/drivers-and-interrupts/src/fancy_print.rs": "true",
-    "org.rust.hideNoCargoProjectNotifications/root/drivers-and-interrupts/src/main.rs": "true",
-    "settings.editor.selected.configurable": "MakefileSettings",
-    "structure.view.defaults.are.configured": "true",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
+    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;org.rust.cargo.project.model.PROJECT_DISCOVERY&quot;: &quot;true&quot;,
+    &quot;org.rust.hideNoCargoProjectNotifications/root/drivers-and-interrupts/src/fancy_print.rs&quot;: &quot;true&quot;,
+    &quot;org.rust.hideNoCargoProjectNotifications/root/drivers-and-interrupts/src/main.rs&quot;: &quot;true&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;MakefileSettings&quot;,
+    &quot;structure.view.defaults.are.configured&quot;: &quot;true&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RdControllerToolWindowsLayoutState" isNewUi="true">
     <layout>
       <window_info id="Space Code Reviews" />
@@ -96,9 +97,9 @@
       <window_info id="Merge Requests" />
       <window_info id="Commit_Guest" />
       <window_info id="Pull Requests" weight="0.2032358" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.50054586" visible="true" weight="0.2032358" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.50054586" visible="true" weight="0.18550533" />
       <window_info id="Commit" order="1" weight="0.25" />
-      <window_info active="true" id="Structure" order="2" sideWeight="0.49945414" side_tool="true" visible="true" weight="0.2032358" />
+      <window_info id="Structure" order="2" sideWeight="0.49945414" side_tool="true" weight="0.2032358" />
       <window_info anchor="bottom" id="CMake" weight="0.22384511" />
       <window_info anchor="bottom" id="Database Changes" />
       <window_info anchor="bottom" id="TypeScript" />
@@ -111,7 +112,7 @@
       <window_info anchor="bottom" id="clangd" />
       <window_info anchor="bottom" id="Version Control" order="0" weight="0.32982337" />
       <window_info anchor="bottom" id="Problems View" order="1" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="2" visible="true" weight="0.32982337" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="2" visible="true" weight="0.26324728" />
       <window_info anchor="bottom" id="Services" order="3" weight="0.22384511" />
       <window_info anchor="right" id="make" side_tool="true" />
       <window_info anchor="right" id="Meet New UI" side_tool="true" />
@@ -120,7 +121,7 @@
     </layout>
   </component>
   <component name="RustProjectSettings">
-    <option name="toolchainHomeDirectory" value="$PROJECT_DIR$/../.cargo/bin" />
+    <option name="toolchainHomeDirectory" value="$USER_HOME$/.cargo/bin" />
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
@@ -145,7 +146,14 @@
       <workItem from="1710237482962" duration="1467000" />
       <workItem from="1710239039309" duration="441000" />
       <workItem from="1710239561572" duration="2000" />
-      <workItem from="1710242577588" duration="3883000" />
+      <workItem from="1710242577588" duration="7515000" />
+      <workItem from="1710341418305" duration="265000" />
+      <workItem from="1710341838935" duration="656000" />
+      <workItem from="1710342627627" duration="2000" />
+      <workItem from="1710342965253" duration="804000" />
+      <workItem from="1710406290228" duration="3416000" />
+      <workItem from="1710410667925" duration="2000" />
+      <workItem from="1710410734122" duration="877000" />
     </task>
     <task id="LOCAL-00001" summary="Removed Rust code, added misc device and irq handle. Began work on correctly formatting print msg and logging files.">
       <option name="closed" value="true" />
diff --git a/src/drivers_and_interrupts.h b/src/drivers_and_interrupts.h
index 894a5a1..3171d96 100644
--- a/src/drivers_and_interrupts.h
+++ b/src/drivers_and_interrupts.h
@@ -27,12 +27,12 @@ struct linked_list_node {
     struct list_head list;
 };
 
-static struct mutex lock;
 
 #ifndef EXTERN
 # define EXTERN extern
 #endif
 extern struct list_head keyboard_log;
+extern struct mutex lock;
 
 
 void    print_keyboard_line(struct KeyboardCaptureData data);
diff --git a/src/keyboard_logger.c b/src/keyboard_logger.c
index 701deb3..29fda7c 100644
--- a/src/keyboard_logger.c
+++ b/src/keyboard_logger.c
@@ -8,7 +8,9 @@
 
 LIST_HEAD(keyboard_log);
 
-const struct KeyboardCaptureData KEY_DICTIONARY[] = {
+#define DICT_SIZE 249
+
+const struct KeyboardCaptureData KEY_DICTIONARY[DICT_SIZE] = {
         { 0x1, "Escape", PRESSED, 0 },
         { 0x2, "1", PRESSED, '1' },
         { 0x3, "2", PRESSED, '2' },
@@ -260,20 +262,42 @@ const struct KeyboardCaptureData KEY_DICTIONARY[] = {
         { 0xe11d45e19dc5, "Pause", PRESSED, 0 },
 };
 
-void printk_key_event(char code) {
+struct KeyboardCaptureData find_key_from_code(uint64_t code) {
+    for (size_t i = 0; i < DICT_SIZE; i++) {
+        if (KEY_DICTIONARY[i].code == code) {
+            return KEY_DICTIONARY[i];
+        }
+    }
+    struct KeyboardCaptureData dummy =  { 0, "", PRESSED, 0 };
+    return dummy;
+}
+
+void printk_key_event(struct KeyboardCaptureData key) {
     struct timespec64 now;
     ktime_get_real_ts64(&now);
     char sec = (now.tv_sec - (sys_tz.tz_minuteswest * 60)) % 60;
     char min = (now.tv_sec - (sys_tz.tz_minuteswest * 60)) / 60 % 60;
     char hour = (now.tv_sec - (sys_tz.tz_minuteswest * 60)) / 60 / 60 % 24;
-    printk("%d:%d:%d code: %d", hour, min, sec, code);
+    printk(KERN_INFO "%d:%d:%d \"%s\" ", hour, min, sec, key.key_name);
+    if (key.ascii_value) {
+        printk(KERN_CONT "(0x%x) ", key.ascii_value);
+    }
+    if (key.state == PRESSED) {
+        printk(KERN_CONT "PRESSED\n");
+    } else {
+        printk(KERN_CONT "RELEASED\n");
+    }
 }
 
 irqreturn_t key_logger_isr(int i, void *dummy) {
-    mb();
-    char code = inb(0x60);
-
-    printk_key_event(code);
+    uint64_t code = inb(0x60);
+    struct KeyboardCaptureData key = find_key_from_code(code);
+    if (!key.code) {
+        return IRQ_NONE;
+    }
+    mutex_lock(&lock);
+    printk_key_event(key);
+    mutex_unlock(&lock);
     return IRQ_HANDLED;
 }
 
diff --git a/src/main.c b/src/main.c
index 2516e5d..6a9fcb5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,7 +25,10 @@ static struct miscdevice device = {
 
 struct logger {
     char code;
-}key_logger;
+} key_logger;
+
+
+struct mutex lock = __MUTEX_INITIALIZER(lock);
 
 static int __init m_init(void) {
     struct linked_list_node *ptr, *tmp;