Changeset 411b6a6 in mainline for kernel/genarch/src/drivers/i8042/i8042.c

Timestamp:

2009-03-07T16:08:40Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4c84368e

Parents:

e06da7e

Message:

Complete emancipation of kernel serial controller drivers (i8042, ns16550 and
z8530). Provide a common keyboard module for PC and Sun keyboards. The serial
line module is still to follow.

File:

• kernel/genarch/src/drivers/i8042/i8042.c (moved) (moved from kernel/genarch/src/kbd/i8042.c ) (7 diffs)

kernel/genarch/src/drivers/i8042/i8042.c

@@ -32 +32 @@
 /**
  * @file
- * @brief       i8042 processor driver.
+ * @brief       i8042 processor driver
  *
- * It takes care of low-level keyboard functions.
+ * It takes care of the i8042 serial communication.
  */
 
-#include <genarch/kbd/i8042.h>
-#include <arch/drivers/kbd.h>
-#include <genarch/kbd/key.h>
-#include <genarch/kbd/scanc.h>
-#include <genarch/kbd/scanc_pc.h>
+#include <genarch/drivers/i8042/i8042.h>
 #include <genarch/drivers/legacy/ia32/io.h>
-#include <cpu.h>
 #include <arch/asm.h>
-#include <arch.h>
 #include <console/chardev.h>
-#include <console/console.h>
-#include <interrupt.h>
-
-/* Keyboard commands. */
-#define KBD_ENABLE      0xf4
-#define KBD_DISABLE     0xf5
-#define KBD_ACK         0xfa
-
-/*
- * 60  Write 8042 Command Byte: next data byte written to port 60h is
- *     placed in 8042 command register. Format:
- *
- *    |7|6|5|4|3|2|1|0|8042 Command Byte
- *     | | | | | | | `---- 1=enable output register full interrupt
- *     | | | | | | `----- should be 0
- *     | | | | | `------ 1=set status register system, 0=clear
- *     | | | | `------- 1=override keyboard inhibit, 0=allow inhibit
- *     | | | `-------- disable keyboard I/O by driving clock line low
- *     | | `--------- disable auxiliary device, drives clock line low
- *     | `---------- IBM scancode translation 0=AT, 1=PC/XT
- *     `----------- reserved, should be 0
- */
+#include <mm/slab.h>
 
 #define i8042_SET_COMMAND       0x60
@@ -75 +48 @@
 #define i8042_BUFFER_FULL_MASK  0x01
 #define i8042_WAIT_MASK         0x02
-#define i8042_MOUSE_DATA        0x20
-
-static void i8042_suspend(chardev_t *);
-static void i8042_resume(chardev_t *);
-
-static chardev_operations_t ops = {
-        .suspend = i8042_suspend,
-        .resume = i8042_resume,
-};
 
 static irq_ownership_t i8042_claim(irq_t *irq)
@@ -106 +70 @@
                 data = pio_read_8(&dev->data);
                         
-                if ((status & i8042_MOUSE_DATA))
-                        return;
-
-                if (data & KEY_RELEASE)
-                        key_released(data ^ KEY_RELEASE);
-                else
-                        key_pressed(data);
+                if (instance->devout)
+                        chardev_push_character(instance->devout, data);
         }
 }
@@ -118 +77 @@
 /** Initialize i8042. */
 bool
-i8042_init(i8042_t *dev, devno_t devno, inr_t inr)
+i8042_init(i8042_t *dev, devno_t devno, inr_t inr, chardev_t *devout)
 {
         i8042_instance_t *instance;
 
-        chardev_initialize("i8042_kbd", &kbrd, &ops);
-        stdin = &kbrd;
-        
         instance = malloc(sizeof(i8042_instance_t), FRAME_ATOMIC);
         if (!instance)
@@ -131 +87 @@
         instance->devno = devno;
         instance->i8042 = dev;
+        instance->devout = devout;
         
         irq_initialize(&instance->irq);
@@ -139 +96 @@
         instance->irq.instance = instance;
         irq_register(&instance->irq);
-        
-        trap_virtual_enable_irqs(1 << inr);
         
         /*
@@ -151 +106 @@
 }
 
-/* Called from getc(). */
-void i8042_resume(chardev_t *d)
-{
-}
-
-/* Called from getc(). */
-void i8042_suspend(chardev_t *d)
-{
-}
-
 /** @}
  */