Changeset cecb0789 in mainline for uspace/srv/kbd/port/i8042.c

Timestamp:

2009-02-21T17:27:59Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9688513

Parents:

0cb9fa0

Message:

This is the evil commit. In particular, it does:

• introduces more powerful pseudo code for userspace IRQ top-half handlers
• changes the internals of IRQ dispatching
• simplifies the kernel's i8042 driver
• adapts the uspace i8042 driver to make use of the new pseudocode
• breaks all other architectures except ia32
• breaks almost all existing drivers
• breaks switching between uspace and kernel drivers

File:

• uspace/srv/kbd/port/i8042.c (modified) (1 diff)

uspace/srv/kbd/port/i8042.c

@@ -64 +64 @@
 #define MOUSE_ACK       0xfa
 
-static irq_cmd_t i8042_cmds[2] = {
-        { CMD_PORT_READ_1, (void *) 0x64, 0, 1 },
-        { CMD_PORT_READ_1, (void *) 0x60, 0, 2 }
+static irq_cmd_t i8042_cmds[] = {
+        {
+                .cmd = CMD_PIO_READ_8,
+                .addr = (void *) 0x64,
+                .dstarg = 1
+        },
+        {
+                .cmd = CMD_BTEST,
+                .value = i8042_OUTPUT_FULL,
+                .srcarg = 1,
+                .dstarg = 3
+        },
+        {
+                .cmd = CMD_PREDICATE,
+                .value = 2,
+                .srcarg = 3
+        },
+        {
+                .cmd = CMD_PIO_READ_8,
+                .addr = (void *) 0x60,
+                .dstarg = 2
+        },
+        {
+                .cmd = CMD_ACCEPT
+        }
 };
 
 static irq_code_t i8042_kbd = {
-        2,
+        sizeof(i8042_cmds) / sizeof(irq_cmd_t),
         i8042_cmds
 };