Changeset 013c4d6 in mainline for kernel/genarch/src/kbd/i8042.c

Timestamp:

2009-02-19T23:55:23Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f32d90b

Parents:

d1eece6

Message:

Improve the ns16550 driver.

• The driver support multiple instances.
• It still remembers the last registered IRQ in a global structure (cannot be easily fixed now)
• Was converted to use PIO directly

File:

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

kernel/genarch/src/kbd/i8042.c

@@ -53 +53 @@
 
 i8042_instance_t lgcy_i8042_instance = {
-        .i8042 = (i8042_t *) i8042_BASE,
+        .i8042 = (i8042_t *) I8042_BASE,
 };
 
@@ -89 +89 @@
         .suspend = i8042_suspend,
         .resume = i8042_resume,
-        .read = i8042_key_read
 };
 
@@ -229 +228 @@
 }
 
-char i8042_key_read(chardev_t *d)
-{
-        i8042_t *dev = lgcy_i8042_instance.i8042;
-        char ch;
-        
-        while (!(ch = active_read_buff_read())) {
-                uint8_t x;
-                
-                while (!(pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK))
-                        ;
-                
-                x = pio_read_8(&dev->data);
-                if (x & KEY_RELEASE)
-                        key_released(x ^ KEY_RELEASE);
-                else
-                        active_read_key_pressed(x);
-        }
-        return ch;
-}
-
 /** @}
  */