Changeset fa09449 in mainline for uspace/lib/libc

Timestamp:

2009-02-15T22:31:07Z (16 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.

Location:

uspace/lib/libc

Files:

• Makefile (modified) (1 diff)
• generic/io/stream.c (modified) (2 diffs)
• generic/kbd.c (added)
• include/ipc/console.h (modified) (1 diff)
• include/kbd/kbd.h (added)
• include/kbd/keycode.h (added)

uspace/lib/libc/Makefile

@@ -80 +80 @@
         generic/err.c \
         generic/stdlib.c \
+        generic/kbd.c \
         generic/mman.c \
         generic/udebug.c \

uspace/lib/libc/generic/io/stream.c

@@ -44 +44 @@
 #include <ipc/services.h>
 #include <ipc/console.h>
+#include <kbd/kbd.h>
 #include <unistd.h>
 #include <async.h>
@@ -59 +60 @@
         open_console();
         if (console_phone >= 0) {
-                ipcarg_t r0, r1;
+                kbd_event_t ev;
+                int rc;
                 size_t i = 0;
         
                 while (i < count) {
-                        if (async_req_0_2(console_phone, CONSOLE_GETCHAR, &r0, &r1) < 0)
-                                return -1;
-                        ((char *) buf)[i++] = r0;
+                        do {
+                                rc = kbd_get_event(&ev);
+                                if (rc < 0) return -1;
+                        } while (ev.c == 0);
+
+                        ((char *) buf)[i++] = ev.c;
                 }
                 return i;

uspace/lib/libc/include/ipc/console.h

@@ -39 +39 @@
 
 typedef enum {
-        CONSOLE_GETCHAR = IPC_FIRST_USER_METHOD,
+        CONSOLE_GETKEY = IPC_FIRST_USER_METHOD,
         CONSOLE_PUTCHAR,
         CONSOLE_CLEAR,