Changeset 4c53333 in mainline for uspace/srv/hid/input/port/chardev.c

Timestamp:

2013-07-11T08:21:10Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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

File:

• uspace/srv/hid/input/port/chardev.c (modified) (3 diffs)

uspace/srv/hid/input/port/chardev.c

@@ -37 +37 @@
 #include <ipc/char.h>
 #include <async.h>
-#include <input.h>
-#include <kbd_port.h>
-#include <kbd.h>
 #include <loc.h>
 #include <errno.h>
 #include <stdio.h>
+#include "../input.h"
+#include "../kbd_port.h"
+#include "../kbd.h"
 
 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -63 +63 @@
 /** List of devices to try connecting to. */
 static const char *in_devs[] = {
-        "char/s3c24ser"
+        "char/s3c24xx_uart"
 };
 
@@ -148 +148 @@
                 }
 
-                int retval;
+                int retval = EOK;
 
                 switch (IPC_GET_IMETHOD(call)) {