Changeset 4c53333 in mainline for uspace/srv/hid/input/port/adb.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/adb.c (modified) (5 diffs)

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

@@ -37 +37 @@
 #include <ipc/adb.h>
 #include <async.h>
-#include <input.h>
-#include <kbd_port.h>
-#include <kbd.h>
 #include <vfs/vfs.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <loc.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);
@@ -65 +65 @@
 static int adb_port_init(kbd_dev_t *kdev)
 {
+        kbd_dev = kdev;
+        
         const char *dev = "adb/kbd";
         service_id_t service_id;
-        async_exch_t *exch;
-        int rc;
-        
-        kbd_dev = kdev;
-        
-        rc = loc_service_get_id(dev, &service_id, 0);
+        int rc = loc_service_get_id(dev, &service_id, 0);
         if (rc != EOK)
                 return rc;
@@ -82 +79 @@
         }
         
-        exch = async_exchange_begin(dev_sess);
+        async_exch_t *exch = async_exchange_begin(dev_sess);
         if (exch == NULL) {
                 printf("%s: Failed starting exchange with device\n", NAME);
@@ -89 +86 @@
         }
         
-        /* NB: The callback connection is slotted for removal */
         rc = async_connect_to_me(exch, 0, 0, 0, kbd_port_events, NULL);
         async_exchange_end(exch);
@@ -122 +118 @@
                 ipc_callid_t callid = async_get_call(&call);
 
-                int retval;
+                int retval = EOK;
                 
                 if (!IPC_GET_IMETHOD(call)) {