Changeset 4b44099d in mainline

Timestamp:

2009-02-19T19:54:02Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7d60cf5

Parents:

c852b948

Message:

Kill arch/drivers/i8042.h.

Location:

kernel

Files:

• arch/ia32/include/drivers/i8042.h (deleted)
• arch/ia64/include/drivers/i8042.h (deleted)
• genarch/src/kbd/i8042.c (modified) (6 diffs)

kernel/genarch/src/kbd/i8042.c

@@ -42 +42 @@
 #include <genarch/kbd/scanc.h>
 #include <genarch/kbd/scanc_pc.h>
-#include <arch/drivers/i8042.h>
 #include <cpu.h>
 #include <arch/asm.h>
@@ -51 +50 @@
 #include <sysinfo/sysinfo.h>
 #include <ipc/irq.h>
+
+#define i8042_DATA      0x60
+#define i8042_STATUS    0x64
 
 /* Keyboard commands. */
@@ -137 +139 @@
                 uint8_t status;
                 
-                while (((status = i8042_status_read()) & i8042_BUFFER_FULL_MASK)) {
-                        data = i8042_data_read();
+                while (((status = pio_read_8(i8042_STATUS)) &
+                    i8042_BUFFER_FULL_MASK)) {
+                        data = pio_read_8(i8042_DATA);
                         
                         if ((status & i8042_MOUSE_DATA))
@@ -152 +155 @@
 
 /** Initialize i8042. */
-void i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno, inr_t mouse_inr)
+void
+i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno,
+    inr_t mouse_inr)
 {
         chardev_initialize("i8042_kbd", &kbrd, &ops);
@@ -179 +184 @@
          */
         int i;
-        for (i = 0; (i8042_status_read() & i8042_BUFFER_FULL_MASK) && i < 100; i++) {
-                i8042_data_read();
+        for (i = 0; (pio_read_8(i8042_STATUS) & i8042_BUFFER_FULL_MASK) &&
+            i < 100; i++) {
+                (void) pio_read_8(i8042_DATA);
         }
         
@@ -213 +219 @@
                 uint8_t x;
                 
-                while (!(i8042_status_read() & i8042_BUFFER_FULL_MASK));
+                while (!(pio_read_8(i8042_STATUS) & i8042_BUFFER_FULL_MASK))
+                        ;
                 
-                x = i8042_data_read();
+                x = pio_read_8(i8042_STATUS);
                 if (x & KEY_RELEASE)
                         key_released(x ^ KEY_RELEASE);