Changeset 30ab05f in mainline for genarch/src/i8042/i8042.c

Timestamp:

2006-02-27T20:33:36Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d87c3f3

Parents:

02f441c0

Message:

sparc64 work.
Very raw and fragile preliminary standalone keyboard support - polling mode only.
Because of a workaround in Simics, the scan codes are the same as on ia32.

File:

• genarch/src/i8042/i8042.c (modified) (6 diffs)

genarch/src/i8042/i8042.c

@@ -53 +53 @@
 /*
  * 60  Write 8042 Command Byte: next data byte written to port 60h is
- *     placed in 8042 command register.Format:
+ *     placed in 8042 command register. Format:
  *
  *    |7|6|5|4|3|2|1|0|8042 Command Byte
@@ -74 +74 @@
 #define SPECIAL         '?'
 #define KEY_RELEASE     0x80
+
+/**
+ * These codes read from i8042 data register are silently ignored.
+ */
+#define IGNORE_CODE     0x7f
 
 static void key_released(__u8 sc);
@@ -262 +267 @@
 
 static void i8042_interrupt(int n, void *stack);
+static void i8042_wait(void);
 
 /** Initialize i8042. */
@@ -267 +273 @@
 {
         exc_register(VECTOR_KBD, "i8042_interrupt", i8042_interrupt);
-        while (i8042_status_read() & i8042_WAIT_MASK) {
-                /* wait */
-        }
+        i8042_wait();
         i8042_command_write(i8042_SET_COMMAND);
-        while (i8042_status_read() & i8042_WAIT_MASK) {
-                /* wait */
-        }
+        i8042_wait();
         i8042_data_write(i8042_COMMAND);
+        i8042_wait();
 
         trap_virtual_enable_irqs(1<<IRQ_KBD);
@@ -296 +299 @@
         else
                 key_pressed(x);
+}
+
+/** Wait until the controller reads its data. */
+void i8042_wait(void) {
+        while (i8042_status_read() & i8042_WAIT_MASK) {
+                /* wait */
+        }
 }
 
@@ -503 +513 @@
                         ;
                 x = i8042_data_read();
-                if (x & KEY_RELEASE)
-                        key_released(x ^ KEY_RELEASE);
-                else
-                        active_read_key_pressed(x);
+                if (x != IGNORE_CODE) {
+                        if (x & KEY_RELEASE)
+                                key_released(x ^ KEY_RELEASE);
+                        else
+                                active_read_key_pressed(x);
+                }
         }
         return ch;
 }
+
+/** Poll for key press and release events.
+ *
+ * This function can be used to implement keyboard polling.
+ */
+void i8042_poll(void)
+{
+        __u8 x;
+
+        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);
+                }
+        }
+}