Changeset 8e7c9fe in mainline for uspace/drv/char/xtkbd/xtkbd.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

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

uspace/drv/char/xtkbd/xtkbd.c

@@ -36 +36 @@
 #include <ddf/log.h>
 #include <io/keycode.h>
+#include <io/chardev.h>
 #include <io/console.h>
 #include <ipc/kbdev.h>
 #include <abi/ipc/methods.h>
 
-#include "chardev.h"
 #include "xtkbd.h"
 
@@ -159 +159 @@
 static const int scanmap_e0[] = {
         [0x38] = KC_RALT,
-        [0x1d] = KC_RSHIFT,
+        [0x1d] = KC_RCTRL,
 
         [0x37] = KC_PRTSCR,
@@ -199 +199 @@
  * @param dev DDF device structure.
  *
- * Connects to parent, creates mouse function, starts polling fibril.
+ * Connects to parent, creates keyboard function, starts polling fibril.
  */
 int xt_kbd_init(xt_kbd_t *kbd, ddf_dev_t *dev)
@@ -207 +207 @@
         kbd->client_sess = NULL;
         kbd->parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
-        if (!kbd->parent_sess)
-                return ENOMEM;
+        if (!kbd->parent_sess) {
+                ddf_msg(LVL_ERROR, "Failed creating parent session.");
+                return EIO;
+        }
 
         kbd->kbd_fun = ddf_fun_create(dev, fun_exposed, "kbd");
         if (!kbd->kbd_fun) {
+                ddf_msg(LVL_ERROR, "Failed creating function 'kbd'.");
                 return ENOMEM;
         }
@@ -218 +221 @@
         int ret = ddf_fun_bind(kbd->kbd_fun);
         if (ret != EOK) {
+                ddf_msg(LVL_ERROR, "Failed binding function 'kbd'.");
                 ddf_fun_destroy(kbd->kbd_fun);
-                return ENOMEM;
+                return EEXIST;
         }
 
         ret = ddf_fun_add_to_category(kbd->kbd_fun, "keyboard");
         if (ret != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding function 'kbd' to category "
+                    "'keyboard'.");
                 ddf_fun_unbind(kbd->kbd_fun);
                 ddf_fun_destroy(kbd->kbd_fun);
@@ -231 +237 @@
         kbd->polling_fibril = fibril_create(polling, kbd);
         if (!kbd->polling_fibril) {
+                ddf_msg(LVL_ERROR, "Failed creating polling fibril.");
                 ddf_fun_unbind(kbd->kbd_fun);
                 ddf_fun_destroy(kbd->kbd_fun);
                 return ENOMEM;
         }
+
         fibril_add_ready(kbd->polling_fibril);
         return EOK;
@@ -241 +249 @@
 /** Get data and parse scancodes.
  * @param arg Pointer to xt_kbd_t structure.
- * @return Never.
+ * @return EIO on error.
  */
 int polling(void *arg)
@@ -259 +267 @@
                 uint8_t code = 0;
                 ssize_t size = chardev_read(parent_exch, &code, 1);
+                if (size != 1)
+                        return EIO;
 
                 /** Ignore AT command reply */
@@ -269 +279 @@
                         map_size = sizeof(scanmap_e0) / sizeof(int);
                         size = chardev_read(parent_exch, &code, 1);
+                        if (size != 1)
+                                return EIO;
+
                         // TODO handle print screen
                 }
-
-                /* Invalid read. */
-                if (size != 1) {
-                        continue;
-                }
-
 
                 /* Bit 7 indicates press/release */