Changeset fa09449 in mainline for uspace/srv/kbd/generic/kbd.c

Timestamp:

2009-02-15T22:31:07Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

6cd9aa6

Parents:

76dd25b

Message:

Keycodes, keyboard events, kbd_event_get(). Keyboard driver now (formally) produces kbd events (press/release, keycode, mods, char) instead of just characters. In reality, the driver and client are only hacked to work with the new interface atm.

File:

• uspace/srv/kbd/generic/kbd.c (modified) (3 diffs)

uspace/srv/kbd/generic/kbd.c

@@ -43 +43 @@
 #include <stdio.h>
 #include <ipc/ns.h>
+#include <async.h>
 #include <errno.h>
+#include <libadt/fifo.h>
+#include <kbd/kbd.h>
+
 #include <arch/kbd.h>
 #include <kbd.h>
-#include <libadt/fifo.h>
 #include <key_buffer.h>
-#include <async.h>
 #include <keys.h>
 
@@ -59 +61 @@
 static void irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {
-        int chr;
+        kbd_event_t ev;
 
 #ifdef MOUSE_ENABLED
@@ -70 +72 @@
         if (cons_connected && phone2cons != -1) {
                 /*
-                 * recode to ASCII - one interrupt can produce more than one
-                 * code so result is stored in fifo
+                 * One interrupt can produce more than one event so the result
+                 * is stored in a FIFO.
                  */
                 while (!keybuffer_empty(&keybuffer)) {
-                        if (!keybuffer_pop(&keybuffer, (int *)&chr))
+                        if (!keybuffer_pop(&keybuffer, &ev))
                                 break;
 
-                        async_msg_1(phone2cons, KBD_PUSHCHAR, chr);
+                        async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key,
+                            ev.mods, ev.c);
                 }
         }