Changeset 607c5f9 in mainline for arch/ia32/src/drivers/i8042.c

Timestamp:

2005-11-23T00:16:03Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a83a802

Parents:

2677758

Message:

Enable dummy kconsole for ia32 and amd64 (UP mode works).

File:

• arch/ia32/src/drivers/i8042.c (modified) (4 diffs)

arch/ia32/src/drivers/i8042.c

@@ -36 +36 @@
 #include <synch/spinlock.h>
 #include <typedefs.h>
+#include <console/chardev.h>
+#include <console/console.h>
 
 /**
@@ -55 +57 @@
 static volatile int keyflags;           /**< Tracking of multiple keypresses. */
 static volatile int lockflags;          /**< Tracking of multiple keys lockings. */
+
+static void i8042_suspend(void);
+static void i8042_resume(void);
+
+static chardev_t kbrd;
+static chardev_operations_t ops = {
+        .suspend = i8042_suspend,
+        .resume = i8042_resume
+};
 
 /** Primary meaning of scancodes. */
@@ -221 +232 @@
         trap_register(VECTOR_KBD, i8042_interrupt);
         spinlock_initialize(&keylock);
+        chardev_initialize(&kbrd, &ops);
+        stdin = &kbrd;
 }
 
@@ -293 +306 @@
                 if (shift)
                         map = sc_secondary_map;
-                putchar(map[sc]);
+                chardev_push_character(&kbrd, map[sc]);
                 break;
         }
         spinlock_unlock(&keylock);
 }
+
+/* Called from getc(). */
+void i8042_resume(void)
+{
+}
+
+/* Called from getc(). */
+void i8042_suspend(void)
+{
+}