Changeset 287920f in mainline for kernel/genarch/src/kbd/i8042.c

Timestamp:

2006-08-09T13:27:55Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d46c6ecd

Parents:

da74747

Message:

i8042 and z8530 separated, the tree compiles again.
Now there is some duplicated code in i8042.c and z8530.c,
but that can be eliminated in slower pace.

File:

• kernel/genarch/src/kbd/i8042.c (modified) (5 diffs)

kernel/genarch/src/kbd/i8042.c

@@ -37 +37 @@
  */
 
-#include <genarch/i8042/i8042.h>
+#include <genarch/kbd/i8042.h>
+#include <genarch/kbd/scanc.h>
+#include <genarch/kbd/scanc_pc.h>
 #include <arch/drivers/i8042.h>
 #include <arch/interrupt.h>
@@ -79 +81 @@
 #define KEY_RELEASE     0x80
 
-/**
- * These codes read from i8042 data register are silently ignored.
- */
-#define IGNORE_CODE     0x7f
-
 static void key_released(uint8_t sc);
 static void key_pressed(uint8_t sc);
@@ -391 +388 @@
                         ;
                 x = i8042_data_read();
-                if (x != IGNORE_CODE) {
-                        if (x & KEY_RELEASE)
-                                key_released(x ^ KEY_RELEASE);
-                        else
-                                active_read_key_pressed(x);
-                }
+                if (x & KEY_RELEASE)
+                        key_released(x ^ KEY_RELEASE);
+                else
+                        active_read_key_pressed(x);
         }
         return ch;
@@ -411 +406 @@
         while (((x = i8042_status_read() & i8042_BUFFER_FULL_MASK))) {
                 x = i8042_data_read();
-                if (x != IGNORE_CODE) {
-                        if (x & KEY_RELEASE)
-                                key_released(x ^ KEY_RELEASE);
-                        else
-                                key_pressed(x);
-                }
+                if (x & KEY_RELEASE)
+                        key_released(x ^ KEY_RELEASE);
+                else
+                        key_pressed(x);
         }
 }
@@ -422 +415 @@
 /** @}
  */
-