Changeset bff90ba in mainline

Timestamp:

2011-12-27T11:36:08Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

da2d75b

Parents:

a84ddf0

Message:

xtkbd: Cleanup.

File:

• uspace/drv/char/xtkbd/xtkbd.c (modified) (4 diffs)

uspace/drv/char/xtkbd/xtkbd.c

@@ -179 +179 @@
 /*----------------------------------------------------------------------------*/
 static int polling(void *);
-static void default_connection_handler(ddf_fun_t *fun,
-    ipc_callid_t icallid, ipc_call_t *icall);
+static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
 /*----------------------------------------------------------------------------*/
 /** Keyboard function ops. */
@@ -241 +240 @@
 {
         assert(arg);
-        xt_kbd_t *kbd = arg;
+        const xt_kbd_t *kbd = arg;
 
         assert(kbd->parent_sess);
@@ -255 +254 @@
                         map_size = sizeof(scanmap_e0) / sizeof(int);
                         size = char_dev_read(kbd->parent_sess, &code, 1);
-                }
-
-
-                kbd_event_type_t type;
-                if (code & 0x80) {
-                        code &= ~0x80;
-                        type = KEY_RELEASE;
-                } else {
-                        type = KEY_PRESS;
-                }
-
-                if ((size_t) code >= map_size) {
-                        ddf_msg(LVL_WARN,
-                            "Unknown scancode: %hhx, size: %zd", code, size);
+                        // TODO handle print screen
+                }
+
+                /* Invalid read. */
+                if (size != 1) {
                         continue;
                 }
 
-                const unsigned key = map[code];
+
+                /* Bit 7 indicates press/release */
+                const kbd_event_type_t type =
+                    (code & 0x80) ? KEY_RELEASE : KEY_PRESS;
+                code &= ~0x80;
+
+                const unsigned key = (code < map_size) ? map[code] : 0;
                 if (key != 0) {
                         async_exch_t *exch =
@@ -283 +279 @@
                         async_msg_4(exch, KBDEV_EVENT, type, key, 0, 0);
                         async_exchange_end(exch);
+                } else {
+                        ddf_msg(LVL_WARN, "Unknown scancode: %hhx", code);
                 }
         }